Browse Source

[trac1030] fix bus error regression

in master the bus error was fixed, but not in this branch. There was no noticeable conflict, but the merge did make it break again (by redefining the InternalError within the anonymous namespace)
Jelte Jansen 14 years ago
parent
commit
e828a215cc
1 changed files with 6 additions and 9 deletions
  1. 6 9
      src/lib/python/isc/log/log.cc

+ 6 - 9
src/lib/python/isc/log/log.cc

@@ -41,7 +41,12 @@ using boost::bind;
 // to solve this issue.
 namespace clang_unnamed_namespace_workaround {
     // To propagate python exceptions through our code
-    class InternalError {};
+    // This exception is used to signal to the calling function that a
+    // proper Python Exception has already been set, and the caller
+    // should now return NULL.
+    // Since it is only used internally, and should not pass any
+    // information itself, is is not derived from std::exception
+    class InternalError : public std::exception {};
 }
 using namespace clang_unnamed_namespace_workaround;
 
@@ -51,14 +56,6 @@ namespace {
 // NULL and will use the global dictionary.
 MessageDictionary* testDictionary = NULL;
 
-// To propagate python exceptions trough our code
-// This exception is used to signal to the calling function that a
-// proper Python Exception has already been set, and the caller
-// should now return NULL.
-// Since it is only used internally, and should not pass any
-// information itself, is is not derived from std::exception
-class InternalError {};
-
 PyObject*
 setTestDictionary(PyObject*, PyObject* args) {
     PyObject* enableO;