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

Timestamp:

Sep 28, 2010, 1:19:10 PM (14 years ago)

Author:

rosiere

Message:

1) compatible gcc 4.4.3
2) Translation file in MORPHEO_PREFIX directory

Location:

trunk/IPs/systemC/processor/Morpheo/Common

Files:

• include/Environment.h (modified) (1 diff)
• src/Basename.cpp (modified) (1 diff)
• src/Environment.cpp (modified) (4 diffs)
• src/Translation.cpp (modified) (1 diff)

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

@@ -47 +47 @@
   // Environment variable
   extern std::string MORPHEO_HOME;
-  extern std::string MORPHEO_TOPLEVEL;
+  extern std::string MORPHEO_PREFIX;
   extern std::string MORPHEO_VERSION;
   extern std::string MORPHEO_HEADER;

trunk/IPs/systemC/processor/Morpheo/Common/src/Basename.cpp

@@ -13 +13 @@
   std::string basename (std::string str, bool keep_extension)
   {
-    std::string res = ::basename(str.c_str());
+    std::string res = ::basename(const_cast<char *>(str.c_str()));
     
     if (not keep_extension)

trunk/IPs/systemC/processor/Morpheo/Common/src/Environment.cpp

@@ -11 +11 @@
 #include "Common/include/Message.h"
 #include <sys/stat.h>
+#include <errno.h>
 
 namespace morpheo {
@@ -16 +17 @@
 static bool environment_initialized;
 std::string MORPHEO_HOME;
-std::string MORPHEO_TOPLEVEL;
+std::string MORPHEO_PREFIX;
 std::string MORPHEO_VERSION;
 std::string MORPHEO_HEADER;
@@ -28 +29 @@
     {
       {
-        char * TOPLEVEL = getenv("MORPHEO_TOPLEVEL");
+        char * PREFIX = getenv("MORPHEO_PREFIX");
         
-        if (TOPLEVEL == NULL)
+        if (PREFIX == NULL)
           throw ERRORMORPHEO(FUNCTION,_("Error morpheo environment is not positioned.\n"));
 
-        MORPHEO_TOPLEVEL = TOPLEVEL;
+        MORPHEO_PREFIX = PREFIX;
       }
 
@@ -91 +92 @@
   if (chdir(dir.c_str())!=0)
     throw ERRORMORPHEO(FUNCTION,toString(_("Error in opening directory \"%s\".\n"),dir.c_str()));
-  chdir(pwd);
+
+  assert(chdir(pwd)==0);
 }
 

trunk/IPs/systemC/processor/Morpheo/Common/src/Translation.cpp

@@ -23 +23 @@
         environment();
         
-        std::string dirname = MORPHEO_TOPLEVEL;
-        dirname += "/IPs/systemC/processor/Morpheo/locale";
+        std::string dirname = MORPHEO_PREFIX;
+        dirname += "/locale";
 
         if (bindtextdomain(MORPHEO_PACKAGE,dirname.c_str()) == NULL)