From 1779dc1f7c6f763328cb707298e88f22335fa7a5 Mon Sep 17 00:00:00 2001
From: Nicolay Korslund <korslund@gmail.com>
Date: Sat, 2 Jan 2010 13:10:39 +0100
Subject: [PATCH] Removed tools/str_exception (now part of Mangle)

---
 bsa/bsa_file.cpp      |  3 +--
 bsa/tests/Makefile    |  4 ++++
 mangle                |  2 +-
 tools/str_exception.h | 19 -------------------
 4 files changed, 6 insertions(+), 22 deletions(-)
 delete mode 100644 tools/str_exception.h

diff --git a/bsa/bsa_file.cpp b/bsa/bsa_file.cpp
index bc0a9338c..fb00c8e83 100644
--- a/bsa/bsa_file.cpp
+++ b/bsa/bsa_file.cpp
@@ -25,12 +25,11 @@
 
 #include "../mangle/stream/servers/file_stream.h"
 #include "../mangle/stream/filters/slice_stream.h"
+#include "../mangle/tools/str_exception.h"
 
 #include <stdlib.h>
 #include <assert.h>
 
-#include "../tools/str_exception.h"
-
 using namespace std;
 using namespace Mangle::Stream;
 
diff --git a/bsa/tests/Makefile b/bsa/tests/Makefile
index 7035b7735..6e1db734f 100644
--- a/bsa/tests/Makefile
+++ b/bsa/tests/Makefile
@@ -10,3 +10,7 @@ bsatool: bsatool.cpp ../bsa_file.cpp bsatool_cmd.c
 
 bsatool_cmd.c: bsatool.ggo
 	gengetopt < bsatool.ggo
+
+clean:
+	rm *_test
+	rm bsatool
diff --git a/mangle b/mangle
index 5e70bc7bd..86089816a 160000
--- a/mangle
+++ b/mangle
@@ -1 +1 @@
-Subproject commit 5e70bc7bd768b9fb6016c02656841d199cbb3759
+Subproject commit 86089816a7532724e4d8ab464a60229b1177b23a
diff --git a/tools/str_exception.h b/tools/str_exception.h
deleted file mode 100644
index 75eb5e849..000000000
--- a/tools/str_exception.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef __STR_EXCEPTION_H
-#define __STR_EXCEPTION_H
-
-#include <exception>
-#include <string>
-
-/// A simple exception that takes and returns a string
-class str_exception : public std::exception
-{
-  std::string msg;
-
- public:
-
-  str_exception(const std::string &m) : msg(m) {}
-  ~str_exception() throw() {}
-  const char* what() const throw() { return msg.c_str(); }
-};
-
-#endif