Skip to content

Commit

Permalink
Merge branch 'modular' of https://github.com/grafikrobot/boostorg.bimap…
Browse files Browse the repository at this point in the history 
… into feature/modular-b2
  • Loading branch information
@pdimov
pdimov committed Sep 22, 2024
2 parents 96c6475 + 560eacb commit 5ed038c
Show file tree
Hide file tree
Showing 8 changed files with 86 additions and 27 deletions.
35 changes: 35 additions & 0 deletions build.jam
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# Copyright René Ferdinand Rivera Morell 2023-2024
# Distributed under the Boost Software License, Version 1.0.
# (See accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt)

require-b2 5.2 ;

constant boost_dependencies :
/boost/concept_check//boost_concept_check
/boost/config//boost_config
/boost/container_hash//boost_container_hash
/boost/core//boost_core
/boost/iterator//boost_iterator
/boost/lambda//boost_lambda
/boost/mpl//boost_mpl
/boost/multi_index//boost_multi_index
/boost/preprocessor//boost_preprocessor
/boost/static_assert//boost_static_assert
/boost/throw_exception//boost_throw_exception
/boost/type_traits//boost_type_traits
/boost/utility//boost_utility ;

project /boost/bimap
: common-requirements
<include>include
;

explicit
[ alias boost_bimap : : : : <library>$(boost_dependencies) ]
[ alias all : boost_bimap example test ]
;

call-if : boost-library bimap
;

33 changes: 23 additions & 10 deletions example/Jamfile.v2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,19 @@
# bring in rules for testing
import testing ;

project : requirements <library>/boost/bimap//boost_bimap ;

test-suite "examples"
:
[ compile mighty_bimap.cpp ]
[ run simple_bimap.cpp ]
[ run tagged_simple_bimap.cpp ]
[ run step_by_step.cpp ]
[ run population_bimap.cpp ]
[ run repetitions_counter.cpp ]
[ run population_bimap.cpp
/boost/assign//boost_assign
/boost/foreach//boost_foreach ]
[ run repetitions_counter.cpp
/boost/tokenizer//boost_tokenizer ]
[ compile user_defined_names.cpp ]
[ run standard_map_comparison.cpp ]
[ run at_function_examples.cpp ]
Expand All @@ -30,21 +35,29 @@ test-suite "examples"
test-suite "bimap_and_boost"
:
[ run bimap_and_boost/property_map.cpp ]
[ run bimap_and_boost/range.cpp ]
[ run bimap_and_boost/foreach.cpp ]
[ run bimap_and_boost/range.cpp
/boost/range//boost_range ]
[ run bimap_and_boost/foreach.cpp
/boost/foreach//boost_foreach ]
[ run bimap_and_boost/lambda.cpp ]
[ run bimap_and_boost/assign.cpp ]
[ run bimap_and_boost/xpressive.cpp ]
[ run bimap_and_boost/assign.cpp
/boost/assign//boost_assign ]
[ run bimap_and_boost/xpressive.cpp
/boost/xpressive//boost_xpressive ]
[ run bimap_and_boost/typeof.cpp ]
[ run bimap_and_boost/serialization.cpp
/boost/serialization//boost_serialization ]
;

test-suite "mi_to_b_path"
:
[ compile mi_to_b_path/bidirectional_map.cpp ]
[ run mi_to_b_path/hashed_indices.cpp ]
[ compile mi_to_b_path/bidirectional_map.cpp
/boost/tokenizer//boost_tokenizer ]
[ run mi_to_b_path/hashed_indices.cpp
/boost/tokenizer//boost_tokenizer ]
[ compile mi_to_b_path/tagged_bidirectional_map.cpp ]
[ compile mi_to_b_path/mi_bidirectional_map.cpp ]
[ run mi_to_b_path/mi_hashed_indices.cpp ]
[ compile mi_to_b_path/mi_bidirectional_map.cpp
/boost/tokenizer//boost_tokenizer ]
[ run mi_to_b_path/mi_hashed_indices.cpp
/boost/tokenizer//boost_tokenizer ]
;
23 changes: 17 additions & 6 deletions test/Jamfile.v2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
# bring in rules for testing
import testing ;

project : requirements
<include>.
<library>/boost/bimap//boost_bimap
;

test-suite "tagged_test"
:
Expand Down Expand Up @@ -41,10 +45,12 @@ test-suite "bimap_test"
[ run test_bimap_sequenced.cpp : : :
<toolset>gcc-4.4.7,<variant>release:<build>no ]
[ run test_bimap_unconstrained.cpp ]
[ run test_bimap_assign.cpp ]
[ run test_bimap_assign.cpp
/boost/assign//boost_assign ]
[ run test_bimap_property_map.cpp ]
[ run test_bimap_modify.cpp ]
[ run test_bimap_range.cpp ]
[ run test_bimap_range.cpp
/boost/range//boost_range ]
[ run test_bimap_operator_bracket.cpp ]
[ run test_bimap_lambda.cpp ]
[ run test_bimap_mutable.cpp ]
Expand All @@ -70,11 +76,16 @@ test-suite "compile_fail_test"
test-suite "bimap_and_boost"
:
[ run ../example/bimap_and_boost/property_map.cpp ]
[ run ../example/bimap_and_boost/range.cpp ]
[ run ../example/bimap_and_boost/foreach.cpp ]
[ run ../example/bimap_and_boost/range.cpp
/boost/range//boost_range ]
[ run ../example/bimap_and_boost/foreach.cpp
/boost/foreach//boost_foreach ]
[ run ../example/bimap_and_boost/lambda.cpp ]
[ run ../example/bimap_and_boost/assign.cpp ]
[ run ../example/bimap_and_boost/xpressive.cpp : : :
[ run ../example/bimap_and_boost/assign.cpp
/boost/assign//boost_assign ]
[ run ../example/bimap_and_boost/xpressive.cpp
/boost/xpressive//boost_xpressive
: : :
<toolset>gcc-10,<cxxstd>03:<build>no
<toolset>gcc-11,<cxxstd>03:<build>no ]
[ run ../example/bimap_and_boost/typeof.cpp ]
Expand Down
6 changes: 3 additions & 3 deletions test/test_bimap_info.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include <boost/bimap/bimap.hpp>
#include <boost/bimap/unordered_set_of.hpp>

#include <libs/bimap/test/strong_type.hpp>
#include <strong_type.hpp>

int test_bimap_info()
{
Expand Down Expand Up @@ -123,13 +123,13 @@ void test_heterogeneous_access_bimap_info()
using namespace boost::bimaps;

typedef bimap
<
<
set_of< int, std::less< strong<int> > >,
unordered_set_of
<
int, boost::hash< strong<int> >, std::equal_to< strong<int> >
>,
with_info<int>
with_info<int>
> bm_type;

bm_type bm;
Expand Down
4 changes: 2 additions & 2 deletions test/test_bimap_operator_bracket.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include <boost/bimap/vector_of.hpp>
#include <boost/bimap/unconstrained_set_of.hpp>

#include <libs/bimap/test/strong_type.hpp>
#include <strong_type.hpp>

void test_bimap_operator_bracket()
{
Expand Down Expand Up @@ -194,7 +194,7 @@ void test_bimap_operator_bracket()
typedef bimap
<
set_of<int, std::less< strong<int> > >,
list_of<std::string>
list_of<std::string>
> bm;

bm b;
Expand Down
4 changes: 2 additions & 2 deletions test/test_bimap_ordered.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
// bimap container
#include <boost/bimap/bimap.hpp>

#include <libs/bimap/test/strong_type.hpp>
#include <libs/bimap/test/test_bimap.hpp>
#include <strong_type.hpp>
#include <test_bimap.hpp>

struct left_tag {};
struct right_tag {};
Expand Down
2 changes: 1 addition & 1 deletion test/test_bimap_sequenced.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#include <boost/bimap/bimap.hpp>
#include <boost/bimap/support/lambda.hpp>

#include <libs/bimap/test/test_bimap.hpp>
#include <test_bimap.hpp>

struct left_tag {};
struct right_tag {};
Expand Down
6 changes: 3 additions & 3 deletions test/test_bimap_unordered.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
// bimap container
#include <boost/bimap/bimap.hpp>

#include <libs/bimap/test/strong_type.hpp>
#include <libs/bimap/test/test_bimap.hpp>
#include <strong_type.hpp>
#include <test_bimap.hpp>

struct left_tag {};
struct right_tag {};
Expand Down Expand Up @@ -161,7 +161,7 @@ void test_bimap()
typedef bimap
<
unordered_set_of
<
<
int, boost::hash< strong<int> >, std::equal_to< strong<int> >
>,
unordered_multiset_of<
Expand Down

0 comments on commit 5ed038c

Please sign in to comment.