dbertoni 00/08/22 13:17:55
Modified: c/src/ICUBridge ICUBridge.cpp
ICUXalanNumberFormatFactory.cpp
Log:
Changes for AIX port.
Revision Changes Path
1.6 +6 -17 xml-xalan/c/src/ICUBridge/ICUBridge.cpp
Index: ICUBridge.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/ICUBridge/ICUBridge.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ICUBridge.cpp 2000/07/25 14:43:45 1.5
+++ ICUBridge.cpp 2000/08/22 20:17:54 1.6
@@ -60,14 +60,11 @@
#include <PlatformSupport/DOMStringHelper.hpp>
+#include <PlatformSupport/XalanAutoPtr.hpp>
#include <PlatformSupport/XalanDecimalFormatSymbols.hpp>
-#include <memory>
-
-
-
#include <unicode/coll.h>
#include <unicode/dcfmtsym.h>
#include <unicode/decimfmt.h>
@@ -219,14 +216,10 @@
const XalanDecimalFormatSymbols* theXalanDFS,
XalanDOMString&
theResult)
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::auto_ptr;
-#endif
-
UErrorCode theStatus = U_ZERO_ERROR;
- // Use an auto_ptr, to keep this safe until we construct the
DecimalFormat instance.
- const auto_ptr<DecimalFormatSymbols> theDFS(new
DecimalFormatSymbols(theStatus));
+ // Use a XalanAutoPtr, to keep this safe until we construct the
DecimalFormat instance.
+ XalanAutoPtr<DecimalFormatSymbols> theDFS(new
DecimalFormatSymbols(theStatus));
if (theStatus == U_ZERO_ERROR ||
theStatus == U_USING_DEFAULT_ERROR)
@@ -255,7 +248,7 @@
UnicodeString theUnicodeResult;
- // Construct a DecimalFormat. Note that we release the
auto_ptr, since the
+ // Construct a DecimalFormat. Note that we release the
XalanAutoPtr, since the
// DecimalFormat will adopt the DecimalFormatSymbols instance.
DecimalFormat
theFormatter(XalanDOMStringToUnicodeString(thePattern), theDFS.release(),
theStatus);
@@ -292,14 +285,10 @@
const XalanDOMChar* theLHS,
const XalanDOMChar* theRHS)
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::auto_ptr;
-#endif
-
UErrorCode theStatus = U_ZERO_ERROR;
- // Create a collcator, and keep it in an auto_ptr
- const auto_ptr<Collator>
theCollator(Collator::createInstance(theStatus));
+ // Create a collator, and keep it in an XalanAutoPtr...
+ const XalanAutoPtr<Collator>
theCollator(Collator::createInstance(theStatus));
if (theStatus == U_ZERO_ERROR || theStatus == U_USING_DEFAULT_ERROR)
{
1.2 +1 -1 xml-xalan/c/src/ICUBridge/ICUXalanNumberFormatFactory.cpp
Index: ICUXalanNumberFormatFactory.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/ICUBridge/ICUXalanNumberFormatFactory.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ICUXalanNumberFormatFactory.cpp 2000/05/08 17:13:13 1.1
+++ ICUXalanNumberFormatFactory.cpp 2000/08/22 20:17:54 1.2
@@ -64,7 +64,7 @@
ICUXalanNumberFormatFactory::ICUXalanNumberFormatFactory() :
- XalanNumberFormatFactory()
+ StylesheetExecutionContextDefault::XalanNumberFormatFactory()
{
}
