Author: borisk
Date: Fri Jul 4 01:50:12 2008
New Revision: 673960
URL: http://svn.apache.org/viewvc?rev=673960&view=rev
Log:
Use XMLSize_t instead of int/long.
Modified:
xerces/c/trunk/src/xercesc/util/OutOfMemoryException.hpp
xerces/c/trunk/src/xercesc/util/SecurityManager.hpp
xerces/c/trunk/src/xercesc/util/TransService.cpp
xerces/c/trunk/src/xercesc/util/XMLException.cpp
xerces/c/trunk/src/xercesc/util/XMLException.hpp
xerces/c/trunk/src/xercesc/util/XMLNetAccessor.hpp
xerces/c/trunk/src/xercesc/util/XMLUni.cpp
xerces/c/trunk/src/xercesc/util/XMLUni.hpp
Modified: xerces/c/trunk/src/xercesc/util/OutOfMemoryException.hpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/OutOfMemoryException.hpp?rev=673960&r1=673959&r2=673960&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/OutOfMemoryException.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/OutOfMemoryException.hpp Fri Jul 4
01:50:12 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,6 +22,7 @@
#if !defined(XERCESC_INCLUDE_GUARD_OUT_OF_MEMORY_EXCEPTION_HPP)
#define XERCESC_INCLUDE_GUARD_OUT_OF_MEMORY_EXCEPTION_HPP
+#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/util/XMemory.hpp>
#include <xercesc/util/XMLExceptMsgs.hpp>
#include <xercesc/util/XMLUniDefs.hpp>
@@ -38,7 +39,7 @@
class XMLUTIL_EXPORT OutOfMemoryException : public XMemory
{
public:
-
+
OutOfMemoryException();
~OutOfMemoryException();
// -----------------------------------------------------------------------
@@ -48,7 +49,7 @@
const XMLCh* getMessage() const;
const XMLCh* getType() const;
const char* getSrcFile() const;
- unsigned int getSrcLine() const;
+ XMLFileLoc getSrcLine() const;
OutOfMemoryException(const OutOfMemoryException& toCopy);
OutOfMemoryException& operator=(const OutOfMemoryException& toAssign);
@@ -58,7 +59,7 @@
inline OutOfMemoryException::OutOfMemoryException() {}
inline OutOfMemoryException::~OutOfMemoryException() {}
inline OutOfMemoryException::OutOfMemoryException(const OutOfMemoryException&
other) : XMemory(other) {}
-inline OutOfMemoryException& OutOfMemoryException::operator=(const
OutOfMemoryException&)
+inline OutOfMemoryException& OutOfMemoryException::operator=(const
OutOfMemoryException&)
{
return *this;
}
@@ -85,8 +86,8 @@
{
return "";
}
-
-inline unsigned int OutOfMemoryException::getSrcLine() const {
+
+inline XMLFileLoc OutOfMemoryException::getSrcLine() const {
return 0;
}
Modified: xerces/c/trunk/src/xercesc/util/SecurityManager.hpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/SecurityManager.hpp?rev=673960&r1=673959&r2=673960&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/SecurityManager.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/SecurityManager.hpp Fri Jul 4 01:50:12 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,7 +36,7 @@
* prohibitive amounts of system resources. Applications can
* attach instances of this class to parsers that they've
* created, via the
- * http://apache.org/xml/properties/security-manager property.
+ * http://apache.org/xml/properties/security-manager property.
* </p>
*
* <p> Defaults will be provided for all known security holes.
@@ -58,12 +58,12 @@
//@{
/** Default constructor */
SecurityManager()
- : fEntityExpansionLimit(ENTITY_EXPANSION_LIMIT)
- {
+ : fEntityExpansionLimit((XMLSize_t)ENTITY_EXPANSION_LIMIT)
+ {
}
/** Destructor */
- virtual ~SecurityManager(){};
+ virtual ~SecurityManager(){};
//@}
/** @name The Security Manager */
@@ -80,7 +80,7 @@
* @param newLimit the new entity expansion limit
*
*/
- virtual void setEntityExpansionLimit(unsigned int newLimit)
+ virtual void setEntityExpansionLimit(XMLSize_t newLimit)
{
fEntityExpansionLimit = newLimit;
}
@@ -92,21 +92,21 @@
* @return the current setting of the entity expansion limit
*
*/
- virtual unsigned int getEntityExpansionLimit() const
- {
+ virtual XMLSize_t getEntityExpansionLimit() const
+ {
return fEntityExpansionLimit;
}
//@}
protected:
- unsigned int fEntityExpansionLimit;
+ XMLSize_t fEntityExpansionLimit;
private:
/* Unimplemented Constructors and operators */
/* Copy constructor */
SecurityManager(const SecurityManager&);
-
+
/** Assignment operator */
SecurityManager& operator=(const SecurityManager&);
};
Modified: xerces/c/trunk/src/xercesc/util/TransService.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/TransService.cpp?rev=673960&r1=673959&r2=673960&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/TransService.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/TransService.cpp Fri Jul 4 01:50:12 2008
@@ -57,7 +57,7 @@
{
XMLTransService::gMappings = new RefHashTableOf<ENameMap>(103);
XMLTransService::gMappingsRecognizer = new RefVectorOf<ENameMap>(
- XMLRecognizer::Encodings_Count);
+ (XMLSize_t)XMLRecognizer::Encodings_Count);
}
void XMLInitializer::terminateTransService()
@@ -208,7 +208,7 @@
//
// A stupid way to increment the fCurCount inside the RefVectorOf
//
- for (unsigned int i = 0; i < XMLRecognizer::Encodings_Count; i++)
+ for (XMLSize_t i = 0; i < (XMLSize_t)XMLRecognizer::Encodings_Count; i++)
gMappingsRecognizer->addElement(0);
//
Modified: xerces/c/trunk/src/xercesc/util/XMLException.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XMLException.cpp?rev=673960&r1=673959&r2=673960&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/XMLException.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/XMLException.cpp Fri Jul 4 01:50:12 2008
@@ -69,7 +69,7 @@
// ---------------------------------------------------------------------------
// XMLException: Setter methods
// ---------------------------------------------------------------------------
-void XMLException::setPosition(const char* const file, const unsigned int line)
+void XMLException::setPosition(const char* const file, const XMLFileLoc line)
{
fSrcLine = line;
fMemoryManager->deallocate(fSrcFile);
@@ -93,7 +93,7 @@
XMLException::XMLException( const char* const srcFile
- , const unsigned int srcLine
+ , const XMLFileLoc srcLine
, MemoryManager* const memoryManager) :
fCode(XMLExcepts::NoError)
Modified: xerces/c/trunk/src/xercesc/util/XMLException.hpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XMLException.hpp?rev=673960&r1=673959&r2=673960&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/XMLException.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/XMLException.hpp Fri Jul 4 01:50:12 2008
@@ -22,6 +22,7 @@
#if !defined(XERCESC_INCLUDE_GUARD_XMLEXCEPTION_HPP)
#define XERCESC_INCLUDE_GUARD_XMLEXCEPTION_HPP
+#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/util/XMemory.hpp>
#include <xercesc/util/XMLExceptMsgs.hpp>
#include <xercesc/util/XMLUni.hpp>
@@ -59,14 +60,14 @@
XMLExcepts::Codes getCode() const;
const XMLCh* getMessage() const;
const char* getSrcFile() const;
- unsigned int getSrcLine() const;
+ XMLFileLoc getSrcLine() const;
XMLErrorReporter::ErrTypes getErrorType() const;
// -----------------------------------------------------------------------
// Setter methods
// -----------------------------------------------------------------------
- void setPosition(const char* const file, const unsigned int line);
+ void setPosition(const char* const file, const XMLFileLoc line);
// -----------------------------------------------------------------------
@@ -79,7 +80,7 @@
// of IE 5.0.
// -----------------------------------------------------------------------
XMLException();
- XMLException(const char* const srcFile, const unsigned int srcLine,
MemoryManager* const memoryManager = 0);
+ XMLException(const char* const srcFile, const XMLFileLoc srcLine,
MemoryManager* const memoryManager = 0);
XMLException(const XMLException& toCopy);
XMLException& operator=(const XMLException& toAssign);
@@ -126,7 +127,7 @@
// -----------------------------------------------------------------------
XMLExcepts::Codes fCode;
char* fSrcFile;
- unsigned int fSrcLine;
+ XMLFileLoc fSrcLine;
XMLCh* fMsg;
protected:
@@ -153,7 +154,7 @@
return fSrcFile;
}
-inline unsigned int XMLException::getSrcLine() const
+inline XMLFileLoc XMLException::getSrcLine() const
{
return fSrcLine;
}
@@ -180,7 +181,7 @@
public: \
\
theType(const char* const srcFile \
- , const unsigned int srcLine \
+ , const XMLFileLoc srcLine \
, const XMLExcepts::Codes toThrow \
, MemoryManager* memoryManager = 0) : \
XMLException(srcFile, srcLine, memoryManager) \
@@ -195,7 +196,7 @@
} \
\
theType(const char* const srcFile \
- , const unsigned int srcLine \
+ , const XMLFileLoc srcLine \
, const XMLExcepts::Codes toThrow \
, const XMLCh* const text1 \
, const XMLCh* const text2 = 0 \
@@ -208,7 +209,7 @@
} \
\
theType(const char* const srcFile \
- , const unsigned int srcLine \
+ , const XMLFileLoc srcLine \
, const XMLExcepts::Codes toThrow \
, const char* const text1 \
, const char* const text2 = 0 \
Modified: xerces/c/trunk/src/xercesc/util/XMLNetAccessor.hpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XMLNetAccessor.hpp?rev=673960&r1=673959&r2=673960&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/XMLNetAccessor.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/XMLNetAccessor.hpp Fri Jul 4 01:50:12 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,6 +22,7 @@
#if !defined(XERCESC_INCLUDE_GUARD_XMLNETACCESSOR_HPP)
#define XERCESC_INCLUDE_GUARD_XMLNETACCESSOR_HPP
+#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/util/XMLURL.hpp>
#include <xercesc/util/XMLException.hpp>
@@ -63,9 +64,9 @@
//
HTTPMethod fHTTPMethod;
const char* fHeaders;
- int fHeadersLen;
+ XMLSize_t fHeadersLen;
const char* fPayload;
- int fPayloadLen;
+ XMLSize_t fPayloadLen;
};
inline XMLNetHTTPInfo::XMLNetHTTPInfo()
Modified: xerces/c/trunk/src/xercesc/util/XMLUni.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XMLUni.cpp?rev=673960&r1=673959&r2=673960&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/XMLUni.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/XMLUni.cpp Fri Jul 4 01:50:12 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -630,7 +630,7 @@
, chLatin_e, chLatin_s, chLatin_p, chLatin_a, chLatin_c, chLatin_e,
chNull
};
-const XMLCh XMLUni::fgInfosetURIName[] =
+const XMLCh XMLUni::fgInfosetURIName[] =
{
chLatin_h, chLatin_t, chLatin_t, chLatin_p, chColon, chForwardSlash
, chForwardSlash, chLatin_w, chLatin_w, chLatin_w, chPeriod, chLatin_w
@@ -1051,7 +1051,7 @@
, chLatin_a, chLatin_t, chLatin_u, chLatin_r, chLatin_e, chLatin_s
, chForwardSlash, chLatin_v, chLatin_a, chLatin_l, chLatin_i, chLatin_d
, chLatin_a, chLatin_t, chLatin_i, chLatin_o, chLatin_n, chForwardSlash
- , chLatin_i, chLatin_d, chLatin_e, chLatin_n, chLatin_t, chLatin_i
+ , chLatin_i, chLatin_d, chLatin_e, chLatin_n, chLatin_t, chLatin_i
, chLatin_t, chLatin_y, chDash , chLatin_c, chLatin_o, chLatin_n,
chLatin_s
, chLatin_t, chLatin_r, chLatin_a, chLatin_i, chLatin_n, chLatin_t
, chDash, chLatin_c, chLatin_h, chLatin_e, chLatin_c, chLatin_k,
chLatin_i
@@ -1143,7 +1143,7 @@
};
//Xerces: http://apache.org/xml/features/generate-synthetic-annotations
-const XMLCh XMLUni::fgXercesGenerateSyntheticAnnotations[] =
+const XMLCh XMLUni::fgXercesGenerateSyntheticAnnotations[] =
{
chLatin_h, chLatin_t, chLatin_t, chLatin_p, chColon, chForwardSlash
, chForwardSlash, chLatin_a, chLatin_p, chLatin_a, chLatin_c, chLatin_h
@@ -1152,7 +1152,7 @@
, chLatin_a, chLatin_t, chLatin_u, chLatin_r, chLatin_e, chLatin_s
, chForwardSlash, chLatin_g, chLatin_e, chLatin_n, chLatin_e, chLatin_r
, chLatin_a, chLatin_t, chLatin_e, chDash, chLatin_s, chLatin_y,
chLatin_n
- , chLatin_t, chLatin_h, chLatin_e, chLatin_t, chLatin_i, chLatin_c,
chDash
+ , chLatin_t, chLatin_h, chLatin_e, chLatin_t, chLatin_i, chLatin_c,
chDash
, chLatin_a, chLatin_n, chLatin_n, chLatin_o, chLatin_t, chLatin_a,
chLatin_t
, chLatin_i, chLatin_o, chLatin_n, chLatin_s, chNull
};
@@ -1370,7 +1370,7 @@
, chLatin_s, chLatin_c, chLatin_h, chLatin_e, chLatin_m, chLatin_a
, chForwardSlash, chLatin_s, chLatin_k, chLatin_i, chLatin_p, chDash
, chLatin_d, chLatin_t, chLatin_d, chDash, chLatin_v, chLatin_a
- , chLatin_l, chLatin_i, chLatin_d, chLatin_a, chLatin_t, chLatin_i
+ , chLatin_l, chLatin_i, chLatin_d, chLatin_a, chLatin_t, chLatin_i
, chLatin_o, chLatin_n, chNull
};
@@ -1387,7 +1387,7 @@
, chLatin_s, chLatin_c, chLatin_h, chLatin_e, chLatin_m, chLatin_a
, chForwardSlash, chLatin_h, chLatin_a, chLatin_n, chLatin_d, chLatin_l,
chLatin_e, chDash
, chLatin_m, chLatin_u, chLatin_l, chLatin_t, chLatin_i, chLatin_p
- , chLatin_l, chLatin_e, chDash, chLatin_i, chLatin_m, chLatin_p,
chLatin_o
+ , chLatin_l, chLatin_e, chDash, chLatin_i, chLatin_m, chLatin_p,
chLatin_o
, chLatin_r, chLatin_t, chLatin_s, chNull
};
@@ -1419,7 +1419,7 @@
, chLatin_n, chLatin_g, chNull
};
-const XMLCh XMLUni::fgDOMCheckCharacterNormalization[] =
+const XMLCh XMLUni::fgDOMCheckCharacterNormalization[] =
{
chLatin_c, chLatin_h, chLatin_e, chLatin_c, chLatin_k, chDash
, chLatin_c, chLatin_h, chLatin_a, chLatin_r, chLatin_a, chLatin_c,
chLatin_t
@@ -1443,7 +1443,7 @@
, chLatin_e, chNull
};
-const XMLCh XMLUni::fgDOMElementContentWhitespace[] =
+const XMLCh XMLUni::fgDOMElementContentWhitespace[] =
{
chLatin_e, chLatin_l, chLatin_e, chLatin_m, chLatin_e, chLatin_n,
chLatin_t
, chDash, chLatin_c, chLatin_o, chLatin_n, chLatin_t, chLatin_e,
chLatin_n
@@ -1457,7 +1457,7 @@
, chLatin_s, chNull
};
-const XMLCh XMLUni::fgDOMErrorHandler[] =
+const XMLCh XMLUni::fgDOMErrorHandler[] =
{
chLatin_e, chLatin_r, chLatin_r, chLatin_o, chLatin_r, chDash,
chLatin_h
, chLatin_a, chLatin_n, chLatin_d, chLatin_l, chLatin_e, chLatin_r,
chNull
@@ -1468,12 +1468,12 @@
chLatin_i, chLatin_n, chLatin_f, chLatin_o, chLatin_s, chLatin_e,
chLatin_t, chNull
};
-const XMLCh XMLUni::fgDOMIgnoreUnknownCharacterDenormalization[] =
+const XMLCh XMLUni::fgDOMIgnoreUnknownCharacterDenormalization[] =
{
chLatin_i, chLatin_g, chLatin_n, chLatin_o, chLatin_r, chLatin_e,
chDash
, chLatin_u, chLatin_n, chLatin_k, chLatin_n, chLatin_o, chLatin_w,
chLatin_n
, chDash, chLatin_c, chLatin_h, chLatin_a, chLatin_r, chLatin_a,
chLatin_c
- , chLatin_t, chLatin_e, chLatin_r, chDash, chLatin_d, chLatin_e,
chLatin_n
+ , chLatin_t, chLatin_e, chLatin_r, chDash, chLatin_d, chLatin_e,
chLatin_n
, chLatin_o, chLatin_r, chLatin_m, chLatin_a, chLatin_l, chLatin_i,
chLatin_z
, chLatin_a, chLatin_t, chLatin_i, chLatin_o, chLatin_n, chNull
};
@@ -1492,34 +1492,34 @@
, chLatin_s, chNull
};
-const XMLCh XMLUni::fgDOMNormalizeCharacters[] =
+const XMLCh XMLUni::fgDOMNormalizeCharacters[] =
{
- chLatin_n, chLatin_o, chLatin_r, chLatin_m, chLatin_a, chLatin_l,
chLatin_i
+ chLatin_n, chLatin_o, chLatin_r, chLatin_m, chLatin_a, chLatin_l,
chLatin_i
, chLatin_z, chLatin_e, chDash, chLatin_c, chLatin_h, chLatin_a,
chLatin_r
, chLatin_a, chLatin_c, chLatin_t, chLatin_e, chLatin_r, chLatin_s,
chNull
};
-const XMLCh XMLUni::fgDOMResourceResolver[] =
+const XMLCh XMLUni::fgDOMResourceResolver[] =
{
chLatin_r, chLatin_e, chLatin_s, chLatin_o, chLatin_u, chLatin_r,
chLatin_c
- , chLatin_e, chDash, chLatin_r, chLatin_e, chLatin_s, chLatin_o,
chLatin_l
+ , chLatin_e, chDash, chLatin_r, chLatin_e, chLatin_s, chLatin_o,
chLatin_l
, chLatin_v, chLatin_e, chLatin_r, chNull
};
-const XMLCh XMLUni::fgDOMSchemaLocation[] =
+const XMLCh XMLUni::fgDOMSchemaLocation[] =
{
chLatin_s, chLatin_c, chLatin_h, chLatin_e, chLatin_m, chLatin_a,
chDash
, chLatin_l, chLatin_o, chLatin_c, chLatin_a, chLatin_t, chLatin_i,
chLatin_o
, chLatin_n, chNull
};
-const XMLCh XMLUni::fgDOMSchemaType[] =
+const XMLCh XMLUni::fgDOMSchemaType[] =
{
chLatin_s, chLatin_c, chLatin_h, chLatin_e, chLatin_m, chLatin_a,
chDash
, chLatin_t, chLatin_y, chLatin_p, chLatin_e, chNull
};
-const XMLCh XMLUni::fgDOMSplitCDATASections[] =
+const XMLCh XMLUni::fgDOMSplitCDATASections[] =
{
chLatin_s, chLatin_p, chLatin_l, chLatin_i, chLatin_t, chDash,
chLatin_c
, chLatin_d, chLatin_a, chLatin_t, chLatin_a, chDash, chLatin_s,
chLatin_e
@@ -1555,7 +1555,7 @@
-const XMLCh XMLUni::fgDOMXMLSchemaType[] =
+const XMLCh XMLUni::fgDOMXMLSchemaType[] =
{
chLatin_h, chLatin_t, chLatin_t, chLatin_p, chColon, chForwardSlash
, chForwardSlash, chLatin_w, chLatin_w, chLatin_w, chPeriod, chLatin_w
@@ -1570,7 +1570,7 @@
chLatin_h, chLatin_t, chLatin_t, chLatin_p, chColon, chForwardSlash
, chForwardSlash, chLatin_w, chLatin_w, chLatin_w, chPeriod, chLatin_w
, chDigit_3, chPeriod, chLatin_o, chLatin_r, chLatin_g, chForwardSlash
- , chLatin_T, chLatin_R, chForwardSlash, chLatin_R, chLatin_E, chLatin_C
+ , chLatin_T, chLatin_R, chForwardSlash, chLatin_R, chLatin_E, chLatin_C
, chDash, chLatin_x, chLatin_m, chLatin_l, chNull
};
@@ -1660,26 +1660,26 @@
//xml-declaration
const XMLCh XMLUni::fgDOMXMLDeclaration[] =
-{
+{
chLatin_x, chLatin_m, chLatin_l, chDash, chLatin_d, chLatin_e, chLatin_c,
chLatin_l, chLatin_a, chLatin_r, chLatin_a, chLatin_t, chLatin_i,
chLatin_o,
- chLatin_n, chNull
+ chLatin_n, chNull
};
//Xerces:
http://apache.org/xml/features/pretty-print/space-first-level-elements
-const XMLCh XMLUni::fgDOMWRTXercesPrettyPrint[] =
+const XMLCh XMLUni::fgDOMWRTXercesPrettyPrint[] =
{
chLatin_h, chLatin_t, chLatin_t, chLatin_p, chColon, chForwardSlash,
chForwardSlash, chLatin_a, chLatin_p, chLatin_a, chLatin_c, chLatin_h,
chLatin_e, chPeriod, chLatin_o, chLatin_r, chLatin_g, chForwardSlash,
chLatin_x, chLatin_m, chLatin_l, chForwardSlash, chLatin_f, chLatin_e,
chLatin_a, chLatin_t, chLatin_u, chLatin_r, chLatin_e, chLatin_s,
- chForwardSlash, chLatin_p, chLatin_r, chLatin_e, chLatin_t, chLatin_t,
- chLatin_y, chDash, chLatin_p, chLatin_r, chLatin_i, chLatin_n, chLatin_t,
- chForwardSlash, chLatin_s, chLatin_p, chLatin_a, chLatin_c, chLatin_e,
+ chForwardSlash, chLatin_p, chLatin_r, chLatin_e, chLatin_t, chLatin_t,
+ chLatin_y, chDash, chLatin_p, chLatin_r, chLatin_i, chLatin_n, chLatin_t,
+ chForwardSlash, chLatin_s, chLatin_p, chLatin_a, chLatin_c, chLatin_e,
chDash, chLatin_f, chLatin_i, chLatin_r, chLatin_s, chLatin_t, chDash,
chLatin_l, chLatin_e, chLatin_v, chLatin_e, chLatin_l, chDash,
- chLatin_e, chLatin_l, chLatin_e, chLatin_m, chLatin_e, chLatin_n,
+ chLatin_e, chLatin_l, chLatin_e, chLatin_m, chLatin_e, chLatin_n,
chLatin_t, chLatin_s, chNull
};
@@ -1700,14 +1700,14 @@
const XMLCh XMLUni::fgXercescInterfaceDOMDocumentImpl[] =
{
chLatin_D, chLatin_O, chLatin_M, chLatin_D, chLatin_o, chLatin_c,
chLatin_u,
- chLatin_m, chLatin_e, chLatin_n, chLatin_t, chLatin_I, chLatin_m,
chLatin_p,
+ chLatin_m, chLatin_e, chLatin_n, chLatin_t, chLatin_I, chLatin_m,
chLatin_p,
chLatin_l, chNull
};
const XMLCh XMLUni::fgXercescInterfaceDOMMemoryManager[] =
{
chLatin_D, chLatin_O, chLatin_M, chLatin_M, chLatin_e, chLatin_m,
chLatin_o,
- chLatin_r, chLatin_y, chLatin_M, chLatin_a, chLatin_n, chLatin_a,
chLatin_g,
+ chLatin_r, chLatin_y, chLatin_M, chLatin_a, chLatin_n, chLatin_a,
chLatin_g,
chLatin_e, chLatin_r, chNull
};
@@ -1737,7 +1737,7 @@
, chLatin_g, chLatin_e, chNull
};
-// Datatype
+// Datatype
const XMLCh XMLUni::fgValueZero[] =
{
chDigit_0, chNull
@@ -1850,8 +1850,6 @@
chLatin_D, chLatin_o, chLatin_X, chLatin_I, chNull
};
-const unsigned int XMLUni::fgBooleanValueSpaceArraySize = sizeof
XMLUni::fgBooleanValueSpace / sizeof (XMLUni::fgBooleanValueSpace[0]);
+const XMLSize_t XMLUni::fgBooleanValueSpaceArraySize = sizeof
XMLUni::fgBooleanValueSpace / sizeof (XMLUni::fgBooleanValueSpace[0]);
XERCES_CPP_NAMESPACE_END
-
-
Modified: xerces/c/trunk/src/xercesc/util/XMLUni.hpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XMLUni.hpp?rev=673960&r1=673959&r2=673960&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/XMLUni.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/XMLUni.hpp Fri Jul 4 01:50:12 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -316,8 +316,8 @@
static const XMLCh fgLangPattern[];
static const XMLCh fgBooleanValueSpace[][8];
- static const unsigned int fgBooleanValueSpaceArraySize;
-
+ static const XMLSize_t fgBooleanValueSpaceArraySize;
+
private:
// -----------------------------------------------------------------------
// Unimplemented constructors and operators
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
