Fix Merge errors

Author: voertler

tests/tests/uvm-systemc/examples/simple/trivial/sc_main.cpp

@@ -1,5 +1,3 @@
-<<<<<<< Upstream, based on temp_uvmsc_regression_merge
-
 //----------------------------------------------------------------------
 //   Copyright 2009 Cadence Design Systems, Inc.
 //   Copyright 2012-2014 NXP B.V.
@@ -39,45 +37,3 @@ int sc_main(int, char*[])
 
   return 0;
 }
-=======
-
-//----------------------------------------------------------------------
-//   Copyright 2009 Cadence Design Systems, Inc.
-//   Copyright 2012-2014 NXP B.V.
-//   All Rights Reserved Worldwide
-//
-//   Licensed under the Apache License, Version 2.0 (the
-//   "License"); you may not use this file except in
-//   compliance with the License.  You may obtain a copy of
-//   the License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in
-//   writing, software distributed under the License is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-//   CONDITIONS OF ANY KIND, either express or implied.  See
-//   the License for the specific language governing
-//   permissions and limitations under the License.
-//----------------------------------------------------------------------
-
-#include <systemc>
-#include <uvm>
-
-#include "component.h"
-
-int sc_main(int, char*[]) 
-{  
-  sc_core::sc_set_time_resolution( 1, sc_core::SC_FS );
-
-  // instantiate UVM component via the factory
-  my_component* component;
-  component = my_component::type_id::create("Top", nullptr);
-
-  uvm::run_test();
-
-  my_component::type_id::destroy(component);
-
-  return 0;
-}
->>>>>>> 5aa50b6 Fix regression tests to avoid -Winconsistent-overrides -Woverloaded-virtual

tests/tests/uvm-systemc/examples_uvmsc/packer/operators/packet.h

@@ -117,13 +117,8 @@ class packet : public uvm::uvm_object
     data = drhs->data;
   }
 
-<<<<<<< Upstream, based on temp_uvmsc_regression_merge
-  virtual bool do_compare( const uvm::uvm_object& rhs,
-                           const uvm::uvm_comparer* comparer = nullptr ) const
-=======
   bool do_compare( const uvm::uvm_object& rhs,
                            const uvm::uvm_comparer* comparer = NULL ) const override
->>>>>>> 5aa50b6 Fix regression tests to avoid -Winconsistent-overrides -Woverloaded-virtual
   {
     const packet* drhs = dynamic_cast<const packet*>(&rhs);
     if (!drhs)

tests/tests/uvm-systemc/unit_tests/01report/10catcher/03regnull/golden/test.log

@@ -1,10 +1,6 @@
 SystemC Simulation
 UVM_INFO @ 0 s: reporter [RNTST] Running test test...
-<<<<<<< Upstream, based on temp_uvmsc_regression_merge
 UVM TEST - ERROR expected since registering a default catcher with nullptr handle
-=======
-UVM TEST - ERROR expected since registering a default catcher with NULL handle
->>>>>>> 5aa50b6 Fix regression tests to avoid -Winconsistent-overrides -Woverloaded-virtual
 UVM_ERROR @ 0 s: reporter [CBUNREG] nullptr callback object cannot be registered with object (*) (uvm_object)
 UVM TEST EXPECT 1 UVM_ERROR
 UVM_INFO <removed by verify-uvm.pl> @ 0 s: reporter [UVM/REPORT/SERVER]