1. more C++ parser fixes - now it almost parses wx/string.h

[wxWidgets.git] / src / common / string.cpp

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 06bb55f9c30953ff72033610af3b01f8f41adc0b..37a116fa020d4e9561cad08cbee96e751e4e46f2 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -116,6 +116,8 @@ extern const char WXDLLEXPORT *g_szNul = &g_strEmpty.dummy;
        // No warning
 #elif defined(__SUNCC__)
     // nothing -- I don't know about "#warning" for Sun's CC
        // No warning
 #elif defined(__SUNCC__)
     // nothing -- I don't know about "#warning" for Sun's CC

+#elif defined(__DECCXX)
+   // nothing

 #else
     // change this to some analogue of '#warning' for your compiler
     #error "Using sprintf() because no snprintf()-like function defined"
 #else
     // change this to some analogue of '#warning' for your compiler
     #error "Using sprintf() because no snprintf()-like function defined"


@@ -1483,8 +1485,9 @@ static int wxStringCompareFunction(const void *first, const void *second)
   wxString *strFirst = (wxString *)first;
   wxString *strSecond = (wxString *)second;
 
   wxString *strFirst = (wxString *)first;
   wxString *strSecond = (wxString *)second;
 

-  if ( gs_compareFunction )
+  if ( gs_compareFunction ) {

     return gs_compareFunction(*strFirst, *strSecond);
     return gs_compareFunction(*strFirst, *strSecond);

+  }

   else {
     int result = strcmp(strFirst->c_str(), strSecond->c_str());
 
   else {
     int result = strcmp(strFirst->c_str(), strSecond->c_str());