dbertoni 2003/12/02 18:30:04
Modified: c/src/xalanc/Utils/MsgCreator MsgCreator.cpp MsgCreator.h
MsgFileOutputStream.hpp SAX2Handler.cpp
Log:
Fixes for stricter platforms.
Revision Changes Path
1.3 +5 -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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MsgCreator.cpp 2 Dec 2003 22:38:00 -0000 1.2
+++ MsgCreator.cpp 3 Dec 2003 02:30:04 -0000 1.3
@@ -69,12 +69,16 @@
#include "InMemHandler.hpp"
#include "ICUResHandler.hpp"
#include "NLSHandler.hpp"
-#include <assert.h>
+#include <cassert>
#if !defined(NDEBUG) && defined(_MSC_VER)
#include <crtdbg.h>
#endif
+
+XALAN_USING_STD(cerr)
+XALAN_USING_STD(cout)
+XALAN_USING_STD(endl)
//
---------------------------------------------------------------------------
1.2 +13 -2 xml-xalan/c/src/xalanc/Utils/MsgCreator/MsgCreator.h
Index: MsgCreator.h
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/Utils/MsgCreator/MsgCreator.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MsgCreator.h 2 Dec 2003 19:58:52 -0000 1.1
+++ MsgCreator.h 3 Dec 2003 02:30:04 -0000 1.2
@@ -58,13 +58,20 @@
#if !defined(MSG_CREATOR_1357924680)
#define MSG_CREATOR_1357924680
+#include <xalanc/Include/PlatformDefinitions.hpp>
//
---------------------------------------------------------------------------
// Includes for all the program files to see
//
---------------------------------------------------------------------------
-#include <string.h>
+#include <cstring>
+#include <cstdlib>
+
+#if defined(XALAN_CLASSIC_IOSTREAMS)
#include <iostream.h>
-#include <stdlib.h>
+#else
+#include <iostream>
+#endif
+
#include "SAX2Handler.hpp"
//
---------------------------------------------------------------------------
@@ -106,7 +113,11 @@
char* fLocalForm;
};
+#if defined(XALAN_CLASSIC_IOSTREAMS)
inline ostream& operator<<(ostream& target, const StrX& toDump)
+#else
+inline XALAN_STD_QUALIFIER ostream& operator<<(XALAN_STD_QUALIFIER ostream&
target, const StrX& toDump)
+#endif
{
target << toDump.localForm();
return target;
1.3 +6 -2
xml-xalan/c/src/xalanc/Utils/MsgCreator/MsgFileOutputStream.hpp
Index: MsgFileOutputStream.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/Utils/MsgCreator/MsgFileOutputStream.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MsgFileOutputStream.hpp 2 Dec 2003 22:38:00 -0000 1.2
+++ MsgFileOutputStream.hpp 3 Dec 2003 02:30:04 -0000 1.3
@@ -86,9 +86,13 @@
public :
#if defined(WIN32)
- typedef HANDLE HandleType;
+ typedef HANDLE HandleType;
#else
- typedef FILE* HandleType;
+#if defined(XALAN_STRICT_ANSI_HEADERS)
+ typedef std::FILE* HandleType;
+#else
+ typedef FILE* HandleType;
+#endif
#endif
/**
1.3 +16 -2 xml-xalan/c/src/xalanc/Utils/MsgCreator/SAX2Handler.cpp
Index: SAX2Handler.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/Utils/MsgCreator/SAX2Handler.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SAX2Handler.cpp 2 Dec 2003 22:38:00 -0000 1.2
+++ SAX2Handler.cpp 3 Dec 2003 02:30:04 -0000 1.3
@@ -59,12 +59,21 @@
//
---------------------------------------------------------------------------
// Includes
//
---------------------------------------------------------------------------
+#include <cassert>
+#include <cstdio>
+
+
+
#include <xercesc/util/XMLUniDefs.hpp>
#include <xercesc/sax2/Attributes.hpp>
+
+
+
#include "MsgCreator.h"
#include "IndexFileData.hpp"
-#include <assert.h>
-#include <stdio.h>
+
+
+
//
---------------------------------------------------------------------------
// Local const data
//
@@ -237,6 +246,11 @@
}
}
+
+
+XALAN_USING_STD(cerr)
+XALAN_USING_STD(endl)
+
//
---------------------------------------------------------------------------
//
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
