cvs commit: xml-xalan/c/src/PlatformSupport DOMStringHelper.cpp DOMStringHelper.hpp DoubleSupport.cpp XalanUnicode.hpp

[dbertoni]

dbertoni    02/04/10 22:52:02

  Modified:    c/src/PlatformSupport DOMStringHelper.cpp
                        DOMStringHelper.hpp DoubleSupport.cpp
                        XalanUnicode.hpp
  Log:
  Cleanup for picky compilers.
  
  Revision  Changes    Path
  1.69      +2 -2      xml-xalan/c/src/PlatformSupport/DOMStringHelper.cpp
  
  Index: DOMStringHelper.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/DOMStringHelper.cpp,v
  retrieving revision 1.68
  retrieving revision 1.69
  diff -u -r1.68 -r1.69
  --- DOMStringHelper.cpp       23 Feb 2002 04:17:45 -0000      1.68
  +++ DOMStringHelper.cpp       11 Apr 2002 05:52:02 -0000      1.69
  @@ -1089,7 +1089,7 @@
        else
        {
                // Include the terminating null byte...
  -             const size_t    theLength = strlen(data) + 1;
  +             const XalanDOMString::size_type         theLength = 
XalanDOMString::length(data) + 1;
   
                theResult.reserve(theLength);
   
  @@ -1158,7 +1158,7 @@
        theVector.insert(
                theVector.end(),
                theString,
  -             theString + strlen(theString) + 1);
  +             theString + XalanDOMString::length(theString) + 1);
   }
   
   
  
  
  
  1.55      +1 -1      xml-xalan/c/src/PlatformSupport/DOMStringHelper.hpp
  
  Index: DOMStringHelper.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/DOMStringHelper.hpp,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- DOMStringHelper.hpp       28 Sep 2001 18:55:47 -0000      1.54
  +++ DOMStringHelper.hpp       11 Apr 2002 05:52:02 -0000      1.55
  @@ -325,7 +325,7 @@
   {
        assert(theString != 0);
   
  -     return XalanDOMString::size_type(strlen(theString));
  +     return XalanDOMString::length(theString);
   }
   
   
  
  
  
  1.32      +19 -13    xml-xalan/c/src/PlatformSupport/DoubleSupport.cpp
  
  Index: DoubleSupport.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/DoubleSupport.cpp,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- DoubleSupport.cpp 9 Apr 2002 04:21:31 -0000       1.31
  +++ DoubleSupport.cpp 11 Apr 2002 05:52:02 -0000      1.32
  @@ -91,7 +91,7 @@
   
   #else
   
  -const double DoubleSupport::s_NaN = 
std::numeric_limits<double>::signaling_NaN();
  +const double DoubleSupport::s_NaN = std::numeric_limits<double>::quiet_NaN();
   const double DoubleSupport::s_positiveInfinity = 
std::numeric_limits<double>::infinity();
   
   #endif
  @@ -367,7 +367,11 @@
   
                double  theResult = divide(theLHS, theRHS);
   
  +#if defined(XALAN_STRICT_ANSI_HEADERS)
  +             return std::modf(theResult, &theDummy) * theRHS;
  +#else
                return modf(theResult, &theDummy) * theRHS;
  +#endif
        }
   }
   
  @@ -660,7 +664,12 @@
   
                        theBuffer[theLength] = '\0';
   #endif
  +
  +#if defined(XALAN_STRICT_ANSI_HEADERS)
  +                     return std::atof(theBuffer);
  +#else
                        return atof(theBuffer);
  +#endif
                }
                else
                {
  @@ -675,7 +684,12 @@
   
                        translateWideString(theString, &*theVector.begin(), 
theLength);
   #endif
  +
  +#if defined(XALAN_STRICT_ANSI_HEADERS)
  +                     return std::atof(&*theVector.begin());
  +#else
                        return atof(&*theVector.begin());
  +#endif
                }
        }
   }
  @@ -785,13 +799,7 @@
        }
        else
        {
  -#if defined(XALAN_FULL_WCHAR_SUPPORT) && defined(XALAN_USE_WCHAR_SUPPORT)
  -             XalanDOMChar*   theDummy;
  -
  -             return wcstod(theString, &theDummy);
  -#else
                return convertHelper(theString, fGotDecimalPoint);
  -#endif
        }
   #else
        bool    fGotDecimalPoint = false;
  @@ -802,13 +810,7 @@
        }
        else
        {
  -#if defined(XALAN_FULL_WCHAR_SUPPORT) && defined(XALAN_USE_WCHAR_SUPPORT)
  -             XalanDOMChar*   theDummy;
  -
  -             return wcstod(theString, &theDummy);
  -#else
                return convertHelper(theString, fGotDecimalPoint);
  -#endif
        }
   #endif
   }
  @@ -1055,7 +1057,11 @@
                // round up (toward 0), rather than down.
                double                  intPart = 0;
   
  +#if defined(XALAN_STRICT_ANSI_HEADERS)
  +             const double    fracPart = std::modf(theValue, &intPart);
  +#else
                const double    fracPart = modf(theValue, &intPart);
  +#endif
   
                if (fracPart == -0.5)
                {
  
  
  
  1.7       +3 -1      xml-xalan/c/src/PlatformSupport/XalanUnicode.hpp
  
  Index: XalanUnicode.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/XalanUnicode.hpp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- XalanUnicode.hpp  19 Jun 2001 20:05:27 -0000      1.6
  +++ XalanUnicode.hpp  11 Apr 2002 05:52:02 -0000      1.7
  @@ -357,8 +357,10 @@
        XalanUnicode&
        operator=(const XalanUnicode&);
   
  -#endif
   };
  +#else
  +}
  +#endif
   
   
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]