boost_mirror/utility
1
0
Fork 0
mirror of https://github.com/boostorg/utility.git synced 2025-05-09 15:04:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:boostorg/utility into develop

Browse Source
This commit is contained in:
Marshall Clow 2017-04-06 07:59:12 -07:00
commit 68b26cddbe
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/boost/utility/string_ref.hpp
View File

@ -92,12 +92,12 @@ namespace boost {
basic_string_ref(const std::basic_string<charT, traits, Allocator>& str) basic_string_ref(const std::basic_string<charT, traits, Allocator>& str)
: ptr_(str.data()), len_(str.length()) {} : ptr_(str.data()), len_(str.length()) {}
#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_DELETED_FUNCTIONS) // #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_DELETED_FUNCTIONS)
// Constructing a string_ref from a temporary string is a bad idea // // Constructing a string_ref from a temporary string is a bad idea
template<typename Allocator> // template<typename Allocator>
basic_string_ref( std::basic_string<charT, traits, Allocator>&&) // basic_string_ref( std::basic_string<charT, traits, Allocator>&&)
= delete; // = delete;
#endif // #endif
BOOST_CONSTEXPR basic_string_ref(const charT* str, size_type len) BOOST_NOEXCEPT BOOST_CONSTEXPR basic_string_ref(const charT* str, size_type len) BOOST_NOEXCEPT
: ptr_(str), len_(len) {} : ptr_(str), len_(len) {}

12
include/boost/utility/string_view.hpp
View File

@ -94,12 +94,12 @@ namespace boost {
basic_string_view(const std::basic_string<charT, traits, Allocator>& str) BOOST_NOEXCEPT basic_string_view(const std::basic_string<charT, traits, Allocator>& str) BOOST_NOEXCEPT
: ptr_(str.data()), len_(str.length()) {} : ptr_(str.data()), len_(str.length()) {}
#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_DELETED_FUNCTIONS) // #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_DELETED_FUNCTIONS)
// Constructing a string_view from a temporary string is a bad idea // // Constructing a string_view from a temporary string is a bad idea
template<typename Allocator> // template<typename Allocator>
basic_string_view( std::basic_string<charT, traits, Allocator>&&) // basic_string_view( std::basic_string<charT, traits, Allocator>&&)
= delete; // = delete;
#endif // #endif
BOOST_CONSTEXPR basic_string_view(const charT* str) BOOST_CONSTEXPR basic_string_view(const charT* str)
: ptr_(str), len_(traits::length(str)) {} : ptr_(str), len_(traits::length(str)) {}

4
test/Jamfile.v2
View File

@ -27,11 +27,11 @@ test-suite utility
[ run ../operators_test.cpp ../../test/build//boost_test_exec_monitor/<link>static ] [ run ../operators_test.cpp ../../test/build//boost_test_exec_monitor/<link>static ]
[ compile result_of_test.cpp ] [ compile result_of_test.cpp ]
[ run ../shared_iterator_test.cpp ] [ run ../shared_iterator_test.cpp ]
[ compile-fail string_ref_from_rvalue.cpp ] # [ compile-fail string_ref_from_rvalue.cpp ]
[ run string_ref_test1.cpp unit_test_framework ] [ run string_ref_test1.cpp unit_test_framework ]
[ run string_ref_test2.cpp unit_test_framework ] [ run string_ref_test2.cpp unit_test_framework ]
[ run string_ref_test_io.cpp unit_test_framework ] [ run string_ref_test_io.cpp unit_test_framework ]
[ compile-fail string_view_from_rvalue.cpp ] # [ compile-fail string_view_from_rvalue.cpp ]
[ run string_view_test1.cpp unit_test_framework ] [ run string_view_test1.cpp unit_test_framework ]
[ run string_view_test2.cpp unit_test_framework ] [ run string_view_test2.cpp unit_test_framework ]
[ run string_view_test_io.cpp unit_test_framework ] [ run string_view_test_io.cpp unit_test_framework ]