Apply upstream commit to adopt boost-1.65.1 upgrade

Originally from by V. Zhestkov: Adapt bindings to work with boost-1.62

Change-Id: I9676b210376d79cd7af27866328697bbe481b1e5

diff --git a/swig/ResPool.i b/swig/ResPool.i
index 08154f8..b9f24e9 100644 (file)
--- a/swig/ResPool.i
+++ b/swig/ResPool.i
@@ -3,6 +3,11 @@
 %ignore zypp::ResPool::byKindEnd;
 %ignore zypp::ResPool::byNameBegin;
 %ignore zypp::ResPool::byNameEnd;
+#if (BOOST_VERSION >= 106501)
+%ignore zypp::ResPool::byStatus;  
+%ignore zypp::ResPool::byStatusBegin;  
+%ignore zypp::ResPool::byStatusEnd; 
+#endif
 %apply unsigned { zypp::ResPool::size_type };
 %include <zypp/ResPool.h>
 

diff --git a/swig/zypp.i b/swig/zypp.i
index 5c1c5fc..1cf9a4d 100644 (file)
--- a/swig/zypp.i
+++ b/swig/zypp.i
@@ -17,13 +17,20 @@
 
 // stuff swig seems to be unable to parse
 #define BOOST_NOEXCEPT
+#define BOOST_SP_NOEXCEPT  
+#define BOOST_SP_NOEXCEPT_WITH_ASSERT  
 #define BOOST_NO_CXX11_NOEXCEPT
 #define BOOST_NO_CXX11_RVALUE_REFERENCES
 #define BOOST_NO_CXX11_SMART_PTR
+#if (BOOST_VERSION >= 106501)
+#define BOOST_CONSTEXPR_OR_CONST const
+#define constexpr
+#define BOOST_CONSTEXPR constexpr
+#else
 #define BOOST_CONSTEXPR
 #define BOOST_CONSTEXPR_OR_CONST const
 #define constexpr
-
+#endif
 %{
 /* Includes the header in the wrapper code */
 #ifdef SWIGRUBY
@@ -209,6 +216,11 @@ namespace zypp {
 %include "std_string.i"
 %include "stl.i"
 
+#if (BOOST_VERSION >= 106501)
+%import <boost/config.hpp>  
+%import <boost/pointer_cast.hpp>  
+#endif
+
 #ifdef BOOST_SMARTPTR_INCLUDE_DIR
 %import <boost/smart_ptr/scoped_ptr.hpp>
 %import <boost/smart_ptr/shared_ptr.hpp>