Update CMakeLists.txt

Changes for Embarcadero C++ clang-based compilers, targeting Boost 1.74. Change __BORLANDC__ to BOOST_BORLANDC, which is defined in Boost conf…

.travis.yml

@@ -0,0 +1,42 @@
+# Copyright 2016 Edward Diener
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
+
+language: cpp
+
+sudo: false
+
+python: "2.7"
+
+os:
+  - linux
+  - osx
+
+branches:
+  only:
+    - master
+    - develop
+
+install:
+  - cd ..
+  - git clone -b $TRAVIS_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
+  - cd boost-root
+  - git submodule update --init tools/build
+  - git submodule update --init libs/config
+  - git submodule update --init tools/boostdep
+  - git submodule update --init tools/boost_install
+  - git submodule update --init libs/headers
+  - cp -r $TRAVIS_BUILD_DIR/* libs/function_types
+  - python tools/boostdep/depinst/depinst.py -I example function_types
+  - ./bootstrap.sh
+  - ./b2 headers
+
+script:
+  - TOOLSET=gcc,clang
+  - if [ $TRAVIS_OS_NAME == osx ]; then TOOLSET=clang; fi
+  - ./b2 --verbose-test libs/config/test//config_info toolset=$TOOLSET || true
+  - ./b2 libs/function_types/test toolset=$TOOLSET
+
+notifications:
+  email:
+    on_success: always

CMakeLists.txt

@@ -0,0 +1,21 @@
+# Copyright 2019 Mike Dev
+# Distributed under the Boost Software License, Version 1.0.
+# See accompanying file LICENSE_1_0.txt or copy at https://www.boost.org/LICENSE_1_0.txt
+
+cmake_minimum_required( VERSION 3.5...3.20 )
+project( boost_function_types VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX )
+
+add_library( boost_function_types INTERFACE )
+add_library( Boost::function_types ALIAS boost_function_types )
+
+target_include_directories( boost_function_types INTERFACE include )
+
+target_link_libraries( boost_function_types
+    INTERFACE
+        Boost::config
+        Boost::core
+        Boost::detail
+        Boost::mpl
+        Boost::preprocessor
+        Boost::type_traits
+)

appveyor.yml

@@ -0,0 +1,48 @@
+# Copyright 2017 Edward Diener
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
+
+version: 1.0.{build}-{branch}
+
+shallow_clone: true
+
+branches:
+  only:
+    - master
+    - develop
+
+environment:
+  matrix:
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      TOOLSET: msvc-10.0,msvc-11.0
+      ADDRMD: 32
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      TOOLSET: msvc-12.0,msvc-14.0
+      ADDRESS_MODEL: 32,64
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      TOOLSET: msvc-14.1
+      CXXSTD: 14,17
+      ADDRESS_MODEL: 32,64
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      TOOLSET: msvc-14.2
+      CXXSTD: 14,17
+      ADDRESS_MODEL: 32,64
+
+install:
+  - cd ..
+  - git clone -b %APPVEYOR_REPO_BRANCH% https://github.com/boostorg/boost.git boost-root
+  - cd boost-root
+  - git submodule update --init tools/build
+  - git submodule update --init libs/config
+  - git submodule update --init tools/boostdep
+  - git submodule update --init tools/boost_install
+  - git submodule update --init libs/headers
+  - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\function_types
+  - python tools/boostdep/depinst/depinst.py -I example function_types
+  - bootstrap
+  - b2 headers
+
+build: off
+
+test_script:
+  - b2 libs/function_types/test toolset=%TOOLSET%

doc/function_types.qbk

@@ -837,6 +837,43 @@ values for the same property the value of the rightmost argument is used.
 
 [endsect]
 
+[section:has_property_tag has_property_tag]
+
+  template<class Tag, class PropertyTag> 
+  struct has_property_tag;
+
+[*Header]
+
+  #include <boost/function_types/property_tags.hpp>
+
+[variablelist
+  [[[^Tag]][Possibly compound property tag]]
+  [[[^PropertyTag]][Single property tag]]
+  [[[^has_property_tag<Tag,PropertyTag>]][Test (possibly) compound property tag for single property tag]]
+]
+
+A metafunction for testing that a compound property tag has a particular single
+property tag in its composition. Returns a boolean value of true if the particular single
+property tag is part of the compound property tag, otherwise false.
+
+For convenience there are also individual metafunctions for the built-in property tags of the form
+
+  template<class Tag> 
+  struct has_'name'_property_tag;
+
+which works exactly the same as `has_property_tag`, where name can be
+[^variadic],[^default_cc],[^const],[^volatile],[^cv],or [^null].
+In these individual metafunctions [^const] is short for [^const_qualified],
+[^volatile] is short for [^volatile_qualified],
+[^cv] is short for [^cv_qualified], and [^null] is short for [^null_tag].
+
+[note Testing for the [^null_tag], with either `has_property_tag<Tag,null_tag>`
+or `has_null_property_tag<Tag>`, always tests whether the [^Tag] is the single
+[^null_tag] property_tag.
+]
+
+[endsect]
+
 [endsect] [/ Tag Types]
 
 [/ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ]

example/result_of.hpp

@@ -57,7 +57,7 @@ namespace example
       typedef typename F::template result<Desc>::type type;
     };
 
-#if !BOOST_WORKAROUND(__BORLANDC__,BOOST_TESTED_AT(0x564))
+#if !BOOST_WORKAROUND(BOOST_BORLANDC,BOOST_TESTED_AT(0x564))
     template<typename F> 
     struct result_member_template< F, F(void) > 
     { 

include/boost/function_types/components.hpp

@@ -22,7 +22,7 @@
 #include <boost/mpl/integral_c.hpp>
 #include <boost/mpl/vector/vector0.hpp>
 
-#if BOOST_WORKAROUND(__BORLANDC__, <= 0x565)
+#if BOOST_WORKAROUND(BOOST_BORLANDC, <= 0x565)
 #   include <boost/type_traits/remove_cv.hpp>
 
 #   include <boost/mpl/identity.hpp>
@@ -76,14 +76,14 @@ namespace boost
     namespace detail 
     {
       template<typename T, typename L> struct components_impl;
-#if BOOST_WORKAROUND(__BORLANDC__, <= 0x565)
+#if BOOST_WORKAROUND(BOOST_BORLANDC, <= 0x565)
       template<typename T, typename OrigT, typename L> struct components_bcc;
 #endif
     }
 
     template<typename T, typename ClassTypeTransform> 
     struct components
-#if !BOOST_WORKAROUND(__BORLANDC__, <= 0x565)
+#if !BOOST_WORKAROUND(BOOST_BORLANDC, <= 0x565)
       : detail::components_impl<T, ClassTypeTransform>
 #else
       : detail::components_bcc<typename remove_cv<T>::type,T,
@@ -255,7 +255,7 @@ namespace boost
           typename detail::class_transform<C,L>::type > types;
     };
 
-#if !BOOST_WORKAROUND(__BORLANDC__, <= 0x565)
+#if !BOOST_WORKAROUND(BOOST_BORLANDC, <= 0x565)
 #   define BOOST_FT_variations BOOST_FT_pointer|BOOST_FT_member_pointer
 
     template<typename T, class C, typename L>

include/boost/function_types/config/compiler.hpp

@@ -91,11 +91,11 @@
 #     define __fastcall __attribute__((__fastcall__))
 #   endif
 
-#elif defined(__BORLANDC__)
+#elif defined(BOOST_BORLANDC)
 
-#   if __BORLANDC__ < 0x550
+#   if BOOST_BORLANDC < 0x550
 #     error "unsupported compiler version"
-#   elif __BORLANDC__ > 0x565
+#   elif BOOST_BORLANDC > 0x565
 #     pragma message("WARNING: library untested with this compiler version")
 #   endif
 

include/boost/function_types/detail/classifier.hpp

@@ -30,7 +30,7 @@ template<bits_t Flags, bits_t CCID, std::size_t Arity> struct encode_charr
   >::type type;
 };
 
-#if defined(BOOST_MSVC) || (defined(__BORLANDC__) && !defined(BOOST_DISABLE_WIN32))
+#if defined(BOOST_MSVC) || (defined(BOOST_BORLANDC) && !defined(BOOST_DISABLE_WIN32))
 #   define BOOST_FT_DECL __cdecl
 #else
 #   define BOOST_FT_DECL /**/

include/boost/function_types/detail/cv_traits.hpp

@@ -12,7 +12,7 @@
 #include <cstddef>
 #include <boost/detail/workaround.hpp>
 
-#if BOOST_WORKAROUND(__BORLANDC__, <= 0x582)
+#if BOOST_WORKAROUND(BOOST_BORLANDC, <= 0x582)
 #   include <boost/type_traits/remove_cv.hpp>
 #   include <boost/type_traits/remove_pointer.hpp>
 #   include <boost/type_traits/remove_reference.hpp>
@@ -22,7 +22,7 @@
 
 namespace boost { namespace function_types { namespace detail {
 
-#if !BOOST_WORKAROUND(__BORLANDC__, <= 0x582)
+#if !BOOST_WORKAROUND(BOOST_BORLANDC, <= 0x582)
 
 template<typename T> struct cv_traits 
 { typedef non_cv tag; typedef T type; };

include/boost/function_types/property_tags.hpp

@@ -12,6 +12,7 @@
 #include <cstddef>
 
 #include <boost/type_traits/integral_constant.hpp>
+#include <boost/type_traits/is_same.hpp>
 #include <boost/mpl/bitxor.hpp>
 
 
@@ -134,6 +135,20 @@ template<class Tag, class QueryTag> struct extract
   > mask; 
 };
 
+/*
+
+  The following is a metafunction which checks whether a
+  property tag is in a possibly compounded tag type.
+  
+  Here both the possibly compounded tag type and a property tag
+  is given.
+  
+*/
+
+template<class Tag, class PropertyTag> struct has_property_tag
+  : detail::represents_impl<Tag,  PropertyTag>
+{ };
+
 } } // namespace ::boost::function_types
 
 #include <boost/function_types/detail/pp_tags/preprocessed.hpp>
@@ -141,6 +156,43 @@ template<class Tag, class QueryTag> struct extract
 namespace boost { namespace function_types {
 #define BOOST_FT_cc_file <boost/function_types/detail/pp_tags/cc_tag.hpp>
 #include <boost/function_types/detail/pp_loop.hpp>
+
+/*
+
+  The following are metafunctions which check whether the
+  specific property tag is in a possibly compounded tag type.
+  Here only the possibly compounded tag type is given.
+  
+*/
+
+template<class Tag> struct has_property_tag<Tag,null_tag>
+  : ::boost::is_same<Tag, null_tag>
+{ };
+
+template<class Tag> struct has_variadic_property_tag
+  : has_property_tag<Tag,  variadic>
+{ };
+
+template<class Tag> struct has_default_cc_property_tag
+  : has_property_tag<Tag,  default_cc>
+{ };
+
+template<class Tag> struct has_const_property_tag
+  : has_property_tag<Tag,  const_qualified>
+{ };
+
+template<class Tag> struct has_volatile_property_tag
+  : has_property_tag<Tag,  volatile_qualified>
+{ };
+
+template<class Tag> struct has_cv_property_tag
+  : has_property_tag<Tag,  cv_qualified>
+{ };
+
+template<class Tag> struct has_null_property_tag
+  : has_property_tag<Tag,  null_tag>
+{ };
+
 } } // namespace boost::function_types
 
 #endif

meta/libraries.json

@@ -11,5 +11,6 @@
     ],
     "maintainers": [
         "Tobias Schwinger <tschwinger -at- isonews2.com>"
-    ]
+    ],
+    "cxxstd": "03"
 }

test/Jamfile

@@ -64,11 +64,15 @@ import testing ;
 
     # Custom calling conventions
 
-    [ compile custom_ccs/nonmember_ccs.cpp ]
-    [ compile custom_ccs/nonmember_ccs_exact.cpp ]
-    [ compile custom_ccs/member_ccs.cpp ]
-    [ compile custom_ccs/member_ccs_exact.cpp ]
+    [ compile custom_ccs/nonmember_ccs.cpp : <address-model>64:<build>no ]
+    [ compile custom_ccs/nonmember_ccs_exact.cpp : <address-model>64:<build>no ]
+    [ compile custom_ccs/member_ccs.cpp : <address-model>64:<build>no ]
+    [ compile custom_ccs/member_ccs_exact.cpp : <address-model>64:<build>no ]
 
+    # Property tag
+    
+    [ compile custom_ccs/property_tag.cpp ]
+    
     # Code from the examples
 
     [ compile ../example/interpreter_example.cpp ]

test/custom_ccs/property_tag.cpp

@@ -0,0 +1,64 @@
+
+//  (C) Copyright Edward Diener 2019
+//  Use, modification and distribution are subject to 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).
+
+//------------------------------------------------------------------------------
+
+#include <boost/mpl/assert.hpp>
+#include <boost/function_types/property_tags.hpp>
+
+namespace ft = boost::function_types;
+namespace mpl = boost::mpl;
+
+typedef ft::tag<ft::variadic,ft::non_volatile,ft::non_const,ft::default_cc> tag1;
+typedef ft::tag<ft::const_non_volatile,ft::const_qualified> tag2;
+typedef ft::tag<ft::cv_qualified,ft::variadic> tag3;
+typedef ft::null_tag tag4;
+typedef ft::tag<ft::variadic,ft::volatile_non_const> tag5;
+typedef ft::tag<ft::volatile_qualified,ft::non_const,ft::variadic> tag6;
+typedef ft::tag<ft::non_variadic,ft::const_non_volatile,ft::default_cc> tag7;
+typedef ft::tag<ft::non_cv,ft::default_cc> tag8;
+    
+BOOST_MPL_ASSERT((ft::has_property_tag<tag1, ft::variadic>));
+BOOST_MPL_ASSERT((ft::has_property_tag<tag2, ft::const_qualified>));
+BOOST_MPL_ASSERT((ft::has_property_tag<tag3, ft::cv_qualified>));
+BOOST_MPL_ASSERT((ft::has_property_tag<tag4, ft::null_tag>));
+BOOST_MPL_ASSERT((ft::has_property_tag<tag5, ft::volatile_qualified>));
+BOOST_MPL_ASSERT((ft::has_property_tag<tag6, ft::volatile_qualified>));
+BOOST_MPL_ASSERT((ft::has_property_tag<tag7, ft::const_qualified>));
+BOOST_MPL_ASSERT((ft::has_property_tag<tag8, ft::default_cc>));
+
+BOOST_MPL_ASSERT((ft::has_variadic_property_tag<tag1>));
+BOOST_MPL_ASSERT((ft::has_variadic_property_tag<tag3>));
+BOOST_MPL_ASSERT((ft::has_variadic_property_tag<tag5>));
+BOOST_MPL_ASSERT((ft::has_variadic_property_tag<tag6>));
+BOOST_MPL_ASSERT((ft::has_default_cc_property_tag<tag1>));
+BOOST_MPL_ASSERT((ft::has_default_cc_property_tag<tag7>));
+BOOST_MPL_ASSERT((ft::has_default_cc_property_tag<tag8>));
+BOOST_MPL_ASSERT((ft::has_const_property_tag<tag2>));
+BOOST_MPL_ASSERT((ft::has_const_property_tag<tag3>));
+BOOST_MPL_ASSERT((ft::has_const_property_tag<tag7>));
+BOOST_MPL_ASSERT((ft::has_volatile_property_tag<tag3>));
+BOOST_MPL_ASSERT((ft::has_volatile_property_tag<tag5>));
+BOOST_MPL_ASSERT((ft::has_volatile_property_tag<tag6>));
+BOOST_MPL_ASSERT((ft::has_cv_property_tag<tag3>));
+BOOST_MPL_ASSERT((ft::has_null_property_tag<tag4>));
+
+BOOST_MPL_ASSERT_NOT((ft::has_property_tag<tag1, ft::const_qualified>));
+BOOST_MPL_ASSERT_NOT((ft::has_property_tag<tag2, ft::cv_qualified>));
+BOOST_MPL_ASSERT_NOT((ft::has_property_tag<tag3, ft::null_tag>));
+BOOST_MPL_ASSERT_NOT((ft::has_property_tag<tag4, ft::volatile_qualified>));
+BOOST_MPL_ASSERT_NOT((ft::has_property_tag<tag5, ft::const_qualified>));
+BOOST_MPL_ASSERT_NOT((ft::has_property_tag<tag6, ft::default_cc>));
+BOOST_MPL_ASSERT_NOT((ft::has_property_tag<tag7, ft::variadic>));
+BOOST_MPL_ASSERT_NOT((ft::has_property_tag<tag8, ft::volatile_qualified>));
+
+BOOST_MPL_ASSERT_NOT((ft::has_variadic_property_tag<tag2>));
+BOOST_MPL_ASSERT_NOT((ft::has_default_cc_property_tag<tag6>));
+BOOST_MPL_ASSERT_NOT((ft::has_const_property_tag<tag4>));
+BOOST_MPL_ASSERT_NOT((ft::has_const_property_tag<tag5>));
+BOOST_MPL_ASSERT_NOT((ft::has_volatile_property_tag<tag7>));
+BOOST_MPL_ASSERT_NOT((ft::has_cv_property_tag<tag1>));
+BOOST_MPL_ASSERT_NOT((ft::has_null_property_tag<tag8>));