[lmi-commits] [4796] GCC 4.4 compilation fix.

[Vaclav Slavik]

Revision: 4796
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=4796
Author:   vslavik
Date:     2010-03-21 11:33:40 +0000 (Sun, 21 Mar 2010)
Log Message:
-----------
GCC 4.4 compilation fix.

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/ihs_pios.hpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2010-03-21 11:33:31 UTC (rev 4795)
+++ lmi/trunk/ChangeLog 2010-03-21 11:33:40 UTC (rev 4796)
@@ -24475,3 +24475,7 @@
   Makefile.am
 Fix duplicate definition of test_input_LDADD.
 
+20100321T1102Z <address@hidden> [761]
+
+  ihs_pios.hpp
+GCC 4.4 compilation fix.

Modified: lmi/trunk/ihs_pios.hpp
===================================================================
--- lmi/trunk/ihs_pios.hpp      2010-03-21 11:33:31 UTC (rev 4795)
+++ lmi/trunk/ihs_pios.hpp      2010-03-21 11:33:40 UTC (rev 4796)
@@ -55,7 +55,7 @@
 #if 1
 #   include <string>
 //using std::string;
-#elif __BORLANDC__ < 0x0550
+#elif defined(__BORLANDC__) && __BORLANDC__ < 0x0550
 #   include <cstring.h>
     // This BC++5.02 class uses upper case NPOS, but
     // ISO std C++ uses lower case npos .
@@ -63,7 +63,7 @@
     // This would be preferable, but the borland class doesn't
     // have string::size_type :
     // static const size_type npos = static_cast<size_type>(-1);
-#elif 0x0550 <= __BORLANDC__
+#elif defined(__BORLANDC__) && 0x0550 <= __BORLANDC__
 #   include </bc5/include/cstring.h>
 #endif