dbertoni 2003/12/03 13:47:57
Modified: c/Tests/Dom2Dom dom2dom.cpp
c/src/xalanc/PlatformSupport XalanMessageLoader.cpp
XalanMessageLoader.hpp XalanNLSMessageLoader.cpp
c/src/xalanc/Utils/MsgCreator ICUResHandler.cpp
InMemHandler.cpp MsgCreator.cpp NLSHandler.cpp
Log:
Clean up of some include files.
Revision Changes Path
1.14 +7 -2 xml-xalan/c/Tests/Dom2Dom/dom2dom.cpp
Index: dom2dom.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/Dom2Dom/dom2dom.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- dom2dom.cpp 19 Sep 2003 20:33:03 -0000 1.13
+++ dom2dom.cpp 3 Dec 2003 21:47:56 -0000 1.14
@@ -59,10 +59,15 @@
+#include <cstdio>
+#include <direct.h>
+#if defined(XALAN_CLASSIC_IOSTREAMS)
+#include <iostream.h>
+#include <strstream.h>
+#else
#include <iostream>
#include <strstream>
-#include <stdio.h>
-#include <direct.h>
+#endif
#include <vector>
1.2 +10 -8
xml-xalan/c/src/xalanc/PlatformSupport/XalanMessageLoader.cpp
Index: XalanMessageLoader.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/PlatformSupport/XalanMessageLoader.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanMessageLoader.cpp 2 Dec 2003 19:58:52 -0000 1.1
+++ XalanMessageLoader.cpp 3 Dec 2003 21:47:56 -0000 1.2
@@ -85,6 +85,8 @@
XALAN_CPP_NAMESPACE_BEGIN
+#define MAX_MESSAGE_LEN 1024
+
XalanMessageLoader* XalanMessageLoader::s_msgLoader = 0;
@@ -134,7 +136,7 @@
XalanDOMChar sBuffer[MAX_MESSAGE_LEN];
- s_msgLoader->loadMsg
+ s_msgLoader->load
(
msgToLoad
, sBuffer
@@ -155,7 +157,7 @@
XalanDOMChar sBuffer[MAX_MESSAGE_LEN];
- s_msgLoader->loadMsg
+ s_msgLoader->load
(
msgToLoad
, sBuffer
@@ -178,7 +180,7 @@
XalanDOMChar sBuffer[MAX_MESSAGE_LEN];
- s_msgLoader->loadMsg
+ s_msgLoader->load
(
msgToLoad
, sBuffer
@@ -210,7 +212,7 @@
}
bool
-XalanMessageLoader::loadMsg(
+XalanMessageLoader::load(
XalanMessages::Codes msgToLoad
, XalanDOMChar* toFill
, unsigned int maxChars
@@ -243,7 +245,7 @@
createLoader();
- s_msgLoader->loadMsg(
+ s_msgLoader->load(
msgToLoad
, sBuffer
, MAX_MESSAGE_LEN
@@ -266,7 +268,7 @@
createLoader();
- s_msgLoader->loadMsg(
+ s_msgLoader->load(
msgToLoad
, sBuffer
, MAX_MESSAGE_LEN
@@ -278,7 +280,7 @@
bool
-XalanMessageLoader::loadMsg(
+XalanMessageLoader::load(
XalanMessages::Codes msgToLoad
, XalanDOMChar* toFill
, unsigned int maxChars
@@ -311,7 +313,7 @@
theForthParam.assign(repText4);
}
- return loadMsg(msgToLoad, toFill, maxChars, theFirstParam.c_str(),
theSecParam.c_str(),
+ return load(msgToLoad, toFill, maxChars, theFirstParam.c_str(),
theSecParam.c_str(),
theThirdParam.c_str(),
theForthParam.c_str());
}
1.2 +4 -5
xml-xalan/c/src/xalanc/PlatformSupport/XalanMessageLoader.hpp
Index: XalanMessageLoader.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/PlatformSupport/XalanMessageLoader.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanMessageLoader.hpp 2 Dec 2003 19:58:52 -0000 1.1
+++ XalanMessageLoader.hpp 3 Dec 2003 21:47:56 -0000 1.2
@@ -70,7 +70,6 @@
XALAN_CPP_NAMESPACE_BEGIN
-#define MAX_MESSAGE_LEN 1024
// class for calling fom outside of the module
class XALAN_PLATFORMSUPPORT_EXPORT XalanMessageLoader {
@@ -135,7 +134,9 @@
, unsigned int maxChars
) =0;
- virtual bool loadMsg
+private:
+
+ bool load
(
XalanMessages::Codes msgToLoad
, XalanDOMChar* toFill
@@ -146,7 +147,7 @@
, const XalanDOMChar* repText4 = 0
);
- virtual bool loadMsg
+ bool load
(
XalanMessages::Codes msgToLoad
, XalanDOMChar* toFill
@@ -156,8 +157,6 @@
, const char* repText3 = 0
, const char* repText4 = 0
);
-
-private:
XalanMessageLoader(const XalanMessageLoader&);
1.3 +2 -2
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XalanNLSMessageLoader.cpp 3 Dec 2003 19:54:21 -0000 1.2
+++ XalanNLSMessageLoader.cpp 3 Dec 2003 21:47:56 -0000 1.3
@@ -66,9 +66,9 @@
#include <xalanc/PlatformSupport/DOMStringHelper.hpp>
-#include <string.h>
+#include <cstring>
-#include <errno.h>
+#include <cerrno>
XALAN_CPP_NAMESPACE_BEGIN
1.3 +2 -2 xml-xalan/c/src/xalanc/Utils/MsgCreator/ICUResHandler.cpp
Index: ICUResHandler.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/Utils/MsgCreator/ICUResHandler.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ICUResHandler.cpp 2 Dec 2003 22:38:00 -0000 1.2
+++ ICUResHandler.cpp 3 Dec 2003 21:47:56 -0000 1.3
@@ -60,11 +60,11 @@
// Includes
//
---------------------------------------------------------------------------
#include "ICUResHandler.hpp"
+#include <cstdio>
+#include <cassert>
#include <xercesc/util/XMLUniDefs.hpp>
#include <xercesc/sax2/Attributes.hpp>
#include "ICUResData.hpp"
-#include <stdio.h>
-#include <assert.h>
// -----------------------------------------------------------------------
1.3 +2 -2 xml-xalan/c/src/xalanc/Utils/MsgCreator/InMemHandler.cpp
Index: InMemHandler.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/Utils/MsgCreator/InMemHandler.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InMemHandler.cpp 2 Dec 2003 22:38:00 -0000 1.2
+++ InMemHandler.cpp 3 Dec 2003 21:47:56 -0000 1.3
@@ -60,12 +60,12 @@
// Includes
//
---------------------------------------------------------------------------
#include "InMemHandler.hpp"
+#include <cstdio>
+#include <cassert>
#include <xercesc/util/XMLUniDefs.hpp>
#include <xercesc/sax2/Attributes.hpp>
#include "MsgCreator.h"
#include "InMemData.hpp"
-#include <stdio.h>
-#include <assert.h>
// -----------------------------------------------------------------------
1.6 +1 -1 xml-xalan/c/src/xalanc/Utils/MsgCreator/MsgCreator.cpp
Index: MsgCreator.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/Utils/MsgCreator/MsgCreator.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MsgCreator.cpp 3 Dec 2003 07:20:43 -0000 1.5
+++ MsgCreator.cpp 3 Dec 2003 21:47:56 -0000 1.6
@@ -61,6 +61,7 @@
//
---------------------------------------------------------------------------
// Includes
//
---------------------------------------------------------------------------
+#include <cassert>
#include <xercesc/util/PlatformUtils.hpp>
#include <xercesc/util/TransService.hpp>
#include <xercesc/sax2/SAX2XMLReader.hpp>
@@ -69,7 +70,6 @@
#include "InMemHandler.hpp"
#include "ICUResHandler.hpp"
#include "NLSHandler.hpp"
-#include <cassert>
#if !defined(NDEBUG) && defined(_MSC_VER)
#include <crtdbg.h>
1.3 +1 -1 xml-xalan/c/src/xalanc/Utils/MsgCreator/NLSHandler.cpp
Index: NLSHandler.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/Utils/MsgCreator/NLSHandler.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NLSHandler.cpp 2 Dec 2003 22:38:00 -0000 1.2
+++ NLSHandler.cpp 3 Dec 2003 21:47:56 -0000 1.3
@@ -63,7 +63,7 @@
#include "NLSData.h"
-#include <stdio.h>
+#include <cstdio>
// -----------------------------------------------------------------------
// Constructors
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
