diff options
author | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-09-13 11:24:46 +0900 |
---|---|---|
committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-09-13 11:25:39 +0900 |
commit | 4fadd968fa12130524c8380f33fcfe25d4de79e5 (patch) | |
tree | fd26a490cd15388d42fc6652b3c5c13012e7f93e /boost/utility | |
parent | b5c87084afaef42b2d058f68091be31988a6a874 (diff) | |
download | boost-upstream/1.65.0.tar.gz boost-upstream/1.65.0.tar.bz2 boost-upstream/1.65.0.zip |
Imported Upstream version 1.65.0upstream/1.65.0
Change-Id: Icf8400b375482cb11bcf77440a6934ba360d6ba4
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'boost/utility')
-rw-r--r-- | boost/utility/result_of.hpp | 5 | ||||
-rw-r--r-- | boost/utility/string_view.hpp | 60 |
2 files changed, 35 insertions, 30 deletions
diff --git a/boost/utility/result_of.hpp b/boost/utility/result_of.hpp index 206ae3088a..cb16d099b6 100644 --- a/boost/utility/result_of.hpp +++ b/boost/utility/result_of.hpp @@ -201,6 +201,11 @@ struct tr1_result_of_impl<F, FArgs, false> #define BOOST_PP_ITERATION_PARAMS_1 (3,(0,BOOST_RESULT_OF_NUM_ARGS,<boost/utility/detail/result_of_iterate.hpp>)) #include BOOST_PP_ITERATE() +#if 0 +// inform dependency trackers, as they can't see through macro includes +#include <boost/utility/detail/result_of_iterate.hpp> +#endif + #else # define BOOST_NO_RESULT_OF 1 #endif diff --git a/boost/utility/string_view.hpp b/boost/utility/string_view.hpp index 425d7d2de3..09d52d2d34 100644 --- a/boost/utility/string_view.hpp +++ b/boost/utility/string_view.hpp @@ -368,7 +368,7 @@ namespace boost { // Comparison operators // Equality template<typename charT, typename traits> - inline bool operator==(basic_string_view<charT, traits> x, + inline BOOST_CXX14_CONSTEXPR bool operator==(basic_string_view<charT, traits> x, basic_string_view<charT, traits> y) BOOST_NOEXCEPT { if (x.size () != y.size ()) return false; return x.compare(y) == 0; @@ -376,7 +376,7 @@ namespace boost { // Inequality template<typename charT, typename traits> - inline bool operator!=(basic_string_view<charT, traits> x, + inline BOOST_CXX14_CONSTEXPR bool operator!=(basic_string_view<charT, traits> x, basic_string_view<charT, traits> y) BOOST_NOEXCEPT { if ( x.size () != y.size ()) return true; return x.compare(y) != 0; @@ -384,173 +384,173 @@ namespace boost { // Less than template<typename charT, typename traits> - inline bool operator<(basic_string_view<charT, traits> x, + inline BOOST_CXX14_CONSTEXPR bool operator<(basic_string_view<charT, traits> x, basic_string_view<charT, traits> y) BOOST_NOEXCEPT { return x.compare(y) < 0; } // Greater than template<typename charT, typename traits> - inline bool operator>(basic_string_view<charT, traits> x, + inline BOOST_CXX14_CONSTEXPR bool operator>(basic_string_view<charT, traits> x, basic_string_view<charT, traits> y) BOOST_NOEXCEPT { return x.compare(y) > 0; } // Less than or equal to template<typename charT, typename traits> - inline bool operator<=(basic_string_view<charT, traits> x, + inline BOOST_CXX14_CONSTEXPR bool operator<=(basic_string_view<charT, traits> x, basic_string_view<charT, traits> y) BOOST_NOEXCEPT { return x.compare(y) <= 0; } // Greater than or equal to template<typename charT, typename traits> - inline bool operator>=(basic_string_view<charT, traits> x, + inline BOOST_CXX14_CONSTEXPR bool operator>=(basic_string_view<charT, traits> x, basic_string_view<charT, traits> y) BOOST_NOEXCEPT { return x.compare(y) >= 0; } // "sufficient additional overloads of comparison functions" template<typename charT, typename traits, typename Allocator> - inline bool operator==(basic_string_view<charT, traits> x, + inline BOOST_CXX14_CONSTEXPR bool operator==(basic_string_view<charT, traits> x, const std::basic_string<charT, traits, Allocator> & y) BOOST_NOEXCEPT { return x == basic_string_view<charT, traits>(y); } template<typename charT, typename traits, typename Allocator> - inline bool operator==(const std::basic_string<charT, traits, Allocator> & x, + inline BOOST_CXX14_CONSTEXPR bool operator==(const std::basic_string<charT, traits, Allocator> & x, basic_string_view<charT, traits> y) BOOST_NOEXCEPT { return basic_string_view<charT, traits>(x) == y; } template<typename charT, typename traits> - inline bool operator==(basic_string_view<charT, traits> x, + inline BOOST_CXX14_CONSTEXPR bool operator==(basic_string_view<charT, traits> x, const charT * y) BOOST_NOEXCEPT { return x == basic_string_view<charT, traits>(y); } template<typename charT, typename traits> - inline bool operator==(const charT * x, + inline BOOST_CXX14_CONSTEXPR bool operator==(const charT * x, basic_string_view<charT, traits> y) BOOST_NOEXCEPT { return basic_string_view<charT, traits>(x) == y; } template<typename charT, typename traits, typename Allocator> - inline bool operator!=(basic_string_view<charT, traits> x, + inline BOOST_CXX14_CONSTEXPR bool operator!=(basic_string_view<charT, traits> x, const std::basic_string<charT, traits, Allocator> & y) BOOST_NOEXCEPT { return x != basic_string_view<charT, traits>(y); } template<typename charT, typename traits, typename Allocator> - inline bool operator!=(const std::basic_string<charT, traits, Allocator> & x, + inline BOOST_CXX14_CONSTEXPR bool operator!=(const std::basic_string<charT, traits, Allocator> & x, basic_string_view<charT, traits> y) BOOST_NOEXCEPT { return basic_string_view<charT, traits>(x) != y; } template<typename charT, typename traits> - inline bool operator!=(basic_string_view<charT, traits> x, + inline BOOST_CXX14_CONSTEXPR bool operator!=(basic_string_view<charT, traits> x, const charT * y) BOOST_NOEXCEPT { return x != basic_string_view<charT, traits>(y); } template<typename charT, typename traits> - inline bool operator!=(const charT * x, + inline BOOST_CXX14_CONSTEXPR bool operator!=(const charT * x, basic_string_view<charT, traits> y) BOOST_NOEXCEPT { return basic_string_view<charT, traits>(x) != y; } template<typename charT, typename traits, typename Allocator> - inline bool operator<(basic_string_view<charT, traits> x, + inline BOOST_CXX14_CONSTEXPR bool operator<(basic_string_view<charT, traits> x, const std::basic_string<charT, traits, Allocator> & y) BOOST_NOEXCEPT { return x < basic_string_view<charT, traits>(y); } template<typename charT, typename traits, typename Allocator> - inline bool operator<(const std::basic_string<charT, traits, Allocator> & x, + inline BOOST_CXX14_CONSTEXPR bool operator<(const std::basic_string<charT, traits, Allocator> & x, basic_string_view<charT, traits> y) BOOST_NOEXCEPT { return basic_string_view<charT, traits>(x) < y; } template<typename charT, typename traits> - inline bool operator<(basic_string_view<charT, traits> x, + inline BOOST_CXX14_CONSTEXPR bool operator<(basic_string_view<charT, traits> x, const charT * y) BOOST_NOEXCEPT { return x < basic_string_view<charT, traits>(y); } template<typename charT, typename traits> - inline bool operator<(const charT * x, + inline BOOST_CXX14_CONSTEXPR bool operator<(const charT * x, basic_string_view<charT, traits> y) BOOST_NOEXCEPT { return basic_string_view<charT, traits>(x) < y; } template<typename charT, typename traits, typename Allocator> - inline bool operator>(basic_string_view<charT, traits> x, + inline BOOST_CXX14_CONSTEXPR bool operator>(basic_string_view<charT, traits> x, const std::basic_string<charT, traits, Allocator> & y) BOOST_NOEXCEPT { return x > basic_string_view<charT, traits>(y); } template<typename charT, typename traits, typename Allocator> - inline bool operator>(const std::basic_string<charT, traits, Allocator> & x, + inline BOOST_CXX14_CONSTEXPR bool operator>(const std::basic_string<charT, traits, Allocator> & x, basic_string_view<charT, traits> y) BOOST_NOEXCEPT { return basic_string_view<charT, traits>(x) > y; } template<typename charT, typename traits> - inline bool operator>(basic_string_view<charT, traits> x, + inline BOOST_CXX14_CONSTEXPR bool operator>(basic_string_view<charT, traits> x, const charT * y) BOOST_NOEXCEPT { return x > basic_string_view<charT, traits>(y); } template<typename charT, typename traits> - inline bool operator>(const charT * x, + inline BOOST_CXX14_CONSTEXPR bool operator>(const charT * x, basic_string_view<charT, traits> y) BOOST_NOEXCEPT { return basic_string_view<charT, traits>(x) > y; } template<typename charT, typename traits, typename Allocator> - inline bool operator<=(basic_string_view<charT, traits> x, + inline BOOST_CXX14_CONSTEXPR bool operator<=(basic_string_view<charT, traits> x, const std::basic_string<charT, traits, Allocator> & y) BOOST_NOEXCEPT { return x <= basic_string_view<charT, traits>(y); } template<typename charT, typename traits, typename Allocator> - inline bool operator<=(const std::basic_string<charT, traits, Allocator> & x, + inline BOOST_CXX14_CONSTEXPR bool operator<=(const std::basic_string<charT, traits, Allocator> & x, basic_string_view<charT, traits> y) BOOST_NOEXCEPT { return basic_string_view<charT, traits>(x) <= y; } template<typename charT, typename traits> - inline bool operator<=(basic_string_view<charT, traits> x, + inline BOOST_CXX14_CONSTEXPR bool operator<=(basic_string_view<charT, traits> x, const charT * y) BOOST_NOEXCEPT { return x <= basic_string_view<charT, traits>(y); } template<typename charT, typename traits> - inline bool operator<=(const charT * x, + inline BOOST_CXX14_CONSTEXPR bool operator<=(const charT * x, basic_string_view<charT, traits> y) BOOST_NOEXCEPT { return basic_string_view<charT, traits>(x) <= y; } template<typename charT, typename traits, typename Allocator> - inline bool operator>=(basic_string_view<charT, traits> x, + inline BOOST_CXX14_CONSTEXPR bool operator>=(basic_string_view<charT, traits> x, const std::basic_string<charT, traits, Allocator> & y) BOOST_NOEXCEPT { return x >= basic_string_view<charT, traits>(y); } template<typename charT, typename traits, typename Allocator> - inline bool operator>=(const std::basic_string<charT, traits, Allocator> & x, + inline BOOST_CXX14_CONSTEXPR bool operator>=(const std::basic_string<charT, traits, Allocator> & x, basic_string_view<charT, traits> y) BOOST_NOEXCEPT { return basic_string_view<charT, traits>(x) >= y; } template<typename charT, typename traits> - inline bool operator>=(basic_string_view<charT, traits> x, + inline BOOST_CXX14_CONSTEXPR bool operator>=(basic_string_view<charT, traits> x, const charT * y) BOOST_NOEXCEPT { return x >= basic_string_view<charT, traits>(y); } template<typename charT, typename traits> - inline bool operator>=(const charT * x, + inline BOOST_CXX14_CONSTEXPR bool operator>=(const charT * x, basic_string_view<charT, traits> y) BOOST_NOEXCEPT { return basic_string_view<charT, traits>(x) >= y; } |