From 67846960957ca6223221ffe103699edef1bbe313 Mon Sep 17 00:00:00 2001 From: Ahmed Charles Date: Tue, 18 Feb 2014 04:19:00 -0800 Subject: [PATCH 1/5] Fix broken concept build. The stl_concept_covering.cpp file only works with __GNUC__ or __KCC. --- stl_concept_covering.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/stl_concept_covering.cpp b/stl_concept_covering.cpp index 338d23f..6d3144d 100644 --- a/stl_concept_covering.cpp +++ b/stl_concept_covering.cpp @@ -3,6 +3,9 @@ // accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) +// This file doesn't work on other compilers. +#if defined(__GNUC__) || defined(__KCC) + #include #include #include @@ -905,3 +908,9 @@ main() } return 0; } + +#else + +int main() {} + +#endif From e7ca7744c43a31fff6b1c0498cc1079b19fde3c8 Mon Sep 17 00:00:00 2001 From: Ahmed Charles Date: Tue, 18 Feb 2014 04:47:31 -0800 Subject: [PATCH 2/5] Fix for Ticket #2628. Sequence containers are not required to have a size_type constructor. The standard only requires that sequences have an S(size_type, value_type) constructor. --- include/boost/concept_check.hpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/include/boost/concept_check.hpp b/include/boost/concept_check.hpp index 292f37d..2d6fa32 100644 --- a/include/boost/concept_check.hpp +++ b/include/boost/concept_check.hpp @@ -818,9 +818,8 @@ namespace boost BOOST_CONCEPT_USAGE(Sequence) { S - c(n), - c2(n, t), - c3(first, last); + c(n, t), + c2(first, last); c.insert(p, t); c.insert(p, n, t); @@ -833,7 +832,6 @@ namespace boost ignore_unused_variable_warning(c); ignore_unused_variable_warning(c2); - ignore_unused_variable_warning(c3); ignore_unused_variable_warning(r); const_constraints(c); } From 50574588aee9ae5d8a5b0ea58997fd163472b7bb Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Mon, 9 Jun 2014 04:29:52 +0300 Subject: [PATCH 3/5] Remove include of boost/parameter/aux_/parenthesized_type.hpp. --- include/boost/concept/requires.hpp | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/include/boost/concept/requires.hpp b/include/boost/concept/requires.hpp index 7a74d2f..365ce10 100644 --- a/include/boost/concept/requires.hpp +++ b/include/boost/concept/requires.hpp @@ -5,12 +5,33 @@ # define BOOST_CONCEPT_REQUIRES_DWA2006430_HPP # include -# include # include # include namespace boost { +// unaryfunptr_arg_type from parameter/aux_/parenthesized_type.hpp + +namespace ccheck_aux { + +// A metafunction that transforms void(*)(T) -> T +template +struct unaryfunptr_arg_type; + +template +struct unaryfunptr_arg_type +{ + typedef Arg type; +}; + +template <> +struct unaryfunptr_arg_type +{ + typedef void type; +}; + +} // namespace ccheck_aux + // Template for use in handwritten assertions template struct requires_ : More @@ -29,7 +50,7 @@ struct _requires_ }; template -struct Requires_ : ::boost::parameter::aux::unaryfunptr_arg_type +struct Requires_ : ::boost::ccheck_aux::unaryfunptr_arg_type { }; @@ -42,7 +63,7 @@ struct Requires_ : ::boost::parameter::aux::unaryfunptr_arg_type #if defined(NDEBUG) # define BOOST_CONCEPT_REQUIRES(models, result) \ - typename ::boost::parameter::aux::unaryfunptr_arg_type::type + typename ::boost::ccheck_aux::unaryfunptr_arg_type::type #elif BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) @@ -50,7 +71,7 @@ struct Requires_ : ::boost::parameter::aux::unaryfunptr_arg_type # define BOOST_CONCEPT_REQUIRES(models, result) \ ::boost::Requires_< \ (0 BOOST_PP_SEQ_FOR_EACH(BOOST_CONCEPT_REQUIRES_, ~, models)), \ - ::boost::parameter::aux::unaryfunptr_arg_type \ + ::boost::ccheck_aux::unaryfunptr_arg_type \ >::type #else From 0d5bfc869c12aa24cd6d0ca5d998457c2abe3a1c Mon Sep 17 00:00:00 2001 From: Daniel James Date: Mon, 18 Aug 2014 14:57:53 +0100 Subject: [PATCH 4/5] Add metadata file. --- meta/libraries.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 meta/libraries.json diff --git a/meta/libraries.json b/meta/libraries.json new file mode 100644 index 0000000..480b9c8 --- /dev/null +++ b/meta/libraries.json @@ -0,0 +1,15 @@ +{ + "key": "concept_check", + "name": "Concept Check", + "authors": [ + "Jeremy Siek" + ], + "description": "Tools for generic programming.", + "category": [ + "Correctness", + "Generic" + ], + "maintainers": [ + "Jeremy Siek " + ] +} From bb9257a37e80147ab6cc95e0f4f07825975eec92 Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Mon, 24 Nov 2014 13:55:31 -0800 Subject: [PATCH 5/5] Remove executable status from a bunch of source files --- fake_sort.hpp | 0 function_requires_fail.cpp | 0 include/boost/concept/detail/concept_undef.hpp | 0 include/boost/concept_check/borland.hpp | 0 include/boost/concept_check/general.hpp | 0 include/boost/concept_check/has_constraints.hpp | 0 include/boost/concept_check/msvc.hpp | 0 old_concept_class_fail.cpp | 0 old_concept_function_fail.cpp | 0 old_concept_pass.cpp | 0 old_concepts.hpp | 0 usage_fail.cpp | 0 where.cpp | 0 where_fail.cpp | 0 14 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 fake_sort.hpp mode change 100755 => 100644 function_requires_fail.cpp mode change 100755 => 100644 include/boost/concept/detail/concept_undef.hpp mode change 100755 => 100644 include/boost/concept_check/borland.hpp mode change 100755 => 100644 include/boost/concept_check/general.hpp mode change 100755 => 100644 include/boost/concept_check/has_constraints.hpp mode change 100755 => 100644 include/boost/concept_check/msvc.hpp mode change 100755 => 100644 old_concept_class_fail.cpp mode change 100755 => 100644 old_concept_function_fail.cpp mode change 100755 => 100644 old_concept_pass.cpp mode change 100755 => 100644 old_concepts.hpp mode change 100755 => 100644 usage_fail.cpp mode change 100755 => 100644 where.cpp mode change 100755 => 100644 where_fail.cpp diff --git a/fake_sort.hpp b/fake_sort.hpp old mode 100755 new mode 100644 diff --git a/function_requires_fail.cpp b/function_requires_fail.cpp old mode 100755 new mode 100644 diff --git a/include/boost/concept/detail/concept_undef.hpp b/include/boost/concept/detail/concept_undef.hpp old mode 100755 new mode 100644 diff --git a/include/boost/concept_check/borland.hpp b/include/boost/concept_check/borland.hpp old mode 100755 new mode 100644 diff --git a/include/boost/concept_check/general.hpp b/include/boost/concept_check/general.hpp old mode 100755 new mode 100644 diff --git a/include/boost/concept_check/has_constraints.hpp b/include/boost/concept_check/has_constraints.hpp old mode 100755 new mode 100644 diff --git a/include/boost/concept_check/msvc.hpp b/include/boost/concept_check/msvc.hpp old mode 100755 new mode 100644 diff --git a/old_concept_class_fail.cpp b/old_concept_class_fail.cpp old mode 100755 new mode 100644 diff --git a/old_concept_function_fail.cpp b/old_concept_function_fail.cpp old mode 100755 new mode 100644 diff --git a/old_concept_pass.cpp b/old_concept_pass.cpp old mode 100755 new mode 100644 diff --git a/old_concepts.hpp b/old_concepts.hpp old mode 100755 new mode 100644 diff --git a/usage_fail.cpp b/usage_fail.cpp old mode 100755 new mode 100644 diff --git a/where.cpp b/where.cpp old mode 100755 new mode 100644 diff --git a/where_fail.cpp b/where_fail.cpp old mode 100755 new mode 100644