mirror of
https://github.com/boostorg/python.git
synced 2026-01-19 16:32:16 +00:00
Compare commits
2 Commits
boost-1.73
...
pr/fix-num
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8c8b0dc215 | ||
|
|
fdc9ec760f |
@@ -30,8 +30,6 @@ else
|
||||
;
|
||||
}
|
||||
|
||||
if [ python.configured ]
|
||||
{
|
||||
project boost/python
|
||||
: source-location ../src
|
||||
;
|
||||
@@ -123,7 +121,7 @@ lib boost_numpy
|
||||
<library>boost_python
|
||||
<python-debugging>on:<define>BOOST_DEBUG_PYTHON
|
||||
-<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag
|
||||
<tag>@$(__name__).python-tag
|
||||
<tag>@$(__name__).python-tag
|
||||
<conditional>@python.require-py
|
||||
|
||||
: # default build
|
||||
@@ -142,8 +140,16 @@ lib boost_numpy
|
||||
# `install` installs the two libraries and their dependencies and is similar
|
||||
# to issuing `b2 --with-python install` from top level
|
||||
|
||||
boost-install boost_python boost_numpy ;
|
||||
|
||||
if [ python.configured ]
|
||||
{
|
||||
if [ python.numpy ]
|
||||
{
|
||||
boost-install boost_python boost_numpy ;
|
||||
}
|
||||
else
|
||||
{
|
||||
boost-install boost_python ;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -4,17 +4,17 @@
|
||||
// http://www.boost.org/LICENSE_1_0.txt)
|
||||
#ifndef TEST_CLASS_DWA2002326_HPP
|
||||
# define TEST_CLASS_DWA2002326_HPP
|
||||
# include <boost/detail/lightweight_test.hpp>
|
||||
# include <boost/assert.hpp>
|
||||
|
||||
template <int n = 0>
|
||||
struct test_class
|
||||
{
|
||||
explicit test_class(int x) : x(x), magic(7654321 + n) { ++counter; }
|
||||
test_class(test_class const& rhs) : x(rhs.x), magic(7654321 + n) { ++counter; }
|
||||
virtual ~test_class() { BOOST_TEST(magic == 7654321 + n); magic = 6666666; x = 9999; --counter; }
|
||||
virtual ~test_class() { BOOST_ASSERT(magic == 7654321 + n); magic = 6666666; x = 9999; --counter; }
|
||||
|
||||
void set(int _x) { BOOST_TEST(magic == 7654321 + n); this->x = _x; }
|
||||
int value() const { BOOST_TEST(magic == 7654321 + n); return x; }
|
||||
void set(int _x) { BOOST_ASSERT(magic == 7654321 + n); this->x = _x; }
|
||||
int value() const { BOOST_ASSERT(magic == 7654321 + n); return x; }
|
||||
operator int() const { return x; }
|
||||
static int count() { return counter; }
|
||||
|
||||
|
||||
Reference in New Issue
Block a user