From: Charles McGarvey <chazmcgarvey@brokenzipper.com>
Date: Wed, 13 Jul 2011 21:14:03 +0000 (-0600)
Subject: C++ template uses -ggdb; whitespace modifications
X-Git-Tag: v0.3.2~1
X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=26607a072a4cc87ff1843f49aa1194614724ab4d;p=chaz%2Fvimcoder

C++ template uses -ggdb; whitespace modifications
---

diff --git a/src/com/dogcows/resources/C++Driver b/src/com/dogcows/resources/C++Driver
index 718ced4..142fdac 100644
--- a/src/com/dogcows/resources/C++Driver
+++ b/src/com/dogcows/resources/C++Driver
@@ -90,7 +90,6 @@ std::istream& operator >> (std::istream& in, std::vector<T>& vec)
 			vec.push_back(t);
 			while (in.good() && std::isspace(in.peek())) in.get();
 		}
-
 	}
 	else
 	{
@@ -104,8 +103,8 @@ std::istream& operator >> (std::istream& in, std::vector<T>& vec)
 int main(int argc, char* argv[])
 {
 	bool	__exit_on_fail = false;
-	int		__pass = 0;
-	int		__fail = 0;
+	int	__pass = 0;
+	int	__fail = 0;
 	
 	if (1 < argc) __exit_on_fail = true;
 	
@@ -118,7 +117,7 @@ int main(int argc, char* argv[])
 		if (!__in.good()) break;
 		
 		std::cout << "----------------------------------------" << std::endl
-				  << "Test " << (__pass + __fail) << ": ";
+			  << "Test " << (__pass + __fail) << ": ";
 		std::cout.flush();
 		
 		__timer_start();
@@ -136,23 +135,23 @@ int main(int argc, char* argv[])
 		else
 		{
 			std::cout << "[FAIL] in " << __t << " seconds." << std::endl
-					  << "->  Input: " << $METHODPARAMSTREAMOUT$ << std::endl
-					  << "   Actual: " << __actual << std::endl
-					  << " Expected: " << __expected << std::endl;
+				  << "->  Input: " << $METHODPARAMSTREAMOUT$ << std::endl
+				  << "   Actual: " << __actual << std::endl
+				  << " Expected: " << __expected << std::endl;
 			++__fail;
 			if (__exit_on_fail) exit(1);
 		}
 	}
 
 	std::cout << "========================================" << std::endl
-			  << " Total Pass: " << __pass << std::endl
-			  << " Total Fail: " << __fail << std::endl;
+		  << " Total Pass: " << __pass << std::endl
+		  << " Total Fail: " << __fail << std::endl;
 
 	if (__fail == 0)
 	{
 		std::cout << std::endl << "Nice!  "
-				  << "Don't forget to compile remotely before submitting."
-				  << std::endl;
+			  << "Don't forget to compile remotely before submitting."
+			  << std::endl;
 	}
 
 	return __fail;
diff --git a/src/com/dogcows/resources/C++Makefile b/src/com/dogcows/resources/C++Makefile
index 062a464..e864df3 100644
--- a/src/com/dogcows/resources/C++Makefile
+++ b/src/com/dogcows/resources/C++Makefile
@@ -1,6 +1,6 @@
 
-CXX			:= g++
-CXXFLAGS	:= -O0 -g -Wall
+CXX		= g++
+CXXFLAGS	= -O0 -ggdb -Wall
 
 all: driver
 	
@@ -13,7 +13,7 @@ test: all
 driver.o: $CLASSNAME$.o
 
 driver: driver.o
-	$(CXX) $(CXXFLAGS) $< -o $@ $(LDFLAGS) $(LIBS)
+	$(CXX) $(CXXFLAGS) $< -o $@ $(LDFLAGS) $(LDLIBS)
 
 .PHONY: all run test