diff options
| author | Michael Andres <ma@suse.de> | 2013-04-30 13:45:48 +0200 |
|---|---|---|
| committer | Michael Andres <ma@suse.de> | 2013-04-30 13:45:48 +0200 |
| commit | fa4f0252f27fab99db4ad665a549e8a5ba04a63b (patch) | |
| tree | 1233911a1f1430f77e96e1eafffba04eafb49f6b | |
| parent | 05eb87243d28be648e59508edc03fe275e76dcfa (diff) | |
| download | libzypp-bindings-fa4f0252f27fab99db4ad665a549e8a5ba04a63b.tar.gz libzypp-bindings-fa4f0252f27fab99db4ad665a549e8a5ba04a63b.tar.bz2 libzypp-bindings-fa4f0252f27fab99db4ad665a549e8a5ba04a63b.zip | |
Try to disable stuff swig seems to be unable to parse (rvalue references, noexcept)
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | swig/zypp.i | 16 |
2 files changed, 12 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e02ba6b..9cb417a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 2.8) ENABLE_TESTING() -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++11 -fPIC -fno-strict-aliasing") +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++0x -fPIC -fno-strict-aliasing") # # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked diff --git a/swig/zypp.i b/swig/zypp.i index 6aab2bd..96b0ac7 100644 --- a/swig/zypp.i +++ b/swig/zypp.i @@ -15,6 +15,12 @@ %} #endif +// stuff swig seems to be unable to parse +#define BOOST_NOEXCEPT +#define BOOST_NO_CXX11_NOEXCEPT +#define BOOST_NO_CXX11_RVALUE_REFERENCES +#define BOOST_NO_CXX11_SMART_PTR + %{ /* Includes the header in the wrapper code */ #ifdef SWIGRUBY @@ -27,7 +33,7 @@ /* * type definitions to keep the C code generic */ - + #if defined(SWIGPYTHON) #define Target_Null_p(x) (x == Py_None) #define Target_INCREF(x) Py_INCREF(x) @@ -54,8 +60,8 @@ #if defined(SWIGRUBY) #define Target_Null_p(x) NIL_P(x) -#define Target_INCREF(x) -#define Target_DECREF(x) +#define Target_INCREF(x) +#define Target_DECREF(x) #define Target_True Qtrue #define Target_False Qfalse #define Target_Null Qnil @@ -87,8 +93,8 @@ SWIGINTERNINLINE SV *SWIG_FromCharPtr(const char *cptr); SWIGINTERNINLINE SV *SWIG_From_double SWIG_PERL_DECL_ARGS_1(double value); #define Target_Null_p(x) (x == NULL) -#define Target_INCREF(x) -#define Target_DECREF(x) +#define Target_INCREF(x) +#define Target_DECREF(x) #define Target_True (&PL_sv_yes) #define Target_False (&PL_sv_no) #define Target_Null NULL |