Changeset 75 for trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Component_vhdl_instance.cpp

Timestamp:

Jan 31, 2008, 6:46:41 PM (16 years ago)

Author:

rosiere

Message:

Update all component (except front_end) to :

• new statistics model
• no namespace std

File:

• trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Component_vhdl_instance.cpp (modified) (10 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Component_vhdl_instance.cpp

@@ -19 +19 @@
 
     uint32_t             cpt = 0;
-    map<Signal *,string> tab;
+    std::map<Signal *,std::string> tab;
 
     // buffer all output
@@ -25 +25 @@
     {
       // for each interface
-      list<Interface_fifo *>         * list_interface = (_entity)->get_interfaces_list()->get_interface_list();
-      list<Interface_fifo *>::iterator j              = list_interface->begin();
+      std::list<Interface_fifo *>         * list_interface = (_entity)->get_interfaces_list()->get_interface_list();
+      std::list<Interface_fifo *>::iterator j              = list_interface->begin();
       if (not list_interface->empty())
         {
@@ -36 +36 @@
             {
               // for each signal
-              list<Signal *>         * list_signal = (*j)->get_signal_list();
-              list<Signal *>::iterator k           = list_signal->begin();
+              std::list<Signal *>         * list_signal = (*j)->get_signal_list();
+              std::list<Signal *>::iterator k           = list_signal->begin();
               if (not list_signal->empty())
                 {
@@ -49 +49 @@
                         {
                           // Create name
-                          string signal_name = "signal_"+toString(cpt++);
+                          std::string signal_name = "signal_"+toString(cpt++);
                           
                           tab [signal                           ] = signal_name;
@@ -76 +76 @@
 
     // for each entity
-    list<Tcomponent_t *>         * list_component = _list_component;
-    list<Tcomponent_t *>::iterator i              = list_component->begin();
+    std::list<Tcomponent_t *>         * list_component = _list_component;
+    std::list<Tcomponent_t *>::iterator i              = list_component->begin();
     if (not list_component->empty())
       {
@@ -90 +90 @@
             if (instance & INSTANCE_COMPONENT)
             {
-              list<string> list_port_map;
+              std::list<std::string> list_port_map;
               
               // for each interface
-              list<Interface_fifo *>         * list_interface = entity->get_interfaces_list()->get_interface_list();
-              list<Interface_fifo *>::iterator j              = list_interface->begin();
+              std::list<Interface_fifo *>         * list_interface = entity->get_interfaces_list()->get_interface_list();
+              std::list<Interface_fifo *>::iterator j              = list_interface->begin();
               if (not list_interface->empty())
                 {
@@ -100 +100 @@
                     {
                       // for each signal
-                      list<Signal *>         * list_signal = (*j)->get_signal_list();
-                      list<Signal *>::iterator k           = list_signal->begin();
+                      std::list<Signal *>         * list_signal = (*j)->get_signal_list();
+                      std::list<Signal *>::iterator k           = list_signal->begin();
                       if (not list_signal->empty())
                         {
@@ -112 +112 @@
                                 {
                                   Signal * signal_dest = signal_src->get_connect_to_signal();
-                                  string   name_src    = signal_src->get_name();
-                                  string   name_dest;
+                                  std::string   name_src    = signal_src->get_name();
+                                  std::string   name_dest;
                                   
 //                              // Test if destination signal is a interface port ?
@@ -119 +119 @@
 //                                {
                                   // find if signal is already link
-                                  map<Signal *,string>::iterator it = tab.find(signal_dest); 
+                                  std::map<Signal *,std::string>::iterator it = tab.find(signal_dest); 
                                   if (tab.find(signal_dest) == tab.end())
                                     {
@@ -144 +144 @@
 //                                    {
 //                                      // Take buffer's signal
-//                                      map<Signal *,string>::iterator it = tab.find(signal_dest);
+//                                      map<Signal *,std::string>::iterator it = tab.find(signal_dest);
 //                                      name_dest        = (*it).second;