Implemented the first version of the XML request. Fixed eXpat incompatability with XML_Get/SetUserData and the void* in the handler functions.

1 files changed, 7 insertions, 7 deletions

diff --git a/server/src/exception.cc b/server/src/exception.cc
index 3e3bd46..57bd6bf 100644
--- a/server/src/exception.cc
+++ b/server/src/exception.cc
@@ -30,14 +30,14 @@
 
 #include "log.h"
 
-Pentominos::Exception::Exception(std::string what)
+Exception::Exception(std::string what)
 {
-  Pentominos::log(what);
+  log(what);
   _what = what;
   
 }
 
-const char* Pentominos::Exception::what() const throw()
+const char* Exception::what() const throw()
 {
   return _what.c_str();
 }
@@ -45,16 +45,16 @@ const char* Pentominos::Exception::what() const throw()
 
 #ifdef TEST_EXCEPTION
 
-class MyException : public Pentominos::Exception {
+class MyException : public Exception {
 public:
   MyException() :
-    Pentominos::Exception("MyException has been thrown") {}
+    Exception("MyException has been thrown") {}
 };
 
-class MyExtException : public Pentominos::Exception {
+class MyExtException : public Exception {
 public:
   MyExtException(std::string thingy) :
-    Pentominos::Exception("MyExtException has been thrown: " + thingy) {}
+    Exception("MyExtException has been thrown: " + thingy) {}
 };
 
 int main()