dmitryh 2004/11/13 19:25:48
Modified: c/src/xalanc/PlatformSupport XalanNLSMessageLoader.cpp
XalanNLSMessageLoader.hpp
Log:
NLS localization with the memory management
Revision Changes Path
1.6 +5 -4
xml-xalan/c/src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp
Index: XalanNLSMessageLoader.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XalanNLSMessageLoader.cpp 26 Feb 2004 22:34:18 -0000 1.5
+++ XalanNLSMessageLoader.cpp 14 Nov 2004 03:25:48 -0000 1.6
@@ -48,8 +48,9 @@
}
}
-XalanNLSMessageLoader::XalanNLSMessageLoader() :
- m_catalogHandle(nl_catd(-1))
+XalanNLSMessageLoader::XalanNLSMessageLoader(MemoryManagerType& theManager) :
+ m_catalogHandle(nl_catd(-1)),
+ m_memoryManager(theManager)
{
char fileName[50];
@@ -97,7 +98,7 @@
if ((int)m_catalogHandle == -1)
{
// for transcoding to Unicode
- const XalanDOMString errorMsg("Message can't be retrieved: the
message catalog is not open.");
+ const XalanDOMString errorMsg("Message can't be retrieved: the
message catalog is not open.", m_memoryManager );
if(errorMsg.length() < maxChars)
{
@@ -112,7 +113,7 @@
// from the message catalog
if (catMessage != 0)
{
- const XalanDOMString errorMsg(catMessage);
+ const XalanDOMString errorMsg(catMessage, m_memoryManager);
if(errorMsg.length() < maxChars)
{
1.5 +3 -1
xml-xalan/c/src/xalanc/PlatformSupport/XalanNLSMessageLoader.hpp
Index: XalanNLSMessageLoader.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/PlatformSupport/XalanNLSMessageLoader.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XalanNLSMessageLoader.hpp 26 Feb 2004 22:34:18 -0000 1.4
+++ XalanNLSMessageLoader.hpp 14 Nov 2004 03:25:48 -0000 1.5
@@ -30,7 +30,7 @@
{
public:
- XalanNLSMessageLoader();
+ XalanNLSMessageLoader(MemoryManagerType& theManager);
virtual
~XalanNLSMessageLoader();
@@ -55,6 +55,8 @@
nl_catd m_catalogHandle;
+
+ MemoryManagerType& m_memoryManager;
};
XALAN_CPP_NAMESPACE_END
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
