Menu
▾
▴
[ZooLib-checkins] SF.net SVN: zoolib:[2628] trunk/zoolib/source/cxx/zoolib
|
From: <ag...@us...> - 2011-11-30 15:00:53
|
Revision: 2628
http://zoolib.svn.sourceforge.net/zoolib/?rev=2628&view=rev
Author: agreen
Date: 2011-11-30 15:00:45 +0000 (Wed, 30 Nov 2011)
Log Message:
-----------
Various tweaks to remove warnings.
Modified Paths:
--------------
trunk/zoolib/source/cxx/zoolib/ZBitStream.cpp
trunk/zoolib/source/cxx/zoolib/ZDCFont.cpp
trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder_BMP.cpp
trunk/zoolib/source/cxx/zoolib/ZDCPixmapNS.cpp
trunk/zoolib/source/cxx/zoolib/ZIntervalTreeClock.cpp
trunk/zoolib/source/cxx/zoolib/ZMIME.cpp
trunk/zoolib/source/cxx/zoolib/ZML.cpp
trunk/zoolib/source/cxx/zoolib/ZNet.cpp
trunk/zoolib/source/cxx/zoolib/ZNet_Internet.cpp
trunk/zoolib/source/cxx/zoolib/ZNet_Internet_MacOT_OSX.cpp
trunk/zoolib/source/cxx/zoolib/ZStream.cpp
trunk/zoolib/source/cxx/zoolib/ZStreamRW_FlushOnRead.cpp
trunk/zoolib/source/cxx/zoolib/ZStreamW_HexStrim.cpp
trunk/zoolib/source/cxx/zoolib/ZStream_CGData.cpp
trunk/zoolib/source/cxx/zoolib/ZStream_Data_T.h
trunk/zoolib/source/cxx/zoolib/ZStream_LZW.cpp
trunk/zoolib/source/cxx/zoolib/ZStream_Memory.cpp
trunk/zoolib/source/cxx/zoolib/ZTxn.cpp
trunk/zoolib/source/cxx/zoolib/ZUSB_OSX.cpp
trunk/zoolib/source/cxx/zoolib/ZVal_AppleEvent.cpp
trunk/zoolib/source/cxx/zoolib/ZVal_NS.mm
trunk/zoolib/source/cxx/zoolib/ZYad_DividedValues.cpp
trunk/zoolib/source/cxx/zoolib/ZYad_ML.cpp
trunk/zoolib/source/cxx/zoolib/ZYad_XMLPList.cpp
Modified: trunk/zoolib/source/cxx/zoolib/ZBitStream.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZBitStream.cpp 2011-11-30 15:00:03 UTC (rev 2627)
+++ trunk/zoolib/source/cxx/zoolib/ZBitStream.cpp 2011-11-30 15:00:45 UTC (rev 2628)
@@ -209,7 +209,7 @@
bool ZBitWriterBE::WriteBits(const ZStreamW& iStream, size_t iCountBits, uint32 iBits)
{
ZAssertStop(kDebug_BitStream, iCountBits <= 32);
- ZAssertStop(kDebug_BitStream, iBits < (1 << iCountBits));
+ ZAssertStop(kDebug_BitStream, iBits < (1U << iCountBits));
while (iCountBits)
{
if (fAvailBits == 0)
@@ -243,7 +243,7 @@
(void* oDest, size_t iCountBits, uint32 iBits, size_t* oCountBytesWritten)
{
ZAssertStop(kDebug_BitStream, iCountBits <= 32);
- ZAssertStop(kDebug_BitStream, iBits < (1 << iCountBits));
+ ZAssertStop(kDebug_BitStream, iBits < (1U << iCountBits));
uint8* localDest = static_cast<uint8*>(oDest);
while (iCountBits)
@@ -317,7 +317,7 @@
bool ZBitWriterLE::WriteBits(const ZStreamW& iStream, size_t iCountBits, uint32 iBits)
{
ZAssertStop(kDebug_BitStream, iCountBits <= 32);
- ZAssertStop(kDebug_BitStream, iBits < (1 << iCountBits));
+ ZAssertStop(kDebug_BitStream, iBits < (1U << iCountBits));
while (iCountBits--)
{
if (fAvailBits-- == 0)
@@ -346,7 +346,7 @@
(void* oDest, size_t iCountBits, uint32 iBits, size_t* oCountBytesWritten)
{
ZAssertStop(kDebug_BitStream, iCountBits <= 32);
- ZAssertStop(kDebug_BitStream, iBits < (1 << iCountBits));
+ ZAssertStop(kDebug_BitStream, iBits < (1U << iCountBits));
uint8* localDest = static_cast<uint8*>(oDest);
while (iCountBits--)
Modified: trunk/zoolib/source/cxx/zoolib/ZDCFont.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZDCFont.cpp 2011-11-30 15:00:03 UTC (rev 2627)
+++ trunk/zoolib/source/cxx/zoolib/ZDCFont.cpp 2011-11-30 15:00:45 UTC (rev 2628)
@@ -75,8 +75,8 @@
ZDCFont::ZDCFont(const ZDCFont& inOther)
: fFontName(inOther.fFontName),
- fStyle(inOther.fStyle),
- fSize(inOther.fSize)
+ fSize(inOther.fSize),
+ fStyle(inOther.fStyle)
{}
ZDCFont::ZDCFont(const string8& inFontName, Style inStyle, int16 inSize)
Modified: trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder_BMP.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder_BMP.cpp 2011-11-30 15:00:03 UTC (rev 2627)
+++ trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder_BMP.cpp 2011-11-30 15:00:45 UTC (rev 2628)
@@ -158,7 +158,7 @@
void* theRowBuffer = &theRowBufferVector[0];
- for (size_t y = iBounds.bottom; y > iBounds.top; --y)
+ for (int y = iBounds.bottom; y > iBounds.top; --y)
{
const void* sourceRowAddress = iRasterDesc.CalcRowAddress(iBaseAddress, y - 1);
sBlitRow
Modified: trunk/zoolib/source/cxx/zoolib/ZDCPixmapNS.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZDCPixmapNS.cpp 2011-11-30 15:00:03 UTC (rev 2627)
+++ trunk/zoolib/source/cxx/zoolib/ZDCPixmapNS.cpp 2011-11-30 15:00:45 UTC (rev 2628)
@@ -291,6 +291,7 @@
case eFormatEfficient_Color_16: return eFormatStandard_RGB_16_BE;
case eFormatEfficient_Color_24: return eFormatStandard_RGB_24;
case eFormatEfficient_Color_32: return eFormatStandard_ARGB_32;
+ default: break;
}
return eFormatStandard_Invalid;
@@ -1042,7 +1043,8 @@
cumuMask8 |= destMask8;
destMask8 = destMask8 >> 1;
}
- *localDest8++ = (*localDest8 & (0xFF ^ cumuMask8)) | destVal8;
+ *localDest8 = (*localDest8 & (0xFF ^ cumuMask8)) | destVal8;
+ ++localDest8;
}
while (localCount >= 8)
@@ -1096,7 +1098,8 @@
destVal8 |= (*iPixvals++ & 0x03) << sourceShift;
sourceShift -= 2;
}
- *localDest8++ = *localDest8 & (0xFF ^ cumuMask8) | destVal8;
+ *localDest8 = *localDest8 & (0xFF ^ cumuMask8) | destVal8;
+ ++localDest8;
}
while (localCount >= 4)
@@ -1133,7 +1136,8 @@
if (iStartH & 0x01)
{
--localCount;
- *localDest8++ = (*localDest8 & 0xF0) | (*iPixvals++ & 0x0F);
+ *localDest8 = (*localDest8 & 0xF0) | (*iPixvals++ & 0x0F);
+ ++localDest8;
}
while (localCount >= 2)
@@ -1175,7 +1179,8 @@
cumuMask8 |= destMask8;
destMask8 = destMask8 << 1;
}
- *localDest8++ = *localDest8 & (0xFF ^ cumuMask8) | destVal8;
+ *localDest8 = *localDest8 & (0xFF ^ cumuMask8) | destVal8;
+ ++localDest8;
}
while (localCount >= 8)
@@ -1229,7 +1234,8 @@
destVal8 |= (*iPixvals++ & 0x03) << sourceShift;
sourceShift += 2;
}
- *localDest8++ = (*localDest8 & (0xFF ^ cumuMask8)) | destVal8;
+ *localDest8 = (*localDest8 & (0xFF ^ cumuMask8)) | destVal8;
+ ++localDest8;
}
while (localCount >= 4)
@@ -1266,7 +1272,8 @@
if (iStartH & 0x01)
{
--localCount;
- *localDest8++ = (*localDest8 & 0x0F) | ((*iPixvals++ & 0x0F) << 4);
+ *localDest8 = (*localDest8 & 0x0F) | ((*iPixvals++ & 0x0F) << 4);
+ ++localDest8;
}
while (localCount >= 2)
Modified: trunk/zoolib/source/cxx/zoolib/ZIntervalTreeClock.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZIntervalTreeClock.cpp 2011-11-30 15:00:03 UTC (rev 2627)
+++ trunk/zoolib/source/cxx/zoolib/ZIntervalTreeClock.cpp 2011-11-30 15:00:45 UTC (rev 2628)
@@ -171,17 +171,17 @@
{}
Event::Event(size_t iValue, const ZRef<Event>& iLeft, const ZRef<Event>& iRight)
-: fValue(iValue)
-, fLeft(iLeft)
+: fLeft(iLeft)
, fRight(iRight)
+, fValue(iValue)
{
ZAssert(fLeft && fRight || !fLeft && !fRight);
}
Event::Event(bool iWithZeroChildren, size_t iValue)
-: fValue(iValue)
-, fLeft(spEventZero)
+: fLeft(spEventZero)
, fRight(spEventZero)
+, fValue(iValue)
{
ZAssert(iWithZeroChildren);
}
Modified: trunk/zoolib/source/cxx/zoolib/ZMIME.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZMIME.cpp 2011-11-30 15:00:03 UTC (rev 2627)
+++ trunk/zoolib/source/cxx/zoolib/ZMIME.cpp 2011-11-30 15:00:45 UTC (rev 2628)
@@ -172,8 +172,8 @@
ZMIME::StreamR_Line::StreamR_Line(const ZStreamR& iStream)
: fStreamR(iStream),
- fState(eNormal),
- fEmpty(true)
+ fEmpty(true),
+ fState(eNormal)
{}
void ZMIME::StreamR_Line::Imp_Read(void* oDest, size_t iCount, size_t* oCountRead)
Modified: trunk/zoolib/source/cxx/zoolib/ZML.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZML.cpp 2011-11-30 15:00:03 UTC (rev 2627)
+++ trunk/zoolib/source/cxx/zoolib/ZML.cpp 2011-11-30 15:00:45 UTC (rev 2628)
@@ -296,18 +296,18 @@
StrimU::StrimU(const ZStrimU& iStrim)
: fStrim(iStrim),
+ fRecognizeEntitiesInAttributeValues(false),
fBufferStart(0),
- fToken(eToken_Fresh),
- fRecognizeEntitiesInAttributeValues(false)
+ fToken(eToken_Fresh)
{}
StrimU::StrimU(const ZStrimU& iStrim,
bool iRecognizeEntitiesInAttributeValues, ZRef<Callable_Entity> iCallable)
: fStrim(iStrim),
+ fRecognizeEntitiesInAttributeValues(iRecognizeEntitiesInAttributeValues),
+ fCallable(iCallable),
fBufferStart(0),
- fToken(eToken_Fresh),
- fRecognizeEntitiesInAttributeValues(iRecognizeEntitiesInAttributeValues),
- fCallable(iCallable)
+ fToken(eToken_Fresh)
{}
StrimU::~StrimU()
Modified: trunk/zoolib/source/cxx/zoolib/ZNet.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZNet.cpp 2011-11-30 15:00:03 UTC (rev 2627)
+++ trunk/zoolib/source/cxx/zoolib/ZNet.cpp 2011-11-30 15:00:45 UTC (rev 2628)
@@ -27,8 +27,8 @@
#pragma mark * ZNetEx
ZNetEx::ZNetEx(ZNet::Error iError)
-: fError(iError),
- runtime_error("ZNetEx")
+: runtime_error("ZNetEx"),
+ fError(iError)
{}
// =================================================================================================
Modified: trunk/zoolib/source/cxx/zoolib/ZNet_Internet.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZNet_Internet.cpp 2011-11-30 15:00:03 UTC (rev 2627)
+++ trunk/zoolib/source/cxx/zoolib/ZNet_Internet.cpp 2011-11-30 15:00:45 UTC (rev 2628)
@@ -99,11 +99,11 @@
const ip6_addr& ZNetAddress_IP6::GetAddr() const
{ return fAddr; }
-const ip6_addr ZNetAddress_IP6::sLoopback = {0};
+const ip6_addr ZNetAddress_IP6::sLoopback = {{{0}}};
const ip6_addr ZNetAddress_IP6::sAny =
- { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 };
+ {{{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 }}};
// =================================================================================================
#pragma mark -
Modified: trunk/zoolib/source/cxx/zoolib/ZNet_Internet_MacOT_OSX.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZNet_Internet_MacOT_OSX.cpp 2011-11-30 15:00:03 UTC (rev 2627)
+++ trunk/zoolib/source/cxx/zoolib/ZNet_Internet_MacOT_OSX.cpp 2011-11-30 15:00:45 UTC (rev 2628)
@@ -177,7 +177,7 @@
if (spInitCount++ == 0)
{
::InitOpenTransportInContext(kInitOTForExtensionMask, &spOTClientContextPtr);
- MPLibraryIsLoaded();
+ (void)MPLibraryIsLoaded();
}
}
Modified: trunk/zoolib/source/cxx/zoolib/ZStream.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZStream.cpp 2011-11-30 15:00:03 UTC (rev 2627)
+++ trunk/zoolib/source/cxx/zoolib/ZStream.cpp 2011-11-30 15:00:45 UTC (rev 2628)
@@ -1482,8 +1482,8 @@
#pragma mark * ZStreamWPos_Null
ZStreamWPos_Null::ZStreamWPos_Null()
-: fSize(0),
- fPosition(0)
+: fPosition(0),
+ fSize(0)
{}
ZStreamWPos_Null::~ZStreamWPos_Null()
Modified: trunk/zoolib/source/cxx/zoolib/ZStreamRW_FlushOnRead.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZStreamRW_FlushOnRead.cpp 2011-11-30 15:00:03 UTC (rev 2627)
+++ trunk/zoolib/source/cxx/zoolib/ZStreamRW_FlushOnRead.cpp 2011-11-30 15:00:45 UTC (rev 2628)
@@ -46,9 +46,9 @@
*/
ZStreamRW_FlushOnRead::ZStreamRW_FlushOnRead(const ZStreamR& iStreamR, const ZStreamW& iStreamW)
-: fStreamR(iStreamR),
- fStreamW(iStreamW),
- fLastWasWrite(0)
+: fLastWasWrite(0),
+ fStreamR(iStreamR),
+ fStreamW(iStreamW)
{}
ZStreamRW_FlushOnRead::~ZStreamRW_FlushOnRead()
Modified: trunk/zoolib/source/cxx/zoolib/ZStreamW_HexStrim.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZStreamW_HexStrim.cpp 2011-11-30 15:00:03 UTC (rev 2627)
+++ trunk/zoolib/source/cxx/zoolib/ZStreamW_HexStrim.cpp 2011-11-30 15:00:45 UTC (rev 2628)
@@ -43,8 +43,8 @@
fChunkSeparator(iChunkSeparator),
fChunkSize(iChunkSize),
fCurrentChunkLength(0),
- fHexDigits(spHexDigits),
- fWrittenAny(false)
+ fWrittenAny(false),
+ fHexDigits(spHexDigits)
{}
/**
Modified: trunk/zoolib/source/cxx/zoolib/ZStream_CGData.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZStream_CGData.cpp 2011-11-30 15:00:03 UTC (rev 2627)
+++ trunk/zoolib/source/cxx/zoolib/ZStream_CGData.cpp 2011-11-30 15:00:45 UTC (rev 2628)
@@ -99,8 +99,8 @@
return countRead;
}
-static void spSkipBytes_RPos(void* iInfo, size_t iCount)
- { static_cast<ZStreamerRPos*>(iInfo)->GetStreamR().Skip(iCount); }
+//static void spSkipBytes_RPos(void* iInfo, size_t iCount)
+// { static_cast<ZStreamerRPos*>(iInfo)->GetStreamR().Skip(iCount); }
static void spRewind_RPos(void* iInfo)
{ static_cast<ZStreamerRPos*>(iInfo)->GetStreamRPos().SetPosition(0); }
Modified: trunk/zoolib/source/cxx/zoolib/ZStream_Data_T.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZStream_Data_T.h 2011-11-30 15:00:03 UTC (rev 2627)
+++ trunk/zoolib/source/cxx/zoolib/ZStream_Data_T.h 2011-11-30 15:00:45 UTC (rev 2628)
@@ -81,9 +81,13 @@
};
template <class T>
-ZStreamRPos_Data_T<T> MakeStreamRPos_Data_T(const T& iData)
+ZStreamRPos_Data_T<T> sStreamRPos_Data_T(const T& iData)
{ return ZStreamRPos_Data_T<T>(iData); }
+template <class T>
+ZStreamRPos_Data_T<T> MakeStreamRPos_Data_T(const T& iData)
+ { return sStreamRPos_Data_T<T>(iData); }
+
// =================================================================================================
#pragma mark -
#pragma mark * ZStreamRWPos_Data_T
@@ -202,9 +206,13 @@
};
template <class T>
-ZStreamRWPos_Data_T<T> MakeStreamRWPos_Data_T(T& iData)
+ZStreamRWPos_Data_T<T> sStreamRWPos_Data_T(T& iData)
{ return ZStreamRWPos_Data_T<T>(iData); }
+template <class T>
+ZStreamRWPos_Data_T<T> MakeStreamRWPos_Data_T(T& iData)
+ { return sStreamRWPos_Data_T<T>(iData); }
+
// =================================================================================================
#pragma mark -
#pragma mark * Data stream reading functions
Modified: trunk/zoolib/source/cxx/zoolib/ZStream_LZW.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZStream_LZW.cpp 2011-11-30 15:00:03 UTC (rev 2627)
+++ trunk/zoolib/source/cxx/zoolib/ZStream_LZW.cpp 2011-11-30 15:00:45 UTC (rev 2628)
@@ -78,7 +78,7 @@
while (!fFinished && iCount)
{
size_t countRead;
- if (fCountSinceClear == (1 << fCodeSize_Alphabet) - 2)
+ if (fCountSinceClear == (1U << fCodeSize_Alphabet) - 2)
{
fBitWriter.WriteBits(localDest, fCodeSize_Emitted, fCode_Clear, &countRead);
fCountSinceClear = 0;
Modified: trunk/zoolib/source/cxx/zoolib/ZStream_Memory.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZStream_Memory.cpp 2011-11-30 15:00:03 UTC (rev 2627)
+++ trunk/zoolib/source/cxx/zoolib/ZStream_Memory.cpp 2011-11-30 15:00:45 UTC (rev 2628)
@@ -307,9 +307,9 @@
*/
ZStreamWPos_Memory::ZStreamWPos_Memory(void* iAddress, size_t iSize)
: fAddress(static_cast<char*>(iAddress)),
+ fPosition(0),
fSize(iSize),
- fCapacity(iSize),
- fPosition(0)
+ fCapacity(iSize)
{}
/**
@@ -320,9 +320,9 @@
*/
ZStreamWPos_Memory::ZStreamWPos_Memory(void* iAddress, size_t iSize, size_t iCapacity)
: fAddress(static_cast<char*>(iAddress)),
+ fPosition(0),
fSize(iSize),
- fCapacity(iCapacity),
- fPosition(0)
+ fCapacity(iCapacity)
{}
void ZStreamWPos_Memory::Imp_Write(const void* iSource, size_t iCount, size_t* oCountWritten)
Modified: trunk/zoolib/source/cxx/zoolib/ZTxn.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZTxn.cpp 2011-11-30 15:00:03 UTC (rev 2627)
+++ trunk/zoolib/source/cxx/zoolib/ZTxn.cpp 2011-11-30 15:00:45 UTC (rev 2628)
@@ -226,4 +226,4 @@
iTxn.pRegisterTarget(this);
}
-} // namespace ZooLib
\ No newline at end of file
+} // namespace ZooLib
Modified: trunk/zoolib/source/cxx/zoolib/ZUSB_OSX.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZUSB_OSX.cpp 2011-11-30 15:00:03 UTC (rev 2627)
+++ trunk/zoolib/source/cxx/zoolib/ZUSB_OSX.cpp 2011-11-30 15:00:45 UTC (rev 2628)
@@ -568,8 +568,8 @@
: fUSBII(iUSBII),
fII(iIOUSBInterfaceInterface),
fPipeRefR(iPipeRefR),
+ fBuffer(new uint8[iBufferSize]),
fSize(iBufferSize),
- fBuffer(new uint8[iBufferSize]),
fOffset(0),
fEnd(0),
fPending(false),
Modified: trunk/zoolib/source/cxx/zoolib/ZVal_AppleEvent.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZVal_AppleEvent.cpp 2011-11-30 15:00:03 UTC (rev 2627)
+++ trunk/zoolib/source/cxx/zoolib/ZVal_AppleEvent.cpp 2011-11-30 15:00:45 UTC (rev 2628)
@@ -135,7 +135,7 @@
long count;
if (noErr == ::AECountItems(&iDesc, &count))
{
- for (size_t x = 0; x < count; ++x)
+ for (long x = 0; x < count; ++x)
{
ZVal_AppleEvent result;
if (noErr == ::AEGetNthDesc(&iDesc, x + 1, typeWildCard, nullptr, &result.OParam()))
@@ -155,7 +155,7 @@
long count;
if (noErr == ::AECountItems(&iDesc, &count))
{
- for (size_t x = 0; x < count; ++x)
+ for (long x = 0; x < count; ++x)
{
AEKeyword key;
ZVal_AppleEvent result;
Modified: trunk/zoolib/source/cxx/zoolib/ZVal_NS.mm
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZVal_NS.mm 2011-11-30 15:00:03 UTC (rev 2627)
+++ trunk/zoolib/source/cxx/zoolib/ZVal_NS.mm 2011-11-30 15:00:45 UTC (rev 2628)
@@ -74,11 +74,8 @@
{
if (NSObject* theVal = inherited::Get())
{
-// #if defined(MAC_OS_X_VERSION_MIN_REQUIRED) \
-// && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_2
- if ([theVal isMemberOfClass:[NSNull class]])
- return false;
-// #endif
+ if ([theVal isMemberOfClass:[NSNull class]])
+ return false;
return true;
}
return false;
Modified: trunk/zoolib/source/cxx/zoolib/ZYad_DividedValues.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZYad_DividedValues.cpp 2011-11-30 15:00:03 UTC (rev 2627)
+++ trunk/zoolib/source/cxx/zoolib/ZYad_DividedValues.cpp 2011-11-30 15:00:45 UTC (rev 2628)
@@ -31,11 +31,6 @@
#pragma mark -
#pragma mark * Static parsing functions
-static void spThrowParseException(const string& iMessage)
- {
- throw ParseException(iMessage);
- }
-
static bool spReadValues(vector<string8>& oValues,
UTF32 iDivider_Value, UTF32 iDivider_Line, const ZStrimR& iStrimR)
{
Modified: trunk/zoolib/source/cxx/zoolib/ZYad_ML.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZYad_ML.cpp 2011-11-30 15:00:03 UTC (rev 2627)
+++ trunk/zoolib/source/cxx/zoolib/ZYad_ML.cpp 2011-11-30 15:00:45 UTC (rev 2628)
@@ -137,6 +137,8 @@
oYadR = new ZYadStrimR_ML(fStrimmerU);
break;
}
+ default:
+ break;
}
if (!oYadR && !fTagName.empty())
Modified: trunk/zoolib/source/cxx/zoolib/ZYad_XMLPList.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZYad_XMLPList.cpp 2011-11-30 15:00:03 UTC (rev 2627)
+++ trunk/zoolib/source/cxx/zoolib/ZYad_XMLPList.cpp 2011-11-30 15:00:45 UTC (rev 2628)
@@ -38,14 +38,6 @@
throw ZYadParseException_XMLPList(iMessage);
}
-static void spBegin(ZML::StrimU& r, const string& iTagName)
- {
- sSkipText(r);
-
- if (!sTryRead_Begin(r, iTagName))
- spThrowParseException("Expected begin tag '" + iTagName + "'");
- }
-
static void spEnd(ZML::StrimU& r, const string& iTagName)
{
sSkipText(r);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
