tng 2002/11/04 07:17:05
Modified: c/src/xercesc/util/regx ASCIIRangeFactory.cpp
ASCIIRangeFactory.hpp BMPattern.cpp BMPattern.hpp
BlockRangeFactory.cpp BlockRangeFactory.hpp
CharToken.cpp CharToken.hpp ClosureToken.cpp
ClosureToken.hpp ConcatToken.cpp ConcatToken.hpp
ConditionToken.cpp ConditionToken.hpp Match.cpp
Match.hpp ModifierToken.cpp ModifierToken.hpp
Op.cpp Op.hpp OpFactory.cpp OpFactory.hpp
ParenToken.cpp ParenToken.hpp
ParserForXMLSchema.cpp ParserForXMLSchema.hpp
RangeFactory.cpp RangeFactory.hpp RangeToken.cpp
RangeToken.hpp RangeTokenMap.cpp RangeTokenMap.hpp
RegularExpression.cpp RegularExpression.hpp
RegxDefs.hpp RegxParser.cpp RegxParser.hpp
RegxUtil.cpp RegxUtil.hpp StringToken.cpp
StringToken.hpp Token.cpp Token.hpp
TokenFactory.cpp TokenFactory.hpp TokenInc.hpp
UniCharTable.hpp UnicodeRangeFactory.cpp
UnicodeRangeFactory.hpp UnionToken.cpp
UnionToken.hpp XMLRangeFactory.cpp
XMLRangeFactory.hpp XMLUniCharacter.cpp
XMLUniCharacter.hpp
Log:
C++ Namespace Support.
Revision Changes Path
1.3 +6 -0 xml-xerces/c/src/xercesc/util/regx/ASCIIRangeFactory.cpp
Index: ASCIIRangeFactory.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/ASCIIRangeFactory.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ASCIIRangeFactory.cpp 5 Feb 2002 13:20:06 -0000 1.2
+++ ASCIIRangeFactory.cpp 4 Nov 2002 15:17:00 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/02/05 13:20:06 tng
* [Bug 5716] Can't parse with Validation more than one file.
*
@@ -94,6 +97,7 @@
#include <xercesc/util/regx/RangeToken.hpp>
#include <xercesc/util/regx/RangeTokenMap.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// ASCIIRangeFactory: Constructors and Destructor
@@ -178,6 +182,8 @@
fKeywordsInitialized = true;
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file ASCIIRangeFactory.cpp
1.3 +4 -1 xml-xerces/c/src/xercesc/util/regx/ASCIIRangeFactory.hpp
Index: ASCIIRangeFactory.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/ASCIIRangeFactory.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ASCIIRangeFactory.hpp 5 Feb 2002 13:20:06 -0000 1.2
+++ ASCIIRangeFactory.hpp 4 Nov 2002 15:17:00 -0000 1.3
@@ -66,6 +66,7 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/regx/RangeFactory.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
class XMLUTIL_EXPORT ASCIIRangeFactory: public RangeFactory {
@@ -97,6 +98,8 @@
bool fRangesCreated;
bool fKeywordsInitialized;
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +7 -0 xml-xerces/c/src/xercesc/util/regx/BMPattern.cpp
Index: BMPattern.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/BMPattern.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BMPattern.cpp 1 Feb 2002 22:22:28 -0000 1.1
+++ BMPattern.cpp 4 Nov 2002 15:17:00 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:28 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:28 peiyongz
+ * sane_include
*
* Revision 1.2 2001/05/11 13:26:40 tng
* Copyright update.
@@ -74,6 +77,8 @@
#include <xercesc/util/XMLString.hpp>
#include <xercesc/util/Janitor.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// BMPattern: Constructors
// ---------------------------------------------------------------------------
@@ -216,6 +221,8 @@
}
}
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file BMPattern.cpp
1.2 +5 -1 xml-xerces/c/src/xercesc/util/regx/BMPattern.hpp
Index: BMPattern.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/BMPattern.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BMPattern.hpp 1 Feb 2002 22:22:28 -0000 1.1
+++ BMPattern.hpp 4 Nov 2002 15:17:00 -0000 1.2
@@ -65,6 +65,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class XMLUTIL_EXPORT BMPattern {
public:
// -----------------------------------------------------------------------
@@ -174,6 +176,8 @@
delete [] fUppercasePattern;
delete [] fShiftTable;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.4 +6 -0 xml-xerces/c/src/xercesc/util/regx/BlockRangeFactory.cpp
Index: BlockRangeFactory.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/BlockRangeFactory.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BlockRangeFactory.cpp 24 Sep 2002 19:59:36 -0000 1.3
+++ BlockRangeFactory.cpp 4 Nov 2002 15:17:00 -0000 1.4
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/09/24 19:59:36 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -107,6 +110,7 @@
#include <xercesc/util/regx/RangeTokenMap.hpp>
#include <xercesc/util/XMLString.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Local static data
@@ -445,6 +449,8 @@
fKeywordsInitialized = true;
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file BlockRangeFactory.cpp
1.3 +4 -1 xml-xerces/c/src/xercesc/util/regx/BlockRangeFactory.hpp
Index: BlockRangeFactory.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/BlockRangeFactory.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BlockRangeFactory.hpp 5 Feb 2002 13:20:06 -0000 1.2
+++ BlockRangeFactory.hpp 4 Nov 2002 15:17:00 -0000 1.3
@@ -66,6 +66,7 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/regx/RangeFactory.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
class XMLUTIL_EXPORT BlockRangeFactory: public RangeFactory {
@@ -97,6 +98,8 @@
bool fRangesCreated;
bool fKeywordsInitialized;
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +7 -0 xml-xerces/c/src/xercesc/util/regx/CharToken.cpp
Index: CharToken.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/CharToken.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CharToken.cpp 1 Feb 2002 22:22:28 -0000 1.1
+++ CharToken.cpp 4 Nov 2002 15:17:00 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:28 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:28 peiyongz
+ * sane_include
*
* Revision 1.2 2001/05/11 13:26:40 tng
* Copyright update.
@@ -72,6 +75,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/regx/CharToken.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Token: Constructors and Destructors
// ---------------------------------------------------------------------------
@@ -86,6 +91,8 @@
CharToken::~CharToken() {
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file CharToken.cpp
1.2 +5 -1 xml-xerces/c/src/xercesc/util/regx/CharToken.hpp
Index: CharToken.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/CharToken.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CharToken.hpp 1 Feb 2002 22:22:29 -0000 1.1
+++ CharToken.hpp 4 Nov 2002 15:17:00 -0000 1.2
@@ -66,6 +66,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/regx/Token.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class XMLUTIL_EXPORT CharToken : public Token {
public:
// -----------------------------------------------------------------------
@@ -114,6 +116,8 @@
return ch == fCharData;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +7 -0 xml-xerces/c/src/xercesc/util/regx/ClosureToken.cpp
Index: ClosureToken.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/ClosureToken.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ClosureToken.cpp 1 Feb 2002 22:22:29 -0000 1.1
+++ ClosureToken.cpp 4 Nov 2002 15:17:00 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:29 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:29 peiyongz
+ * sane_include
*
* Revision 1.2 2001/05/11 13:26:41 tng
* Copyright update.
@@ -72,6 +75,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/regx/ClosureToken.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// ClosureToken: Constructors and Destructors
// ---------------------------------------------------------------------------
@@ -88,6 +93,8 @@
ClosureToken::~ClosureToken() {
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file ClosureToken.cpp
1.2 +4 -1 xml-xerces/c/src/xercesc/util/regx/ClosureToken.hpp
Index: ClosureToken.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/ClosureToken.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ClosureToken.hpp 1 Feb 2002 22:22:29 -0000 1.1
+++ ClosureToken.hpp 4 Nov 2002 15:17:00 -0000 1.2
@@ -66,6 +66,7 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/regx/Token.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
class XMLUTIL_EXPORT ClosureToken : public Token {
public:
@@ -141,6 +142,8 @@
fMin = minVal;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.3 +7 -0 xml-xerces/c/src/xercesc/util/regx/ConcatToken.cpp
Index: ConcatToken.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/ConcatToken.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ConcatToken.cpp 18 Mar 2002 19:29:53 -0000 1.2
+++ ConcatToken.cpp 4 Nov 2002 15:17:00 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/03/18 19:29:53 knoaman
* Change constant names to eliminate possible conflict with user defined ones.
*
@@ -75,6 +78,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/regx/ConcatToken.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Token: Constructors and Destructors
// ---------------------------------------------------------------------------
@@ -90,6 +95,8 @@
ConcatToken::~ConcatToken() {
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file ConcatToken.cpp
1.2 +4 -1 xml-xerces/c/src/xercesc/util/regx/ConcatToken.hpp
Index: ConcatToken.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/ConcatToken.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ConcatToken.hpp 1 Feb 2002 22:22:29 -0000 1.1
+++ ConcatToken.hpp 4 Nov 2002 15:17:00 -0000 1.2
@@ -66,6 +66,7 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/regx/Token.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
class XMLUTIL_EXPORT ConcatToken : public Token {
public:
@@ -108,6 +109,8 @@
return index == 0 ? fChild1 : fChild2;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.3 +7 -0 xml-xerces/c/src/xercesc/util/regx/ConditionToken.cpp
Index: ConditionToken.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/ConditionToken.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ConditionToken.cpp 18 Mar 2002 19:29:53 -0000 1.2
+++ ConditionToken.cpp 4 Nov 2002 15:17:00 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/03/18 19:29:53 knoaman
* Change constant names to eliminate possible conflict with user defined ones.
*
@@ -75,6 +78,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/regx/ConditionToken.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// ConditionToken: Constructors and Destructors
// ---------------------------------------------------------------------------
@@ -93,6 +98,8 @@
ConditionToken::~ConditionToken() {
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file ConditionToken.cpp
1.2 +4 -1 xml-xerces/c/src/xercesc/util/regx/ConditionToken.hpp
Index: ConditionToken.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/ConditionToken.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ConditionToken.hpp 1 Feb 2002 22:22:29 -0000 1.1
+++ ConditionToken.hpp 4 Nov 2002 15:17:00 -0000 1.2
@@ -66,6 +66,7 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/regx/Token.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
class XMLUTIL_EXPORT ConditionToken : public Token {
public:
@@ -129,6 +130,8 @@
return fConditionToken;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +7 -0 xml-xerces/c/src/xercesc/util/regx/Match.cpp
Index: Match.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/Match.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Match.cpp 1 Feb 2002 22:22:29 -0000 1.1
+++ Match.cpp 4 Nov 2002 15:17:00 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:29 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:29 peiyongz
+ * sane_include
*
* Revision 1.2 2001/05/11 13:26:42 tng
* Copyright update.
@@ -72,6 +75,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/regx/Match.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Match: Constructors and Destructors
// ---------------------------------------------------------------------------
@@ -120,6 +125,8 @@
fStartPositions = 0;
fEndPositions = 0;
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file Match.cpp
1.2 +5 -1 xml-xerces/c/src/xercesc/util/regx/Match.hpp
Index: Match.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/Match.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Match.hpp 1 Feb 2002 22:22:29 -0000 1.1
+++ Match.hpp 4 Nov 2002 15:17:00 -0000 1.2
@@ -67,6 +67,8 @@
#include <xercesc/util/ArrayIndexOutOfBoundsException.hpp>
#include <xercesc/util/RuntimeException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
/**
* An instance of this class has ranges captured in matching
*/
@@ -183,5 +185,7 @@
fEndPositions[index] = value;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.3 +7 -0 xml-xerces/c/src/xercesc/util/regx/ModifierToken.cpp
Index: ModifierToken.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/ModifierToken.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ModifierToken.cpp 18 Mar 2002 19:29:53 -0000 1.2
+++ ModifierToken.cpp 4 Nov 2002 15:17:00 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/03/18 19:29:53 knoaman
* Change constant names to eliminate possible conflict with user defined ones.
*
@@ -75,6 +78,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/regx/ModifierToken.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// ModifierToken: Constructors and Destructors
// ---------------------------------------------------------------------------
@@ -92,6 +97,8 @@
ModifierToken::~ModifierToken() {
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file ModifierToken.cpp
1.3 +5 -1 xml-xerces/c/src/xercesc/util/regx/ModifierToken.hpp
Index: ModifierToken.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/ModifierToken.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ModifierToken.hpp 22 Aug 2002 15:41:18 -0000 1.2
+++ ModifierToken.hpp 4 Nov 2002 15:17:00 -0000 1.3
@@ -66,6 +66,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/regx/Token.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class XMLUTIL_EXPORT ModifierToken : public Token {
public:
// -----------------------------------------------------------------------
@@ -120,6 +122,8 @@
return fChild;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +8 -1 xml-xerces/c/src/xercesc/util/regx/Op.cpp
Index: Op.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/Op.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Op.cpp 1 Feb 2002 22:22:29 -0000 1.1
+++ Op.cpp 4 Nov 2002 15:17:00 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:29 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:29 peiyongz
+ * sane_include
*
* Revision 1.3 2001/06/01 14:15:36 knoaman
* Add a return value to satisfy compilers that complain about
@@ -77,6 +80,8 @@
#include <xercesc/util/regx/Op.hpp>
#include <xercesc/util/XMLString.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Op: Constructors and Destructors
// ---------------------------------------------------------------------------
@@ -91,7 +96,7 @@
int Op::getSize() const {
ThrowXML(RuntimeException, XMLExcepts::Regex_NotSupported);
- return 0; // for compilers that complain about no return value
+ return 0; // for compilers that complain about no return value
}
XMLInt32 Op::getData() const {
@@ -314,6 +319,8 @@
return fNoOp;
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End file Op.cpp
1.4 +5 -1 xml-xerces/c/src/xercesc/util/regx/Op.hpp
Index: Op.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/Op.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Op.hpp 8 May 2002 18:55:01 -0000 1.3
+++ Op.hpp 4 Nov 2002 15:17:00 -0000 1.4
@@ -68,6 +68,8 @@
#include <xercesc/util/RefVectorOf.hpp>
#include <xercesc/util/RuntimeException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Forward Declaration
// ---------------------------------------------------------------------------
@@ -330,6 +332,8 @@
fNextOp = nextOp;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.3 +6 -0 xml-xerces/c/src/xercesc/util/regx/OpFactory.cpp
Index: OpFactory.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/OpFactory.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- OpFactory.cpp 18 Mar 2002 19:29:53 -0000 1.2
+++ OpFactory.cpp 4 Nov 2002 15:17:00 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/03/18 19:29:53 knoaman
* Change constant names to eliminate possible conflict with user defined ones.
*
@@ -79,6 +82,7 @@
#include <xercesc/util/regx/OpFactory.hpp>
#include <xercesc/util/regx/Op.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// OpFactory: Constructors and Destructor
@@ -230,6 +234,8 @@
tmpOp->setNextOp(next);
return tmpOp;
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file OpFactory.cpp
1.2 +5 -1 xml-xerces/c/src/xercesc/util/regx/OpFactory.hpp
Index: OpFactory.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/OpFactory.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OpFactory.hpp 1 Feb 2002 22:22:29 -0000 1.1
+++ OpFactory.hpp 4 Nov 2002 15:17:00 -0000 1.2
@@ -67,6 +67,8 @@
#include <xercesc/util/XMLUniDefs.hpp>
#include <xercesc/util/RefVectorOf.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Forward Declaration
// ---------------------------------------------------------------------------
@@ -153,6 +155,8 @@
fOpVector->removeAllElements();
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +7 -0 xml-xerces/c/src/xercesc/util/regx/ParenToken.cpp
Index: ParenToken.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/ParenToken.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ParenToken.cpp 1 Feb 2002 22:22:29 -0000 1.1
+++ ParenToken.cpp 4 Nov 2002 15:17:00 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:29 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:29 peiyongz
+ * sane_include
*
* Revision 1.2 2001/05/11 13:26:44 tng
* Copyright update.
@@ -72,6 +75,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/regx/ParenToken.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// ParenToken: Constructors and Destructors
// ---------------------------------------------------------------------------
@@ -88,6 +93,8 @@
ParenToken::~ParenToken() {
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file ParenToken.cpp
1.3 +4 -1 xml-xerces/c/src/xercesc/util/regx/ParenToken.hpp
Index: ParenToken.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/ParenToken.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ParenToken.hpp 22 Aug 2002 15:41:18 -0000 1.2
+++ ParenToken.hpp 4 Nov 2002 15:17:00 -0000 1.3
@@ -66,6 +66,7 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/regx/Token.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
class XMLUTIL_EXPORT ParenToken : public Token {
public:
@@ -115,6 +116,8 @@
return fChild;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.3 +8 -1 xml-xerces/c/src/xercesc/util/regx/ParserForXMLSchema.cpp
Index: ParserForXMLSchema.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/ParserForXMLSchema.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ParserForXMLSchema.cpp 18 Mar 2002 19:29:53 -0000 1.2
+++ ParserForXMLSchema.cpp 4 Nov 2002 15:17:00 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/03/18 19:29:53 knoaman
* Change constant names to eliminate possible conflict with user defined ones.
*
@@ -106,6 +109,8 @@
#include <xercesc/util/ParseException.hpp>
#include <xercesc/util/RuntimeException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// ParserForXMLSchema: Constructors and Destructors
// ---------------------------------------------------------------------------
@@ -545,7 +550,7 @@
case chCloseSquare:
break;
default:
- {
+ {
XMLCh chString[] = {chBackSlash, ch, chNull};
chString[1] = ch;
ThrowXML1(ParseException,XMLExcepts::Parser_Process2, chString);
@@ -554,6 +559,8 @@
return ch;
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file ParserForXMLSchema.cpp
1.2 +5 -1 xml-xerces/c/src/xercesc/util/regx/ParserForXMLSchema.hpp
Index: ParserForXMLSchema.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/ParserForXMLSchema.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ParserForXMLSchema.hpp 1 Feb 2002 22:22:29 -0000 1.1
+++ ParserForXMLSchema.hpp 4 Nov 2002 15:17:00 -0000 1.2
@@ -66,6 +66,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/regx/RegxParser.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Forward Declaration
// ---------------------------------------------------------------------------
@@ -140,6 +142,8 @@
// Private data members
// -----------------------------------------------------------------------
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +7 -0 xml-xerces/c/src/xercesc/util/regx/RangeFactory.cpp
Index: RangeFactory.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/RangeFactory.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RangeFactory.cpp 1 Feb 2002 22:22:29 -0000 1.1
+++ RangeFactory.cpp 4 Nov 2002 15:17:00 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:29 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:29 peiyongz
+ * sane_include
*
* Revision 1.4 2001/05/11 13:26:45 tng
* Copyright update.
@@ -90,6 +93,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/regx/RangeFactory.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// RangeFactory: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -100,6 +105,8 @@
RangeFactory::~RangeFactory() {
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file RangeFactory.cpp
1.2 +4 -1 xml-xerces/c/src/xercesc/util/regx/RangeFactory.hpp
Index: RangeFactory.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/RangeFactory.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RangeFactory.hpp 1 Feb 2002 22:22:29 -0000 1.1
+++ RangeFactory.hpp 4 Nov 2002 15:17:00 -0000 1.2
@@ -66,6 +66,7 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
class XMLUTIL_EXPORT RangeFactory {
@@ -98,6 +99,8 @@
RangeFactory(const RangeFactory&);
void operator=(const RangeFactory&);
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.6 +8 -0 xml-xerces/c/src/xercesc/util/regx/RangeToken.cpp
Index: RangeToken.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/RangeToken.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RangeToken.cpp 15 Oct 2002 18:15:02 -0000 1.5
+++ RangeToken.cpp 4 Nov 2002 15:17:00 -0000 1.6
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
* Revision 1.5 2002/10/15 18:15:02 knoaman
* [Bug 13490]: - new[]/delete mismatch in RangeToken.cpp
*
@@ -104,6 +107,8 @@
#include <xercesc/util/regx/TokenFactory.hpp>
#include <xercesc/util/XMLExceptMsgs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Static member data initialization
// ---------------------------------------------------------------------------
@@ -666,6 +671,9 @@
}
}
}
+
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file RangeToken.cpp
*/
1.3 +4 -1 xml-xerces/c/src/xercesc/util/regx/RangeToken.hpp
Index: RangeToken.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/RangeToken.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RangeToken.hpp 24 May 2002 16:42:20 -0000 1.2
+++ RangeToken.hpp 4 Nov 2002 15:17:00 -0000 1.3
@@ -66,6 +66,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/regx/Token.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Forward Declaration
// ---------------------------------------------------------------------------
@@ -139,6 +141,7 @@
RangeToken* fCaseIToken;
};
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +7 -0 xml-xerces/c/src/xercesc/util/regx/RangeTokenMap.cpp
Index: RangeTokenMap.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/RangeTokenMap.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RangeTokenMap.cpp 1 Feb 2002 22:22:30 -0000 1.1
+++ RangeTokenMap.cpp 4 Nov 2002 15:17:00 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:30 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:30 peiyongz
+ * sane_include
*
* Revision 1.5 2001/10/25 15:06:26 tng
* Thread safe the static instance.
@@ -100,6 +103,8 @@
#include <xercesc/util/XMLExceptMsgs.hpp>
#include <xercesc/util/XMLRegisterCleanup.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Static member data initialization
// ---------------------------------------------------------------------------
@@ -301,6 +306,8 @@
delete fInstance;
fInstance = 0;
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file RangeTokenMap.cpp
1.2 +5 -1 xml-xerces/c/src/xercesc/util/regx/RangeTokenMap.hpp
Index: RangeTokenMap.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/RangeTokenMap.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RangeTokenMap.hpp 1 Feb 2002 22:22:30 -0000 1.1
+++ RangeTokenMap.hpp 4 Nov 2002 15:17:00 -0000 1.2
@@ -67,6 +67,8 @@
#include <xercesc/util/StringPool.hpp>
#include <xercesc/util/Mutexes.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Forward Declaration
// ---------------------------------------------------------------------------
@@ -264,6 +266,8 @@
return fTokenFactory;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.4 +6 -0 xml-xerces/c/src/xercesc/util/regx/RegularExpression.cpp
Index: RegularExpression.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/RegularExpression.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RegularExpression.cpp 15 Oct 2002 18:56:02 -0000 1.3
+++ RegularExpression.cpp 4 Nov 2002 15:17:00 -0000 1.4
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/10/15 18:56:02 knoaman
* [Bug 13604] while loop never terminates.
*
@@ -112,6 +115,7 @@
#include <xercesc/util/Janitor.hpp>
#include <xercesc/util/ParseException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Static member data initialization
@@ -1308,6 +1312,8 @@
return WT_OTHER;
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file RegularExpression.cpp
1.3 +5 -1 xml-xerces/c/src/xercesc/util/regx/RegularExpression.hpp
Index: RegularExpression.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/RegularExpression.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RegularExpression.hpp 18 Mar 2002 19:29:53 -0000 1.2
+++ RegularExpression.hpp 4 Nov 2002 15:17:00 -0000 1.3
@@ -74,6 +74,8 @@
#include <xercesc/util/regx/ConditionToken.hpp>
#include <xercesc/util/regx/OpFactory.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Forward Declaration
// ---------------------------------------------------------------------------
@@ -572,6 +574,8 @@
//REVISIT - for now we will return a case sensitive match
return (ch1 == ch2);
}
+
+XERCES_CPP_NAMESPACE_END
#endif
/**
1.3 +5 -1 xml-xerces/c/src/xercesc/util/regx/RegxDefs.hpp
Index: RegxDefs.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/RegxDefs.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RegxDefs.hpp 5 Feb 2002 13:20:06 -0000 1.2
+++ RegxDefs.hpp 4 Nov 2002 15:17:00 -0000 1.3
@@ -67,6 +67,8 @@
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/util/XMLUniDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
const XMLCh fgXMLCategory[] =
{
chLatin_X, chLatin_M, chLatin_L, chNull
@@ -265,6 +267,8 @@
{
chLatin_S, chNull
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.3 +7 -0 xml-xerces/c/src/xercesc/util/regx/RegxParser.cpp
Index: RegxParser.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/RegxParser.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RegxParser.cpp 18 Mar 2002 19:29:53 -0000 1.2
+++ RegxParser.cpp 4 Nov 2002 15:17:00 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/03/18 19:29:53 knoaman
* Change constant names to eliminate possible conflict with user defined ones.
*
@@ -119,6 +122,8 @@
#include <xercesc/framework/XMLErrorCodes.hpp>
#include <xercesc/util/ParseException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Static member data initialization
// ---------------------------------------------------------------------------
@@ -1505,6 +1510,8 @@
return ((off < fStringLen) && fString[off] == chQuestion);
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End file RegxParser.cpp
1.2 +5 -1 xml-xerces/c/src/xercesc/util/regx/RegxParser.hpp
Index: RegxParser.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/RegxParser.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RegxParser.hpp 1 Feb 2002 22:22:31 -0000 1.1
+++ RegxParser.hpp 4 Nov 2002 15:17:00 -0000 1.2
@@ -71,6 +71,8 @@
#include <xercesc/util/XMLUniDefs.hpp>
#include <xercesc/util/Mutexes.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Forward Declaration
// ---------------------------------------------------------------------------
@@ -315,6 +317,8 @@
return ch - chLatin_a + 10;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +8 -0 xml-xerces/c/src/xercesc/util/regx/RegxUtil.cpp
Index: RegxUtil.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/RegxUtil.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RegxUtil.cpp 1 Feb 2002 22:22:31 -0000 1.1
+++ RegxUtil.cpp 4 Nov 2002 15:17:00 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:31 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:31 peiyongz
+ * sane_include
*
* Revision 1.3 2001/06/07 20:55:38 tng
* Fix no newline at the end warning. By Pei Yong Zhang.
@@ -76,6 +79,8 @@
#include <xercesc/util/regx/RegxUtil.hpp>
#include <xercesc/framework/XMLBuffer.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
XMLCh* RegxUtil::decomposeToSurrogates(XMLInt32 ch) {
XMLCh* pszStr = new XMLCh[3];
@@ -143,6 +148,9 @@
return XMLString::replicate(buffer.getRawBuffer());
}
+
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file RegxUtil.cpp
*/
1.2 +5 -1 xml-xerces/c/src/xercesc/util/regx/RegxUtil.hpp
Index: RegxUtil.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/RegxUtil.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RegxUtil.hpp 1 Feb 2002 22:22:31 -0000 1.1
+++ RegxUtil.hpp 4 Nov 2002 15:17:00 -0000 1.2
@@ -67,6 +67,8 @@
#include <xercesc/util/XMLString.hpp>
#include <xercesc/util/XMLUniDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class XMLUTIL_EXPORT RegxUtil {
public:
@@ -122,6 +124,8 @@
return false;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +7 -0 xml-xerces/c/src/xercesc/util/regx/StringToken.cpp
Index: StringToken.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/StringToken.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StringToken.cpp 1 Feb 2002 22:22:31 -0000 1.1
+++ StringToken.cpp 4 Nov 2002 15:17:00 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:31 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:31 peiyongz
+ * sane_include
*
* Revision 1.2 2001/05/11 13:26:49 tng
* Copyright update.
@@ -72,6 +75,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/regx/StringToken.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Token: Constructors and Destructors
// ---------------------------------------------------------------------------
@@ -90,6 +95,8 @@
delete [] fString;
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file StringToken.cpp
1.2 +4 -1 xml-xerces/c/src/xercesc/util/regx/StringToken.hpp
Index: StringToken.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/StringToken.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StringToken.hpp 1 Feb 2002 22:22:31 -0000 1.1
+++ StringToken.hpp 4 Nov 2002 15:17:00 -0000 1.2
@@ -67,6 +67,7 @@
#include <xercesc/util/regx/Token.hpp>
#include <xercesc/util/XMLString.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
class XMLUTIL_EXPORT StringToken : public Token {
public:
@@ -124,6 +125,8 @@
delete [] fString;
fString = XMLString::replicate(literal);
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.4 +7 -0 xml-xerces/c/src/xercesc/util/regx/Token.cpp
Index: Token.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/Token.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Token.cpp 15 Oct 2002 18:11:02 -0000 1.3
+++ Token.cpp 4 Nov 2002 15:17:00 -0000 1.4
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/10/15 18:11:02 knoaman
* [Bug 13489]: missing 'return' in Token.cpp
*
@@ -96,6 +99,8 @@
#include <xercesc/util/regx/RegularExpression.hpp>
#include <xercesc/util/regx/RegxUtil.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Static member data initialization
// ---------------------------------------------------------------------------
@@ -482,6 +487,8 @@
return length < tokLength;
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file Token.cpp
1.4 +5 -1 xml-xerces/c/src/xercesc/util/regx/Token.hpp
Index: Token.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/Token.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Token.hpp 22 Aug 2002 15:41:18 -0000 1.3
+++ Token.hpp 4 Nov 2002 15:17:00 -0000 1.4
@@ -67,6 +67,8 @@
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/util/RuntimeException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Forward Declaration
// ---------------------------------------------------------------------------
@@ -287,6 +289,8 @@
ThrowXML(RuntimeException, XMLExcepts::Regex_NotSupported);
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.3 +6 -0 xml-xerces/c/src/xercesc/util/regx/TokenFactory.cpp
Index: TokenFactory.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/TokenFactory.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TokenFactory.cpp 18 Mar 2002 19:29:53 -0000 1.2
+++ TokenFactory.cpp 4 Nov 2002 15:17:00 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/03/18 19:29:53 knoaman
* Change constant names to eliminate possible conflict with user defined ones.
*
@@ -103,6 +106,7 @@
#include <xercesc/util/regx/RangeTokenMap.hpp>
#include <xercesc/util/regx/RegxDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// TokenFactory: Constructors and Destructor
@@ -504,6 +508,8 @@
#endif
}
*/
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file TokenFactory.cpp
1.2 +4 -1 xml-xerces/c/src/xercesc/util/regx/TokenFactory.hpp
Index: TokenFactory.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/TokenFactory.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TokenFactory.hpp 1 Feb 2002 22:22:31 -0000 1.1
+++ TokenFactory.hpp 4 Nov 2002 15:17:00 -0000 1.2
@@ -70,6 +70,8 @@
#include <xercesc/util/regx/Token.hpp>
#include <xercesc/util/Mutexes.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Forward Declaration
// ---------------------------------------------------------------------------
@@ -181,6 +183,7 @@
Token* fGrapheme;
};
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +3 -1 xml-xerces/c/src/xercesc/util/regx/TokenInc.hpp
Index: TokenInc.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/TokenInc.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TokenInc.hpp 1 Feb 2002 22:22:31 -0000 1.1
+++ TokenInc.hpp 4 Nov 2002 15:17:00 -0000 1.2
@@ -74,6 +74,8 @@
#include <xercesc/util/regx/StringToken.hpp>
#include <xercesc/util/regx/UnionToken.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +5 -0 xml-xerces/c/src/xercesc/util/regx/UniCharTable.hpp
Index: UniCharTable.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/UniCharTable.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UniCharTable.hpp 1 Feb 2002 22:22:34 -0000 1.1
+++ UniCharTable.hpp 4 Nov 2002 15:17:01 -0000 1.2
@@ -54,6 +54,9 @@
* <http://www.apache.org/>.
*/
+#include <xercesc/util/XercesDefs.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// These are Unicode character type lookup table. The table is used by the
@@ -4160,3 +4163,5 @@
, 0x19, 0x19, 0x18, 0x1A, 0x1B, 0x19, 0x19, 0x00, 0x1B, 0x18, 0x18, 0x18, 0x18,
0x1B, 0x1B, 0x00
, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x10, 0x1B,
0x1B, 0x00, 0x00
};
+
+XERCES_CPP_NAMESPACE_END
1.3 +7 -0 xml-xerces/c/src/xercesc/util/regx/UnicodeRangeFactory.cpp
Index: UnicodeRangeFactory.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/UnicodeRangeFactory.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UnicodeRangeFactory.cpp 5 Feb 2002 13:20:06 -0000 1.2
+++ UnicodeRangeFactory.cpp 4 Nov 2002 15:17:01 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:17:01 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/02/05 13:20:06 tng
* [Bug 5716] Can't parse with Validation more than one file.
*
@@ -98,6 +101,8 @@
#include <xercesc/util/regx/RegxDefs.hpp>
#include <xercesc/util/regx/XMLUniCharacter.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Local data
// ---------------------------------------------------------------------------
@@ -302,6 +307,8 @@
return 0;
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file UnicodeRangeFactory.cpp
1.3 +4 -1 xml-xerces/c/src/xercesc/util/regx/UnicodeRangeFactory.hpp
Index: UnicodeRangeFactory.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/UnicodeRangeFactory.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UnicodeRangeFactory.hpp 5 Feb 2002 13:20:06 -0000 1.2
+++ UnicodeRangeFactory.hpp 4 Nov 2002 15:17:01 -0000 1.3
@@ -66,6 +66,7 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/regx/RangeFactory.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
class XMLUTIL_EXPORT UnicodeRangeFactory: public RangeFactory {
@@ -102,6 +103,8 @@
bool fRangesCreated;
bool fKeywordsInitialized;
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.3 +7 -0 xml-xerces/c/src/xercesc/util/regx/UnionToken.cpp
Index: UnionToken.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/UnionToken.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UnionToken.cpp 18 Mar 2002 19:29:53 -0000 1.2
+++ UnionToken.cpp 4 Nov 2002 15:17:01 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:17:01 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/03/18 19:29:53 knoaman
* Change constant names to eliminate possible conflict with user defined ones.
*
@@ -97,6 +100,8 @@
#include <xercesc/util/regx/TokenFactory.hpp>
#include <xercesc/util/regx/StringToken.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Static member data initialization
// ---------------------------------------------------------------------------
@@ -209,6 +214,8 @@
((StringToken*) previousTok)->setString(stringBuf.getRawBuffer());
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file UnionToken.cpp
1.2 +4 -1 xml-xerces/c/src/xercesc/util/regx/UnionToken.hpp
Index: UnionToken.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/UnionToken.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UnionToken.hpp 1 Feb 2002 22:22:34 -0000 1.1
+++ UnionToken.hpp 4 Nov 2002 15:17:01 -0000 1.2
@@ -67,6 +67,7 @@
#include <xercesc/util/regx/Token.hpp>
#include <xercesc/util/RefVectorOf.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
class XMLUTIL_EXPORT UnionToken : public Token {
public:
@@ -118,6 +119,8 @@
return fChildren->elementAt(index);
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.4 +7 -1 xml-xerces/c/src/xercesc/util/regx/XMLRangeFactory.cpp
Index: XMLRangeFactory.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/XMLRangeFactory.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLRangeFactory.cpp 24 May 2002 16:42:20 -0000 1.3
+++ XMLRangeFactory.cpp 4 Nov 2002 15:17:01 -0000 1.4
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 15:17:01 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/05/24 16:42:20 knoaman
* Performance fixes: eliminate mulitple calls to addRange and sort.
*
@@ -103,6 +106,7 @@
#include <xercesc/util/Janitor.hpp>
#include <string.h>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Local static functions
@@ -233,7 +237,7 @@
tok->sortRanges();
tok->compactRanges();
rangeTokMap->setRangeToken(fgXMLInitialNameChar, tok);
-
+
// Create word range
tok = tokFactory->createRange();
tok->setRangeValues(wordRange, wordRangeLen);
@@ -263,6 +267,8 @@
fKeywordsInitialized = true;
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file XMLRangeFactory.cpp
1.4 +4 -1 xml-xerces/c/src/xercesc/util/regx/XMLRangeFactory.hpp
Index: XMLRangeFactory.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/XMLRangeFactory.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLRangeFactory.hpp 24 May 2002 16:42:20 -0000 1.3
+++ XMLRangeFactory.hpp 4 Nov 2002 15:17:01 -0000 1.4
@@ -66,6 +66,7 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/regx/RangeFactory.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
class XMLUTIL_EXPORT XMLRangeFactory: public RangeFactory {
@@ -97,6 +98,8 @@
bool fRangesCreated;
bool fKeywordsInitialized;
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +7 -0 xml-xerces/c/src/xercesc/util/regx/XMLUniCharacter.cpp
Index: XMLUniCharacter.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/XMLUniCharacter.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLUniCharacter.cpp 1 Feb 2002 22:22:34 -0000 1.1
+++ XMLUniCharacter.cpp 4 Nov 2002 15:17:01 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:34 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:17:01 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:34 peiyongz
+ * sane_include
*
* Revision 1.2 2001/05/11 13:26:52 tng
* Copyright update.
@@ -79,6 +82,8 @@
#include <xercesc/util/regx/UniCharTable.hpp>
#endif
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// XMLUniCharacter: Public static methods
// ---------------------------------------------------------------------------
@@ -90,6 +95,8 @@
return (unsigned short) fgUniCharsTable[ch];
#endif
}
+
+XERCES_CPP_NAMESPACE_END
/**
* End of file XMLUniCharacter.cpp
1.2 +4 -1 xml-xerces/c/src/xercesc/util/regx/XMLUniCharacter.hpp
Index: XMLUniCharacter.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/XMLUniCharacter.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLUniCharacter.hpp 1 Feb 2002 22:22:34 -0000 1.1
+++ XMLUniCharacter.hpp 4 Nov 2002 15:17:01 -0000 1.2
@@ -63,6 +63,7 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
/**
* Class for representing unicode characters
@@ -129,6 +130,8 @@
XMLUniCharacter();
//@}
};
+
+XERCES_CPP_NAMESPACE_END
#endif
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
