monad release

git-svn-id: https://subversion.cs.illinois.edu/svn/cs225@5778 6fbd10e7-183d-0410-a318-cb416676e4f2

.monadid

 monad identification file
 This file is used for monad directory identification
 Built by toole1 on linux1.ews.illinois.edu
-Build Date: Sat Dec 10 03:45:14 CST 2011
+Build Date: Tue Jan 17 22:32:12 CST 2012

Makefile.proxy

@@ -21,15 +21,18 @@ ALL_TARGET = all
 all: $(TESTEXE)
 endif
 
-IS_LIBRT:=$(shell locate -l 1 -c librt.so)
+LIBS:=
+IS_LIBRT:=$(shell echo "int main(){}" | g++ -o /dev/null -x c++ - -lrt &>/dev/null ; echo $$?)
+IS_LIBPNG:=$(shell echo "int main(){}" | g++ -o /dev/null -x c++ - -lpng &>/dev/null ; echo $$?)
 ifeq ($(IS_LIBRT),0)
-LIBRT=
-else
-LIBRT=-lrt
+LIBS+= -lrt
+endif
+ifeq ($(IS_LIBPNG),0)
+LIBS+= -lpng 
 endif
 
 $(TESTEXE): $(TESTOBJS)
-	$(CC) $(LIBRT) $(TESTOBJS) -o $@
+	$(CC) $(LIBS) $(TESTOBJS) -o $@
 
 unit_tests.o : unit_tests.cpp $(wildcard *.h)
 	../ccmonad $(CC) $(CFLAGS) -c $(@:.o=.cpp) -o $@

monad_shared.cpp

@@ -15,7 +15,7 @@ namespace versioninfo
 {
 const char * official_name = "Monad Autograder";
 const char * version_name  = "confession";
-const Version version_num  = Version(2, 1, 1, 2);
+const Version version_num  = Version(2, 1, 2, 2);
 const char * date          = "10 Nov 2011";
 }
 

proxy.h

@@ -261,8 +261,8 @@ using std::endl;
 	} while (0)
 
 namespace proxy {
-template <typename T>
-inline std::string assert_equals_help(const T & expected, const T & actual, const char * expstr, const char * actstr)
+template <typename T, typename K>
+inline std::string assert_equals_help(const T & expected, const K & actual, const char * expstr, const char * actstr)
 {
 	std::stringstream ss;
 	if (actual != expected)