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/algorithm/string | |
| 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/algorithm/string')
| -rw-r--r-- | boost/algorithm/string/detail/case_conv.hpp | 8 | ||||
| -rw-r--r-- | boost/algorithm/string/detail/find_iterator.hpp | 2 | ||||
| -rw-r--r-- | boost/algorithm/string/detail/util.hpp | 5 |
3 files changed, 10 insertions, 5 deletions
diff --git a/boost/algorithm/string/detail/case_conv.hpp b/boost/algorithm/string/detail/case_conv.hpp index 42621c74f0..233912ca0f 100644 --- a/boost/algorithm/string/detail/case_conv.hpp +++ b/boost/algorithm/string/detail/case_conv.hpp @@ -30,8 +30,10 @@ namespace boost { // a tolower functor template<typename CharT> - struct to_lowerF : public std::unary_function<CharT, CharT> + struct to_lowerF { + typedef CharT argument_type; + typedef CharT result_type; // Constructor to_lowerF( const std::locale& Loc ) : m_Loc( &Loc ) {} @@ -50,8 +52,10 @@ namespace boost { // a toupper functor template<typename CharT> - struct to_upperF : public std::unary_function<CharT, CharT> + struct to_upperF { + typedef CharT argument_type; + typedef CharT result_type; // Constructor to_upperF( const std::locale& Loc ) : m_Loc( &Loc ) {} diff --git a/boost/algorithm/string/detail/find_iterator.hpp b/boost/algorithm/string/detail/find_iterator.hpp index 9b78a0f7e1..4f90a98fc0 100644 --- a/boost/algorithm/string/detail/find_iterator.hpp +++ b/boost/algorithm/string/detail/find_iterator.hpp @@ -40,7 +40,7 @@ namespace boost { // Protected construction/destruction // Default constructor - find_iterator_base() {}; + find_iterator_base() {} // Copy construction find_iterator_base( const find_iterator_base& Other ) : m_Finder(Other.m_Finder) {} diff --git a/boost/algorithm/string/detail/util.hpp b/boost/algorithm/string/detail/util.hpp index cf4a8b1c8c..7844b6723c 100644 --- a/boost/algorithm/string/detail/util.hpp +++ b/boost/algorithm/string/detail/util.hpp @@ -89,9 +89,10 @@ namespace boost { template< typename SeqT, typename IteratorT=BOOST_STRING_TYPENAME SeqT::const_iterator > - struct copy_iterator_rangeF : - public std::unary_function< iterator_range<IteratorT>, SeqT > + struct copy_iterator_rangeF { + typedef iterator_range<IteratorT> argument_type; + typedef SeqT result_type; SeqT operator()( const iterator_range<IteratorT>& Range ) const { return copy_range<SeqT>(Range); |