Merge pull request #4 from rleigh-codelibre/c++98-fixes2
C++98 fixes, part 2
This permits the ICU code to build with the CMake build to be introduced later.
diff --git a/samples/ExternalFunction/ExternalFunction.cpp b/samples/ExternalFunction/ExternalFunction.cpp
index 5b758ca..4d5f1a1 100644
--- a/samples/ExternalFunction/ExternalFunction.cpp
+++ b/samples/ExternalFunction/ExternalFunction.cpp
@@ -84,7 +84,6 @@
assert(args[0].null() == false);
using std::sqrt;
-#endif
return executionContext.getXObjectFactory().createNumber(sqrt(args[0]->num(executionContext)));
}
diff --git a/src/xalanc/ICUBridge/ICUXalanNumberFormatProxy.cpp b/src/xalanc/ICUBridge/ICUXalanNumberFormatProxy.cpp
index 0ba4b51..b330ba6 100644
--- a/src/xalanc/ICUBridge/ICUXalanNumberFormatProxy.cpp
+++ b/src/xalanc/ICUBridge/ICUXalanNumberFormatProxy.cpp
@@ -72,7 +72,7 @@
XalanDOMString&
-ICUXalanNumberFormatProxy::format(int theValue,
+ICUXalanNumberFormatProxy::format(XMLInt16 theValue,
XalanDOMString& theResult)
{
UnicodeString theUnicodeResult;
@@ -86,7 +86,7 @@
XalanDOMString&
-ICUXalanNumberFormatProxy::format(unsigned int theValue, XalanDOMString& theResult)
+ICUXalanNumberFormatProxy::format(XMLUInt16 theValue, XalanDOMString& theResult)
{
UnicodeString theUnicodeResult;
@@ -97,7 +97,7 @@
XalanDOMString&
-ICUXalanNumberFormatProxy::format(long theValue,
+ICUXalanNumberFormatProxy::format(XMLInt32 theValue,
XalanDOMString& theResult)
{
UnicodeString theUnicodeResult;
@@ -112,7 +112,7 @@
XalanDOMString&
-ICUXalanNumberFormatProxy::format(unsigned long theValue,
+ICUXalanNumberFormatProxy::format(XMLUInt32 theValue,
XalanDOMString& theResult)
{
UnicodeString theUnicodeResult;
diff --git a/src/xalanc/ICUBridge/ICUXalanNumberFormatProxy.hpp b/src/xalanc/ICUBridge/ICUXalanNumberFormatProxy.hpp
index 2ffa57a..9da5258 100644
--- a/src/xalanc/ICUBridge/ICUXalanNumberFormatProxy.hpp
+++ b/src/xalanc/ICUBridge/ICUXalanNumberFormatProxy.hpp
@@ -57,25 +57,25 @@
virtual XalanDOMString&
format(
- int theValue,
+ XMLInt16 theValue,
XalanDOMString& theResult);
virtual XalanDOMString&
format(
- unsigned int theValue,
+ XMLUInt16 theValue,
XalanDOMString& theResult);
virtual XalanDOMString&
format(
- long theValue,
+ XMLInt32 theValue,
XalanDOMString& theResult);
virtual XalanDOMString&
format(
- unsigned long theValue,
+ XMLUInt32 theValue,
XalanDOMString& theResult);
/**