Menu
▾
▴
[ZooLib-checkins] SF.net SVN: zoolib:[1848] trunk/zoolib/source/cxx
|
From: <ag...@us...> - 2011-01-02 20:09:12
|
Revision: 1848
http://zoolib.svn.sourceforge.net/zoolib/?rev=1848&view=rev
Author: agreen
Date: 2011-01-02 20:09:05 +0000 (Sun, 02 Jan 2011)
Log Message:
-----------
Whitespace.
Modified Paths:
--------------
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Result.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_RelHead.cpp
trunk/zoolib/source/cxx/zoolib/ZCompare_Integer.h
trunk/zoolib/source/cxx/zoolib/ZCompare_Real.h
trunk/zoolib/source/cxx/zoolib/ZCompare_String.cpp
trunk/zoolib/source/cxx/zoolib/ZCompare_String.h
trunk/zoolib/source/cxx/zoolib/ZGeomPOD.h
trunk/zoolib/source/cxx/zoolib/ZUtil_CFType.cpp
trunk/zoolib/source/cxx/zoolib/ZValPred_Any.cpp
trunk/zoolib/source/cxx/zoolib/ZVal_Any.cpp
trunk/zoolib/source/cxx/zoolib/ZVal_CFType.cpp
Modified: trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Result.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Result.cpp 2011-01-02 20:03:45 UTC (rev 1847)
+++ trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Result.cpp 2011-01-02 20:09:05 UTC (rev 1848)
@@ -31,7 +31,8 @@
#pragma mark -
#pragma mark * sCompare
-template <> int sCompare_T(const ZRef<ZQE::Result>& iL, const ZRef<ZQE::Result>& iR)
+template <>
+int sCompare_T(const ZRef<ZQE::Result>& iL, const ZRef<ZQE::Result>& iR)
{
if (iL)
{
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_RelHead.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_RelHead.cpp 2011-01-02 20:03:45 UTC (rev 1847)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_RelHead.cpp 2011-01-02 20:09:05 UTC (rev 1848)
@@ -27,7 +27,8 @@
#pragma mark -
#pragma mark * sCompare
-template <> int sCompare_T(const ZRA::RelHead& iL, const ZRA::RelHead& iR)
+template <>
+int sCompare_T(const ZRA::RelHead& iL, const ZRA::RelHead& iR)
{ return sCompareIterators_T(iL.begin(), iL.end(), iR.begin(), iR.end()); }
ZMACRO_CompareRegistration_T(ZRA::RelHead)
Modified: trunk/zoolib/source/cxx/zoolib/ZCompare_Integer.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZCompare_Integer.h 2011-01-02 20:03:45 UTC (rev 1847)
+++ trunk/zoolib/source/cxx/zoolib/ZCompare_Integer.h 2011-01-02 20:09:05 UTC (rev 1848)
@@ -26,59 +26,74 @@
namespace ZooLib {
-template <> int sCompare_T(const bool& iL, const bool& iR)
+template <>
+int sCompare_T(const bool& iL, const bool& iR)
{ return int(iL) - int(iR); }
-template <> int sCompare_T(const char& iL, const char& iR)
+template <>
+int sCompare_T(const char& iL, const char& iR)
{ return iL - iR; }
-template <> int sCompare_T(const unsigned char& iL, const unsigned char& iR)
+template <>
+int sCompare_T(const unsigned char& iL, const unsigned char& iR)
{ return int(iL) - int(iR); }
-template <> int sCompare_T(const signed char& iL, const signed char& iR)
+template <>
+int sCompare_T(const signed char& iL, const signed char& iR)
{ return iL - iR; }
-template <> int sCompare_T(const wchar_t& iL, const wchar_t& iR)
+template <>
+int sCompare_T(const wchar_t& iL, const wchar_t& iR)
{ return iL < iR ? -1 : iR < iL ? 1 : 0; }
-template <> int sCompare_T(const short& iL, const short& iR)
+template <>
+int sCompare_T(const short& iL, const short& iR)
{ return iL - iR; }
-template <> int sCompare_T(const unsigned short& iL, const unsigned short& iR)
+template <>
+int sCompare_T(const unsigned short& iL, const unsigned short& iR)
{ return int(iL) - int(iR); }
-template <> int sCompare_T(const int& iL, const int& iR)
+template <>
+int sCompare_T(const int& iL, const int& iR)
{ return iL < iR ? -1 : iR < iL ? 1 : 0; }
-template <> int sCompare_T(const unsigned int& iL, const unsigned int& iR)
+template <>
+int sCompare_T(const unsigned int& iL, const unsigned int& iR)
{ return iL < iR ? -1 : iR < iL ? 1 : 0; }
-template <> int sCompare_T(const long& iL, const long& iR)
+template <>
+int sCompare_T(const long& iL, const long& iR)
{ return iL < iR ? -1 : iR < iL ? 1 : 0; }
-template <> int sCompare_T(const unsigned long& iL, const unsigned long& iR)
+template <>
+int sCompare_T(const unsigned long& iL, const unsigned long& iR)
{ return iL < iR ? -1 : iR < iL ? 1 : 0; }
#if ZCONFIG(Compiler, MSVC)
- template <> int sCompare_T(const __int64& iL, const __int64& iR)
+ template <>
+ int sCompare_T(const __int64& iL, const __int64& iR)
{ return iL < iR ? -1 : iR < iL ? 1 : 0; }
- template <> int sCompare_T(const unsigned __int64& iL, const unsigned __int64& iR)
+ template <>
+ int sCompare_T(const unsigned __int64& iL, const unsigned __int64& iR)
{ return iL < iR ? -1 : iR < iL ? 1 : 0; }
#else
- template <> int sCompare_T(const long long& iL, const long long& iR)
+ template <>
+ int sCompare_T(const long long& iL, const long long& iR)
{ return iL < iR ? -1 : iR < iL ? 1 : 0; }
- template <> int sCompare_T(const unsigned long long& iL, const unsigned long long& iR)
+ template <>
+ int sCompare_T(const unsigned long long& iL, const unsigned long long& iR)
{ return iL < iR ? -1 : iR < iL ? 1 : 0; }
#endif
Modified: trunk/zoolib/source/cxx/zoolib/ZCompare_Real.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZCompare_Real.h 2011-01-02 20:03:45 UTC (rev 1847)
+++ trunk/zoolib/source/cxx/zoolib/ZCompare_Real.h 2011-01-02 20:09:05 UTC (rev 1848)
@@ -26,9 +26,12 @@
namespace ZooLib {
-template <> int sCompare_T(const float& iL, const float& iR);
-template <> int sCompare_T(const double& iL, const double& iR);
+template <>
+int sCompare_T(const float& iL, const float& iR);
+template <>
+int sCompare_T(const double& iL, const double& iR);
+
} // namespace ZooLib
#endif // __ZCompare_Real__
Modified: trunk/zoolib/source/cxx/zoolib/ZCompare_String.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZCompare_String.cpp 2011-01-02 20:03:45 UTC (rev 1847)
+++ trunk/zoolib/source/cxx/zoolib/ZCompare_String.cpp 2011-01-02 20:09:05 UTC (rev 1848)
@@ -23,7 +23,8 @@
namespace ZooLib {
-template <> int sCompare_T(const std::string& iL, const std::string& iR);
+template <>
+int sCompare_T(const std::string& iL, const std::string& iR);
ZMACRO_CompareRegistration_T(std::string)
Modified: trunk/zoolib/source/cxx/zoolib/ZCompare_String.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZCompare_String.h 2011-01-02 20:03:45 UTC (rev 1847)
+++ trunk/zoolib/source/cxx/zoolib/ZCompare_String.h 2011-01-02 20:09:05 UTC (rev 1848)
@@ -28,7 +28,8 @@
namespace ZooLib {
-template <> int sCompare_T(const std::string& iL, const std::string& iR)
+template <>
+int sCompare_T(const std::string& iL, const std::string& iR)
{ return iL.compare(iR); }
} // namespace ZooLib
Modified: trunk/zoolib/source/cxx/zoolib/ZGeomPOD.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZGeomPOD.h 2011-01-02 20:03:45 UTC (rev 1847)
+++ trunk/zoolib/source/cxx/zoolib/ZGeomPOD.h 2011-01-02 20:09:05 UTC (rev 1848)
@@ -61,7 +61,8 @@
inline ZPointPOD& operator-=(ZPointPOD& l, ZPointPOD p)
{ l.h -= p.h; l.v -= p.v; return l; }
-template <> int sCompare_T(const ZPointPOD& iL, const ZPointPOD& iR);
+template <>
+int sCompare_T(const ZPointPOD& iL, const ZPointPOD& iR);
// =================================================================================================
#pragma mark -
@@ -156,7 +157,8 @@
return l;
}
-template <> int sCompare_T(const ZRectPOD& iL, const ZRectPOD& iR);
+template <>
+int sCompare_T(const ZRectPOD& iL, const ZRectPOD& iR);
} // namespace ZooLib
Modified: trunk/zoolib/source/cxx/zoolib/ZUtil_CFType.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZUtil_CFType.cpp 2011-01-02 20:03:45 UTC (rev 1847)
+++ trunk/zoolib/source/cxx/zoolib/ZUtil_CFType.cpp 2011-01-02 20:09:05 UTC (rev 1848)
@@ -444,7 +444,8 @@
} // namespace ZUtil_CFType
-template <> int sCompare_T(const ZRef<CFTypeRef>& iLHS, const ZRef<CFTypeRef>& iRHS)
+template <>
+int sCompare_T(const ZRef<CFTypeRef>& iLHS, const ZRef<CFTypeRef>& iRHS)
{
ZUnimplemented();
return 0;
Modified: trunk/zoolib/source/cxx/zoolib/ZValPred_Any.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZValPred_Any.cpp 2011-01-02 20:03:45 UTC (rev 1847)
+++ trunk/zoolib/source/cxx/zoolib/ZValPred_Any.cpp 2011-01-02 20:09:05 UTC (rev 1848)
@@ -34,7 +34,8 @@
const ZVal_Any& ZValComparand_Const_Any::GetVal() const
{ return fVal; }
-template <> int sCompare_T(const ZValComparand_Const_Any& iL, const ZValComparand_Const_Any& iR)
+template <>
+int sCompare_T(const ZValComparand_Const_Any& iL, const ZValComparand_Const_Any& iR)
{ return sCompare_T(iL.GetVal(), iR.GetVal()); }
ZMACRO_CompareRegistration_T(ZValComparand_Const_Any)
@@ -50,7 +51,8 @@
const ZRef<ZValComparator_Callable_Any::Callable>& ZValComparator_Callable_Any::GetCallable() const
{ return fCallable; }
-template <> int sCompare_T(const ZValComparator_Callable_Any& iL,
+template <>
+int sCompare_T(const ZValComparator_Callable_Any& iL,
const ZValComparator_Callable_Any& iR)
{ return sCompare_T((void*)iL.GetCallable().Get(), (void*)iR.GetCallable().Get()); }
Modified: trunk/zoolib/source/cxx/zoolib/ZVal_Any.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZVal_Any.cpp 2011-01-02 20:03:45 UTC (rev 1847)
+++ trunk/zoolib/source/cxx/zoolib/ZVal_Any.cpp 2011-01-02 20:09:05 UTC (rev 1848)
@@ -35,16 +35,20 @@
static ZVal_Any spVal_Null;
-template <> int sCompare_T(const ZVal_Any& iL, const ZVal_Any& iR)
+template <>
+int sCompare_T(const ZVal_Any& iL, const ZVal_Any& iR)
{ return iL.Compare(iR); }
-template <> int sCompare_T(const ZSeq_Any& iL, const ZSeq_Any& iR)
+template <>
+int sCompare_T(const ZSeq_Any& iL, const ZSeq_Any& iR)
{ return iL.Compare(iR); }
-template <> int sCompare_T(const ZMap_Any& iL, const ZMap_Any& iR)
+template <>
+int sCompare_T(const ZMap_Any& iL, const ZMap_Any& iR)
{ return iL.Compare(iR); }
-template <> int sCompare_T(const ZNameVal& iL, const ZNameVal& iR)
+template <>
+int sCompare_T(const ZNameVal& iL, const ZNameVal& iR)
{
if (int compare = sCompare_T(iL.first, iR.first))
return compare;
Modified: trunk/zoolib/source/cxx/zoolib/ZVal_CFType.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZVal_CFType.cpp 2011-01-02 20:03:45 UTC (rev 1847)
+++ trunk/zoolib/source/cxx/zoolib/ZVal_CFType.cpp 2011-01-02 20:09:05 UTC (rev 1848)
@@ -38,13 +38,16 @@
using ZUtil_CFType::sArrayMutable;
using ZUtil_CFType::sDictionaryMutable;
-template <> int sCompare_T(const ZVal_CFType& iL, const ZVal_CFType& iR)
+template <>
+int sCompare_T(const ZVal_CFType& iL, const ZVal_CFType& iR)
{ return sCompare_T(ZRef<CFTypeRef>(iL), ZRef<CFTypeRef>(iR)); }
-template <> int sCompare_T(const ZSeq_CFType& iL, const ZSeq_CFType& iR)
+template <>
+int sCompare_T(const ZSeq_CFType& iL, const ZSeq_CFType& iR)
{ return sCompare_T(ZRef<CFTypeRef>(iL), ZRef<CFTypeRef>(iR)); }
-template <> int sCompare_T(const ZMap_CFType& iL, const ZMap_CFType& iR)
+template <>
+int sCompare_T(const ZMap_CFType& iL, const ZMap_CFType& iR)
{ return sCompare_T(ZRef<CFTypeRef>(iL), ZRef<CFTypeRef>(iR)); }
// =================================================================================================
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
