From 99235aa7e34c2c61d9151f8ba6ba796ea081b127 Mon Sep 17 00:00:00 2001
From: randomdan <randomdan@localhost>
Date: Wed, 14 Sep 2011 22:42:10 +0000
Subject: Remove pointless check

---
 project2/common/iHaveParameters.cpp | 3 +--
 project2/common/iHaveParameters.h   | 2 +-
 project2/common/rowProcessor.cpp    | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/project2/common/iHaveParameters.cpp b/project2/common/iHaveParameters.cpp
index 7d750b3..18996e5 100644
--- a/project2/common/iHaveParameters.cpp
+++ b/project2/common/iHaveParameters.cpp
@@ -33,9 +33,8 @@ IHaveParameters::push(const IHaveParameters * p)
 }
 
 void
-IHaveParameters::pop(const IHaveParameters * p)
+IHaveParameters::pop()
 {
-	assert(scope.back() == p);
 	scope.pop_back();
 }
 
diff --git a/project2/common/iHaveParameters.h b/project2/common/iHaveParameters.h
index 28dbf7d..08c8d00 100644
--- a/project2/common/iHaveParameters.h
+++ b/project2/common/iHaveParameters.h
@@ -23,7 +23,7 @@ class IHaveParameters {
 		Parameters parameters;
 
 		static void push(const IHaveParameters *);
-		static void pop(const IHaveParameters *);
+		static void pop();
 	private:
 		typedef std::vector<const IHaveParameters *> Stack;
 		static Stack scope;
diff --git a/project2/common/rowProcessor.cpp b/project2/common/rowProcessor.cpp
index 71fdd76..f9d821e 100644
--- a/project2/common/rowProcessor.cpp
+++ b/project2/common/rowProcessor.cpp
@@ -25,7 +25,7 @@ void
 RowProcessor::execute() const
 {
 	IHaveParameters::push(this);
-	ScopeObject _ihp(boost::bind(&IHaveParameters::pop, this));
+	ScopeObject _ihp(boost::bind(&IHaveParameters::pop));
 	BOOST_FOREACH(const CachePtr & c, caches) {
 		if (c->checkAndExecute(source->name, filter, this)) {
 			BOOST_FOREACH(const TargetCaches::value_type & c, tc) {
-- 
cgit v1.2.3