Menu
▾
▴
[ZooLib-checkins] SF.net SVN: zoolib:[1244] trunk/zoolib/source/cxx
|
From: <ag...@us...> - 2010-04-06 19:12:55
|
Revision: 1244
http://zoolib.svn.sourceforge.net/zoolib/?rev=1244&view=rev
Author: agreen
Date: 2010-04-06 19:12:48 +0000 (Tue, 06 Apr 2010)
Log Message:
-----------
Whitespace -- get rid of extraneous double spaces.
Modified Paths:
--------------
trunk/zoolib/source/cxx/more/zoolib/tql/ZUtil_TQLConvert.cpp
trunk/zoolib/source/cxx/more/zoolib/tuplebase/ZTB.cpp
trunk/zoolib/source/cxx/more/zoolib/tuplebase/ZTB.h
trunk/zoolib/source/cxx/more/zoolib/tuplebase/ZTS.cpp
trunk/zoolib/source/cxx/more/zoolib/tuplebase/ZTupleIndex_String.h
trunk/zoolib/source/cxx/zoolib/ZAny.h
trunk/zoolib/source/cxx/zoolib/ZAtomic.h
trunk/zoolib/source/cxx/zoolib/ZBitStream.cpp
trunk/zoolib/source/cxx/zoolib/ZDCPixmap.h
trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder_GIF.cpp
trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder_JPEGLib.cpp
trunk/zoolib/source/cxx/zoolib/ZDCPixmapNS.h
trunk/zoolib/source/cxx/zoolib/ZDList.h
trunk/zoolib/source/cxx/zoolib/ZData_Any.h
trunk/zoolib/source/cxx/zoolib/ZFile.cpp
trunk/zoolib/source/cxx/zoolib/ZFile.h
trunk/zoolib/source/cxx/zoolib/ZFile_Win.cpp
trunk/zoolib/source/cxx/zoolib/ZGRgn.h
trunk/zoolib/source/cxx/zoolib/ZGeom.h
trunk/zoolib/source/cxx/zoolib/ZGeometry.h
trunk/zoolib/source/cxx/zoolib/ZHTTP.cpp
trunk/zoolib/source/cxx/zoolib/ZLog.h
trunk/zoolib/source/cxx/zoolib/ZML.h
trunk/zoolib/source/cxx/zoolib/ZNet_Internet_MacOT_OSX.cpp
trunk/zoolib/source/cxx/zoolib/ZRegex.h
trunk/zoolib/source/cxx/zoolib/ZStackCrawl.cpp
trunk/zoolib/source/cxx/zoolib/ZStream_Buffered.cpp
trunk/zoolib/source/cxx/zoolib/ZStream_LZW.h
trunk/zoolib/source/cxx/zoolib/ZStream_POSIX.cpp
trunk/zoolib/source/cxx/zoolib/ZStream_ZLib.cpp
trunk/zoolib/source/cxx/zoolib/ZStrim.h
trunk/zoolib/source/cxx/zoolib/ZTextCoder_Win.cpp
trunk/zoolib/source/cxx/zoolib/ZTextCollator.h
trunk/zoolib/source/cxx/zoolib/ZThread_Win.h
trunk/zoolib/source/cxx/zoolib/ZTime.cpp
trunk/zoolib/source/cxx/zoolib/ZTime.h
trunk/zoolib/source/cxx/zoolib/ZTrail.h
trunk/zoolib/source/cxx/zoolib/ZUtil_ATSUI.cpp
trunk/zoolib/source/cxx/zoolib/ZUtil_MacOSX.cpp
trunk/zoolib/source/cxx/zoolib/ZUtil_STL.h
trunk/zoolib/source/cxx/zoolib/ZUtil_Strim_Tuple.h
trunk/zoolib/source/cxx/zoolib/ZVal_ZooLib.cpp
trunk/zoolib/source/cxx/zoolib/ZWinRegistry_Val.cpp
trunk/zoolib/source/cxx/zoolib/ZYad_JSON.cpp
trunk/zoolib/source/cxx/zoolib/zconfigl.h
Modified: trunk/zoolib/source/cxx/more/zoolib/tql/ZUtil_TQLConvert.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/tql/ZUtil_TQLConvert.cpp 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/more/zoolib/tql/ZUtil_TQLConvert.cpp 2010-04-06 19:12:48 UTC (rev 1244)
@@ -341,7 +341,7 @@
{
if (iName)
{
- theQ = sJoin(theQ, sAllID(sIDName, RelHead(*iName) | thePropName));
+ theQ = sJoin(theQ, sAllID(sIDName, RelHead(*iName) | thePropName));
if (iVerbose)
theQ = sProject(RelHead(*iName) | "$$Property_Name", theQ);
else
Modified: trunk/zoolib/source/cxx/more/zoolib/tuplebase/ZTB.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/tuplebase/ZTB.cpp 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/more/zoolib/tuplebase/ZTB.cpp 2010-04-06 19:12:48 UTC (rev 1244)
@@ -294,7 +294,7 @@
We've already seen that a ZTBQuery can be initialized from a ZTBSpec, and
a ZTBIter initialized from such a ZTBQuery will return all the tuples
-that match the specification. The other simple instantiations of a ZTBQuery
+that match the specification. The other simple instantiations of a ZTBQuery
take an ID or a list of IDs in a \c vector, \c set or pointer and count. A
ZTBIter initialized from one of the following queries would simply return
the tuples with the specified IDs.
Modified: trunk/zoolib/source/cxx/more/zoolib/tuplebase/ZTB.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/tuplebase/ZTB.h 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/more/zoolib/tuplebase/ZTB.h 2010-04-06 19:12:48 UTC (rev 1244)
@@ -39,7 +39,7 @@
class ZTB
{
- ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES(ZTB, operator_bool_generator_type, operator_bool_type);
+ ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES(ZTB, operator_bool_generator_type, operator_bool_type);
public:
ZTB() {}
ZTB(ZRef<ZTBRep> iTBRep);
@@ -127,7 +127,7 @@
class ZTBIter
{
- ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES(ZTBIter, operator_bool_generator_type, operator_bool_type);
+ ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES(ZTBIter, operator_bool_generator_type, operator_bool_type);
public:
/** \name Constructors
*/ //@{
Modified: trunk/zoolib/source/cxx/more/zoolib/tuplebase/ZTS.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/tuplebase/ZTS.cpp 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/more/zoolib/tuplebase/ZTS.cpp 2010-04-06 19:12:48 UTC (rev 1244)
@@ -34,7 +34,7 @@
needn't be physically stored.
In addition a tuplestore allocates IDs, on demand it will return IDs that have never been
-allocated before and never will again. This lets us add new data to a tuplestore without
+allocated before and never will again. This lets us add new data to a tuplestore without
overwriting IDs that have already been used.
The class ZTS defines an API for reading and writing entries in a tuplestore. Generally though
Modified: trunk/zoolib/source/cxx/more/zoolib/tuplebase/ZTupleIndex_String.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/tuplebase/ZTupleIndex_String.h 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/more/zoolib/tuplebase/ZTupleIndex_String.h 2010-04-06 19:12:48 UTC (rev 1244)
@@ -63,11 +63,11 @@
class Compare
{
public:
- typedef Key value_type;
+ typedef Key value_type;
Compare();
- bool operator()(const value_type& iLeft, const value_type& iRight) const;
+ bool operator()(const value_type& iLeft, const value_type& iRight) const;
ZTextCollator fTextCollator;
};
Modified: trunk/zoolib/source/cxx/zoolib/ZAny.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZAny.h 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/zoolib/ZAny.h 2010-04-06 19:12:48 UTC (rev 1244)
@@ -109,14 +109,14 @@
};
#ifdef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
- public: // so ZAnyBaseCast can be non-friend
+ public: // so ZAnyBaseCast can be non-friend
#else
-private:
- template<typename ValueType>
- friend ValueType* ZAnyBaseCast(ZAnyBase*);
+ private:
+ template<typename ValueType>
+ friend ValueType* ZAnyBaseCast(ZAnyBase*);
- template<typename ValueType>
- friend const ValueType* ZAnyBaseCast(const ZAnyBase*);
+ template<typename ValueType>
+ friend const ValueType* ZAnyBaseCast(const ZAnyBase*);
#endif
placeholder* content;
Modified: trunk/zoolib/source/cxx/zoolib/ZAtomic.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZAtomic.h 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/zoolib/ZAtomic.h 2010-04-06 19:12:48 UTC (rev 1244)
@@ -136,7 +136,7 @@
"bne- 1b\n"
"isync\n"
: "=m" (iAtomic->fValue), "=&r" (oldValue)
- : "r" (iAtomic), "r" (iOldValue), "r" (iNewValue)
+ : "r" (iAtomic), "r" (iOldValue), "r" (iNewValue)
: "cc"
);
return oldValue == iOldValue;
Modified: trunk/zoolib/source/cxx/zoolib/ZBitStream.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZBitStream.cpp 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/zoolib/ZBitStream.cpp 2010-04-06 19:12:48 UTC (rev 1244)
@@ -263,7 +263,7 @@
}
if (oCountBytesWritten)
- *oCountBytesWritten = localDest - static_cast<uint8*>(iDest);
+ *oCountBytesWritten = localDest - static_cast<uint8*>(iDest);
}
/// Flush the buffer by writing pending bits to \a iStream.
@@ -362,7 +362,7 @@
}
if (oCountBytesWritten)
- *oCountBytesWritten = localDest - static_cast<uint8*>(iDest);
+ *oCountBytesWritten = localDest - static_cast<uint8*>(iDest);
}
/// Flush the buffer by writing pending bits to \a iStream.
Modified: trunk/zoolib/source/cxx/zoolib/ZDCPixmap.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZDCPixmap.h 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/zoolib/ZDCPixmap.h 2010-04-06 19:12:48 UTC (rev 1244)
@@ -45,7 +45,7 @@
class ZDCPixmap
{
- ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES(ZDCPixmap, operator_bool_generator_type, operator_bool_type);
+ ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES(ZDCPixmap, operator_bool_generator_type, operator_bool_type);
public:
// The usual mantra: constructor, copy constructor, destructor, assignment
Modified: trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder_GIF.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder_GIF.cpp 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder_GIF.cpp 2010-04-06 19:12:48 UTC (rev 1244)
@@ -440,7 +440,7 @@
// Skip any data blocks.
StreamR_Chunk(iStream).SkipAll();
}
- else if (blockType == ',')
+ else if (blockType == ',')
{
// It's an image.
ZRect curBounds;
Modified: trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder_JPEGLib.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder_JPEGLib.cpp 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder_JPEGLib.cpp 2010-04-06 19:12:48 UTC (rev 1244)
@@ -453,7 +453,7 @@
struct jpeg_decompress_struct theJDS;
JPEGErrorMgr theEM(theJDS);
-
+
theEM.BeforeCall();
::jpeg_create_decompress(&theJDS);
Modified: trunk/zoolib/source/cxx/zoolib/ZDCPixmapNS.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZDCPixmapNS.h 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/zoolib/ZDCPixmapNS.h 2010-04-06 19:12:48 UTC (rev 1244)
@@ -376,7 +376,7 @@
static uint32 sConvert(
uint32 iPixval, uint32 iMask, int32 iShift, uint32 iMultiplier, uint32 iAdd)
{
- return iAdd + (((iPixval & iMask) >> iShift) * iMultiplier);
+ return iAdd + (((iPixval & iMask) >> iShift) * iMultiplier);
}
void AsRGBA(uint32 iPixval, ZRGBA_POD& oColor) const
@@ -422,7 +422,7 @@
static uint32 sConvert(
uint32 iPixval, uint32 iMask, int32 iShift, uint32 iMultiplier, uint32 iAdd)
{
- return iAdd + (((iPixval & iMask) >> iShift) * iMultiplier);
+ return iAdd + (((iPixval & iMask) >> iShift) * iMultiplier);
}
void AsRGBA(uint32 iPixval, ZRGBA_POD& oColor) const
Modified: trunk/zoolib/source/cxx/zoolib/ZDList.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZDList.h 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/zoolib/ZDList.h 2010-04-06 19:12:48 UTC (rev 1244)
@@ -37,8 +37,8 @@
template <typename L>
struct DListHead
{
- ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES_T(
- DListHead, operator_bool_generator_type, operator_bool_type);
+ ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES_T(
+ DListHead, operator_bool_generator_type, operator_bool_type);
DListHead() : fHeadL(nullptr), fSize(0) {}
@@ -181,8 +181,8 @@
template <typename P, typename L>
class DListIterator
{
- ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES_T(
- DListIterator, operator_bool_generator_type, operator_bool_type);
+ ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES_T(
+ DListIterator, operator_bool_generator_type, operator_bool_type);
public:
enum { kDebug = L::kDebug };
@@ -219,8 +219,8 @@
template <typename P, typename L>
class DListIteratorEraseAll
{
- ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES_T(
- DListIteratorEraseAll, operator_bool_generator_type, operator_bool_type);
+ ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES_T(
+ DListIteratorEraseAll, operator_bool_generator_type, operator_bool_type);
public:
enum { kDebug = L::kDebug };
Modified: trunk/zoolib/source/cxx/zoolib/ZData_Any.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZData_Any.h 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/zoolib/ZData_Any.h 2010-04-06 19:12:48 UTC (rev 1244)
@@ -35,8 +35,8 @@
class ZData_Any
{
- ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES(ZData_Any,
- operator_bool_generator_type, operator_bool_type);
+ ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES(ZData_Any,
+ operator_bool_generator_type, operator_bool_type);
class Rep;
public:
Modified: trunk/zoolib/source/cxx/zoolib/ZFile.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZFile.cpp 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/zoolib/ZFile.cpp 2010-04-06 19:12:48 UTC (rev 1244)
@@ -299,7 +299,7 @@
return string();
}
-/** \brief Return a native textual representation of the path that would
+/** \brief Return a native textual representation of the path that would
be passed to the file system to access this node. */
/**
The representation will be in the syntax used by the underlying API.
@@ -498,7 +498,7 @@
return ZFileSpec();
}
-/** \brief Move the entity in the file system referenced by
+/** \brief Move the entity in the file system referenced by
the file spec to the location referenced by \a iDest. */
ZFileSpec ZFileSpec::MoveTo(const ZFileSpec& iDest, ZFile::Error* oError) const
{
Modified: trunk/zoolib/source/cxx/zoolib/ZFile.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZFile.h 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/zoolib/ZFile.h 2010-04-06 19:12:48 UTC (rev 1244)
@@ -75,7 +75,7 @@
class ZFileSpec
{
- ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES(ZFileSpec, operator_bool_generator_type, operator_bool_type);
+ ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES(ZFileSpec, operator_bool_generator_type, operator_bool_type);
public:
typedef ZFile::Error Error;
@@ -179,7 +179,7 @@
class ZFileIter
{
- ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES(ZFileIter, operator_bool_generator_type, operator_bool_type);
+ ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES(ZFileIter, operator_bool_generator_type, operator_bool_type);
public:
ZFileIter();
ZFileIter(const ZFileIter& iOther);
@@ -204,7 +204,7 @@
class ZFileTreeIter
{
- ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES(
+ ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES(
ZFileTreeIter, operator_bool_generator_type, operator_bool_type);
public:
ZFileTreeIter();
Modified: trunk/zoolib/source/cxx/zoolib/ZFile_Win.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZFile_Win.cpp 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/zoolib/ZFile_Win.cpp 2010-04-06 19:12:48 UTC (rev 1244)
@@ -484,7 +484,7 @@
// Subtract the number of seconds between 1601 and 1970.
result -= ZTime::kEpochDelta_1601_To_1970;
- return result;
+ return result;
}
// =================================================================================================
Modified: trunk/zoolib/source/cxx/zoolib/ZGRgn.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZGRgn.h 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/zoolib/ZGRgn.h 2010-04-06 19:12:48 UTC (rev 1244)
@@ -99,7 +99,7 @@
ZRef<ZGRgnRep> fRep;
public:
- ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES(ZGRgn, operator_bool_generator_type, operator_bool_type);
+ ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES(ZGRgn, operator_bool_generator_type, operator_bool_type);
operator operator_bool_type() const
{ return operator_bool_generator_type::translate(fRep && !fRep->IsEmpty()); }
Modified: trunk/zoolib/source/cxx/zoolib/ZGeom.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZGeom.h 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/zoolib/ZGeom.h 2010-04-06 19:12:48 UTC (rev 1244)
@@ -50,8 +50,8 @@
class ZPoint_T
{
public:
- ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES_T(ZPoint_T<T>,
- operator_bool_generator_type, operator_bool_type);
+ ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES_T(ZPoint_T<T>,
+ operator_bool_generator_type, operator_bool_type);
operator operator_bool_type() const
{ return operator_bool_generator_type::translate(h || v); }
@@ -219,8 +219,8 @@
class ZRect_T
{
public:
- ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES_T(ZRect_T<T>,
- operator_bool_generator_type, operator_bool_type);
+ ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES_T(ZRect_T<T>,
+ operator_bool_generator_type, operator_bool_type);
operator operator_bool_type() const
{ return operator_bool_generator_type::translate(left < right && top < bottom); }
Modified: trunk/zoolib/source/cxx/zoolib/ZGeometry.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZGeometry.h 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/zoolib/ZGeometry.h 2010-04-06 19:12:48 UTC (rev 1244)
@@ -69,8 +69,8 @@
class ZGPointPOD_T
{
public:
- ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES_T(ZGPointPOD_T<T>,
- operator_bool_generator_type, operator_bool_type);
+ ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES_T(ZGPointPOD_T<T>,
+ operator_bool_generator_type, operator_bool_type);
operator operator_bool_type() const
{ return operator_bool_generator_type::translate(x || y); }
@@ -218,8 +218,8 @@
class ZGExtentPOD_T
{
public:
- ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES_T(ZGExtentPOD_T<T>,
- operator_bool_generator_type, operator_bool_type);
+ ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES_T(ZGExtentPOD_T<T>,
+ operator_bool_generator_type, operator_bool_type);
operator operator_bool_type() const
{ return operator_bool_generator_type::translate(h || v); }
@@ -373,8 +373,8 @@
class ZGRectPOD_T
{
public:
- ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES_T(ZGRectPOD_T<T>,
- operator_bool_generator_type, operator_bool_type);
+ ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES_T(ZGRectPOD_T<T>,
+ operator_bool_generator_type, operator_bool_type);
operator operator_bool_type() const
{ return operator_bool_generator_type::translate(extent); }
Modified: trunk/zoolib/source/cxx/zoolib/ZHTTP.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZHTTP.cpp 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/zoolib/ZHTTP.cpp 2010-04-06 19:12:48 UTC (rev 1244)
@@ -896,7 +896,7 @@
/*
There are three basic forms for a range request, which
we encode as a tuple with a form as follows:
-bytes=x-y { begin = int64(x); end = int64(y); } // (x to y inclusive)
+bytes=x-y { begin = int64(x); end = int64(y); } // (x to y inclusive)
bytes=x- { begin = int64(x); } // (x to the end)
bytes=-y { last = int64(y); } // (last y)
*/
Modified: trunk/zoolib/source/cxx/zoolib/ZLog.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZLog.h 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/zoolib/ZLog.h 2010-04-06 19:12:48 UTC (rev 1244)
@@ -60,7 +60,7 @@
{
ePriority_Emerg = 0, ///< System on fire?
ePriority_Alert = 1, ///< action must be taken immediately
- ePriority_Crit = 2, ///< critical conditions
+ ePriority_Crit = 2, ///< critical conditions
ePriority_Err = 3, ///< error conditions
ePriority_Warning = 4,///< warning conditions
ePriority_Notice = 5, ///< normal but significant condition
@@ -90,7 +90,7 @@
class StrimW : public ZStrimW
{
- ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES(StrimW, operator_bool_generator_type, operator_bool_type);
+ ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES(StrimW, operator_bool_generator_type, operator_bool_type);
public:
StrimW(EPriority iPriority, const std::string& iName);
StrimW(EPriority iPriority, const char* iName);
Modified: trunk/zoolib/source/cxx/zoolib/ZML.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZML.h 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/zoolib/ZML.h 2010-04-06 19:12:48 UTC (rev 1244)
@@ -66,7 +66,7 @@
: public ZStrimU
, NonCopyable
{
- ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES(StrimU, operator_bool_generator_type, operator_bool_type);
+ ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES(StrimU, operator_bool_generator_type, operator_bool_type);
public:
StrimU(const ZStrimU& iStrim);
StrimU(const ZStrimU& iStrim, bool iRecognizeEntitiesInAttributeValues);
Modified: trunk/zoolib/source/cxx/zoolib/ZNet_Internet_MacOT_OSX.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZNet_Internet_MacOT_OSX.cpp 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/zoolib/ZNet_Internet_MacOT_OSX.cpp 2010-04-06 19:12:48 UTC (rev 1244)
@@ -496,7 +496,7 @@
OTResult look = ::OTLook(listener);
// Only two async events should be able to cause Accept to "look", namely
- // T_LISTEN and T_DISCONNECT. However, the "tilisten" module prevents
+ // T_LISTEN and T_DISCONNECT. However, the "tilisten" module prevents
// further connection attempts coming up while we're still thinking about
// this one, so the only event that should come up is T_DISCONNECT.
@@ -504,8 +504,8 @@
if (look == T_DISCONNECT)
{
// If we get a T_DISCONNECT, it should be for the current pending
- // connection attempt. We receive the disconnect info and check
- // the sequence number against that in the call. If they match,
+ // connection attempt. We receive the disconnect info and check
+ // the sequence number against that in the call. If they match,
// the connection attempt disappeared and we return kOTNoDataErr.
// If they don't match, that's weird.
Modified: trunk/zoolib/source/cxx/zoolib/ZRegex.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZRegex.h 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/zoolib/ZRegex.h 2010-04-06 19:12:48 UTC (rev 1244)
@@ -48,7 +48,7 @@
class ZRegex
{
- ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES(ZRegex, operator_bool_generator_type, operator_bool_type);
+ ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES(ZRegex, operator_bool_generator_type, operator_bool_type);
public:
ZRegex();
ZRegex(const ZRegex& iOther);
Modified: trunk/zoolib/source/cxx/zoolib/ZStackCrawl.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZStackCrawl.cpp 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/zoolib/ZStackCrawl.cpp 2010-04-06 19:12:48 UTC (rev 1244)
@@ -180,11 +180,11 @@
bool inited2 = ::SymLoadModule(
currentProcess, // process handle
- nullptr, // file handle
+ nullptr, // file handle
moduleFileName, // path to exe
- nullptr, // module name
- 0, // load address
- 0); // module size
+ nullptr, // module name
+ 0, // load address
+ 0); // module size
spInited = true;
}
Modified: trunk/zoolib/source/cxx/zoolib/ZStream_Buffered.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZStream_Buffered.cpp 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/zoolib/ZStream_Buffered.cpp 2010-04-06 19:12:48 UTC (rev 1244)
@@ -98,7 +98,7 @@
else
{
// We're asking for less data than the stream guarantees it could provide without
- // blocking, in which case we fill up as much of our buffer as we can, so some
+ // blocking, in which case we fill up as much of our buffer as we can, so some
// later request will be able to be satisfied straight from our buffer.
size_t countToRead = min(fBufferSize, countReadable);
size_t countRead;
Modified: trunk/zoolib/source/cxx/zoolib/ZStream_LZW.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZStream_LZW.h 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/zoolib/ZStream_LZW.h 2010-04-06 19:12:48 UTC (rev 1244)
@@ -163,7 +163,7 @@
uint16 fPendingPrefix;
- bool fFresh;
+ bool fFresh;
ZBitWriterBE fBitWriter;
};
Modified: trunk/zoolib/source/cxx/zoolib/ZStream_POSIX.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZStream_POSIX.cpp 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/zoolib/ZStream_POSIX.cpp 2010-04-06 19:12:48 UTC (rev 1244)
@@ -45,7 +45,7 @@
{
while (iCount)
{
- size_t countRead = fread(localDest, 1, iCount, iFILE);
+ size_t countRead = fread(localDest, 1, iCount, iFILE);
if (countRead == 0)
break;
iCount -= countRead;
Modified: trunk/zoolib/source/cxx/zoolib/ZStream_ZLib.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZStream_ZLib.cpp 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/zoolib/ZStream_ZLib.cpp 2010-04-06 19:12:48 UTC (rev 1244)
@@ -145,7 +145,7 @@
case ZStream_ZLib::eFormatR_Raw: windowBits = -15; break;
}
- int error = inflateInit2(&fState, windowBits);
+ int error = inflateInit2(&fState, windowBits);
if (Z_OK != error)
throw runtime_error("ZStreamR_ZLibDecode problem");
}
Modified: trunk/zoolib/source/cxx/zoolib/ZStrim.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZStrim.h 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/zoolib/ZStrim.h 2010-04-06 19:12:48 UTC (rev 1244)
@@ -360,7 +360,7 @@
/**
A derivation of ZStrimW that provides implementations of ZStrimW::Imp_WriteUTF16 and
ZStrimW::Imp_WriteUTF8 that call through to ZStrimW::Imp_WriteUTF32, which must be implemented
-by subclasses. We redeclare ZStrimW::Imp_WriteUTF32 as pure virtual for emphasis.
+by subclasses. We redeclare ZStrimW::Imp_WriteUTF32 as pure virtual for emphasis.
*/
class ZStrimW_NativeUTF32 : public ZStrimW
@@ -378,7 +378,7 @@
/**
A derivation of ZStrimW that provides implementations of ZStrimW::Imp_WriteUTF32 and
ZStrimW::Imp_WriteUTF8 that call through to ZStrimW::Imp_WriteUTF16, which must be implemented
-by subclasses. We redeclare ZStrimW::Imp_WriteUTF16 as pure virtual for emphasis.
+by subclasses. We redeclare ZStrimW::Imp_WriteUTF16 as pure virtual for emphasis.
*/
class ZStrimW_NativeUTF16 : public ZStrimW
@@ -396,7 +396,7 @@
/**
A derivation of ZStrimW that provides implementations of ZStrimW::Imp_WriteUTF32 and
ZStrimW::Imp_WriteUTF16 that call through to ZStrimW::Imp_WriteUTF8, which must be implemented
-by subclasses. We redeclare ZStrimW::Imp_WriteUTF8 as pure virtual for emphasis.
+by subclasses. We redeclare ZStrimW::Imp_WriteUTF8 as pure virtual for emphasis.
*/
class ZStrimW_NativeUTF8 : public ZStrimW
Modified: trunk/zoolib/source/cxx/zoolib/ZTextCoder_Win.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZTextCoder_Win.cpp 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/zoolib/ZTextCoder_Win.cpp 2010-04-06 19:12:48 UTC (rev 1244)
@@ -149,7 +149,7 @@
{ "ibm870", 870, 2055 }, // IBM EBCDIC - Multilingual/ROECE (Latin-2)
// { "ibm874", 874, -1 }, // ANSI/OEM - Thai (same as CP28605, ISO 8859-15) <--- Not true?
{ "ibm949", 949, -1 }, // ANSI/OEM - Korean (Unified Hangeul Code)
- { "ibm950", 950, -1 }, // ANSI/OEM - Traditional Chinese (Taiwan; Hong Kong SAR, PRC)
+ { "ibm950", 950, -1 }, // ANSI/OEM - Traditional Chinese (Taiwan; Hong Kong SAR, PRC)
{ "macintosh", 10000, 2027 }, // MAC - Roman
{ "x-mac-japanese", 10001, -1 },
Modified: trunk/zoolib/source/cxx/zoolib/ZTextCollator.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZTextCollator.h 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/zoolib/ZTextCollator.h 2010-04-06 19:12:48 UTC (rev 1244)
@@ -38,8 +38,8 @@
class ZTextCollator
{
- ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES(ZTextCollator,
- operator_bool_generator_type, operator_bool_type);
+ ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES(ZTextCollator,
+ operator_bool_generator_type, operator_bool_type);
public:
ZTextCollator();
ZTextCollator(const ZTextCollator& iOther);
@@ -105,8 +105,8 @@
class ZTextCollationKey
{
- ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES(ZTextCollationKey,
- operator_bool_generator_type, operator_bool_type);
+ ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES(ZTextCollationKey,
+ operator_bool_generator_type, operator_bool_type);
public:
ZTextCollationKey();
ZTextCollationKey(const ZTextCollationKey& iOther);
Modified: trunk/zoolib/source/cxx/zoolib/ZThread_Win.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZThread_Win.h 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/zoolib/ZThread_Win.h 2010-04-06 19:12:48 UTC (rev 1244)
@@ -92,10 +92,10 @@
{
void* DebugInfo;
long LockCount;
- long RecursionCount;
- void* OwningThread;
- void* LockSemaphore;
- void* SpinCount;
+ long RecursionCount;
+ void* OwningThread;
+ void* LockSemaphore;
+ void* SpinCount;
};
Dummy_CRITICAL_SECTION fCRITICAL_SECTION;
Modified: trunk/zoolib/source/cxx/zoolib/ZTime.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZTime.cpp 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/zoolib/ZTime.cpp 2010-04-06 19:12:48 UTC (rev 1244)
@@ -155,7 +155,7 @@
// Subtract the number of seconds between 1601 and 1970.
result -= kEpochDelta_1601_To_1970;
- return result;
+ return result;
#else
Modified: trunk/zoolib/source/cxx/zoolib/ZTime.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZTime.h 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/zoolib/ZTime.h 2010-04-06 19:12:48 UTC (rev 1244)
@@ -34,7 +34,7 @@
class ZTime
{
- ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES(ZTime, operator_bool_generator_type, operator_bool_type);
+ ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES(ZTime, operator_bool_generator_type, operator_bool_type);
public:
ZTime();
Modified: trunk/zoolib/source/cxx/zoolib/ZTrail.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZTrail.h 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/zoolib/ZTrail.h 2010-04-06 19:12:48 UTC (rev 1244)
@@ -36,7 +36,7 @@
class ZTrail
{
- ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES(ZTrail, operator_bool_generator_type, operator_bool_type);
+ ZOOLIB_DEFINE_OPERATOR_BOOL_TYPES(ZTrail, operator_bool_generator_type, operator_bool_type);
public:
operator operator_bool_type() const;
Modified: trunk/zoolib/source/cxx/zoolib/ZUtil_ATSUI.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZUtil_ATSUI.cpp 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/zoolib/ZUtil_ATSUI.cpp 2010-04-06 19:12:48 UTC (rev 1244)
@@ -44,7 +44,7 @@
if (iFontSize > 0)
atsuSize = iFontSize * 65536.0;
- ATSUFontID theATSUFontID;
+ ATSUFontID theATSUFontID;
string fontName = iFont.GetName();
if (noErr != ::ATSUFindFontFromName((char*)fontName.data(), fontName.size(),
kFontFullName, kFontMacintoshPlatform,
@@ -108,11 +108,11 @@
if (!iStyle)
return nullptr;
- if (!iTextLength)
- return nullptr;
+ if (!iTextLength)
+ return nullptr;
UniCharCount runLengths = kATSUToTextEnd;
- ATSUTextLayout theLayout = nullptr;
+ ATSUTextLayout theLayout = nullptr;
::ATSUCreateTextLayoutWithTextPtr((ConstUniCharArrayPtr)iText,
kATSUFromTextBeginning, kATSUToTextEnd,
iTextLength,
Modified: trunk/zoolib/source/cxx/zoolib/ZUtil_MacOSX.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZUtil_MacOSX.cpp 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/zoolib/ZUtil_MacOSX.cpp 2010-04-06 19:12:48 UTC (rev 1244)
@@ -64,7 +64,7 @@
*localFuncs = localDest++;
}
- ::MakeDataExecutable(&ioStorage[0], ioStorage.size());
+ ::MakeDataExecutable(&ioStorage[0], ioStorage.size());
}
NAMESPACE_ZOOLIB_END
Modified: trunk/zoolib/source/cxx/zoolib/ZUtil_STL.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZUtil_STL.h 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/zoolib/ZUtil_STL.h 2010-04-06 19:12:48 UTC (rev 1244)
@@ -142,7 +142,7 @@
}
-/** If ioSet contains iElement then it is removed and true returned.
+/** If ioSet contains iElement then it is removed and true returned.
Otherwise no change is made to ioSet and false is returned. */
template <typename T>
bool sEraseIfContains(std::set<T>& ioSet, T iElement)
Modified: trunk/zoolib/source/cxx/zoolib/ZUtil_Strim_Tuple.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZUtil_Strim_Tuple.h 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/zoolib/ZUtil_Strim_Tuple.h 2010-04-06 19:12:48 UTC (rev 1244)
@@ -46,7 +46,7 @@
bool sFromStrim(const ZStrimU& iStrimU, ZTValue& oTV);
-} // namespace ZUtil_Strim_Tuple
+} // namespace ZUtil_Strim_Tuple
// =================================================================================================
#pragma mark -
Modified: trunk/zoolib/source/cxx/zoolib/ZVal_ZooLib.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZVal_ZooLib.cpp 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/zoolib/ZVal_ZooLib.cpp 2010-04-06 19:12:48 UTC (rev 1244)
@@ -1330,7 +1330,7 @@
case eZType_Int32: return sCompare_T(fData.fAs_Int32, iOther.fData.fAs_Int32);
case eZType_Int64: return sCompare_T(fData.fAs_Int64, iOther.fData.fAs_Int64);
case eZType_Bool: return sCompare_T(fData.fAs_Bool, iOther.fData.fAs_Bool);
- case eZType_Float: return sCompare_T(fData.fAs_Float, iOther.fData.fAs_Float);
+ case eZType_Float: return sCompare_T(fData.fAs_Float, iOther.fData.fAs_Float);
case eZType_Double: return sCompare_T(fData.fAs_Double, iOther.fData.fAs_Double);
case eZType_Time: return sCompare_T(fData.fAs_Time, iOther.fData.fAs_Time);
case eZType_Pointer: return sCompare_T(fData.fAs_Pointer, iOther.fData.fAs_Pointer);
Modified: trunk/zoolib/source/cxx/zoolib/ZWinRegistry_Val.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZWinRegistry_Val.cpp 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/zoolib/ZWinRegistry_Val.cpp 2010-04-06 19:12:48 UTC (rev 1244)
@@ -46,7 +46,7 @@
nullptr, // lpReserved,
oCountKeys,
oMaxLengthKeyName,
- nullptr, // lpcMaxClassLen,
+ nullptr, // lpcMaxClassLen,
oCountValues,
oMaxLengthValueName,
nullptr, // lpcMaxValueLen,
Modified: trunk/zoolib/source/cxx/zoolib/ZYad_JSON.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZYad_JSON.cpp 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/zoolib/ZYad_JSON.cpp 2010-04-06 19:12:48 UTC (rev 1244)
@@ -35,42 +35,42 @@
ZMap is isomorphic to JSON's object, ZSeq to JSON's array, and strings, booleans
and null translate back and forth without trouble. JSON's only other primitive is
-the number, whereas ZVal_ZooLib explicitly stores and retrieves integers of different sizes,
+the number, whereas ZVal explicitly stores and retrieves integers of different sizes,
floats and doubles, raw bytes and other composite types.
-ZYad_JSON writes all ZVal_ZooLib number types as JSON numbers. When reading, JSON numbers
+ZYad_JSON writes all ZVal number types as JSON numbers. When reading, JSON numbers
are stored as int64s, unless the mantissa has a fractional component or exceeds 2^64,
or if there is an exponent,in which case a double is used.
The mappings are as follows:
-
+
<pre>
-JSON ZVal_ZooLib
+JSON ZVal
---- -------
null null
-object ZMap_ZooLib
-array ZSeq_ZooLib
+object ZMap
+array ZSeq
boolean bool
string string
number int64 or double
-ZVal_ZooLib JSON
-------- ----
-null null
-ZMap_ZooLib object
-ZSeq_ZooLib array
-bool boolean
-string string
-int8 number
-int16 number
-int32 number
-int64 number
-float number
-double number
-uint64 (ID) number
-time number
+ZVal JSON
+---- ----
+null null
+ZMap object
+ZSeq array
+bool boolean
+string string
+int8 number
+int16 number
+int32 number
+int64 number
+float number
+double number
+uint64 (ID) number
+time number
all other types are written as nulls in maps and lists if the appropriate
preserve flag is passed, otherwise they are skipped.
Modified: trunk/zoolib/source/cxx/zoolib/zconfigl.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/zconfigl.h 2010-04-06 18:12:39 UTC (rev 1243)
+++ trunk/zoolib/source/cxx/zoolib/zconfigl.h 2010-04-06 19:12:48 UTC (rev 1244)
@@ -156,7 +156,7 @@
#endif
// The second define is ZCONFIG_Debug, which takes its value from ZCONFIG_DebugLevel if we're doing
-// a SYM build, otherwise it is set to 0. You can override ZCONFIG_Debug by setting its value in
+// a SYM build, otherwise it is set to 0. You can override ZCONFIG_Debug by setting its value in
// your zconfig.h before including this file.
// With XCode we could base debug off !__OPTIMIZE__
#ifndef ZCONFIG_Debug
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|