Changeset 75 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Counter

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

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Counter

Files:

• VERSION (deleted)
• include/Counter.h (modified) (4 diffs)
• include/Parameters.h (modified) (1 diff)
• src/Counter_allocation.cpp (modified) (1 diff)
• src/Counter_statistics_declaration.cpp (modified) (1 diff)
• src/Counter_statistics_print.cpp (deleted)
• src/Counter_vhdl_body.cpp (modified) (1 diff)
• src/Parameters_msg_error.cpp (modified) (2 diffs)
• src/Parameters_print.cpp (modified) (3 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Counter/include/Counter.h

@@ -27 +27 @@
 #include "Behavioural/include/Component.h"
 
-using namespace std;
-
 namespace morpheo {
 namespace behavioural {
@@ -41 +39 @@
     // -----[ fields ]----------------------------------------------------
     // Parameters
-  protected : const string     _name;
+  protected : const std::string     _name;
 
   protected : const Parameters _param;
 
 #ifdef STATISTICS
-  private   : Stat                           * _stat;
+  public    : Stat                           * _stat;
 #endif
 
@@ -75 +73 @@
   public  :          Counter              (sc_module_name                              name,
 #else                                          
-  public  :          Counter              (string                                      name,
+  public  :          Counter              (std::string                                 name,
 #endif                                         
 #ifdef STATISTICS
@@ -96 +94 @@
 #ifdef STATISTICS
   public  : void     statistics_declaration    (morpheo::behavioural::Parameters_Statistics * param_statistics);
-  public  : string   statistics_print          (uint32_t depth);
 #endif
                                                

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Counter/include/Parameters.h

@@ -32 +32 @@
   public : ~Parameters () ;
 
-  public : string msg_error (void);
-
-  public :        string   print      (uint32_t depth);
-  public : friend ostream& operator<< (ostream& output_stream,
-                                       morpheo::behavioural::generic::counter::Parameters & x);
+  public :        std::string   msg_error  (void);
+  public :        std::string   print      (uint32_t depth);
+  public : friend std::ostream& operator<< (std::ostream& output_stream,
+                                            morpheo::behavioural::generic::counter::Parameters & x);
   };
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Counter/src/Counter_allocation.cpp

@@ -17 +17 @@
   void Counter::allocation (void)
   {
-    string rename;
-
     log_printf(FUNC,Counter,"allocation","Begin");
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Counter/src/Counter_statistics_declaration.cpp

@@ -20 +20 @@
     log_printf(FUNC,Counter,FUNCTION,"Begin");
 
-    _stat = new Stat (static_cast<string>(_name),
+    _stat = new Stat (static_cast<std::string>(_name),
                       "Counter",
                       param_statistics);

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Counter/src/Counter_vhdl_body.cpp

@@ -21 +21 @@
     for (uint32_t i=0; i<_param._nb_port; i++)
       {
-        string counter_inc, counter_dec;
+        std::string counter_inc, counter_dec;
 
         if (_param._size_data > 1)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Counter/src/Parameters_msg_error.cpp

@@ -9 +9 @@
 #include "Behavioural/Generic/Counter/include/Types.h"
 #include <sstream>
-using namespace std;
 
 namespace morpheo                    {
@@ -17 +16 @@
 
 
-  string Parameters::msg_error(void)
+  std::string Parameters::msg_error(void)
   {
     log_printf(FUNC,Counter,"msg_error","Begin");
 
-    string msg = "";
+    std::string msg = "";
 
     if (_size_data < 1)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Counter/src/Parameters_print.cpp

@@ -8 +8 @@
 #include "Behavioural/Generic/Counter/include/Parameters.h"
 #include "Behavioural/include/XML.h"
-using namespace std;
 
 namespace morpheo                    {
@@ -16 +15 @@
 
 
-  string Parameters::print (uint32_t depth)
+  std::string Parameters::print (uint32_t depth)
   {
     log_printf(FUNC,Counter,"print","Begin");
@@ -36 +35 @@
   };
 
-  ostream& operator<< (ostream& output_stream ,
-                       morpheo::behavioural::generic::counter::Parameters & x)
+  std::ostream& operator<< (std::ostream& output_stream ,
+                            morpheo::behavioural::generic::counter::Parameters & x)
   {
     output_stream << x.print(0);