[Boost-commit] svn:boost r76818 - trunk/boost

Subject: [Boost-commit] svn:boost r76818 - trunk/boost
From: antoshkka_at_[hidden]
Date: 2012-01-31 23:25:22

Author: apolukhin
Date: 2012-01-31 23:25:21 EST (Tue, 31 Jan 2012)
New Revision: 76818
URL: http://svn.boost.org/trac/boost/changeset/76818

Log:
FIxes #6453 (compile error due to deduce_char_traits ambiguity)
Text files modified: 
   trunk/boost/lexical_cast.hpp |    18 ++++++++++++++++++                      
   1 files changed, 18 insertions(+), 0 deletions(-)

Modified: trunk/boost/lexical_cast.hpp
==============================================================================
--- trunk/boost/lexical_cast.hpp	(original)
+++ trunk/boost/lexical_cast.hpp	2012-01-31 23:25:21 EST (Tue, 31 Jan 2012)
@@ -324,6 +324,24 @@
         {
             typedef Traits type;
         };
+
+        template<class CharT, class Traits, class Alloc1, class Alloc2>
+        struct deduce_char_traits< CharT
+                                 , ::boost::container::basic_string<CharT,Traits,Alloc1>
+                                 , std::basic_string<CharT,Traits,Alloc2>
+                                 >
+        {
+            typedef Traits type;
+        };
+
+        template<class CharT, class Traits, class Alloc1, class Alloc2>
+        struct deduce_char_traits< CharT
+                                 , std::basic_string<CharT,Traits,Alloc1>
+                                 , ::boost::container::basic_string<CharT,Traits,Alloc2>
+                                 >
+        {
+            typedef Traits type;
+        };
 #endif
     }