Replace systemc.h with systemc header

examples/sysc/2.1/dpipe/main.cpp

@@ -38,7 +38,11 @@
  *****************************************************************************/
 
 
-#include "systemc.h"
+#include <systemc>
+using namespace sc_core;
+using namespace sc_dt;
+using std::cout;
+using std::endl;
 
 // This program implements a delay pipe which passes values through a fifo
 // in a specified number of clocks. A value may be inserted at each clock

examples/sysc/2.1/forkjoin/forkjoin.cpp

@@ -37,7 +37,10 @@
  *****************************************************************************/
 
 
-#include <systemc.h>
+#include <systemc>
+using namespace sc_core;
+using std::cout;
+using std::endl;
 
 
 int test_function(double d)

examples/sysc/2.1/reset_signal_is/reset_signal_is.cpp

@@ -38,7 +38,10 @@
  *****************************************************************************/
 
 
-#include "systemc.h" 
+#include <systemc>
+using namespace sc_core;
+using std::cout;
+using std::endl;
 SC_MODULE(CONSUMER)
 {
 	SC_CTOR(CONSUMER)

examples/sysc/2.1/sc_export/main.cpp

@@ -68,7 +68,10 @@ bound to ports P1 and P2 of module X.
 
 */
 
-#include "systemc.h"
+#include <systemc>
+using namespace sc_core;
+using std::cout;
+using std::endl;
 
 // Interface
 class C_if : virtual public sc_interface

examples/sysc/2.1/sc_report/main.cpp

@@ -40,7 +40,10 @@
 
  *****************************************************************************/
 
-#include <systemc.h>
+#include <systemc>
+using namespace sc_core;
+using std::cout;
+using std::endl;
 
 
 /*

examples/sysc/2.1/scx_barrier/main.cpp

@@ -39,7 +39,11 @@
 
  *****************************************************************************/
 
-#include "systemc.h"
+#include <systemc>
+using namespace sc_core;
+using std::cout;
+using std::endl;
+using std::printf;
 #include "scx_barrier.h"
 using sc_core::scx_barrier;
 

examples/sysc/2.1/scx_mutex_w_policy/scx_mutex_w_policy.cpp

@@ -56,7 +56,12 @@
 // See section 7.4, page 120 of "System Design with SystemC" for
 //  additional discussion
 
-#include <systemc.h>
+#include <systemc>
+using namespace sc_core;
+using std::cout;
+using std::endl;
+using std::rand;
+using std::remove;
 
 class scx_mutex_w_policy : public sc_mutex 
 { 

examples/sysc/2.3/sc_rvd/main.cpp

@@ -37,7 +37,11 @@
 //  Andy Goodrich: new example using a ready-valid handshake for communication.
 //
 
-#include "systemc.h"
+#include <systemc>
+using namespace sc_core;
+using namespace sc_dt;
+using std::cout;
+using std::endl;
 #include <iomanip>
 #include "sc_rvd.h"
 

examples/sysc/2.3/sc_ttd/main.cpp

@@ -37,7 +37,11 @@
 //  Andy Goodrich: new example using a toggle-toggle handshake for communication.
 //
 
-#include "systemc.h"
+#include <systemc>
+using namespace sc_core;
+using namespace sc_dt;
+using std::cout;
+using std::endl;
 #include <iomanip>
 #include "sc_ttd.h"
 

examples/sysc/2.3/simple_async/main.cpp

@@ -28,7 +28,10 @@
  *****************************************************************************/
 
 
-#include "systemc.h"
+#include <systemc>
+using namespace sc_core;
+using std::cout;
+using std::endl;
 #include "async_event.h"
 
 #if SC_CPLUSPLUS >= 201103L

examples/sysc/2.4/in_class_initialization/adder.h

@@ -30,7 +30,8 @@
 #ifndef ADDER_H_
 #define ADDER_H_
 
-#include <systemc.h>
+#include <systemc>
+using namespace sc_core;
 
 template <typename T, int N_INPUTS>
 struct adder : sc_module {

examples/sysc/2.4/in_class_initialization/adder_int_5_pimpl.h

@@ -31,7 +31,8 @@
 #ifndef ADDER_PIMPL_H_
 #define ADDER_PIMPL_H_
 
-#include <systemc.h>
+#include <systemc>
+using namespace sc_core;
 
 // Demonstrates how to remove compile dependency on adder.h header using PImpl
 class adder_int_5_pimpl {

examples/sysc/2.4/in_class_initialization/in_class_initialization.cpp

@@ -26,7 +26,9 @@
 
  *****************************************************************************/
 
-#include <systemc.h>
+#include <systemc>
+using namespace sc_core;
+using std::cout;
 
 #ifdef USE_PIMPL_ADDER
     #include "adder_int_5_pimpl.h"

examples/sysc/async_suspend/async_suspend.cpp

@@ -22,7 +22,11 @@
 
  *****************************************************************************/
 
-#include <systemc.h>
+#include <systemc>
+using namespace sc_core;
+using std::rand;
+using std::size_t;
+using std::srand;
 #include "node.h"
 #include <vector>
 

examples/sysc/async_suspend/collector.h

@@ -31,6 +31,8 @@
 namespace plt = matplotlibcpp;
 #endif
 
+using std::cout;
+
 /* thread-safe collector to enable pretty-printing the output of the
  * simulation as a csv style output (import it into a spreadsheet and draw some
  * nice graphs !*/

examples/sysc/fft/fft_flpt/fft.cpp

@@ -36,7 +36,11 @@
  *****************************************************************************/
 
 
-#include "systemc.h"
+#include <systemc>
+using namespace sc_core;
+using namespace sc_dt;
+using std::cout;
+using std::endl;
 #include "fft.h"
 
 void fft::entry()

examples/sysc/fft/fft_flpt/main.cpp

@@ -37,7 +37,10 @@
  *****************************************************************************/
 
 
-#include "systemc.h"
+#include <systemc>
+using namespace sc_core;
+using std::FILE;
+using std::fclose;
 #include "fft.h"
 #include "source.h"
 #include "sink.h"

examples/sysc/fft/fft_flpt/sink.cpp

@@ -37,7 +37,12 @@
  *****************************************************************************/
 
 
-#include "systemc.h"
+#include <systemc>
+using namespace sc_core;
+using std::FILE;
+using std::fclose;
+using std::fopen;
+using std::fprintf;
 #include "sink.h"
 
 void sink::entry()

examples/sysc/fft/fft_flpt/source.cpp

@@ -37,7 +37,13 @@
  *****************************************************************************/
 
 
-#include "systemc.h"
+#include <systemc>
+using namespace sc_core;
+using std::FILE;
+using std::cout;
+using std::endl;
+using std::fopen;
+using std::fscanf;
 #include "source.h"
 void source::entry()
 { FILE *fp_real, *fp_imag;

examples/sysc/fft/fft_fxpt/fft.cpp

@@ -37,7 +37,11 @@
 
 
 /* This is the implementation file for the synchronous process "fft" */
-#include "systemc.h"
+#include <systemc>
+using namespace sc_core;
+using namespace sc_dt;
+using std::cout;
+using std::endl;
 #include "fft.h"
 
 

examples/sysc/fft/fft_fxpt/main.cpp

@@ -37,7 +37,11 @@
  *****************************************************************************/
 
 
-#include "systemc.h"
+#include <systemc>
+using namespace sc_core;
+using namespace sc_dt;
+using std::FILE;
+using std::fclose;
 #include "fft.h"
 #include "source.h"
 #include "sink.h"

examples/sysc/fft/fft_fxpt/sink.cpp

@@ -37,7 +37,13 @@
  *****************************************************************************/
 
 
-#include "systemc.h"
+#include <systemc>
+using namespace sc_core;
+using namespace sc_dt;
+using std::FILE;
+using std::fclose;
+using std::fopen;
+using std::fprintf;
 #include "sink.h"
 
 void sink::entry()

examples/sysc/fft/fft_fxpt/source.cpp

@@ -37,7 +37,14 @@
  *****************************************************************************/
 
 
-#include "systemc.h"
+#include <systemc>
+using namespace sc_core;
+using namespace sc_dt;
+using std::FILE;
+using std::cout;
+using std::endl;
+using std::fopen;
+using std::fscanf;
 #include "source.h"
 
 void source::entry()

examples/sysc/fir/display.cpp

@@ -35,7 +35,10 @@
 
  *****************************************************************************/
 
-#include <systemc.h>
+#include <systemc>
+using namespace sc_core;
+using std::cout;
+using std::endl;
 #include "display.h"
 
 void display::entry(){

examples/sysc/fir/fir.cpp

@@ -35,7 +35,9 @@
 
  *****************************************************************************/
 
-#include <systemc.h>
+#include <systemc>
+using namespace sc_core;
+using namespace sc_dt;
 #include "fir.h"
 
 void fir::entry() {

examples/sysc/fir/fir_data.cpp

@@ -35,7 +35,11 @@
 
  *****************************************************************************/
 
-#include <systemc.h>
+#include <systemc>
+using namespace sc_core;
+using namespace sc_dt;
+using std::cout;
+using std::endl;
 #include "fir_data.h"
 
 void fir_data::entry()

examples/sysc/fir/fir_fsm.cpp

@@ -35,7 +35,11 @@
 
  *****************************************************************************/
 
-#include <systemc.h>
+#include <systemc>
+using namespace sc_core;
+using namespace sc_dt;
+using std::cout;
+using std::endl;
 #include "fir_fsm.h"
 
 void fir_fsm::entry() {

examples/sysc/fir/fir_top.h

@@ -35,7 +35,9 @@
 
  *****************************************************************************/
 
-#include <systemc.h>
+#include <systemc>
+using namespace sc_core;
+using namespace sc_dt;
 #include "fir_fsm.h"
 #include "fir_data.h"
 

examples/sysc/fir/main.cpp

@@ -35,7 +35,9 @@
 
  *****************************************************************************/
 
-#include <systemc.h>
+#include <systemc>
+using namespace sc_core;
+using namespace sc_dt;
 #include "stimulus.h"
 #include "display.h"
 #include "fir.h"

examples/sysc/fir/main_rtl.cpp

@@ -35,7 +35,9 @@
 
  *****************************************************************************/
 
-#include <systemc.h>
+#include <systemc>
+using namespace sc_core;
+using namespace sc_dt;
 #include "stimulus.h"
 #include "display.h"
 #include "fir_top.h"

examples/sysc/fir/stimulus.cpp

@@ -35,7 +35,11 @@
 
  *****************************************************************************/
 
-#include <systemc.h>
+#include <systemc>
+using namespace sc_core;
+using namespace sc_dt;
+using std::cout;
+using std::endl;
 #include "stimulus.h"
 
 void stimulus::entry() {

examples/sysc/pipe/display.cpp

@@ -35,7 +35,9 @@
 
  *****************************************************************************/
 
-#include "systemc.h"
+#include <systemc>
+using namespace sc_core;
+using std::printf;
 #include "display.h"
 
 #include <stdio.h>