C++ template uses -ggdb; whitespace modifications

diff --git a/src/com/dogcows/resources/C++Driver b/src/com/dogcows/resources/C++Driver
index 718ced40bbce7d119631781e0779d426ace63ded..142fdac9d5745d375da6329e15e810427cbd0c87 100644 (file)
--- 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 062a464470b19c0ca563cb1e628a87c030fd3213..e864df393c6f33d2c59390f5bf1c82c00543af5e 100644 (file)
--- 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