boostorg/algorithm
1
0
Fork 1
mirror of https://github.com/boostorg/algorithm.git synced 2025-07-06 09:16:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix potential ODR violation; disambiguate doxygen comments

Browse Source 
[SVN r82789]
This commit is contained in:
Marshall Clow
2013-02-08 17:34:57 +00:00
parent 6d22c99f2e
commit 21e88adcda
1 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
include/boost/algorithm/hex.hpp
View File

@ -10,12 +10,6 @@
/* /*
General problem - turn a sequence of integral types into a sequence of hexadecimal characters. General problem - turn a sequence of integral types into a sequence of hexadecimal characters.
- and back. - and back.
TO DO:
1. these should really only work on integral types. (see the >> and << operations)
-- this is done, I think.
2. The 'value_type_or_char' struct is really a hack.
-- but it's a better hack now that it works with back_insert_iterators
*/ */
/// \file hex.hpp /// \file hex.hpp
@ -42,11 +36,11 @@ namespace boost { namespace algorithm {
/*! /*!
\struct hex_decode_error \struct hex_decode_error
\brief Base exception class for all hex decoding errors \brief Base exception class for all hex decoding errors
*/ /*!
\struct non_hex_input \struct non_hex_input
\brief Thrown when a non-hex value (0-9, A-F) encountered when decoding. \brief Thrown when a non-hex value (0-9, A-F) encountered when decoding.
Contains the offending character Contains the offending character
*/ /*!
\struct not_enough_input \struct not_enough_input
\brief Thrown when the input sequence unexpectedly ends \brief Thrown when the input sequence unexpectedly ends
@ -69,18 +63,16 @@ namespace detail {
return std::copy ( res, res + num_hex_digits, out ); return std::copy ( res, res + num_hex_digits, out );
} }
// this needs to be in an un-named namespace because it is not a template template <typename T>
// and might get included in several compilation units. This could cause unsigned char hex_char_to_int ( T val ) {
// multiple definition errors at link time. char c = static_cast<char> ( val );
namespace { unsigned retval = 0;
unsigned hex_char_to_int ( char c ) { if ( c >= '0' && c <= '9' ) retval = c - '0';
if ( c >= '0' && c <= '9' ) return c - '0'; else if ( c >= 'A' && c <= 'F' ) retval = c - 'A' + 10;
if ( c >= 'A' && c <= 'F' ) return c - 'A' + 10; else if ( c >= 'a' && c <= 'f' ) retval = c - 'a' + 10;
if ( c >= 'a' && c <= 'f' ) return c - 'a' + 10; else BOOST_THROW_EXCEPTION (non_hex_input() << bad_char (c));
BOOST_THROW_EXCEPTION (non_hex_input() << bad_char (c)); return retval;
return 0; // keep dumb compilers happy
} }
}
// My own iterator_traits class. // My own iterator_traits class.
// It is here so that I can "reach inside" some kinds of output iterators // It is here so that I can "reach inside" some kinds of output iterators
@ -134,7 +126,7 @@ namespace detail {
for ( std::size_t i = 0; i < 2 * sizeof ( T ); ++i, ++first ) { for ( std::size_t i = 0; i < 2 * sizeof ( T ); ++i, ++first ) {
if ( pred ( first, last )) if ( pred ( first, last ))
BOOST_THROW_EXCEPTION (not_enough_input ()); BOOST_THROW_EXCEPTION (not_enough_input ());
res = ( 16 * res ) + hex_char_to_int (static_cast<char> (*first)); res = ( 16 * res ) + hex_char_to_int (*first);
} }
*out = res; *out = res;