mirror of
https://gitlab.isc.org/isc-projects/kea
synced 2025-08-31 05:55:28 +00:00
[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)
This commit is contained in:
@@ -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;
|
||||
|
Reference in New Issue
Block a user