You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by tn...@apache.org on 2002/11/04 16:10:41 UTC
cvs commit: xml-xerces/c/src/xercesc/util/MsgLoaders/Win32 Win32MsgLoader.cpp Win32MsgLoader.hpp
tng 2002/11/04 07:10:41
Modified: c/src/xercesc/util/MsgLoaders/ICU ICUMsgLoader.cpp
ICUMsgLoader.hpp
c/src/xercesc/util/MsgLoaders/InMemory CppErrMsgs_EN_US.hpp
InMemMsgLoader.cpp InMemMsgLoader.hpp
c/src/xercesc/util/MsgLoaders/MsgCatalog
MsgCatalogLoader.cpp MsgCatalogLoader.hpp
XMLMsgCat_Ids.hpp
c/src/xercesc/util/MsgLoaders/MsgFile MsgLoader.cpp
MsgLoader.hpp XMLMessages.h
c/src/xercesc/util/MsgLoaders/Win32 Win32MsgLoader.cpp
Win32MsgLoader.hpp
Log:
C++ Namespace Support.
Revision Changes Path
1.5 +11 -4 xml-xerces/c/src/xercesc/util/MsgLoaders/ICU/ICUMsgLoader.cpp
Index: ICUMsgLoader.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/ICU/ICUMsgLoader.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ICUMsgLoader.cpp 10 Oct 2002 21:07:55 -0000 1.4
+++ ICUMsgLoader.cpp 4 Nov 2002 15:10:40 -0000 1.5
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2002/11/04 15:10:40 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/10/10 21:07:55 peiyongz
* load resource files using environement vars and base name
*
@@ -115,6 +118,8 @@
#include <stdio.h>
#include <stdlib.h>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Local static methods
// ---------------------------------------------------------------------------
@@ -122,7 +127,7 @@
// ---------------------------------------------------------------------------
// Public Constructors and Destructor
// ---------------------------------------------------------------------------
-ICUMsgLoader::ICUMsgLoader(const XMLCh* const msgDomain)
+ICUMsgLoader::ICUMsgLoader(const XMLCh* const msgDomain)
:fLocaleBundle(0)
,fDomainBundle(0)
{
@@ -140,7 +145,7 @@
if (location)
strcpy(tempBuf, location);
-
+
strcat(tempBuf, U_FILE_SEP_STRING);
strcat(tempBuf, "XercescErrMsg");
@@ -150,7 +155,7 @@
{
XMLPlatformUtils::panic(XMLPlatformUtils::Panic_CantLoadMsgDomain);
}
-
+
/***
get the resource bundle for the domain
strip off path information, if any
@@ -160,7 +165,7 @@
err = U_ZERO_ERROR;
fDomainBundle = ures_getByKey(fLocaleBundle, domainName, NULL, &err);
delete [] domainName;
-
+
if (!U_SUCCESS(err) || fDomainBundle == NULL)
{
XMLPlatformUtils::panic(XMLPlatformUtils::Panic_CantLoadMsgDomain);
@@ -273,3 +278,5 @@
return bRet;
}
+
+XERCES_CPP_NAMESPACE_END
1.4 +7 -1 xml-xerces/c/src/xercesc/util/MsgLoaders/ICU/ICUMsgLoader.hpp
Index: ICUMsgLoader.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/ICU/ICUMsgLoader.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ICUMsgLoader.hpp 10 Oct 2002 21:07:55 -0000 1.3
+++ ICUMsgLoader.hpp 4 Nov 2002 15:10:40 -0000 1.4
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 15:10:40 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/10/10 21:07:55 peiyongz
* load resource files using environement vars and base name
*
@@ -99,6 +102,7 @@
#include <xercesc/util/XMLMsgLoader.hpp>
#include "unicode/ures.h"
+XERCES_CPP_NAMESPACE_BEGIN
//
// This is the ICU specific implementation of the XMLMsgLoader interface.
@@ -165,12 +169,14 @@
// locale specific resource bundle unavailable.
//
// fDomainBundle
- // pointer to the domain specific resource bundle with in the
+ // pointer to the domain specific resource bundle with in the
// required locale specific (or default locale) resource bundle.
//
// -----------------------------------------------------------------------
UResourceBundle* fLocaleBundle;
UResourceBundle* fDomainBundle;
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.12 +6 -0 xml-xerces/c/src/xercesc/util/MsgLoaders/InMemory/CppErrMsgs_EN_US.hpp
Index: CppErrMsgs_EN_US.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/InMemory/CppErrMsgs_EN_US.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- CppErrMsgs_EN_US.hpp 22 Aug 2002 20:26:00 -0000 1.11
+++ CppErrMsgs_EN_US.hpp 4 Nov 2002 15:10:40 -0000 1.12
@@ -3,6 +3,10 @@
// so do not edit this file directly!!
// ----------------------------------------------------------------
+#include <xercesc/util/XercesDefs.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
+
const XMLCh gXMLErrArray[][128] =
{
{ 0x0057,0x005F,0x0053,0x0074,0x0061,0x0072,0x0074,0x00 }
@@ -1505,4 +1509,6 @@
};
const unsigned int gXMLExceptArraySize = 360;
+
+XERCES_CPP_NAMESPACE_END
1.4 +6 -1 xml-xerces/c/src/xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.cpp
Index: InMemMsgLoader.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- InMemMsgLoader.cpp 24 Sep 2002 19:57:59 -0000 1.3
+++ InMemMsgLoader.cpp 4 Nov 2002 15:10:40 -0000 1.4
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 15:10:40 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/09/24 19:57:59 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -101,7 +104,7 @@
#include "InMemMsgLoader.hpp"
#include "CppErrMsgs_EN_US.hpp"
-
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Public Constructors and Destructor
@@ -233,3 +236,5 @@
return bRet;
}
+
+XERCES_CPP_NAMESPACE_END
1.2 +19 -12 xml-xerces/c/src/xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.hpp
Index: InMemMsgLoader.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InMemMsgLoader.hpp 1 Feb 2002 22:22:21 -0000 1.1
+++ InMemMsgLoader.hpp 4 Nov 2002 15:10:40 -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:21 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:10:40 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:21 peiyongz
+ * sane_include
*
* Revision 1.4 2000/03/28 19:43:21 roddey
* Fixes for signed/unsigned warnings. New work for two way transcoding
@@ -86,6 +89,8 @@
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/util/XMLMsgLoader.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
//
// This is a simple in memory message loader implementation. For those
// folks who just want a single language and want something very fast and
@@ -152,5 +157,7 @@
// -----------------------------------------------------------------------
XMLCh* fMsgDomain;
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.5 +7 -0 xml-xerces/c/src/xercesc/util/MsgLoaders/MsgCatalog/MsgCatalogLoader.cpp
Index: MsgCatalogLoader.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/MsgCatalog/MsgCatalogLoader.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MsgCatalogLoader.cpp 24 Sep 2002 19:58:33 -0000 1.4
+++ MsgCatalogLoader.cpp 4 Nov 2002 15:10:41 -0000 1.5
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2002/11/04 15:10:41 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/09/24 19:58:33 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -114,6 +117,8 @@
#include <stdio.h>
#include <string.h>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Public Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -243,3 +248,5 @@
return bRet;
}
+
+XERCES_CPP_NAMESPACE_END
1.3 +19 -12 xml-xerces/c/src/xercesc/util/MsgLoaders/MsgCatalog/MsgCatalogLoader.hpp
Index: MsgCatalogLoader.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/MsgCatalog/MsgCatalogLoader.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MsgCatalogLoader.hpp 23 Sep 2002 21:03:06 -0000 1.2
+++ MsgCatalogLoader.hpp 4 Nov 2002 15:10:41 -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:10:41 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/09/23 21:03:06 peiyongz
* Build MsgCatalog on Solaris
*
@@ -86,6 +89,8 @@
#include <nl_types.h>
+XERCES_CPP_NAMESPACE_BEGIN
+
//
// This is a simple in Iconv RC message loader implementation.
//
@@ -156,5 +161,7 @@
unsigned int fMsgSet;
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +12 -0 xml-xerces/c/src/xercesc/util/MsgLoaders/MsgCatalog/XMLMsgCat_Ids.hpp
Index: XMLMsgCat_Ids.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/MsgCatalog/XMLMsgCat_Ids.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLMsgCat_Ids.hpp 1 Feb 2002 22:22:21 -0000 1.1
+++ XMLMsgCat_Ids.hpp 4 Nov 2002 15:10:41 -0000 1.2
@@ -1,3 +1,15 @@
+// ----------------------------------------------------------------
+// This file was generated from the XML error message source.
+// so do not edit this file directly!!
+// ----------------------------------------------------------------
+
+#include <xercesc/util/XercesDefs.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
+
const unsigned int CatId_XMLErrs = 1;
const unsigned int CatId_XMLValid = 2;
const unsigned int CatId_XMLExcepts = 3;
+
+XERCES_CPP_NAMESPACE_END
+
1.3 +4 -1 xml-xerces/c/src/xercesc/util/MsgLoaders/MsgFile/MsgLoader.cpp
Index: MsgLoader.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/MsgFile/MsgLoader.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MsgLoader.cpp 24 Sep 2002 19:58:52 -0000 1.2
+++ MsgLoader.cpp 4 Nov 2002 15:10:41 -0000 1.3
@@ -75,6 +75,7 @@
#include <qmhrtvm.h>
#include <qusec.h>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Public Constructors and Destructor
@@ -294,3 +295,5 @@
return bRet;
}
+
+XERCES_CPP_NAMESPACE_END
1.2 +18 -14 xml-xerces/c/src/xercesc/util/MsgLoaders/MsgFile/MsgLoader.hpp
Index: MsgLoader.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/MsgFile/MsgLoader.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MsgLoader.hpp 1 Feb 2002 22:22:22 -0000 1.1
+++ MsgLoader.hpp 4 Nov 2002 15:10:41 -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
@@ -64,7 +64,9 @@
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/util/XMLMsgLoader.hpp>
-#include <nl_types.h>
+#include <nl_types.h>
+
+XERCES_CPP_NAMESPACE_BEGIN
//
// This is a simple in Iconv RC message loader implementation.
@@ -135,5 +137,7 @@
XMLCh* fMsgDomain;
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +12 -10 xml-xerces/c/src/xercesc/util/MsgLoaders/MsgFile/XMLMessages.h
Index: XMLMessages.h
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/MsgFile/XMLMessages.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLMessages.h 1 Feb 2002 22:22:22 -0000 1.1
+++ XMLMessages.h 4 Nov 2002 15:10:41 -0000 1.2
@@ -1,6 +1,10 @@
#ifndef XML_ERROR_MESSAGES_H
#define XML_ERROR_MESSAGES_H
+#include <xercesc/util/XercesDefs.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
+
// These are Fatal error messages
#define E_ExpectedCommentOrCDATA "XMLBE00"
@@ -177,7 +181,7 @@
#define Mutex_CouldNotClose "XMLBE9C"
#define Mutex_CouldNotLock "XMLBE9D"
#define Mutex_CouldNotUnlock "XMLBE9E"
-#define Mutex_CouldNotDestroy "XMLBE9F"
+#define Mutex_CouldNotDestroy "XMLBE9F"
#define Pool_ElemAlreadyExists "XMLBEA0"
#define Pool_BadHashFromKey "XMLBEA1"
#define Pool_InvalidId "XMLBEA2"
@@ -231,7 +235,7 @@
#define Val_InvalidElemId "XMLBED2"
// These are the new messages for 3.0 code base
-// Note ALL CAPITALIZED DEFINES ARE AS/400 UNIQUE MESSAGES
+// Note ALL CAPITALIZED DEFINES ARE AS/400 UNIQUE MESSAGES
#define FILE_OPEN_PROBLEMS "XMLBED3"
#define ICONV_CONVERT_PROBLEM "XMLBED4"
#define ICONV_CCSID_PROBLEM "XMLBED5"
@@ -488,7 +492,7 @@
Reader_EOIInMultiSeq,
Reader_BadUTF8Seq,
Reader_BadSurrogateInUTF8,
- Reader_SrcOfsNotSupported,
+ Reader_SrcOfsNotSupported,
Scan_CouldNotOpenSource,
Scan_UnbalancedStartEnd,
Scan_BadPScanToken,
@@ -504,9 +508,9 @@
StrPool_IllegalId,
Trans_CouldNotXCodeXMLData,
Trans_CouldNotCreateDefCvtr,
- Trans_InvalidSizeReq,
- Trans_Unrepresentable,
- Trans_NotInSourceSet,
+ Trans_InvalidSizeReq,
+ Trans_Unrepresentable,
+ Trans_NotInSourceSet,
URL_MalformedURL,
URL_UnsupportedProto,
URL_UnsupportedProto1,
@@ -521,10 +525,8 @@
XMLRec_UnknownEncoding
};
-#endif
-
-
-
+XERCES_CPP_NAMESPACE_END
+#endif
1.3 +5 -1 xml-xerces/c/src/xercesc/util/MsgLoaders/Win32/Win32MsgLoader.cpp
Index: Win32MsgLoader.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/Win32/Win32MsgLoader.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Win32MsgLoader.cpp 24 Sep 2002 19:59:09 -0000 1.2
+++ Win32MsgLoader.cpp 4 Nov 2002 15:10:41 -0000 1.3
@@ -70,6 +70,8 @@
#include <windows.h>
#include "Win32MsgLoader.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Public Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -267,3 +269,5 @@
return bRet;
}
+
+XERCES_CPP_NAMESPACE_END
1.2 +19 -12 xml-xerces/c/src/xercesc/util/MsgLoaders/Win32/Win32MsgLoader.hpp
Index: Win32MsgLoader.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/Win32/Win32MsgLoader.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Win32MsgLoader.hpp 1 Feb 2002 22:22:22 -0000 1.1
+++ Win32MsgLoader.hpp 4 Nov 2002 15:10:41 -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:22 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:10:41 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:22 peiyongz
+ * sane_include
*
* Revision 1.4 2000/03/28 19:43:23 roddey
* Fixes for signed/unsigned warnings. New work for two way transcoding
@@ -86,6 +89,8 @@
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/util/XMLMsgLoader.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
//
// This is a simple in Win32 RC message loader implementation.
//
@@ -162,5 +167,7 @@
HINSTANCE fModHandle;
XMLCh* fMsgDomain;
};
+
+XERCES_CPP_NAMESPACE_END
#endif
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org