Changeset 63 for trunk

Timestamp:

Jul 21, 2010, 5:57:00 PM (14 years ago)

Author:

nipo

Message:

Use proper namespaces

Location:

trunk/communication/gate_2/caba/source/include

Files:

• gate_ports_2.h (modified) (2 diffs)
• gate_signals_2.h (modified) (1 diff)

trunk/communication/gate_2/caba/source/include/gate_ports_2.h

@@ -37 +37 @@
 public:
 
-        sc_out<sc_uint<ring_cmd_data_size> > cmd_data;
-        sc_in<bool> cmd_wok;
-        sc_out<bool> cmd_w;
+        sc_core::sc_out<sc_dt::sc_uint<ring_cmd_data_size> > cmd_data;
+        sc_core::sc_in<bool> cmd_wok;
+        sc_core::sc_out<bool> cmd_w;
 
-        sc_in<sc_uint<ring_rsp_data_size> > rsp_data;
-        sc_out<bool> rsp_r;
-        sc_in<bool> rsp_rok;
+        sc_core::sc_in<sc_dt::sc_uint<ring_rsp_data_size> > rsp_data;
+        sc_core::sc_out<bool> rsp_r;
+        sc_core::sc_in<bool> rsp_rok;
 
         GateTarget2(const std::string &name = sc_gen_unique_name("gate_target_2_"))
@@ -87 +87 @@
 public:
         
-        sc_in<sc_uint<ring_cmd_data_size> > cmd_data;
-        sc_out<bool> cmd_r;
-        sc_in<bool> cmd_rok;
+        sc_core::sc_in<sc_dt::sc_uint<ring_cmd_data_size> > cmd_data;
+        sc_core::sc_out<bool> cmd_r;
+        sc_core::sc_in<bool> cmd_rok;
 
-        sc_out<sc_uint<ring_rsp_data_size> > rsp_data;
-        sc_in<bool> rsp_wok;
-        sc_out<bool> rsp_w;
+        sc_core::sc_out<sc_dt::sc_uint<ring_rsp_data_size> > rsp_data;
+        sc_core::sc_in<bool> rsp_wok;
+        sc_core::sc_out<bool> rsp_w;
         
         GateInitiator2(const std::string &name = sc_gen_unique_name("gate_initiator_2_"))

trunk/communication/gate_2/caba/source/include/gate_signals_2.h

@@ -37 +37 @@
 public:
 
-        sc_signal<sc_uint<ring_cmd_data_size> > cmd_data;
-        sc_signal<bool> cmd_r_wok;
-        sc_signal<bool> cmd_w_rok;
+        sc_core::sc_signal<sc_dt::sc_uint<ring_cmd_data_size> > cmd_data;
+        sc_core::sc_signal<bool> cmd_r_wok;
+        sc_core::sc_signal<bool> cmd_w_rok;
 
-        sc_signal<sc_uint<ring_rsp_data_size> > rsp_data;
-        sc_signal<bool> rsp_r_wok;
-        sc_signal<bool> rsp_w_rok;
+        sc_core::sc_signal<sc_dt::sc_uint<ring_rsp_data_size> > rsp_data;
+        sc_core::sc_signal<bool> rsp_r_wok;
+        sc_core::sc_signal<bool> rsp_w_rok;
 
         GateSignals2(std::string name = (std::string)sc_gen_unique_name("gate_signals_2_"))