Changeset 75 for trunk/IPs/systemC/processor/Morpheo/Common

Timestamp:

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

Author:

rosiere

Message:

Update all component (except front_end) to :

• new statistics model
• no namespace std

Location:

trunk/IPs/systemC/processor/Morpheo/Common/include

Files:

• Test.h (modified) (5 diffs)
• ToBase2.h (modified) (2 diffs)

trunk/IPs/systemC/processor/Morpheo/Common/include/Test.h

@@ -9 +9 @@
 #include "Common/include/ToString.h"
 
+namespace morpheo {
+
 //-----[ Routine de test ]---------------------------------------
 
@@ -15 +17 @@
 inline void test_ko_error (void)
 {
-  string msg = "Test ko : error in test \""+morpheo::toString(num_test)+"\"";
+  std::string msg = "Test ko : error in test \""+morpheo::toString(num_test)+"\"";
   throw (morpheo::ErrorMorpheo (msg));
 }
@@ -22 +24 @@
 inline void test_ko (char * file, uint32_t line, T exp1, T exp2)
 {
-  cerr << "[" << num_test << "] : Test KO"
-       << "\tline " << line                           << endl
-       << " * Localisation"                           << endl
-       << "   - File : " << file                      << endl
-       << "   - Line : " << line                      << endl
-       << " * Expression is different"                << endl
-       << "   - exp1 : "+morpheo::toString(exp1)               << endl
-       << "   - exp2 : "+morpheo::toString(exp2)               << endl;
+  std::cerr << "[" << num_test << "] : Test KO"
+       << "\tline " << line                           << std::endl
+       << " * Localisation"                           << std::endl
+       << "   - File : " << file                      << std::endl
+       << "   - Line : " << line                      << std::endl
+       << " * Expression is different"                << std::endl
+       << "   - exp1 : "+morpheo::toString(exp1)               << std::endl
+       << "   - exp2 : "+morpheo::toString(exp2)               << std::endl;
 
   test_ko_error ();
@@ -36 +38 @@
 inline void test_ko (char * file, uint32_t line)
 {
-  cerr << "[" << num_test << "] : Test KO"
-       << "\tline " << line                           << endl
-       << " * Localisation"                           << endl
-       << "   - File : " << file                      << endl
-       << "   - Line : " << line                      << endl;
+  std::cerr << "[" << num_test << "] : Test KO"
+       << "\tline " << line                           << std::endl
+       << " * Localisation"                           << std::endl
+       << "   - File : " << file                      << std::endl
+       << "   - Line : " << line                      << std::endl;
   
   test_ko_error ();
@@ -79 +81 @@
 };
 
-#define TEST(type,exp1,exp2)            do {test<type> (__FILE__,__LINE__,exp1,exp2);} while(0)
-#define TEST_STR(type,exp1,exp2,str...) do {fprintf(stdout,str); fprintf(stdout,"\n"); test<type> (__FILE__,__LINE__,exp1,exp2);} while(0)
-#define TEST_OK(str...)                 do {fprintf(stdout,str); fprintf(stdout,"\n"); test_ok(__FILE__,__LINE__);} while(0)
-#define TEST_KO(str...)                 do {fprintf(stdout,str); fprintf(stdout,"\n"); test_ko(__FILE__,__LINE__);} while(0)
+#define TEST(type,exp1,exp2)            do {morpheo::test<type> (__FILE__,__LINE__,exp1,exp2);} while(0)
+#define TEST_STR(type,exp1,exp2,str...) do {fprintf(stdout,str); fprintf(stdout,"\n"); morpheo::test<type> (__FILE__,__LINE__,exp1,exp2);} while(0)
+#define TEST_OK(str...)                 do {fprintf(stdout,str); fprintf(stdout,"\n"); morpheo::test_ok(__FILE__,__LINE__);} while(0)
+#define TEST_KO(str...)                 do {fprintf(stdout,str); fprintf(stdout,"\n"); morpheo::test_ko(__FILE__,__LINE__);} while(0)
 
 
+};
 #endif

trunk/IPs/systemC/processor/Morpheo/Common/include/ToBase2.h

@@ -10 +10 @@
 
 #include <sstream>
-using namespace std;
 
 namespace morpheo              {
@@ -16 +15 @@
   template<typename T> inline std::string toBase2 (const T& value, const uint32_t & size)
   {
-    ostringstream res;
+    std::ostringstream res;
     T mask = 1<<(size-1);