Changeset 75 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Queue/include/Queue.h

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/Generic/Queue/include/Queue.h (modified) (7 diffs)

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

@@ -22 +22 @@
 #include "Behavioural/Generic/Queue/include/Parameters.h"
 #ifdef STATISTICS
-#include "Behavioural/Generic/Queue/include/Statistics.h"
+#include "Behavioural/include/Stat.h"
 #endif
 #include "Behavioural/include/Component.h"
@@ -29 +29 @@
 #endif
 #include "Behavioural/include/Usage.h"
-
-using namespace std;
-using namespace morpheo::behavioural::generic::queue_control;
 
 namespace morpheo {
@@ -46 +43 @@
     // -----[ fields ]----------------------------------------------------
     // Parameters
-  protected : const string       _name;
+  protected : const std::string       _name;
   protected : const Parameters * _param;
   private   : const Tusage_t     _usage;
@@ -55 +52 @@
 
 #ifdef STATISTICS
-  private   : Statistics                     * _stat;
+  public    : Stat                           * _stat;
 #endif
 
@@ -99 +96 @@
    sc_module_name                                name,
 #else                                          
-   string                                        name,
+   std::string                                   name,
 #endif                                         
 #ifdef STATISTICS
@@ -116 +113 @@
   public  : void     genMoore                  (void);
 #endif                                         
+
 #ifdef STATISTICS
-  public  : string   statistics                (uint32_t depth);
+  public  : void     statistics_declaration    (morpheo::behavioural::Parameters_Statistics * param_statistics);
 #endif
                                                
@@ -125 +123 @@
   private : void     vhdl_body                 (Vhdl * & vhdl);
 #endif                                         
-                                               
-#ifdef VHDL_TESTBENCH                          
-  private : void     vhdl_testbench_transition (void);
+
+#if defined(STATISTICS) or defined(VHDL_TESTBENCH)
+  private : void     end_cycle                 (void);
 #endif
   };