dbertoni 2002/12/06 17:48:36
Modified: c/src/ICUBridge FunctionICUFormatNumber.cpp
FunctionICUFormatNumber.hpp ICUBridge.cpp
ICUBridge.hpp ICUBridgeCleanup.cpp
ICUBridgeCleanup.hpp
ICUBridgeCollationCompareFunctor.cpp
ICUBridgeCollationCompareFunctor.hpp
ICUBridgeCollationCompareFunctorImpl.cpp
ICUBridgeCollationCompareFunctorImpl.hpp
ICUBridgeDefinitions.hpp
ICUXalanNumberFormatFactory.cpp
ICUXalanNumberFormatFactory.hpp
ICUXalanNumberFormatProxy.cpp
ICUXalanNumberFormatProxy.hpp
Log:
Updates for C++ namespace support.
Revision Changes Path
1.10 +9 -1 xml-xalan/c/src/ICUBridge/FunctionICUFormatNumber.cpp
Index: FunctionICUFormatNumber.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/ICUBridge/FunctionICUFormatNumber.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FunctionICUFormatNumber.cpp 12 Aug 2002 03:54:43 -0000 1.9
+++ FunctionICUFormatNumber.cpp 7 Dec 2002 01:48:36 -0000 1.10
@@ -72,6 +72,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
FunctionICUFormatNumber::FunctionICUFormatNumberInstaller::FunctionICUFormatNumberInstaller()
{
XPath::installFunction(
@@ -124,7 +128,7 @@
const XalanDOMString&
thePattern,
const XalanDecimalFormatSymbols* theDFS,
XalanDOMString&
theResult,
- const Locator*
locator,
+ const LocatorType*
locator,
bool
/* fWarn */) const
{
unsigned long theResultCode =
@@ -154,3 +158,7 @@
false);
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.5 +9 -1 xml-xalan/c/src/ICUBridge/FunctionICUFormatNumber.hpp
Index: FunctionICUFormatNumber.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/ICUBridge/FunctionICUFormatNumber.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FunctionICUFormatNumber.hpp 12 Aug 2002 03:54:43 -0000 1.4
+++ FunctionICUFormatNumber.hpp 7 Dec 2002 01:48:36 -0000 1.5
@@ -68,6 +68,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
// Class that implements the XSLT function format-number using the ICU.
//
class XALAN_ICUBRIDGE_EXPORT FunctionICUFormatNumber : public
FunctionFormatNumber
@@ -107,7 +111,7 @@
const XalanDOMString&
thePattern,
const XalanDecimalFormatSymbols* theDFS,
XalanDOMString&
theResult,
- const Locator*
locator,
+ const LocatorType*
locator,
bool
fWarn = true) const;
private:
@@ -119,6 +123,10 @@
bool
operator==(const FunctionICUFormatNumber&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.19 +8 -0 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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ICUBridge.cpp 20 Aug 2002 21:31:58 -0000 1.18
+++ ICUBridge.cpp 7 Dec 2002 01:48:36 -0000 1.19
@@ -78,6 +78,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
#if defined(XALAN_NO_NAMESPACES)
typedef vector<UChar> UCharVectorType;
#else
@@ -380,3 +384,7 @@
return theStatus;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.7 +8 -0 xml-xalan/c/src/ICUBridge/ICUBridge.hpp
Index: ICUBridge.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/ICUBridge/ICUBridge.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ICUBridge.hpp 12 Aug 2002 03:54:43 -0000 1.6
+++ ICUBridge.hpp 7 Dec 2002 01:48:36 -0000 1.7
@@ -72,6 +72,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class Function;
class XalanDecimalFormatSymbols;
@@ -107,6 +111,10 @@
const XalanDecimalFormatSymbols* theXalanDFS,
XalanDOMString&
theResult);
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +9 -0 xml-xalan/c/src/ICUBridge/ICUBridgeCleanup.cpp
Index: ICUBridgeCleanup.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/ICUBridge/ICUBridgeCleanup.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ICUBridgeCleanup.cpp 20 Aug 2002 21:31:58 -0000 1.2
+++ ICUBridgeCleanup.cpp 7 Dec 2002 01:48:36 -0000 1.3
@@ -66,6 +66,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
void
ICUBridgeCleanup::cleanup()
{
@@ -74,3 +78,8 @@
u_cleanup();
#endif
}
+
+
+
+XALAN_CPP_NAMESPACE_END
+
1.2 +8 -0 xml-xalan/c/src/ICUBridge/ICUBridgeCleanup.hpp
Index: ICUBridgeCleanup.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/ICUBridge/ICUBridgeCleanup.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ICUBridgeCleanup.hpp 5 Apr 2002 03:45:41 -0000 1.1
+++ ICUBridgeCleanup.hpp 7 Dec 2002 01:48:36 -0000 1.2
@@ -64,6 +64,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_ICUBRIDGE_EXPORT ICUBridgeCleanup
{
public:
@@ -71,6 +75,10 @@
static void
cleanup();
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.23 +8 -0
xml-xalan/c/src/ICUBridge/ICUBridgeCollationCompareFunctor.cpp
Index: ICUBridgeCollationCompareFunctor.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/ICUBridge/ICUBridgeCollationCompareFunctor.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ICUBridgeCollationCompareFunctor.cpp 12 Aug 2002 03:54:43 -0000
1.22
+++ ICUBridgeCollationCompareFunctor.cpp 7 Dec 2002 01:48:36 -0000
1.23
@@ -64,6 +64,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
ICUBridgeCollationCompareFunctor::ICUBridgeCollationCompareFunctor(bool
fCacheCollators) :
m_impl(new ICUBridgeCollationCompareFunctorImpl(fCacheCollators))
{
@@ -98,3 +102,7 @@
{
return (*m_impl)(theLHS, theRHS, theLocale, theCaseOrder);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.11 +8 -0
xml-xalan/c/src/ICUBridge/ICUBridgeCollationCompareFunctor.hpp
Index: ICUBridgeCollationCompareFunctor.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/ICUBridge/ICUBridgeCollationCompareFunctor.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ICUBridgeCollationCompareFunctor.hpp 12 Aug 2002 03:54:43 -0000
1.10
+++ ICUBridgeCollationCompareFunctor.hpp 7 Dec 2002 01:48:36 -0000
1.11
@@ -68,6 +68,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class ICUBridgeCollationCompareFunctorImpl;
@@ -105,6 +109,10 @@
ICUBridgeCollationCompareFunctorImpl* const m_impl;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.5 +8 -0
xml-xalan/c/src/ICUBridge/ICUBridgeCollationCompareFunctorImpl.cpp
Index: ICUBridgeCollationCompareFunctorImpl.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/ICUBridge/ICUBridgeCollationCompareFunctorImpl.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ICUBridgeCollationCompareFunctorImpl.cpp 15 Aug 2002 00:44:01 -0000
1.4
+++ ICUBridgeCollationCompareFunctorImpl.cpp 7 Dec 2002 01:48:36 -0000
1.5
@@ -74,6 +74,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
const StylesheetExecutionContextDefault::DefaultCollationCompareFunctor
ICUBridgeCollationCompareFunctorImpl::s_defaultFunctor;
@@ -513,3 +517,7 @@
theEntry.m_collator = theCollator;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.6 +8 -0
xml-xalan/c/src/ICUBridge/ICUBridgeCollationCompareFunctorImpl.hpp
Index: ICUBridgeCollationCompareFunctorImpl.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/ICUBridge/ICUBridgeCollationCompareFunctorImpl.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ICUBridgeCollationCompareFunctorImpl.hpp 28 Aug 2002 21:02:34 -0000
1.5
+++ ICUBridgeCollationCompareFunctorImpl.hpp 7 Dec 2002 01:48:36 -0000
1.6
@@ -77,6 +77,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_ICUBRIDGE_EXPORT ICUBridgeCollationCompareFunctorImpl : public
StylesheetExecutionContextDefault::CollationCompareFunctor
{
public:
@@ -240,6 +244,10 @@
const static
StylesheetExecutionContextDefault::DefaultCollationCompareFunctor
s_defaultFunctor;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +1 -1 xml-xalan/c/src/ICUBridge/ICUBridgeDefinitions.hpp
Index: ICUBridgeDefinitions.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/ICUBridge/ICUBridgeDefinitions.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ICUBridgeDefinitions.hpp 8 May 2000 17:13:13 -0000 1.1
+++ ICUBridgeDefinitions.hpp 7 Dec 2002 01:48:36 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.4 +8 -0 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ICUXalanNumberFormatFactory.cpp 4 Jan 2002 19:12:43 -0000 1.3
+++ ICUXalanNumberFormatFactory.cpp 7 Dec 2002 01:48:36 -0000 1.4
@@ -63,6 +63,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
ICUXalanNumberFormatFactory::ICUXalanNumberFormatFactory() :
StylesheetExecutionContextDefault::XalanNumberFormatFactory()
{
@@ -81,3 +85,7 @@
{
return new ICUXalanNumberFormatProxy;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +8 -0 xml-xalan/c/src/ICUBridge/ICUXalanNumberFormatFactory.hpp
Index: ICUXalanNumberFormatFactory.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/ICUBridge/ICUXalanNumberFormatFactory.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ICUXalanNumberFormatFactory.hpp 4 Jan 2002 19:12:43 -0000 1.2
+++ ICUXalanNumberFormatFactory.hpp 7 Dec 2002 01:48:36 -0000 1.3
@@ -68,6 +68,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
// Class that implements the XSLT function format-number using the ICU.
//
class XALAN_ICUBRIDGE_EXPORT ICUXalanNumberFormatFactory : public
StylesheetExecutionContextDefault::XalanNumberFormatFactory
@@ -82,6 +86,10 @@
virtual XalanNumberFormat*
create();
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.11 +8 -0 xml-xalan/c/src/ICUBridge/ICUXalanNumberFormatProxy.cpp
Index: ICUXalanNumberFormatProxy.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/ICUBridge/ICUXalanNumberFormatProxy.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ICUXalanNumberFormatProxy.cpp 20 Aug 2002 21:31:58 -0000 1.10
+++ ICUXalanNumberFormatProxy.cpp 7 Dec 2002 01:48:36 -0000 1.11
@@ -78,6 +78,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
ICUXalanNumberFormatProxy::ICUXalanNumberFormatProxy() :
XalanNumberFormat(),
m_decimalFormat(0)
@@ -266,3 +270,7 @@
m_decimalFormat->adoptDecimalFormatSymbols(theNewSymbols);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.6 +8 -0 xml-xalan/c/src/ICUBridge/ICUXalanNumberFormatProxy.hpp
Index: ICUXalanNumberFormatProxy.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/ICUBridge/ICUXalanNumberFormatProxy.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ICUXalanNumberFormatProxy.hpp 28 Aug 2002 21:02:34 -0000 1.5
+++ ICUXalanNumberFormatProxy.hpp 7 Dec 2002 01:48:36 -0000 1.6
@@ -72,6 +72,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
// Class that implements the XSLT function format-number using the ICU.
//
class XALAN_ICUBRIDGE_EXPORT ICUXalanNumberFormatProxy : public
XalanNumberFormat
@@ -144,6 +148,10 @@
U_ICU_NAMESPACE::DecimalFormat* m_decimalFormat;
#endif
};
+
+
+
+XALAN_CPP_NAMESPACE_END
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
