Skip to content

Commit 99022d2

Browse files
stefanseefeldstefanseefeld
committed
Merge branch 'develop'
2 parents 3e405b6 + 37f8f37 commit 99022d2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+74
-1120
lines changed

‎build/Attic/python_v1.zip‎

-231 KB
Binary file not shown.

‎example/boost-build.jam‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
# Software License, Version 1.0. (See accompanying
33
# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
44

5-
# Edit this path to point at the tools/build/v2 subdirectory of your
5+
# Edit this path to point at the tools/build/src subdirectory of your
66
# Boost installation. Absolute paths work, too.
7-
boost-build ../../../tools/build/v2 ;
7+
boost-build ../../../tools/build/src ;

‎example/quickstart/Jamroot‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import testing ;
3131
testing.make-test run-pyd : extending test_extending.py : : test_ext ;
3232

3333
# Declare a test of the embedding application
34-
testing.run embedding
34+
testing.run embedding embedding.cpp
3535
: # any ordinary arguments
3636
: script.py # any arguments that should be treated as relative paths
3737
: # requirements

‎example/quickstart/boost-build.jam‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
# Software License, Version 1.0. (See accompanying
33
# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
44

5-
# Edit this path to point at the tools/build/v2 subdirectory of your
5+
# Edit this path to point at the tools/build/src subdirectory of your
66
# Boost installation. Absolute paths work, too.
7-
boost-build ../../../../tools/build/v2 ;
7+
boost-build ../../../../tools/build/src ;

‎include/boost/python.hpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
# include <boost/python/pointee.hpp>
5454
# include <boost/python/pure_virtual.hpp>
5555
# include <boost/python/ptr.hpp>
56+
# include <boost/python/raw_function.hpp>
5657
# include <boost/python/reference_existing_object.hpp>
5758
# include <boost/python/register_ptr_to_python.hpp>
5859
# include <boost/python/return_arg.hpp>
@@ -61,7 +62,9 @@
6162
# include <boost/python/return_value_policy.hpp>
6263
# include <boost/python/scope.hpp>
6364
# include <boost/python/self.hpp>
65+
# include <boost/python/slice.hpp>
6466
# include <boost/python/slice_nil.hpp>
67+
# include <boost/python/stl_iterator.hpp>
6568
# include <boost/python/str.hpp>
6669
# include <boost/python/to_python_converter.hpp>
6770
# include <boost/python/to_python_indirect.hpp>

‎include/boost/python/args.hpp‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ namespace detail
102102
return this->operator,(python::arg(name));
103103
}
104104

105-
# ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
106105
template<typename T>
107106
struct is_keywords
108107
{
@@ -126,31 +125,6 @@ namespace detail
126125
typedef mpl::bool_<value> type;
127126
BOOST_PYTHON_MPL_LAMBDA_SUPPORT(1,is_reference_to_keywords,(T))
128127
};
129-
# else
130-
typedef char (&yes_keywords_t)[1];
131-
typedef char (&no_keywords_t)[2];
132-
133-
no_keywords_t is_keywords_test(...);
134-
135-
template<std::size_t nkeywords>
136-
yes_keywords_t is_keywords_test(void (*)(keywords<nkeywords>&));
137-
138-
template<std::size_t nkeywords>
139-
yes_keywords_t is_keywords_test(void (*)(keywords<nkeywords> const&));
140-
141-
template<typename T>
142-
class is_reference_to_keywords
143-
{
144-
public:
145-
BOOST_STATIC_CONSTANT(
146-
bool, value = (
147-
sizeof(detail::is_keywords_test( (void (*)(T))0 ))
148-
== sizeof(detail::yes_keywords_t)));
149-
150-
typedef mpl::bool_<value> type;
151-
BOOST_PYTHON_MPL_LAMBDA_SUPPORT(1,is_reference_to_keywords,(T))
152-
};
153-
# endif
154128
}
155129

156130
inline detail::keywords<1> args(char const* name)

‎include/boost/python/back_reference.hpp‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ struct back_reference
2929
T m_value;
3030
};
3131

32-
# ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
3332
template<typename T>
3433
class is_back_reference
3534
{
@@ -44,36 +43,6 @@ class is_back_reference<back_reference<T> >
4443
BOOST_STATIC_CONSTANT(bool, value = true);
4544
};
4645

47-
# else // no partial specialization
48-
49-
}} // namespace boost::python
50-
51-
#include <boost/type.hpp>
52-
53-
namespace boost { namespace python {
54-
55-
namespace detail
56-
{
57-
typedef char (&yes_back_reference_t)[1];
58-
typedef char (&no_back_reference_t)[2];
59-
60-
no_back_reference_t is_back_reference_test(...);
61-
62-
template<typename T>
63-
yes_back_reference_t is_back_reference_test(boost::type< back_reference<T> >);
64-
}
65-
66-
template<typename T>
67-
class is_back_reference
68-
{
69-
public:
70-
BOOST_STATIC_CONSTANT(
71-
bool, value = (
72-
sizeof(detail::is_back_reference_test(boost::type<T>()))
73-
== sizeof(detail::yes_back_reference_t)));
74-
};
75-
76-
# endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
7746

7847
//
7948
// implementations

‎include/boost/python/bases.hpp‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ namespace boost { namespace python {
2424

2525
namespace detail
2626
{
27-
# ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
2827
template <class T> struct specifies_bases
2928
: mpl::false_
3029
{
@@ -35,23 +34,6 @@ namespace boost { namespace python {
3534
: mpl::true_
3635
{
3736
};
38-
# else
39-
template < BOOST_PP_ENUM_PARAMS(BOOST_PYTHON_MAX_BASES, class Base) >
40-
static char is_bases_helper(bases< BOOST_PYTHON_BASE_PARAMS > const&);
41-
42-
static char (& is_bases_helper(...) )[256];
43-
44-
template <class T>
45-
struct specifies_bases
46-
{
47-
private:
48-
static typename add_reference<T>::type make();
49-
BOOST_STATIC_CONSTANT(bool, non_ref = !is_reference<T>::value);
50-
public:
51-
BOOST_STATIC_CONSTANT(bool, value = non_ref & (sizeof(is_bases_helper(make())) == 1));
52-
typedef mpl::bool_<value> type;
53-
};
54-
# endif
5537
template <class T, class Prev = bases<> >
5638
struct select_bases
5739
: mpl::if_<

‎include/boost/python/class.hpp‎

Lines changed: 1 addition & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@
4545
# if BOOST_WORKAROUND(__MWERKS__, <= 0x3004) \
4646
/* pro9 reintroduced the bug */ \
4747
|| (BOOST_WORKAROUND(__MWERKS__, > 0x3100) \
48-
&& BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3201))) \
49-
|| BOOST_WORKAROUND(__GNUC__, < 3)
48+
&& BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3201)))
5049

5150
# define BOOST_PYTHON_NO_MEMBER_POINTER_ORDERING 1
5251

@@ -302,7 +301,6 @@ class class_ : public objects::class_base
302301
}
303302

304303
// Property creation
305-
# if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
306304
template <class Get>
307305
self& add_property(char const* name, Get fget, char const* docstr = 0)
308306
{
@@ -317,47 +315,6 @@ class class_ : public objects::class_base
317315
name, this->make_getter(fget), this->make_setter(fset), docstr);
318316
return *this;
319317
}
320-
# else
321-
private:
322-
template <class Get>
323-
self& add_property_impl(char const* name, Get fget, char const* docstr, int)
324-
{
325-
base::add_property(name, this->make_getter(fget), docstr);
326-
return *this;
327-
}
328-
329-
template <class Get, class Set>
330-
self& add_property_impl(char const* name, Get fget, Set fset, ...)
331-
{
332-
base::add_property(
333-
name, this->make_getter(fget), this->make_setter(fset), 0);
334-
return *this;
335-
}
336-
337-
public:
338-
template <class Get>
339-
self& add_property(char const* name, Get fget)
340-
{
341-
base::add_property(name, this->make_getter(fget), 0);
342-
return *this;
343-
}
344-
345-
template <class Get, class DocStrOrSet>
346-
self& add_property(char const* name, Get fget, DocStrOrSet docstr_or_set)
347-
{
348-
this->add_property_impl(name, this->make_getter(fget), docstr_or_set, 0);
349-
return *this;
350-
}
351-
352-
template <class Get, class Set>
353-
self&
354-
add_property(char const* name, Get fget, Set fset, char const* docstr)
355-
{
356-
base::add_property(
357-
name, this->make_getter(fget), this->make_setter(fset), docstr);
358-
return *this;
359-
}
360-
# endif
361318

362319
template <class Get>
363320
self& add_static_property(char const* name, Get fget)

‎include/boost/python/converter/arg_from_python.hpp‎

100755100644
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,9 @@ struct arg_rvalue_from_python
115115
arg_rvalue_from_python(PyObject*);
116116
bool convertible() const;
117117

118-
# if BOOST_MSVC < 1301 || _MSC_FULL_VER > 13102196
118+
# if _MSC_FULL_VER > 13102196
119119
typename arg_rvalue_from_python<T>::
120-
# endif
120+
# endif
121121
result_type operator()();
122122

123123
private:

0 commit comments

Comments
 (0)