Menu
▾
▴
[ZooLib-checkins] SF.net SVN: zoolib:[1877] trunk/zoolib/source/cxx/zoolib
|
From: <ag...@us...> - 2011-01-12 12:03:26
|
Revision: 1877
http://zoolib.svn.sourceforge.net/zoolib/?rev=1877&view=rev
Author: agreen
Date: 2011-01-12 12:03:19 +0000 (Wed, 12 Jan 2011)
Log Message:
-----------
Break things up a bit, so we're not pulling <map>, <set>
and <vector> into place they're not needed.
Modified Paths:
--------------
trunk/zoolib/source/cxx/zoolib/ZUtil_STL.h
trunk/zoolib/source/cxx/zoolib/ZUtil_STL_set.h
Added Paths:
-----------
trunk/zoolib/source/cxx/zoolib/ZUtil_STL_map.h
trunk/zoolib/source/cxx/zoolib/ZUtil_STL_vector.h
Modified: trunk/zoolib/source/cxx/zoolib/ZUtil_STL.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZUtil_STL.h 2011-01-12 12:02:21 UTC (rev 1876)
+++ trunk/zoolib/source/cxx/zoolib/ZUtil_STL.h 2011-01-12 12:03:19 UTC (rev 1877)
@@ -22,14 +22,6 @@
#define __ZUtil_STL__
#include "zconfig.h"
-#include "zoolib/ZCompat_algorithm.h"
-#include "zoolib/ZDebug.h"
-#include "zoolib/ZQ.h"
-
-#include <map>
-#include <set>
-#include <vector>
-
namespace ZooLib {
namespace ZUtil_STL {
@@ -46,289 +38,8 @@
}
}
-template <class T>
-T* sFirstOrNil(std::vector<T>& iVec)
- {
- return iVec.empty() ? nullptr : &iVec[0];
- }
-
-template <class T>
-const T* sFirstOrNil(const std::vector<T>& iVec)
- {
- return iVec.empty() ? nullptr : &iVec[0];
- }
-
-template <typename T, typename Comparator>
-typename std::set<T,Comparator>::iterator
-sEraseInc(std::set<T,Comparator>& ioSet, typename std::set<T,Comparator>::iterator iter)
- {
- if (ioSet.end() != iter)
- {
- const T theVal = *iter;
- ioSet.erase(iter);
- iter = ioSet.lower_bound(theVal);
- }
- return iter;
- }
-
// ==================================================
-/** Returns true if iVector contains iElement. iVector is
-assumed to be unordered, so we use find to make the determination. */
-template <typename Base, typename Derived>
-bool sContains(const std::vector<Base>& iVector, Derived iElement)
- { return iVector.end() != std::find(iVector.begin(), iVector.end(), iElement); }
-
-
-/** Returns true if iSet contains iElement. */
-template <typename Base, typename Derived, typename Comparator>
-bool sContains(const std::set<Base,Comparator>& iSet, Derived iElement)
- { return iSet.end() != iSet.find(iElement); }
-
-
-/** Returns true if iMap has an element at iKey. */
-template <typename KBase, typename KDerived, typename Value, typename Comparator>
-bool sContains(const std::map<KBase, Value, Comparator>& iMap, KDerived iKey)
- { return iMap.end() != iMap.find(iKey); }
-
-
-/** Appends iElement to ioVec by calling push_back. If iElement was already contained in ioVec
-then false is returned and no change is made to ioVec. */
-template <typename Base, typename Derived>
-bool sPushBackIfNotContains(std::vector<Base>& ioVec, Derived iElement)
- {
- typename std::vector<Base>::iterator i = std::find(ioVec.begin(), ioVec.end(), iElement);
- if (i != ioVec.end())
- return false;
- ioVec.push_back(iElement);
- return true;
- }
-
-
-/** Appends iElement to ioVec by calling push_back. We first assert, controlled
-by iDebugLevel, that iElement is not already present in ioVec. */
-template <typename Base, typename Derived>
-void sPushBackMustNotContain(const int iDebugLevel, std::vector<Base>& ioVec, Derived iElement)
- {
- ZAssertStop(iDebugLevel, ioVec.end() == std::find(ioVec.begin(), ioVec.end(), iElement));
- ioVec.push_back(iElement);
- }
-
-
-/** Inserts iElement to ioSet. We first assert, controlled
-by iDebugLevel, that iElement is not already present in ioSet. */
-template <typename Base, typename Derived, typename Comparator>
-void sInsertMustNotContain(const int iDebugLevel, std::set<Base,Comparator>& ioSet, Derived iElement)
- {
- bool didInsert = ioSet.insert(iElement).second;
- ZAssertStop(iDebugLevel, didInsert);
- }
-
-
-/** Inserts iElement in ioSet, if it's not already contained. */
-template <typename Base, typename Derived, typename Comparator>
-bool sInsertIfNotContains(std::set<Base,Comparator>& ioSet, Derived iElement)
- { return ioSet.insert(iElement).second; }
-
-
-/** If the unordered vector ioVec contains iElement then it is
-removed and true returned. Otherwise no change is made to ioVec and
-false is returned. */
-template <typename Base, typename Derived>
-bool sEraseIfContains(std::vector<Base>& ioVec, Derived iElement)
- {
- typename std::vector<Base>::iterator i = std::find(ioVec.begin(), ioVec.end(), iElement);
- if (i == ioVec.end())
- return false;
- ioVec.erase(i);
- return true;
- }
-
-
-/** If ioSet contains iElement then it is removed and true returned.
-Otherwise no change is made to ioSet and false is returned. */
-template <typename Base, typename Derived, typename Comparator>
-bool sEraseIfContains(std::set<Base,Comparator>& ioSet, Derived iElement)
- { return ioSet.erase(iElement); }
-
-
-/** Removes iElement from ioVec, asserting that it is present and
-returning an iterator referencing the position at which iElement was found. */
-template <typename Base, typename Derived>
-typename std::vector<Base>::iterator sEraseMustContain(const int iDebugLevel,
- std::vector<Base>& ioVec, Derived iElement)
- {
- typename std::vector<Base>::iterator i = std::find(ioVec.begin(), ioVec.end(), iElement);
- ZAssertStop(iDebugLevel, i != ioVec.end());
- return ioVec.erase(i);
- }
-
-
-/** Removes iElement from ioSet, asserting that it is present. */
-template <typename Base, typename Derived, typename Comparator>
-void sEraseMustContain(const int iDebugLevel, std::set<Base,Comparator>& ioSet, Derived iElement)
- {
- size_t count = ioSet.erase(iElement);
- ZAssertStop(iDebugLevel, count);
- }
-
-// ==================================================
-
-/** The contents of iVector are assumed to be sorted by less<Base>. Returns
-true if iVector contains iElement. */
-template <typename Base, typename Derived>
-bool sSortedContains(const std::vector<Base>& iVector, Derived iElement)
- {
- typename std::vector<Base>::const_iterator i =
- lower_bound(iVector.begin(), iVector.end(), iElement);
- return i != iVector.end() && *i == iElement;
- }
-
-
-/** The contents of ioVec are assumed to be sorted by less<Base>. If iElement
-was already contained in ioVec then false is returned and no change is made
-to ioVec. Otherwise it is inserted using lower_bound and less<Base> and true
-is returned. */
-template <typename Base, typename Derived>
-bool sSortedInsertIfNotContains(std::vector<Base>& ioVec, Derived iElement)
- {
- typename std::vector<Base>::iterator i = lower_bound(ioVec.begin(), ioVec.end(), iElement);
-
- if (i != ioVec.end() && *i == iElement)
- return false;
-
- ioVec.insert(i, iElement);
- return true;
- }
-
-
-/** The contents of ioVec are assumed to be sorted by less<Base>. Returns false
-if ioVec does not contain iElement. If ioVec does contain
-iElement then it is removed and true returned. */
-template <typename Base, typename Derived>
-bool sSortedEraseIfContains(std::vector<Base>& ioVec, Derived iElement)
- {
- typename std::vector<Base>::iterator i = lower_bound(ioVec.begin(), ioVec.end(), iElement);
-
- if (i == ioVec.end() || !(*i == iElement))
- return false;
-
- ioVec.erase(i);
- return true;
- }
-
-
-/** The contents of ioVec are assumed to be sorted by less<Base>. We first
-assert, under the control of iDebugLevel, that ioVec does not contain iElement.
-We then insert iElement using lower_bound and less<Base>. */
-template <typename Base, typename Derived>
-void sSortedInsertMustNotContain(const int iDebugLevel, std::vector<Base>& ioVec, Derived iElement)
- {
- typename std::vector<Base>::iterator i = lower_bound(ioVec.begin(), ioVec.end(), iElement);
- ZAssertStop(iDebugLevel, i == ioVec.end() || !(*i == iElement));
- ioVec.insert(i, iElement);
- }
-
-
-/** The contents of ioVec are assumed to be sorted by less<Base>. We first
-assert, under the control of iDebugLevel, that ioVec contains iElement.
-We then remove iElement using lower_bound and less<Base>. */
-template <typename Base, typename Derived>
-void sSortedEraseMustContain(const int iDebugLevel, std::vector<Base>& ioVec, Derived iElement)
- {
- typename std::vector<Base>::iterator i = lower_bound(ioVec.begin(), ioVec.end(), iElement);
- ZAssertStop(iDebugLevel, i != ioVec.end() && *i == iElement);
- ioVec.erase(i);
- }
-
-// ==================================================
-
-template <typename KBase, typename KDerived, typename Value, typename Comparator>
-bool sEraseIfContains(std::map<KBase, Value, Comparator>& ioMap, KDerived iKey)
- { return ioMap.erase(iKey); }
-
-
-template <typename KBase, typename KDerived, typename Value, typename Comparator>
-void sEraseMustContain(const int iDebugLevel, std::map<KBase, Value, Comparator>& ioMap, KDerived iKey)
- {
- size_t count = ioMap.erase(iKey);
- ZAssertStop(iDebugLevel, count);
- }
-
-
-template <typename KBase, typename KDerived, typename Value, typename Comparator>
-Value sEraseAndReturn(const int iDebugLevel, std::map<KBase, Value, Comparator>& ioMap, KDerived iKey)
- {
- typename std::map<KBase, Value, Comparator>::iterator iter = ioMap.find(iKey);
- ZAssertStop(iDebugLevel, ioMap.end() != iter);
- Value result = (*iter).second;
- ioMap.erase(iter);
- return result;
- }
-
-
-template <typename KBase, typename KDerived, typename Value, typename Comparator>
-ZQ<Value> sEraseAndReturnIfContains(std::map<KBase, Value, Comparator>& ioMap, KDerived iKey)
- {
- typename std::map<KBase, Value, Comparator>::iterator i = ioMap.find(iKey);
- if (ioMap.end() == i)
- return null;
- const Value result = i->second;
- ioMap.erase(i);
- return result;
- }
-
-
-template <typename KBase, typename KDerived, typename Value, typename Comparator>
-void sInsertMustNotContain(const int iDebugLevel,
- std::map<KBase, Value, Comparator>& ioMap, KDerived iKey, Value iValue)
- {
- const bool didInsert =
- ioMap.insert(typename std::map<KBase, Value, Comparator>::value_type(iKey, iValue)).second;
- ZAssertStop(iDebugLevel, didInsert);
- }
-
-
-template <typename KBase, typename KDerived, typename Value, typename Comparator>
-void sSetMustContain(const int iDebugLevel,
- std::map<KBase, Value, Comparator>& ioMap, KDerived iKey, Value iValue)
- {
- typename std::map<KBase, Value, Comparator>::iterator i = ioMap.find(iKey);
- ZAssertStop(iDebugLevel, ioMap.end() != i);
- i->second = iValue;
- }
-
-
-template <typename KBase, typename KDerived, typename Value, typename Comparator>
-bool sSetIfContains(std::map<KBase, Value, Comparator>& ioMap, KDerived iKey, Value iValue)
- {
- typename std::map<KBase, Value, Comparator>::iterator i = ioMap.find(iKey);
- if (ioMap.end() == i)
- return false;
- i->second = iValue;
- return true;
- }
-
-
-template <typename KBase, typename KDerived, typename Value, typename Comparator>
-const Value& sGetMustContain(const int iDebugLevel,
- const std::map<KBase, Value, Comparator>& iMap, KDerived iKey)
- {
- typename std::map<KBase, Value, Comparator>::const_iterator i = iMap.find(iKey);
- ZAssertStop(iDebugLevel, iMap.end() != i);
- return i->second;
- }
-
-
-template <typename KBase, typename KDerived, typename Value, typename Comparator>
-ZQ<Value> sGetIfContains(const std::map<KBase, Value, Comparator>& iMap, KDerived iKey)
- {
- typename std::map<KBase, Value, Comparator>::const_iterator i = iMap.find(iKey);
- if (iMap.end() == i)
- return null;
- return i->second;
- }
-
} // namespace ZUtil_STL
} // namespace ZooLib
Added: trunk/zoolib/source/cxx/zoolib/ZUtil_STL_map.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZUtil_STL_map.h (rev 0)
+++ trunk/zoolib/source/cxx/zoolib/ZUtil_STL_map.h 2011-01-12 12:03:19 UTC (rev 1877)
@@ -0,0 +1,125 @@
+/* -------------------------------------------------------------------------------------------------
+Copyright (c) 2011 Andrew Green
+http://www.zoolib.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+and associated documentation files (the "Software"), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge, publish, distribute,
+sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES
+OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+------------------------------------------------------------------------------------------------- */
+
+#ifndef __ZUtil_STL_map__
+#define __ZUtil_STL_map__
+#include "zconfig.h"
+
+#include "zoolib/ZDebug.h"
+#include "zoolib/ZQ.h"
+
+#include <map>
+
+namespace ZooLib {
+namespace ZUtil_STL {
+
+// =================================================================================================
+#pragma mark -
+#pragma mark * ZUtil_STL
+
+/** Returns true if iMap has an element at iKey. */
+template <typename KBase, typename Value, typename Comparator, typename KDerived>
+bool sContains(const std::map<KBase,Value,Comparator>& iMap, const KDerived& iKey)
+ { return iMap.end() != iMap.find(iKey); }
+
+template <typename KBase, typename Value, typename Comparator, typename KDerived>
+bool sEraseIfContains(std::map<KBase,Value,Comparator>& ioMap, const KDerived& iKey)
+ { return ioMap.erase(iKey); }
+
+template <typename KBase, typename Value, typename Comparator, typename KDerived>
+void sEraseMustContain(const int iDebugLevel,
+ std::map<KBase,Value,Comparator>& ioMap, const KDerived& iKey)
+ {
+ size_t count = ioMap.erase(iKey);
+ ZAssertStop(iDebugLevel, count);
+ }
+
+template <typename KBase, typename Value, typename Comparator, typename KDerived>
+Value sEraseAndReturn(const int iDebugLevel,
+ std::map<KBase,Value,Comparator>& ioMap, const KDerived& iKey)
+ {
+ typename std::map<KBase,Value,Comparator>::iterator iter = ioMap.find(iKey);
+ ZAssertStop(iDebugLevel, ioMap.end() != iter);
+ const Value result = (*iter).second;
+ ioMap.erase(iter);
+ return result;
+ }
+
+template <typename KBase, typename Value, typename Comparator, typename KDerived>
+ZQ<Value> sEraseAndReturnIfContains(std::map<KBase,Value,Comparator>& ioMap, const KDerived& iKey)
+ {
+ typename std::map<KBase,Value,Comparator>::iterator i = ioMap.find(iKey);
+ if (ioMap.end() == i)
+ return null;
+ const Value result = i->second;
+ ioMap.erase(i);
+ return result;
+ }
+
+template <typename KBase, typename Value, typename Comparator, typename KDerived>
+void sInsertMustNotContain(const int iDebugLevel,
+ std::map<KBase,Value,Comparator>& ioMap, const KDerived& iKey, const Value& iValue)
+ {
+ const bool didInsert =
+ ioMap.insert(typename std::map<KBase,Value,Comparator>::value_type(iKey, iValue)).second;
+ ZAssertStop(iDebugLevel, didInsert);
+ }
+
+template <typename KBase, typename Value, typename Comparator, typename KDerived>
+void sSetMustContain(const int iDebugLevel,
+ std::map<KBase,Value,Comparator>& ioMap, const KDerived& iKey, const Value& iValue)
+ {
+ typename std::map<KBase,Value,Comparator>::iterator i = ioMap.find(iKey);
+ ZAssertStop(iDebugLevel, ioMap.end() != i);
+ i->second = iValue;
+ }
+
+template <typename KBase, typename Value, typename Comparator, typename KDerived>
+bool sSetIfContains(std::map<KBase,Value,Comparator>& ioMap, const KDerived& iKey, const Value& iValue)
+ {
+ typename std::map<KBase,Value,Comparator>::iterator i = ioMap.find(iKey);
+ if (ioMap.end() == i)
+ return false;
+ i->second = iValue;
+ return true;
+ }
+
+template <typename KBase, typename Value, typename Comparator, typename KDerived>
+const Value& sGetMustContain(const int iDebugLevel,
+ const std::map<KBase,Value,Comparator>& iMap, const KDerived& iKey)
+ {
+ typename std::map<KBase,Value,Comparator>::const_iterator i = iMap.find(iKey);
+ ZAssertStop(iDebugLevel, iMap.end() != i);
+ return i->second;
+ }
+
+template <typename KBase, typename Value, typename Comparator, typename KDerived>
+ZQ<Value> sGetIfContains(const std::map<KBase,Value,Comparator>& iMap, const KDerived& iKey)
+ {
+ typename std::map<KBase,Value,Comparator>::const_iterator i = iMap.find(iKey);
+ if (iMap.end() == i)
+ return null;
+ return i->second;
+ }
+
+} // namespace ZUtil_STL
+} // namespace ZooLib
+
+#endif // __ZUtil_STL_map__
Modified: trunk/zoolib/source/cxx/zoolib/ZUtil_STL_set.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZUtil_STL_set.h 2011-01-12 12:02:21 UTC (rev 1876)
+++ trunk/zoolib/source/cxx/zoolib/ZUtil_STL_set.h 2011-01-12 12:03:19 UTC (rev 1877)
@@ -22,93 +22,168 @@
#define __ZUtil_STL_set__
#include "zconfig.h"
-#include "zoolib/ZCompat_algorithm.h"
+#include "zoolib/ZDebug.h"
#include <set>
namespace ZooLib {
+namespace ZUtil_STL {
// =================================================================================================
#pragma mark -
-#pragma mark * ZUtil_STL_set
+#pragma mark * ZUtil_STL
-namespace ZUtil_STL_set {
+template <typename T, typename Comparator>
+typename std::set<T,Comparator>::iterator
+sEraseInc(std::set<T,Comparator>& ioSet, typename std::set<T,Comparator>::iterator iter)
+ {
+ if (ioSet.end() != iter)
+ {
+ const T theVal = *iter;
+ ioSet.erase(iter);
+ iter = ioSet.lower_bound(theVal);
+ }
+ return iter;
+ }
-using std::set;
-template <class T>
-void sOr(const set<T>& iLHS, const set<T>& iRHS, set<T>& oResult)
+/** Returns true if iSet contains iElement. */
+template <typename Base, typename Comparator, typename Derived>
+bool sContains(const std::set<Base,Comparator>& iSet, const Derived& iElement)
+ { return iSet.end() != iSet.find(iElement); }
+
+
+/** Inserts iElement to ioSet. We first assert, controlled
+by iDebugLevel, that iElement is not already present in ioSet. */
+template <typename Base, typename Comparator, typename Derived>
+void sInsertMustNotContain(const int iDebugLevel,
+ std::set<Base,Comparator>& ioSet, const Derived& iElement)
{
+ bool didInsert = ioSet.insert(iElement).second;
+ ZAssertStop(iDebugLevel, didInsert);
+ }
+
+
+/** Inserts iElement in ioSet, if it's not already contained. */
+template <typename Base, typename Comparator, typename Derived>
+bool sInsertIfNotContains(std::set<Base,Comparator>& ioSet, const Derived& iElement)
+ { return ioSet.insert(iElement).second; }
+
+
+/** If ioSet contains iElement then it is removed and true returned.
+Otherwise no change is made to ioSet and false is returned. */
+template <typename Base, typename Comparator, typename Derived>
+bool sEraseIfContains(std::set<Base,Comparator>& ioSet, const Derived& iElement)
+ { return ioSet.erase(iElement); }
+
+
+/** Removes iElement from ioSet, asserting that it is present. */
+template <typename Base, typename Comparator, typename Derived>
+void sEraseMustContain(const int iDebugLevel,
+ std::set<Base,Comparator>& ioSet, const Derived& iElement)
+ {
+ size_t count = ioSet.erase(iElement);
+ ZAssertStop(iDebugLevel, count);
+ }
+
+// ==================================================
+
+
+template <typename T, typename Comparator>
+void sOr(
+ const std::set<T,Comparator>& iLHS,
+ const std::set<T,Comparator>& iRHS,
+ std::set<T,Comparator>& ioResult)
+ {
set_union(iLHS.begin(), iLHS.end(),
iRHS.begin(), iRHS.end(),
- inserter(oResult, oResult.end()));
+ inserter(ioResult, ioResult.end()));
}
-template <class T>
-set<T> sOr(const set<T>& iLHS, const set<T>& iRHS)
+template <typename T, typename Comparator>
+std::set<T,Comparator> sOr(
+ const std::set<T,Comparator>& iLHS,
+ const std::set<T,Comparator>& iRHS)
{
- set<T> result;
+ std::set<T,Comparator> result;
sOr(iLHS, iRHS, result);
return result;
}
-template <class T>
-void sAnd(const set<T>& iLHS, const set<T>& iRHS, set<T>& oResult)
+template <typename T, typename Comparator>
+void sAnd(
+
+ const std::set<T,Comparator>& iLHS,
+ const std::set<T,Comparator>& iRHS,
+ std::set<T,Comparator>& ioResult)
{
set_intersection(iLHS.begin(), iLHS.end(),
iRHS.begin(), iRHS.end(),
- inserter(oResult, oResult.end()));
+ inserter(ioResult, ioResult.end()));
}
-template <class T>
-set<T> sAnd(const set<T>& iLHS, const set<T>& iRHS)
+template <typename T, typename Comparator>
+std::set<T,Comparator> sAnd(
+ const std::set<T,Comparator>& iLHS,
+ const std::set<T,Comparator>& iRHS)
{
- set<T> result;
+ std::set<T,Comparator> result;
sAnd(iLHS, iRHS, result);
return result;
}
-template <class T>
-void sMinus(const set<T>& iLHS, const set<T>& iRHS, set<T>& oResult)
+template <typename T, typename Comparator>
+void sMinus(
+ const std::set<T,Comparator>& iLHS,
+ const std::set<T,Comparator>& iRHS,
+ std::set<T,Comparator>& ioResult)
{
set_difference(iLHS.begin(), iLHS.end(),
iRHS.begin(), iRHS.end(),
- inserter(oResult, oResult.end()));
+ inserter(ioResult, ioResult.end()));
}
-template <class T>
-set<T> sMinus(const set<T>& iLHS, const set<T>& iRHS)
+template <typename T, typename Comparator>
+std::set<T,Comparator> sMinus(
+ const std::set<T,Comparator>& iLHS,
+ const std::set<T,Comparator>& iRHS)
{
- set<T> result;
+ std::set<T,Comparator> result;
sMinus(iLHS, iRHS, result);
return result;
}
-template <class T>
-void sXor(const set<T>& iLHS, const set<T>& iRHS, set<T>& oResult)
+template <typename T, typename Comparator>
+void sXor(
+ const std::set<T,Comparator>& iLHS,
+ const std::set<T,Comparator>& iRHS,
+ std::set<T,Comparator>& ioResult)
{
set_symmetric_difference(iLHS.begin(), iLHS.end(),
iRHS.begin(), iRHS.end(),
- inserter(oResult, oResult.end()));
+ inserter(ioResult, ioResult.end()));
}
-template <class T>
-set<T> sXor(const set<T>& iLHS, const set<T>& iRHS)
+template <typename T, typename Comparator>
+std::set<T,Comparator> sXor(
+ const std::set<T,Comparator>& iLHS,
+ const std::set<T,Comparator>& iRHS)
{
- set<T> result;
+ std::set<T,Comparator> result;
sXor(iLHS, iRHS, result);
return result;
}
-template <class T>
-bool sIncludes(const set<T>& iLHS, const set<T>& iRHS)
+template <typename T, typename Comparator>
+bool sIncludes(
+ const std::set<T,Comparator>& iLHS,
+ const std::set<T,Comparator>& iRHS)
{
return includes(iLHS.begin(), iLHS.end(),
iRHS.begin(), iRHS.end());
}
-} // namespace ZUtil_STL_set
-
+} // namespace ZUtil_STL
} // namespace ZooLib
#endif // __ZUtil_STL_set__
Added: trunk/zoolib/source/cxx/zoolib/ZUtil_STL_vector.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZUtil_STL_vector.h (rev 0)
+++ trunk/zoolib/source/cxx/zoolib/ZUtil_STL_vector.h 2011-01-12 12:03:19 UTC (rev 1877)
@@ -0,0 +1,177 @@
+/* -------------------------------------------------------------------------------------------------
+Copyright (c) 2011 Andrew Green
+http://www.zoolib.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+and associated documentation files (the "Software"), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge, publish, distribute,
+sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES
+OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+------------------------------------------------------------------------------------------------- */
+
+#ifndef __ZUtil_STL_vector__
+#define __ZUtil_STL_vector__
+#include "zconfig.h"
+
+#include "zoolib/ZDebug.h"
+
+#include <vector>
+
+namespace ZooLib {
+namespace ZUtil_STL {
+
+// =================================================================================================
+#pragma mark -
+#pragma mark * ZUtil_STL
+
+template <class T>
+T* sFirstOrNil(std::vector<T>& iVec)
+ { return iVec.empty() ? nullptr : &iVec[0]; }
+
+template <class T>
+const T* sFirstOrNil(const std::vector<T>& iVec)
+ { return iVec.empty() ? nullptr : &iVec[0]; }
+
+// ==================================================
+
+/** Returns true if iVector contains iElement. iVector is
+assumed to be unordered, so we use find to make the determination. */
+template <typename Base, typename Derived>
+bool sContains(const std::vector<Base>& iVector, const Derived& iElement)
+ { return iVector.end() != std::find(iVector.begin(), iVector.end(), iElement); }
+
+
+/** Appends iElement to ioVec by calling push_back. If iElement was already contained in ioVec
+then false is returned and no change is made to ioVec. */
+template <typename Base, typename Derived>
+bool sPushBackIfNotContains(std::vector<Base>& ioVec, const Derived& iElement)
+ {
+ typename std::vector<Base>::iterator i = std::find(ioVec.begin(), ioVec.end(), iElement);
+ if (i != ioVec.end())
+ return false;
+ ioVec.push_back(iElement);
+ return true;
+ }
+
+
+/** Appends iElement to ioVec by calling push_back. We first assert, controlled
+by iDebugLevel, that iElement is not already present in ioVec. */
+template <typename Base, typename Derived>
+void sPushBackMustNotContain(const int iDebugLevel,
+ std::vector<Base>& ioVec, const Derived& iElement)
+ {
+ ZAssertStop(iDebugLevel, ioVec.end() == std::find(ioVec.begin(), ioVec.end(), iElement));
+ ioVec.push_back(iElement);
+ }
+
+
+/** If the unordered vector ioVec contains iElement then it is
+removed and true returned. Otherwise no change is made to ioVec and
+false is returned. */
+template <typename Base, typename Derived>
+bool sEraseIfContains(std::vector<Base>& ioVec, const Derived& iElement)
+ {
+ typename std::vector<Base>::iterator i = std::find(ioVec.begin(), ioVec.end(), iElement);
+ if (i == ioVec.end())
+ return false;
+ ioVec.erase(i);
+ return true;
+ }
+
+
+/** Removes iElement from ioVec, asserting that it is present and
+returning an iterator referencing the position at which iElement was found. */
+template <typename Base, typename Derived>
+typename std::vector<Base>::iterator sEraseMustContain(const int iDebugLevel,
+ std::vector<Base>& ioVec, const Derived& iElement)
+ {
+ typename std::vector<Base>::iterator i = std::find(ioVec.begin(), ioVec.end(), iElement);
+ ZAssertStop(iDebugLevel, i != ioVec.end());
+ return ioVec.erase(i);
+ }
+
+
+// ==================================================
+
+/** The contents of iVector are assumed to be sorted by less<Base>. Returns
+true if iVector contains iElement. */
+template <typename Base, typename Derived>
+bool sSortedContains(const std::vector<Base>& iVector, const Derived& iElement)
+ {
+ typename std::vector<Base>::const_iterator i =
+ lower_bound(iVector.begin(), iVector.end(), iElement);
+ return i != iVector.end() && *i == iElement;
+ }
+
+
+/** The contents of ioVec are assumed to be sorted by less<Base>. If iElement
+was already contained in ioVec then false is returned and no change is made
+to ioVec. Otherwise it is inserted using lower_bound and less<Base> and true
+is returned. */
+template <typename Base, typename Derived>
+bool sSortedInsertIfNotContains(std::vector<Base>& ioVec, const Derived& iElement)
+ {
+ typename std::vector<Base>::iterator i = lower_bound(ioVec.begin(), ioVec.end(), iElement);
+
+ if (i != ioVec.end() && *i == iElement)
+ return false;
+
+ ioVec.insert(i, iElement);
+ return true;
+ }
+
+
+/** The contents of ioVec are assumed to be sorted by less<Base>. Returns false
+if ioVec does not contain iElement. If ioVec does contain
+iElement then it is removed and true returned. */
+template <typename Base, typename Derived>
+bool sSortedEraseIfContains(std::vector<Base>& ioVec, const Derived& iElement)
+ {
+ typename std::vector<Base>::iterator i = lower_bound(ioVec.begin(), ioVec.end(), iElement);
+
+ if (i == ioVec.end() || !(*i == iElement))
+ return false;
+
+ ioVec.erase(i);
+ return true;
+ }
+
+
+/** The contents of ioVec are assumed to be sorted by less<Base>. We first
+assert, under the control of iDebugLevel, that ioVec does not contain iElement.
+We then insert iElement using lower_bound and less<Base>. */
+template <typename Base, typename Derived>
+void sSortedInsertMustNotContain(const int iDebugLevel,
+ std::vector<Base>& ioVec, const Derived& iElement)
+ {
+ typename std::vector<Base>::iterator i = lower_bound(ioVec.begin(), ioVec.end(), iElement);
+ ZAssertStop(iDebugLevel, i == ioVec.end() || !(*i == iElement));
+ ioVec.insert(i, iElement);
+ }
+
+
+/** The contents of ioVec are assumed to be sorted by less<Base>. We first
+assert, under the control of iDebugLevel, that ioVec contains iElement.
+We then remove iElement using lower_bound and less<Base>. */
+template <typename Base, typename Derived>
+void sSortedEraseMustContain(const int iDebugLevel,
+ std::vector<Base>& ioVec, const Derived& iElement)
+ {
+ typename std::vector<Base>::iterator i = lower_bound(ioVec.begin(), ioVec.end(), iElement);
+ ZAssertStop(iDebugLevel, i != ioVec.end() && *i == iElement);
+ ioVec.erase(i);
+ }
+
+} // namespace ZUtil_STL
+} // namespace ZooLib
+
+#endif // __ZUtil_STL_vector__
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
