From 0e7df97961dbd238094b9223efd217502fe1c747 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 29 Feb 2012 21:52:49 +0100 Subject: [PATCH] Fix bug with identifying SWIG version --- src/Base/Interpreter.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Base/Interpreter.cpp b/src/Base/Interpreter.cpp index a1bd56a9a..6e31a3810 100644 --- a/src/Base/Interpreter.cpp +++ b/src/Base/Interpreter.cpp @@ -508,7 +508,7 @@ int getSWIGVersionFromModule(const std::string& module) // file can have the extension .py or .pyc filename = filename.substr(0, filename.rfind(".")); filename += ".py"; - boost::regex rx("^# Version ([1-9])\\.([1-9])\\.([1-9][0-9])"); + boost::regex rx("^# Version ([1-9])\\.([0-9])\\.([0-9]+)"); boost::cmatch what; std::string line; @@ -552,21 +552,21 @@ PyObject* InterpreterSingleton::createSWIGPointerObj(const char* Module, const c PyObject* proxy=0; PyGILStateLocker locker; int version = getSWIGVersionFromModule(Module); - switch (version&0xff) + switch (version) { - case 25: + case 66329: result = Swig_1_3_25::createSWIGPointerObj_T(TypeName, Pointer, &proxy, own); break; - case 33: + case 66337: result = Swig_1_3_33::createSWIGPointerObj_T(TypeName, Pointer, &proxy, own); break; - case 36: + case 66340: result = Swig_1_3_36::createSWIGPointerObj_T(TypeName, Pointer, &proxy, own); break; - case 38: + case 66342: result = Swig_1_3_38::createSWIGPointerObj_T(TypeName, Pointer, &proxy, own); break; - case 40: + case 66344: result = Swig_1_3_40::createSWIGPointerObj_T(TypeName, Pointer, &proxy, own); break; default: