diff options
| author | SoonKyu Park <sk7.park@samsung.com> | 2018-06-30 20:49:47 +0900 |
|---|---|---|
| committer | SoonKyu Park <sk7.park@samsung.com> | 2018-06-30 20:51:22 +0900 |
| commit | 23ca0cab871cc21b827c6d7caaedd4fcbde06224 (patch) | |
| tree | b116cded81061bc6b3979b7e7cb6fa274c540c57 | |
| parent | eca7ee3756675b33196f890320fec0281f571d24 (diff) | |
| download | libzypp-bindings-23ca0cab871cc21b827c6d7caaedd4fcbde06224.tar.gz libzypp-bindings-23ca0cab871cc21b827c6d7caaedd4fcbde06224.tar.bz2 libzypp-bindings-23ca0cab871cc21b827c6d7caaedd4fcbde06224.zip | |
Apply upstream commit to adopt boost-1.65.1 upgradetizen_5.5.m2_releasesubmit/tizen_5.5_wearable_hotfix/20201026.184307submit/tizen_5.5_mobile_hotfix/20201026.185107submit/tizen_5.5/20191031.000007submit/tizen_5.0/20181101.000007submit/tizen/20180630.115537accepted/tizen/unified/20180702.062927accepted/tizen/5.5/unified/wearable/hotfix/20201027.100934accepted/tizen/5.5/unified/mobile/hotfix/20201027.074246accepted/tizen/5.5/unified/20191031.011822accepted/tizen/5.0/unified/20181102.030942tizen_5.5_wearable_hotfixtizen_5.5_tvtizen_5.5_mobile_hotfixtizen_5.5tizen_5.0accepted/tizen_5.5_unified_wearable_hotfixaccepted/tizen_5.5_unified_mobile_hotfixaccepted/tizen_5.5_unifiedaccepted/tizen_5.0_unified
Originally from by V. Zhestkov: Adapt bindings to work with boost-1.62
Change-Id: I9676b210376d79cd7af27866328697bbe481b1e5
| -rw-r--r-- | swig/ResPool.i | 5 | ||||
| -rw-r--r-- | swig/zypp.i | 14 |
2 files changed, 18 insertions, 1 deletions
diff --git a/swig/ResPool.i b/swig/ResPool.i index 08154f8..b9f24e9 100644 --- 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 --- 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> |