You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by am...@apache.org on 2012/09/11 13:48:31 UTC
svn commit: r1383364 - in /xerces/c/trunk/src/xercesc/util:
XMLUTF8Transcoder.cpp XMLUTF8Transcoder.hpp regx/ParserForXMLSchema.cpp
regx/RegxParser.cpp
Author: amassari
Date: Tue Sep 11 11:48:30 2012
New Revision: 1383364
URL: http://svn.apache.org/viewvc?rev=1383364&view=rev
Log:
Add casts to let new compilers work (XERCESC-1995)
Modified:
xerces/c/trunk/src/xercesc/util/XMLUTF8Transcoder.cpp
xerces/c/trunk/src/xercesc/util/XMLUTF8Transcoder.hpp
xerces/c/trunk/src/xercesc/util/regx/ParserForXMLSchema.cpp
xerces/c/trunk/src/xercesc/util/regx/RegxParser.cpp
Modified: xerces/c/trunk/src/xercesc/util/XMLUTF8Transcoder.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XMLUTF8Transcoder.cpp?rev=1383364&r1=1383363&r2=1383364&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/XMLUTF8Transcoder.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/XMLUTF8Transcoder.cpp Tue Sep 11 11:48:30 2012
@@ -178,7 +178,7 @@ XMLUTF8Transcoder::transcodeFrom(const
if((gUTFByteIndicatorTest[trailingBytes] & *srcPtr) != gUTFByteIndicator[trailingBytes]) {
char pos[2] = {(char)0x31, 0};
char len[2] = {(char)(trailingBytes+0x31), 0};
- char byte[2] = {*srcPtr,0};
+ char byte[2] = {(char)*srcPtr,0};
ThrowXMLwithMemMgr3(UTFDataFormatException, XMLExcepts::UTF8_FormatError, pos, byte, len, getMemoryManager());
}
@@ -246,8 +246,8 @@ XMLUTF8Transcoder::transcodeFrom(const
//
if (( *srcPtr == 0xE0) && ( *(srcPtr+1) < 0xA0))
{
- char byte0[2] = {*srcPtr ,0};
- char byte1[2] = {*(srcPtr+1),0};
+ char byte0[2] = {(char)*srcPtr ,0};
+ char byte1[2] = {(char)*(srcPtr+1),0};
ThrowXMLwithMemMgr2(UTFDataFormatException
, XMLExcepts::UTF8_Invalid_3BytesSeq
@@ -284,8 +284,8 @@ XMLUTF8Transcoder::transcodeFrom(const
if ((*srcPtr == 0xED) && (*(srcPtr+1) >= 0xA0))
{
- char byte0[2] = {*srcPtr, 0};
- char byte1[2] = {*(srcPtr+1),0};
+ char byte0[2] = {(char)*srcPtr, 0};
+ char byte1[2] = {(char)*(srcPtr+1),0};
ThrowXMLwithMemMgr2(UTFDataFormatException
, XMLExcepts::UTF8_Irregular_3BytesSeq
@@ -310,8 +310,8 @@ XMLUTF8Transcoder::transcodeFrom(const
if (((*srcPtr == 0xF0) && (*(srcPtr+1) < 0x90)) ||
((*srcPtr == 0xF4) && (*(srcPtr+1) > 0x8F)) )
{
- char byte0[2] = {*srcPtr ,0};
- char byte1[2] = {*(srcPtr+1),0};
+ char byte0[2] = {(char)*srcPtr ,0};
+ char byte1[2] = {(char)*(srcPtr+1),0};
ThrowXMLwithMemMgr2(UTFDataFormatException
, XMLExcepts::UTF8_Invalid_4BytesSeq
@@ -344,7 +344,7 @@ XMLUTF8Transcoder::transcodeFrom(const
* surrogates, nor U+FFFE and U+FFFF (but it does allow other noncharacters).
***/
char len[2] = {(char)(trailingBytes+0x31), 0};
- char byte[2] = {*srcPtr,0};
+ char byte[2] = {(char)*srcPtr,0};
ThrowXMLwithMemMgr2(UTFDataFormatException
, XMLExcepts::UTF8_Exceeds_BytesLimit
Modified: xerces/c/trunk/src/xercesc/util/XMLUTF8Transcoder.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XMLUTF8Transcoder.hpp?rev=1383364&r1=1383363&r2=1383364&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/XMLUTF8Transcoder.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/XMLUTF8Transcoder.hpp Tue Sep 11 11:48:30 2012
@@ -107,7 +107,7 @@ void XMLUTF8Transcoder::checkTrailingByt
{
char len[2] = {(char)(trailingBytes+0x31), 0};
char pos[2] = {(char)(position+0x31), 0};
- char byte[2] = {toCheck,0};
+ char byte[2] = {(char)toCheck,0};
ThrowXMLwithMemMgr3(UTFDataFormatException, XMLExcepts::UTF8_FormatError, pos, byte, len, getMemoryManager());
}
Modified: xerces/c/trunk/src/xercesc/util/regx/ParserForXMLSchema.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/regx/ParserForXMLSchema.cpp?rev=1383364&r1=1383363&r2=1383364&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/regx/ParserForXMLSchema.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/regx/ParserForXMLSchema.cpp Tue Sep 11 11:48:30 2012
@@ -156,7 +156,7 @@ XMLInt32 ParserForXMLSchema::decodeEscap
break;
default:
{
- XMLCh chString[] = {chBackSlash, ch, chNull};
+ XMLCh chString[] = {chBackSlash, (XMLCh)ch, chNull};
ThrowXMLwithMemMgr1(ParseException,XMLExcepts::Parser_Process2, chString, getMemoryManager());
}
}
Modified: xerces/c/trunk/src/xercesc/util/regx/RegxParser.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/regx/RegxParser.cpp?rev=1383364&r1=1383363&r2=1383364&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/regx/RegxParser.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/regx/RegxParser.cpp Tue Sep 11 11:48:30 2012
@@ -691,11 +691,11 @@ RangeToken* RegxParser::parseCharacterCl
|| (ch == chDash && getCharData() == chCloseSquare && firstLoop))) {
// if regex = [-] then invalid...
// '[', ']', '-' not allowed and should be escaped
- XMLCh chStr[] = { ch, chNull };
+ XMLCh chStr[] = { (XMLCh)ch, chNull };
ThrowXMLwithMemMgr2(ParseException,XMLExcepts::Parser_CC6, chStr, chStr, getMemoryManager());
}
if (ch == chDash && getCharData() == chDash && getState() != REGX_T_BACKSOLIDUS && !wasDecoded) {
- XMLCh chStr[] = { ch, chNull };
+ XMLCh chStr[] = { (XMLCh)ch, chNull };
ThrowXMLwithMemMgr2(ParseException,XMLExcepts::Parser_CC6, chStr, chStr, getMemoryManager());
}
@@ -720,7 +720,7 @@ RangeToken* RegxParser::parseCharacterCl
else {
XMLInt32 rangeEnd = getCharData();
- XMLCh rangeEndStr[] = { rangeEnd, chNull };
+ XMLCh rangeEndStr[] = { (XMLCh)rangeEnd, chNull };
if (type == REGX_T_CHAR) {
@@ -737,7 +737,7 @@ RangeToken* RegxParser::parseCharacterCl
processNext();
if (ch > rangeEnd) {
- XMLCh chStr[] = { ch, chNull };
+ XMLCh chStr[] = { (XMLCh)ch, chNull };
ThrowXMLwithMemMgr2(ParseException,XMLExcepts::Parser_Ope3, rangeEndStr, chStr, getMemoryManager());
}
@@ -845,7 +845,7 @@ XMLInt32 RegxParser::decodeEscaped() {
break;
default:
{
- XMLCh chString[] = {chBackSlash, ch, chNull};
+ XMLCh chString[] = {chBackSlash, (XMLCh)ch, chNull};
ThrowXMLwithMemMgr1(ParseException,XMLExcepts::Parser_Process2, chString, getMemoryManager());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org