diff options
Diffstat (limited to 'swig/zypp.i')
| -rw-r--r-- | swig/zypp.i | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/swig/zypp.i b/swig/zypp.i index 1cf9a4d..cd9327e 100644 --- a/swig/zypp.i +++ b/swig/zypp.i @@ -17,20 +17,14 @@ // stuff swig seems to be unable to parse #define BOOST_NOEXCEPT -#define BOOST_SP_NOEXCEPT -#define BOOST_SP_NOEXCEPT_WITH_ASSERT +#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 @@ -216,10 +210,8 @@ namespace zypp { %include "std_string.i" %include "stl.i" -#if (BOOST_VERSION >= 106501) -%import <boost/config.hpp> -%import <boost/pointer_cast.hpp> -#endif +%import <boost/config.hpp> +%import <boost/pointer_cast.hpp> #ifdef BOOST_SMARTPTR_INCLUDE_DIR %import <boost/smart_ptr/scoped_ptr.hpp> @@ -250,11 +242,11 @@ namespace zypp { %include "Capabilities.i" %include "CapMatch.i" %include "OnMediaLocation.i" -%include "Resolvable.i" +%include "SolvAttr.i" %include "RepoType.i" -%include "TmpPath.i" %include "RepoInfo.i" %include "Repository.i" +%include "Resolvable.i" %include "ServiceInfo.i" %include "ResTraits.i" %include "ResStatus.i" @@ -276,10 +268,10 @@ namespace zypp { %include "ResPool.i" %include "ZYppCommitPolicy.i" %include "ZYppCommitResult.i" +%include "TmpPath.i" %include "Resolver.i" %include "ZConfig.i" %include "PoolQuery.i" -%include "SolvAttr.i" //just simple files, where we need default ctor %include <zypp/repo/RepoProvideFile.h> @@ -294,8 +286,6 @@ namespace zypp { %ignore zypp::ZYpp::setArchitecture; %ignore zypp::ZYpp::applyLocks; -%include <zypp/ZYpp.h> - %include "ZYppFactory.i" #endif |