OCC20850 umake command do not work on SunOS10

diff --git a/src/WOKTools/WOKTools_Define.cxx b/src/WOKTools/WOKTools_Define.cxx
index 52aa7cca4eb7915ec3144111e85e57b6a14af517..0691c61e061742efd6e1cd1af4c90eb5430f2b30 100755 (executable)
--- a/src/WOKTools/WOKTools_Define.cxx
+++ b/src/WOKTools/WOKTools_Define.cxx
@@ -41,14 +41,14 @@ void WOKTools_Define::GetDefineIn(const Handle(TCollection_HAsciiString)& aline)
   if( apos == 0 )
     {
       // il n'y a pas de = dans la ligne
-      ErrorMsg << "WOKTools_Define::GetDefineIn" << "Missing = in line : " << aline << endm;
+      ErrorMsg() << "WOKTools_Define::GetDefineIn" << "Missing = in line : " << aline << endm;
       Standard_ProgramError::Raise("WOKTools_Define::GetDefineIn");
     }
 
   if( apos == 1 )
     {
       // il n'y a pas de nom du parametre dans la ligne
-      ErrorMsg << "WOKTools_Define::GetDefineIn" << "Missing parameter name in line : " << aline << endm;
+      ErrorMsg() << "WOKTools_Define::GetDefineIn" << "Missing parameter name in line : " << aline << endm;
       Standard_ProgramError::Raise("WOKTools_Define::GetDefineIn");
     }  
   // evaluation de du nom
@@ -144,7 +144,7 @@ Standard_Boolean WOKTools_Define::IsValueValid(const Handle(TCollection_HAsciiSt
   
   if(!valid)
     {
-      ErrorMsg << "WOKTools_Define::IsValueValid" 
+      ErrorMsg() << "WOKTools_Define::IsValueValid" 
               << "Parameter value with ~ or * in : " << avalue << " is illegal" << endm;
     }
   return valid;

diff --git a/src/WOKTools/WOKTools_Error.cxx b/src/WOKTools/WOKTools_Error.cxx
index 3902b58b32cb1fe2f53ebe755773e91e5705786d..5527620f183e8b994af0b0f2784cae373b03ec57 100755 (executable)
--- a/src/WOKTools/WOKTools_Error.cxx
+++ b/src/WOKTools/WOKTools_Error.cxx
@@ -5,7 +5,7 @@
 
 #include <WOKTools_Error.ixx>
 
-Standard_EXPORT WOKTools_Error ErrorMsg;
+Standard_EXPORT WOKTools_Error ErrorMsg();
 
 WOKTools_Error::WOKTools_Error() : WOKTools_Message("WOK_ERROR", "Error   : ")
 {

diff --git a/src/WOKTools/WOKTools_Info.cxx b/src/WOKTools/WOKTools_Info.cxx
index c356f61a364aa2b916660cfae468de70609fc2bf..042a80f2a6ec2fd89672ff13d3d2f603d10d7e81 100755 (executable)
--- a/src/WOKTools/WOKTools_Info.cxx
+++ b/src/WOKTools/WOKTools_Info.cxx
@@ -1,7 +1,7 @@
 
 #include <WOKTools_Info.ixx>
 
-Standard_EXPORT WOKTools_Info InfoMsg;
+Standard_EXPORT WOKTools_Info InfoMsg();
 
 WOKTools_Info::WOKTools_Info() : WOKTools_Message("WOK_INFO", "Info    : ")
 {

diff --git a/src/WOKTools/WOKTools_Message.cxx b/src/WOKTools/WOKTools_Message.cxx
index ef985a7bd059d0d7d1bd021002326971c51e748f..3594700d5466be3b354f524030c0d22f43adfd80 100755 (executable)
--- a/src/WOKTools/WOKTools_Message.cxx
+++ b/src/WOKTools/WOKTools_Message.cxx
@@ -400,4 +400,26 @@ WOKTools_Message& flushm(WOKTools_Message& amsgq)
   return result;
 }
 
+WOKTools_Info& InfoMsg()
+{
+  static WOKTools_Info InfoMsg;
+  return InfoMsg;
+}
+
+WOKTools_Warning& WarningMsg()
+{
+  static WOKTools_Warning WarningMsg;
+  return WarningMsg;
+}
 
+WOKTools_Error& ErrorMsg()
+{
+  static WOKTools_Error ErrorMsg;
+  return ErrorMsg;
+}
+
+WOKTools_Verbose& VerboseMsg()
+{
+  static WOKTools_Verbose VerboseMsg;
+  return VerboseMsg;
+}

diff --git a/src/WOKTools/WOKTools_Messages.hxx b/src/WOKTools/WOKTools_Messages.hxx
index cc9abb6169faa5cf9bd64e2c5554499f25743536..82da6f061d0a542f0da97a15676876a5316b75b6 100755 (executable)
--- a/src/WOKTools/WOKTools_Messages.hxx
+++ b/src/WOKTools/WOKTools_Messages.hxx
@@ -23,10 +23,10 @@
 # endif  // WNT
 #endif  // __WOKTools_API
 
-extern __WOKTools_API WOKTools_Info    InfoMsg;
-extern __WOKTools_API WOKTools_Warning WarningMsg;
-extern __WOKTools_API WOKTools_Error   ErrorMsg;
-extern __WOKTools_API WOKTools_Verbose VerboseMsg;
+extern __WOKTools_API WOKTools_Info&    InfoMsg();
+extern __WOKTools_API WOKTools_Warning& WarningMsg();
+extern __WOKTools_API WOKTools_Error&   ErrorMsg();
+extern __WOKTools_API WOKTools_Verbose& VerboseMsg();
 
 extern __WOKTools_API WOKTools_Message& endm(WOKTools_Message&);
 extern __WOKTools_API WOKTools_Message& flushm(WOKTools_Message&);
@@ -35,11 +35,11 @@ extern __WOKTools_API WOKTools_Message& flushm(WOKTools_Message&);
 #define WOK_VERBOSE 1
 #endif
 
-#define WOK_TRACE0(msg) if(VerboseMsg.IsSet()) { msg }
+#define WOK_TRACE0(msg) if(VerboseMsg().IsSet()) { msg }
 
-#define WOK_TRACE if(VerboseMsg.IsSet())
+#define WOK_TRACE if(VerboseMsg().IsSet())
 
 
-#define WOK_BEGIN_TRACE  if(VerboseMsg.IsSet()) {
+#define WOK_BEGIN_TRACE  if(VerboseMsg().IsSet()) {
 #define WOK_END_TRACE    }
 #endif

diff --git a/src/WOKTools/WOKTools_Options.cxx b/src/WOKTools/WOKTools_Options.cxx
index cd53f7273bf3f851798e81a329b002a98338ce34..9bd5093ba875c268d7acaa1b6ab974b3dd8d2330 100755 (executable)
--- a/src/WOKTools/WOKTools_Options.cxx
+++ b/src/WOKTools/WOKTools_Options.cxx
@@ -95,8 +95,8 @@ void WOKTools_Options::Next()
            {
              mymore = Standard_False;
              myerrflg = Standard_True;
-             ErrorMsg << myargv[0] << "option - is illegal" << endm;
-             ErrorMsg << myargv[0] << endm;
+             ErrorMsg() << myargv[0] << "option - is illegal" << endm;
+             ErrorMsg() << myargv[0] << endm;
              if(myusage != NULL) (*myusage)(myargv[0]);
            }
          else
@@ -113,8 +113,8 @@ void WOKTools_Options::Next()
            }
          else
            {
-             ErrorMsg << myargv[0] << "Option " << (char)mycuropt << " is exclusive with : " << (char)myexclflg << endm;
-             ErrorMsg << myargv[0] << endm;
+             ErrorMsg() << myargv[0] << "Option " << (char)mycuropt << " is exclusive with : " << (char)myexclflg << endm;
+             ErrorMsg() << myargv[0] << endm;
              if(myusage != NULL) (*myusage)(myargv[0]);
              myerrflg = Standard_True;
            }
@@ -256,13 +256,13 @@ void WOKTools_Options::Define(const Handle(TCollection_HAsciiString)& aname, con
 {
   if(aname.IsNull())
     { 
-      ErrorMsg << "WOKTools_Options::Define"
+      ErrorMsg() << "WOKTools_Options::Define"
               << "Invalid Null name for define" << endm;
       return;
     }
   if(avalue.IsNull())
     { 
-      ErrorMsg << "WOKTools_Options::Define"
+      ErrorMsg() << "WOKTools_Options::Define"
               << "Invalid Null value for define" << endm;
       return;
     }

diff --git a/src/WOKTools/WOKTools_Verbose.cxx b/src/WOKTools/WOKTools_Verbose.cxx
index 1516c2646a4179735708b5cbebd150d489560c2d..48b77d3f03255bb293735bf5b9b20a7fd38e0048 100755 (executable)
--- a/src/WOKTools/WOKTools_Verbose.cxx
+++ b/src/WOKTools/WOKTools_Verbose.cxx
@@ -15,7 +15,7 @@
 
 #include <WOKTools_Verbose.ixx>
 
-Standard_EXPORT WOKTools_Verbose VerboseMsg;
+Standard_EXPORT WOKTools_Verbose VerboseMsg();
 
 WOKTools_Verbose::WOKTools_Verbose(const Standard_CString astr) : WOKTools_Message(astr, "Verbose : ")
 {
@@ -43,4 +43,3 @@ WOKTools_Verbose& WOKTools_Verbose::LocalSwitcher(const Standard_CString aswitch
 
 Standard_Character WOKTools_Verbose::Code() const 
 {return 'V';}
-

diff --git a/src/WOKTools/WOKTools_Warning.cxx b/src/WOKTools/WOKTools_Warning.cxx
index 14707a78c9a043bb70709b7934cff1128ce89019..75ef3825bb46e8ee18bca477d2c94b1700ce6b3b 100755 (executable)
--- a/src/WOKTools/WOKTools_Warning.cxx
+++ b/src/WOKTools/WOKTools_Warning.cxx
@@ -5,7 +5,7 @@
 
 #include <WOKTools_Warning.ixx>
 
-Standard_EXPORT WOKTools_Warning WarningMsg;
+Standard_EXPORT WOKTools_Warning WarningMsg();
 
 WOKTools_Warning::WOKTools_Warning() : WOKTools_Message("WOK_WARNING", "Warning : ")
 {