Revert "Merge pull request #14 from nigels-com/merge-hex_lower"

This reverts commit 5412438df5, reversing
changes made to a09963bf93.

include/boost/algorithm/hex.hpp

@@ -54,12 +54,12 @@ namespace detail {
 /// \cond DOXYGEN_HIDE
 
     template <typename T, typename OutputIterator>
-    OutputIterator encode_one ( T val, OutputIterator out, const char * hexDigits ) {
+    OutputIterator encode_one ( T val, OutputIterator out ) {
         const std::size_t num_hex_digits =  2 * sizeof ( T );
         char res [ num_hex_digits ];
         char  *p = res + num_hex_digits;
         for ( std::size_t i = 0; i < num_hex_digits; ++i, val >>= 4 )
-            *--p = hexDigits [ val & 0x0F ];
+            *--p = "0123456789ABCDEF" [ val & 0x0F ];
         return std::copy ( res, res + num_hex_digits, out );
         }
 
@@ -148,24 +148,7 @@ template <typename InputIterator, typename OutputIterator>
 typename boost::enable_if<boost::is_integral<typename detail::hex_iterator_traits<InputIterator>::value_type>, OutputIterator>::type
 hex ( InputIterator first, InputIterator last, OutputIterator out ) {
     for ( ; first != last; ++first )
-        out = detail::encode_one ( *first, out, "0123456789ABCDEF" );
+        out = detail::encode_one ( *first, out );
-    return out;
-    }
-
-
-/// \fn hex_lower ( InputIterator first, InputIterator last, OutputIterator out )
-/// \brief   Converts a sequence of integral types into a lower case hexadecimal sequence of characters.
-///
-/// \param first    The start of the input sequence
-/// \param last     One past the end of the input sequence
-/// \param out      An output iterator to the results into
-/// \return         The updated output iterator
-/// \note           Based on the MySQL function of the same name
-template <typename InputIterator, typename OutputIterator>
-typename boost::enable_if<boost::is_integral<typename detail::hex_iterator_traits<InputIterator>::value_type>, OutputIterator>::type
-hex_lower ( InputIterator first, InputIterator last, OutputIterator out ) {
-    for ( ; first != last; ++first )
-        out = detail::encode_one ( *first, out, "0123456789abcdef" );
     return out;
     }
     
@@ -181,27 +164,10 @@ template <typename T, typename OutputIterator>
 typename boost::enable_if<boost::is_integral<T>, OutputIterator>::type
 hex ( const T *ptr, OutputIterator out ) {
     while ( *ptr )
-        out = detail::encode_one ( *ptr++, out, "0123456789ABCDEF" );
+        out = detail::encode_one ( *ptr++, out );
     return out;
     }
 
-
-/// \fn hex_lower ( const T *ptr, OutputIterator out )
-/// \brief   Converts a sequence of integral types into a lower case hexadecimal sequence of characters.
-///
-/// \param ptr      A pointer to a 0-terminated sequence of data.
-/// \param out      An output iterator to the results into
-/// \return         The updated output iterator
-/// \note           Based on the MySQL function of the same name
-template <typename T, typename OutputIterator>
-typename boost::enable_if<boost::is_integral<T>, OutputIterator>::type
-hex_lower ( const T *ptr, OutputIterator out ) {
-    while ( *ptr )
-        out = detail::encode_one ( *ptr++, out, "0123456789abcdef" );
-    return out;
-    }
-
-
 /// \fn hex ( const Range &r, OutputIterator out )
 /// \brief   Converts a sequence of integral types into a hexadecimal sequence of characters.
 /// 
@@ -216,20 +182,6 @@ hex ( const Range &r, OutputIterator out ) {
 }
 
 
-/// \fn hex_lower ( const Range &r, OutputIterator out )
-/// \brief   Converts a sequence of integral types into a lower case hexadecimal sequence of characters.
-///
-/// \param r        The input range
-/// \param out      An output iterator to the results into
-/// \return         The updated output iterator
-/// \note           Based on the MySQL function of the same name
-template <typename Range, typename OutputIterator>
-typename boost::enable_if<boost::is_integral<typename detail::hex_iterator_traits<typename Range::iterator>::value_type>, OutputIterator>::type
-hex_lower ( const Range &r, OutputIterator out ) {
-    return hex_lower (boost::begin(r), boost::end(r), out);
-}
-
-
 /// \fn unhex ( InputIterator first, InputIterator last, OutputIterator out )
 /// \brief   Converts a sequence of hexadecimal characters into a sequence of integers.
 /// 
@@ -290,21 +242,6 @@ String hex ( const String &input ) {
     return output;
     }
 
-
-/// \fn String hex_lower ( const String &input )
-/// \brief   Converts a sequence of integral types into a lower case hexadecimal sequence of characters.
-///
-/// \param input    A container to be converted
-/// \return         A container with the encoded text
-template<typename String>
-String hex_lower ( const String &input ) {
-    String output;
-    output.reserve (input.size () * (2 * sizeof (typename String::value_type)));
-    (void) hex_lower (input, std::back_inserter (output));
-    return output;
-    }
-
-
 /// \fn String unhex ( const String &input )
 /// \brief   Converts a sequence of hexadecimal characters into a sequence of characters.
 /// 

test/hex_test1.cpp

@@ -9,7 +9,6 @@
 
 #include <boost/config.hpp>
 #include <boost/algorithm/hex.hpp>
-#include <boost/algorithm/string/case_conv.hpp>
 
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
@@ -43,31 +42,6 @@ void test_to_hex ( const typename String::value_type ** tests ) {
         }
     }
 
-template<typename String>
-void test_to_hex_lower ( const typename String::value_type ** tests ) {
-    for ( const typename String::value_type **p = tests; *p; p++ ) {
-        String arg, argh, one, two, three, four;
-        arg.assign ( *p );
-        boost::algorithm::hex_lower ( *p, std::back_inserter ( one ));
-        boost::algorithm::hex_lower ( arg, std::back_inserter ( two ));
-        boost::algorithm::hex_lower ( arg.begin (), arg.end (), std::back_inserter ( three ));
-        four = boost::algorithm::hex_lower ( arg );
-        BOOST_CHECK ( one == two );
-        BOOST_CHECK ( one == three );
-        BOOST_CHECK ( one == four );
-        argh = one;
-        one.clear (); two.clear (); three.clear (); four.clear ();
-        boost::algorithm::unhex ( argh.c_str (), std::back_inserter ( one ));
-        boost::algorithm::unhex ( argh, std::back_inserter ( two ));
-        boost::algorithm::unhex ( argh.begin (), argh.end (), std::back_inserter ( three ));
-        four = boost::algorithm::unhex ( argh );
-        BOOST_CHECK ( one == two );
-        BOOST_CHECK ( one == three );
-        BOOST_CHECK ( one == four );
-        BOOST_CHECK ( one == arg );
-        }
-    }
-
 
 template<typename String>
 void test_from_hex_success ( const typename String::value_type ** tests ) {
@@ -87,11 +61,6 @@ void test_from_hex_success ( const typename String::value_type ** tests ) {
         boost::algorithm::hex ( argh, std::back_inserter ( two ));
         boost::algorithm::hex ( argh.begin (), argh.end (), std::back_inserter ( three ));
         four = boost::algorithm::hex ( argh );
-        boost::algorithm::to_lower( arg );
-        boost::algorithm::to_lower( one );
-        boost::algorithm::to_lower( two );
-        boost::algorithm::to_lower( three );
-        boost::algorithm::to_lower( four );
         BOOST_CHECK ( one == two );
         BOOST_CHECK ( one == three );
         BOOST_CHECK ( one == four );
@@ -144,7 +113,6 @@ const wchar_t *tohex_w [] = {
 const char *fromhex [] = {
     "20",
     "2122234556FF",
-    "2122234556ff",
     NULL        // End of the list
     };
 
@@ -152,7 +120,6 @@ const char *fromhex [] = {
 const wchar_t *fromhex_w [] = {
     L"00101020",
     L"2122234556FF3456",
-    L"2122234556ff3456",
     NULL        // End of the list
     };
 
@@ -162,8 +129,6 @@ const char *fromhex_fail [] = {
     "H",
     "234",
     "21222G4556FF",
-    "h",
-    "21222g4556ff",
     NULL        // End of the list
     };
 
@@ -174,8 +139,6 @@ const wchar_t *fromhex_fail_w [] = {
     L"H",
     L"234",
     L"21222G4556FF",
-    L"h",
-    L"21222g4556ff",
     NULL        // End of the list
     };
 
@@ -183,12 +146,10 @@ const wchar_t *fromhex_fail_w [] = {
 BOOST_AUTO_TEST_CASE( test_main )
 {
   test_to_hex<std::string> ( tohex );
-  test_to_hex_lower<std::string> ( tohex );
   test_from_hex_success<std::string> ( fromhex );
   test_from_hex_failure<std::string> ( fromhex_fail );
 
   test_to_hex<std::wstring> ( tohex_w );
-  test_to_hex_lower<std::wstring> ( tohex_w );
   test_from_hex_success<std::wstring> ( fromhex_w );
   test_from_hex_failure<std::wstring> ( fromhex_fail_w );
 }