From 04a40de48dd6fc995ca749ad5e9f819b32c25283 Mon Sep 17 00:00:00 2001 From: Pavol Droba Date: Tue, 17 May 2005 07:43:40 +0000 Subject: [PATCH] borland issues - non working patch reverted - a working one applied [SVN r28982] --- .../boost/algorithm/string/detail/find_format_store.hpp | 5 ----- include/boost/algorithm/string/detail/formatter.hpp | 8 ++++++++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/include/boost/algorithm/string/detail/find_format_store.hpp b/include/boost/algorithm/string/detail/find_format_store.hpp index 054bdbb..a1afc55 100644 --- a/include/boost/algorithm/string/detail/find_format_store.hpp +++ b/include/boost/algorithm/string/detail/find_format_store.hpp @@ -47,12 +47,7 @@ namespace boost { find_format_store& operator=( FindResultT FindResult ) { iterator_range::operator=(FindResult); -#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) - format_result_type temp(m_Formatter(FindResult)); - m_FormatResult=format_result_type(temp); -#else m_FormatResult=m_Formatter(FindResult); -#endif return *this; } diff --git a/include/boost/algorithm/string/detail/formatter.hpp b/include/boost/algorithm/string/detail/formatter.hpp index ab58b6c..367bf67 100644 --- a/include/boost/algorithm/string/detail/formatter.hpp +++ b/include/boost/algorithm/string/detail/formatter.hpp @@ -41,6 +41,14 @@ namespace boost { m_Format(begin(Format), end(Format)) {} // Operation +#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) + template + result_type& operator()(const Range2T&) + { + return m_Format; + } +#endif + template const result_type& operator()(const Range2T&) const {