[Boost-commit] svn:boost r51304 - trunk/boost/spirit/home/support/detail/lexer

Subject: [Boost-commit] svn:boost r51304 - trunk/boost/spirit/home/support/detail/lexer
From: jamin.hanson_at_[hidden]
Date: 2009-02-17 16:51:53

Author: ben_hanson
Date: 2009-02-17 16:51:53 EST (Tue, 17 Feb 2009)
New Revision: 51304
URL: http://svn.boost.org/trac/boost/changeset/51304

Log:
Remove :: from memcpy()
Text files modified: 
   trunk/boost/spirit/home/support/detail/lexer/file_input.hpp |     6 +++++-                                  
   1 files changed, 5 insertions(+), 1 deletions(-)

Modified: trunk/boost/spirit/home/support/detail/lexer/file_input.hpp
==============================================================================
--- trunk/boost/spirit/home/support/detail/lexer/file_input.hpp	(original)
+++ trunk/boost/spirit/home/support/detail/lexer/file_input.hpp	2009-02-17 16:51:53 EST (Tue, 17 Feb 2009)
@@ -7,6 +7,8 @@
 #define BOOST_LEXER_FILE_INPUT
 
 #include "char_traits.hpp"
+// memcpy
+#include <cstring>
 #include <fstream>
 #include "size_t.hpp"
 #include "state_machine.hpp"
@@ -414,8 +416,10 @@
             else if (_start_token < _end_buffer)
             {
                 const std::size_t len_ = _end_buffer - _start_token;
+                using namespace std;
 
-                ::memcpy (_start_buffer, _start_token - 1, (len_ + 1) * sizeof (CharT));
+                // Some systems have memcpy in namespace std.
+                memcpy (_start_buffer, _start_token - 1, (len_ + 1) * sizeof (CharT));
                 _stream->read (_start_buffer + len_ + 1,
                     static_cast<std::streamsize> (_buffer.size () - len_ - 1));
                 count_ = _stream->gcount ();