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

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/include

Files:

• Counter.h (modified) (4 diffs)
• Parameters.h (modified) (1 diff)

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);
   };