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

Put hex_char_to_int in an unnamed namespace to fix linker errors

Browse Source 
[SVN r80696]
This commit is contained in:
Marshall Clow
2012-09-24 18:00:07 +00:00
parent ed9b65dc39
commit 87f97645da
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,14 +69,18 @@ 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
// and might get included in several compilation units. This could cause
// multiple definition errors at link time.
namespace {
unsigned hex_char_to_int ( char c ) { unsigned hex_char_to_int ( char c ) {
if ( c >= '0' && c <= '9' ) return c - '0'; if ( c >= '0' && c <= '9' ) return c - '0';
if ( c >= 'A' && c <= 'F' ) return c - 'A' + 10; if ( c >= 'A' && c <= 'F' ) return c - 'A' + 10;
if ( c >= 'a' && c <= 'f' ) return c - 'a' + 10; if ( c >= 'a' && c <= 'f' ) return c - 'a' + 10;
BOOST_THROW_EXCEPTION (non_hex_input() << bad_char (c)); BOOST_THROW_EXCEPTION (non_hex_input() << bad_char (c));
return 0; // keep dumb compilers happy 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
@ -105,17 +109,17 @@ namespace detail {
// The first one is the output type, the second one is the character type of // The first one is the output type, the second one is the character type of
// the underlying stream, the third is the character traits. // the underlying stream, the third is the character traits.
// We only care about the first one. // We only care about the first one.
template<typename T, typename charType, typename traits> template<typename T, typename charType, typename traits>
struct hex_iterator_traits< std::ostream_iterator<T, charType, traits> > { struct hex_iterator_traits< std::ostream_iterator<T, charType, traits> > {
typedef T value_type; typedef T value_type;
}; };
template <typename Iterator> template <typename Iterator>
bool iter_end ( Iterator current, Iterator last ) { return current == last; } bool iter_end ( Iterator current, Iterator last ) { return current == last; }
template <typename T> template <typename T>
bool ptr_end ( const T* ptr, const T* /*end*/ ) { return *ptr == '\0'; } bool ptr_end ( const T* ptr, const T* /*end*/ ) { return *ptr == '\0'; }
// What can we assume here about the inputs? // What can we assume here about the inputs?
// is std::iterator_traits<InputIterator>::value_type always 'char' ? // is std::iterator_traits<InputIterator>::value_type always 'char' ?
// Could it be wchar_t, say? Does it matter? // Could it be wchar_t, say? Does it matter?