tng 2002/11/04 07:14:35
Modified: c/src/xercesc/util/Transcoders/Cygwin CygwinTransService.cpp
CygwinTransService.hpp
c/src/xercesc/util/Transcoders/ICU ICUTransService.cpp
ICUTransService.hpp
c/src/xercesc/util/Transcoders/Iconv IconvTransService.cpp
IconvTransService.hpp
c/src/xercesc/util/Transcoders/Iconv390
Iconv390TransService.cpp Iconv390TransService.hpp
c/src/xercesc/util/Transcoders/Iconv400
Iconv400TransService.cpp Iconv400TransService.hpp
iconv_cnv.cpp iconv_cnv.hpp iconv_util.cpp
iconv_util.hpp utypes.h
c/src/xercesc/util/Transcoders/IconvFBSD
IconvFBSDTransService.cpp IconvFBSDTransService.hpp
c/src/xercesc/util/Transcoders/IconvGNU
IconvGNUTransService.cpp IconvGNUTransService.hpp
c/src/xercesc/util/Transcoders/MacOSUnicodeConverter
MacOSUnicodeConverter.cpp MacOSUnicodeConverter.hpp
c/src/xercesc/util/Transcoders/Win32 Win32TransService.cpp
Win32TransService.hpp Win32TransService2.cpp
Log:
C++ Namespace Support.
Revision Changes Path
1.2 +6 -3
xml-xerces/c/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.cpp
Index: CygwinTransService.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CygwinTransService.cpp 19 Aug 2002 18:35:56 -0000 1.1
+++ CygwinTransService.cpp 4 Nov 2002 15:14:32 -0000 1.2
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.2 2002/11/04 15:14:32 tng
+ * C++ Namespace Support.
+ *
* Revision 1.1 2002/08/19 18:35:56 tng
* [Bug 6467] Installing Xerces C++ on cygwin environment.
*
@@ -75,7 +78,7 @@
#include <windows.h>
#include <stdlib.h>
-
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Local, const data
@@ -1096,7 +1099,7 @@
}
-
+XERCES_CPP_NAMESPACE_END
1.2 +4 -0
xml-xerces/c/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.hpp
Index: CygwinTransService.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CygwinTransService.hpp 19 Aug 2002 18:35:56 -0000 1.1
+++ CygwinTransService.hpp 4 Nov 2002 15:14:32 -0000 1.2
@@ -62,6 +62,8 @@
#include <xercesc/util/RefHashTableOf.hpp>
#include <windows.h>
+XERCES_CPP_NAMESPACE_BEGIN
+
class CPMapEntry;
@@ -282,5 +284,7 @@
CygwinLCPTranscoder(const CygwinLCPTranscoder&);
void operator=(const CygwinLCPTranscoder&);
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.5 +4 -2
xml-xerces/c/src/xercesc/util/Transcoders/ICU/ICUTransService.cpp
Index: ICUTransService.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/ICU/ICUTransService.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ICUTransService.cpp 27 Aug 2002 03:04:19 -0000 1.4
+++ ICUTransService.cpp 4 Nov 2002 15:14:33 -0000 1.5
@@ -86,7 +86,7 @@
#endif
#endif
-
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Local, const data
@@ -1150,3 +1150,5 @@
toFill[targetCap] = 0;
return true;
}
+
+XERCES_CPP_NAMESPACE_END
1.3 +19 -12
xml-xerces/c/src/xercesc/util/Transcoders/ICU/ICUTransService.hpp
Index: ICUTransService.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/ICU/ICUTransService.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ICUTransService.hpp 9 Apr 2002 15:44:00 -0000 1.2
+++ ICUTransService.hpp 4 Nov 2002 15:14:33 -0000 1.3
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:14:33 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/04/09 15:44:00 knoaman
* Add lower case string support.
*
@@ -108,6 +111,8 @@
#include <xercesc/util/Mutexes.hpp>
#include <xercesc/util/TransService.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
struct UConverter;
class XMLUTIL_EXPORT ICUTransService : public XMLTransService
@@ -306,5 +311,7 @@
UConverter* fConverter;
XMLMutex fMutex;
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.5 +4 -1
xml-xerces/c/src/xercesc/util/Transcoders/Iconv/IconvTransService.cpp
Index: IconvTransService.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/Iconv/IconvTransService.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- IconvTransService.cpp 18 Jun 2002 14:43:32 -0000 1.4
+++ IconvTransService.cpp 4 Nov 2002 15:14:33 -0000 1.5
@@ -75,6 +75,7 @@
#include <stdlib.h>
#include <stdio.h>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Local, const data
@@ -555,3 +556,5 @@
bytesEaten = countIn;
return countOut;
}
+
+XERCES_CPP_NAMESPACE_END
1.3 +19 -12
xml-xerces/c/src/xercesc/util/Transcoders/Iconv/IconvTransService.hpp
Index: IconvTransService.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/Iconv/IconvTransService.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IconvTransService.hpp 9 Apr 2002 15:44:00 -0000 1.2
+++ IconvTransService.hpp 4 Nov 2002 15:14:33 -0000 1.3
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:14:33 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/04/09 15:44:00 knoaman
* Add lower case string support.
*
@@ -100,6 +103,8 @@
#include <xercesc/util/TransService.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class XMLUTIL_EXPORT IconvTransService : public XMLTransService
{
public :
@@ -244,5 +249,7 @@
IconvLCPTranscoder(const IconvLCPTranscoder&);
void operator=(const IconvLCPTranscoder&);
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.3 +6 -1
xml-xerces/c/src/xercesc/util/Transcoders/Iconv390/Iconv390TransService.cpp
Index: Iconv390TransService.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/Iconv390/Iconv390TransService.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Iconv390TransService.cpp 9 Apr 2002 15:44:00 -0000 1.2
+++ Iconv390TransService.cpp 4 Nov 2002 15:14:33 -0000 1.3
@@ -75,6 +75,9 @@
#include <unistd.h>
#endif
#include <ctype.h>
+
+XERCES_CPP_NAMESPACE_BEGIN
+
//
// Cannot use the OS/390 c/c++ towupper and towlower functions in the
// Unicode environment. We will use mytowupper and mytowlower here.
@@ -662,3 +665,5 @@
return maxChars-outByteLeft/2;
}
+
+XERCES_CPP_NAMESPACE_END
1.3 +7 -0
xml-xerces/c/src/xercesc/util/Transcoders/Iconv390/Iconv390TransService.hpp
Index: Iconv390TransService.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/Iconv390/Iconv390TransService.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Iconv390TransService.hpp 9 Apr 2002 15:44:00 -0000 1.2
+++ Iconv390TransService.hpp 4 Nov 2002 15:14:33 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:14:33 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/04/09 15:44:00 knoaman
* Add lower case string support.
*
@@ -83,6 +86,8 @@
#include <xercesc/util/Mutexes.hpp>
#include <iconv.h>
+XERCES_CPP_NAMESPACE_BEGIN
+
/* Max encoding name in characters. */
#define UCNV_MAX_CONVERTER_NAME_LENGTH 60
typedef struct iconvconverter {
@@ -238,5 +243,7 @@
void operator=(const Iconv390LCPTranscoder&);
iconvconverter_t *converter;
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.6 +5 -1
xml-xerces/c/src/xercesc/util/Transcoders/Iconv400/Iconv400TransService.cpp
Index: Iconv400TransService.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/Iconv400/Iconv400TransService.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Iconv400TransService.cpp 21 May 2002 20:36:33 -0000 1.5
+++ Iconv400TransService.cpp 4 Nov 2002 15:14:33 -0000 1.6
@@ -74,6 +74,8 @@
#include <xercesc/util/XMLString.hpp>
#include <xercesc/util/Janitor.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Local functions
// ---------------------------------------------------------------------------
@@ -1035,4 +1037,6 @@
toFill[targetCap] = 0;
return true;
}
+
+XERCES_CPP_NAMESPACE_END
1.4 +16 -12
xml-xerces/c/src/xercesc/util/Transcoders/Iconv400/Iconv400TransService.hpp
Index: Iconv400TransService.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/Iconv400/Iconv400TransService.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Iconv400TransService.hpp 9 May 2002 19:05:19 -0000 1.3
+++ Iconv400TransService.hpp 4 Nov 2002 15:14:33 -0000 1.4
@@ -3,35 +3,35 @@
*
* Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -66,6 +66,8 @@
#include <xercesc/util/TransService.hpp>
#include <qlg.h>
+XERCES_CPP_NAMESPACE_BEGIN
+
struct UConverter;
class XMLUTIL_EXPORT Iconv400TransService : public XMLTransService
@@ -294,5 +296,7 @@
UConverter* fConverter;
XMLMutex fMutex;
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +7 -0 xml-xerces/c/src/xercesc/util/Transcoders/Iconv400/iconv_cnv.cpp
Index: iconv_cnv.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/Iconv400/iconv_cnv.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iconv_cnv.cpp 1 Feb 2002 22:22:36 -0000 1.1
+++ iconv_cnv.cpp 4 Nov 2002 15:14:33 -0000 1.2
@@ -56,8 +56,11 @@
/**
* $Log$
- * Revision 1.1 2002/02/01 22:22:36 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:14:33 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:36 peiyongz
+ * sane_include
*
* Revision 1.1 2001/06/25 16:19:14 tng
* Rename iconv_cnv.c to iconv_cnv.cpp. AS400 changes by Linda Swan.
@@ -86,6 +89,8 @@
#include <errno.h>
#define CHUNK_SIZE 5*1024
+XERCES_CPP_NAMESPACE_BEGIN
+
void Convert_toUnicode(UConverter *,
UChar **,
const UChar *,
@@ -773,3 +778,5 @@
return myUChar;
}
}
+
+XERCES_CPP_NAMESPACE_END
1.2 +6 -1 xml-xerces/c/src/xercesc/util/Transcoders/Iconv400/iconv_cnv.hpp
Index: iconv_cnv.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/Iconv400/iconv_cnv.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iconv_cnv.hpp 1 Feb 2002 22:22:36 -0000 1.1
+++ iconv_cnv.hpp 4 Nov 2002 15:14:33 -0000 1.2
@@ -56,8 +56,11 @@
/**
* $Log$
- * Revision 1.1 2002/02/01 22:22:36 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:14:33 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:36 peiyongz
+ * sane_include
*
* Revision 1.1 2001/06/25 16:19:34 tng
* Rename iconv_cnv.h to iconv_cnv.hpp. AS400 changes by Linda Swan.
@@ -72,6 +75,8 @@
#include "utypes.h"
+XERCES_CPP_NAMESPACE_BEGIN
+
/**
* Creates a UConverter object with the names specified as a C string.
* The actual name will be resolved with the alias file.
@@ -343,7 +348,7 @@
int32_t sourceLength,
UErrorCode * err);
-
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +7 -0
xml-xerces/c/src/xercesc/util/Transcoders/Iconv400/iconv_util.cpp
Index: iconv_util.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/Iconv400/iconv_util.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iconv_util.cpp 1 Feb 2002 22:22:36 -0000 1.1
+++ iconv_util.cpp 4 Nov 2002 15:14:33 -0000 1.2
@@ -56,8 +56,11 @@
/**
* $Log$
- * Revision 1.1 2002/02/01 22:22:36 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:14:33 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:36 peiyongz
+ * sane_include
*
* Revision 1.2 2001/10/24 14:06:59 peiyongz
* [Bug#880] patch to PlatformUtils:init()/term() and related. from Mark Weaver
@@ -77,6 +80,9 @@
#include <iconv_util.hpp>
#include <iconv_cnv.hpp>
#include <ctype.h>
+
+XERCES_CPP_NAMESPACE_BEGIN
+
#define COPYRIGHT_STRING_LENGTH 200
#define MAX_STRLEN 0x00FFFFF
#define CHARCCSIDSIZE 5
@@ -290,3 +296,4 @@
}
+XERCES_CPP_NAMESPACE_END
1.2 +6 -0
xml-xerces/c/src/xercesc/util/Transcoders/Iconv400/iconv_util.hpp
Index: iconv_util.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/Iconv400/iconv_util.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iconv_util.hpp 1 Feb 2002 22:22:36 -0000 1.1
+++ iconv_util.hpp 4 Nov 2002 15:14:33 -0000 1.2
@@ -56,8 +56,11 @@
/**
* $Log$
- * Revision 1.1 2002/02/01 22:22:36 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:14:33 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:36 peiyongz
+ * sane_include
*
* Revision 1.1 2001/06/25 16:20:08 tng
* Rename iconv_util.h to iconv_util.hpp. AS400 changes by Linda Swan.
@@ -67,6 +70,7 @@
*
*/
+
const char* iconv_getDefaultCodepage(void);
@@ -158,3 +162,5 @@
*/
static void initializeDataConverter (UConverter * myUConverter);
UConverter *createConverter (const char *converterName, UErrorCode * err);
+
+XERCES_CPP_NAMESPACE_END
1.2 +21 -15 xml-xerces/c/src/xercesc/util/Transcoders/Iconv400/utypes.h
Index: utypes.h
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/Iconv400/utypes.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- utypes.h 1 Feb 2002 22:22:36 -0000 1.1
+++ utypes.h 4 Nov 2002 15:14:33 -0000 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,8 +56,11 @@
/**
* $Log$
- * Revision 1.1 2002/02/01 22:22:36 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:14:33 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:36 peiyongz
+ * sane_include
*
* Revision 1.1 2000/02/10 18:08:28 abagchi
* Initial checkin
@@ -76,7 +79,9 @@
#include "pos400.h"
-/* XP_CPLUSPLUS is a cross-platform symbol which should be defined when
+XERCES_CPP_NAMESPACE_BEGIN
+
+/* XP_CPLUSPLUS is a cross-platform symbol which should be defined when
using C++. It should not be defined when compiling under C. */
#ifdef __cplusplus
# ifndef XP_CPLUSPLUS
@@ -182,10 +187,10 @@
U_ERROR_LIMIT
};
#ifdef __OS400__
-typedef int UErrorCode;
+typedef int UErrorCode;
#define U_SUCCESS(x) ((x)<=U_ZERO_ERROR)
#define U_FAILURE(x) ((x)>U_ZERO_ERROR)
-#else
+#else
#ifndef XP_CPLUSPLUS
typedef enum UErrorCode UErrorCode;
#endif
@@ -269,5 +274,6 @@
"[BOGUS UErrorCode]"
#endif
+XERCES_CPP_NAMESPACE_END
#endif /* _UTYPES */
1.6 +7 -0
xml-xerces/c/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp
Index: IconvFBSDTransService.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- IconvFBSDTransService.cpp 4 Jul 2002 18:20:18 -0000 1.5
+++ IconvFBSDTransService.cpp 4 Nov 2002 15:14:34 -0000 1.6
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2002/11/04 15:14:34 tng
+ * C++ Namespace Support.
+ *
* Revision 1.5 2002/07/04 18:20:18 tng
* [Bug 10253] Bugfix for the IconvFBSD transcoder. Patch from Max Gotlib.
*
@@ -97,6 +100,8 @@
# include <errno.h>
# include <machine/endian.h>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Description of encoding schemas, supported by iconv()
// ---------------------------------------------------------------------------
@@ -1549,5 +1554,7 @@
size_t rc = iconvTo( srcBuf, &len, &pTmpBuf, 64);
return (rc != (size_t)-1) && (len == 0);
}
+
+XERCES_CPP_NAMESPACE_END
#endif /* XML_USE_LIBICONV */
1.4 +24 -17
xml-xerces/c/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.hpp
Index: IconvFBSDTransService.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IconvFBSDTransService.hpp 11 Apr 2002 15:38:05 -0000 1.3
+++ IconvFBSDTransService.hpp 4 Nov 2002 15:14:34 -0000 1.4
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 2001, International
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 15:14:34 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/04/11 15:38:05 knoaman
* String lower case support for FreeBSD by Max Gotlib
*
@@ -82,6 +85,8 @@
#include <xercesc/util/TransService.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
#ifdef XML_USE_LIBICONV
# include <iconv.h>
@@ -108,7 +113,7 @@
// Convert "native unicode" character into XMLCh
void mbcToXMLCh (const char *mbc, XMLCh *toRet) const;
- // Convert XMLCh into "native unicode" character
+ // Convert XMLCh into "native unicode" character
void xmlChToMbc (XMLCh xch, char *mbc) const;
// Return uppercase equivalent for XMLCh
@@ -118,7 +123,7 @@
XMLCh toLower (const XMLCh ch) const;
// Check if passed characters belongs to the :space: class
- virtual bool isSpace(const XMLCh toCheck) const;
+ virtual bool isSpace(const XMLCh toCheck) const;
// Fill array of XMLCh characters with data, supplyed in the array
// of "native unicode" characters.
@@ -174,7 +179,7 @@
inline void setCDFrom (iconv_t cd) { fCDFrom = cd; }
inline void setUChSize (size_t sz) { fUChSize = sz; }
inline void setUBO (unsigned int u) { fUBO = u; }
-
+
private:
// -----------------------------------------------------------------------
// Unimplemented constructors and operators
@@ -259,7 +264,7 @@
, const unsigned int blockSize
);
-
+
private :
// -----------------------------------------------------------------------
// Unimplemented constructors and operators
@@ -370,7 +375,7 @@
IconvFBSDLCPTranscoder(); // Unimplemented
public:
-
+
#else /* !XML_USE_LIBICONV */
IconvFBSDLCPTranscoder();
@@ -413,5 +418,7 @@
IconvFBSDLCPTranscoder(const IconvFBSDLCPTranscoder&);
void operator=(const IconvFBSDLCPTranscoder&);
};
+
+XERCES_CPP_NAMESPACE_END
#endif /* ICONVFBSDTRANSSERVICE */
1.3 +7 -0
xml-xerces/c/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.cpp
Index: IconvGNUTransService.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IconvGNUTransService.cpp 27 Sep 2002 13:33:43 -0000 1.2
+++ IconvGNUTransService.cpp 4 Nov 2002 15:14:34 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:14:34 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/09/27 13:33:43 tng
* [Bug 12547] Xerces C++ 2.1 fails to build on Linux 64 bits arch with -tlinux.
Patch from Guillaume Morin.
*
@@ -74,6 +77,8 @@
#include <errno.h>
#include <endian.h>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Description of encoding schemas, supported by iconv()
// ---------------------------------------------------------------------------
@@ -1180,4 +1185,6 @@
size_t rc = iconvTo( srcBuf, &len, &pTmpBuf, 64);
return (rc != (size_t)-1) && (len == 0);
}
+
+XERCES_CPP_NAMESPACE_END
1.2 +8 -1
xml-xerces/c/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.hpp
Index: IconvGNUTransService.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IconvGNUTransService.hpp 19 Aug 2002 19:38:18 -0000 1.1
+++ IconvGNUTransService.hpp 4 Nov 2002 15:14:34 -0000 1.2
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.2 2002/11/04 15:14:34 tng
+ * C++ Namespace Support.
+ *
* Revision 1.1 2002/08/19 19:38:18 tng
* [Bug 11771] Linux specific IconvGNU transcoder. Patch from Vasily Tchekalkin.
*
@@ -69,6 +72,8 @@
#include <iconv.h>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Libiconv wrapper (low-level conversion utilities collection)
// ---------------------------------------------------------------------------
@@ -376,6 +381,8 @@
IconvGNULCPTranscoder(const IconvGNULCPTranscoder&);
void operator=(const IconvGNULCPTranscoder&);
};
+
+XERCES_CPP_NAMESPACE_END
#endif /* ICONVGNUTRANSSERVICE */
1.6 +23 -20
xml-xerces/c/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.cpp
Index: MacOSUnicodeConverter.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MacOSUnicodeConverter.cpp 21 Aug 2002 16:55:05 -0000 1.5
+++ MacOSUnicodeConverter.cpp 4 Nov 2002 15:14:34 -0000 1.6
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -97,6 +97,7 @@
#include <CFString.h>
#endif
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Typedefs
@@ -166,7 +167,7 @@
// to allow for the case where the strings being compared
// are larger than the static buffer.
- UCCollateOptions collateOptions =
+ UCCollateOptions collateOptions =
kUCCollateComposeInsensitiveMask
|
kUCCollateWidthInsensitiveMask
|
kUCCollateCaseInsensitiveMask
@@ -282,7 +283,7 @@
// to allow for the case where the strings being compared
// are larger than the static buffer.
- UCCollateOptions collateOptions =
+ UCCollateOptions collateOptions =
kUCCollateComposeInsensitiveMask
|
kUCCollateWidthInsensitiveMask
|
kUCCollateCaseInsensitiveMask
@@ -470,7 +471,7 @@
kCFAllocatorNull);
CFStringUppercase(cfString, NULL);
CFRelease(cfString);
-
+
#elif defined(XML_METROWERKS) || (__GNUC__ >= 3 && _GLIBCPP_USE_WCHAR_T)
// Use this if there's a reasonable c library available.
@@ -498,7 +499,7 @@
kCFAllocatorNull);
CFStringLowercase(cfString, NULL);
CFRelease(cfString);
-
+
#elif defined(XML_METROWERKS) || (__GNUC__ >= 3 && _GLIBCPP_USE_WCHAR_T)
// Use this if there's a reasonable c library available.
@@ -627,7 +628,7 @@
{
ByteCount bytesConsumed = 0;
ByteCount bytesProduced = 0;
-
+
OSStatus status = ConvertFromTextToUnicode(
mTextToUnicodeInfo,
srcCount,
@@ -681,7 +682,7 @@
const XMLCh* src = srcData;
std::size_t srcCnt = srcCount;
-
+
OptionBits controlFlags =
0
// | kUnicodeUseFallbacksMask
@@ -1222,7 +1223,7 @@
// XMLCh in place within the output buffer.
if (UNICODE_SIZE_MISMATCH)
CopyUniCharsToXMLChs(reinterpret_cast<UniChar* const>(toFill), toFill,
charsProduced, maxChars);
-
+
// Zero terminate the output string
toFill[charsProduced] = L'\0';
@@ -1309,3 +1310,5 @@
return (status == noErr);
}
+
+XERCES_CPP_NAMESPACE_END
1.4 +21 -17
xml-xerces/c/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.hpp
Index: MacOSUnicodeConverter.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MacOSUnicodeConverter.hpp 12 Jul 2002 16:48:50 -0000 1.3
+++ MacOSUnicodeConverter.hpp 4 Nov 2002 15:14:34 -0000 1.4
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -72,6 +72,8 @@
#include <UnicodeConverter.h>
#endif
+XERCES_CPP_NAMESPACE_BEGIN
+
//
// The transcoding service has to provide a couple of required string
// and character operations, but its most important service is the creation
@@ -128,7 +130,7 @@
, XMLTransService::Codes& resValue
, const unsigned int blockSize
);
-
+
// Sniff for available functionality
static bool IsMacOSUnicodeConverterSupported(void);
@@ -143,7 +145,7 @@
// -----------------------------------------------------------------------
MacOSUnicodeConverter(const MacOSUnicodeConverter&);
void operator=(const MacOSUnicodeConverter&);
-
+
// -----------------------------------------------------------------------
// Private methods
// -----------------------------------------------------------------------
@@ -210,7 +212,7 @@
// -----------------------------------------------------------------------
MacOSTranscoder(const MacOSTranscoder&);
void operator=(const MacOSTranscoder&);
-
+
// -----------------------------------------------------------------------
// Private members
// -----------------------------------------------------------------------
@@ -275,12 +277,14 @@
// -----------------------------------------------------------------------
MacOSLCPTranscoder(const MacOSLCPTranscoder&);
void operator=(const MacOSLCPTranscoder&);
-
+
// -----------------------------------------------------------------------
// Private data members
// -----------------------------------------------------------------------
TextToUnicodeInfo mTextToUnicodeInfo;
UnicodeToTextInfo mUnicodeToTextInfo;
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.5 +3 -2
xml-xerces/c/src/xercesc/util/Transcoders/Win32/Win32TransService.cpp
Index: Win32TransService.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/Win32/Win32TransService.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Win32TransService.cpp 29 Jul 2002 15:29:09 -0000 1.4
+++ Win32TransService.cpp 4 Nov 2002 15:14:34 -0000 1.5
@@ -72,6 +72,7 @@
#include "Win32TransService.hpp"
#include <windows.h>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
@@ -949,7 +950,7 @@
}
-
+XERCES_CPP_NAMESPACE_END
1.3 +19 -12
xml-xerces/c/src/xercesc/util/Transcoders/Win32/Win32TransService.hpp
Index: Win32TransService.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/Win32/Win32TransService.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Win32TransService.hpp 9 Apr 2002 15:44:00 -0000 1.2
+++ Win32TransService.hpp 4 Nov 2002 15:14:34 -0000 1.3
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:14:34 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/04/09 15:44:00 knoaman
* Add lower case string support.
*
@@ -113,6 +116,8 @@
#include <xercesc/util/RefHashTableOf.hpp>
#include <windows.h>
+XERCES_CPP_NAMESPACE_BEGIN
+
class CPMapEntry;
@@ -326,5 +331,7 @@
Win32LCPTranscoder(const Win32LCPTranscoder&);
void operator=(const Win32LCPTranscoder&);
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +17 -13
xml-xerces/c/src/xercesc/util/Transcoders/Win32/Win32TransService2.cpp
Index: Win32TransService2.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/Win32/Win32TransService2.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Win32TransService2.cpp 1 Feb 2002 22:22:37 -0000 1.1
+++ Win32TransService2.cpp 4 Nov 2002 15:14:34 -0000 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:37 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:14:34 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:37 peiyongz
+ * sane_include
*
* Revision 1.3 2000/05/09 00:22:45 andyh
* Memory Cleanup. XMLPlatformUtils::Terminate() deletes all lazily
@@ -83,4 +86,5 @@
#include "Win32TransService.hpp"
#include <windows.h>
-
+XERCES_CPP_NAMESPACE_BEGIN
+XERCES_CPP_NAMESPACE_END
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
