Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r82348 - in trunk: boost/fusion/adapted/struct/detail boost/fusion/container/deque boost/wave/cpplexer/re2clex boost/wave/util libs/fusion/doc libs/wave/samples/cpp_tokens/slex libs/wave/samples/list_includes/lexertl libs/wave/samples/token_statistics/xlex libs/wave/samples/waveidl/idllexer
From: joel_at_[hidden]
Date: 2013-01-03 20:43:08


Author: djowel
Date: 2013-01-03 20:43:06 EST (Thu, 03 Jan 2013)
New Revision: 82348
URL: http://svn.boost.org/trac/boost/changeset/82348

Log:
Applied patches for Tickets #7738, #7737 and #7646
Text files modified:
   trunk/boost/fusion/adapted/struct/detail/define_struct_inline.hpp | 2 +-
   trunk/boost/fusion/container/deque/deque.hpp | 2 +-
   trunk/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp | 2 +-
   trunk/boost/wave/util/flex_string.hpp | 2 +-
   trunk/libs/fusion/doc/tuple.qbk | 4 ++--
   trunk/libs/wave/samples/cpp_tokens/slex/cpp_slex_lexer.hpp | 2 +-
   trunk/libs/wave/samples/list_includes/lexertl/lexertl_lexer.hpp | 2 +-
   trunk/libs/wave/samples/token_statistics/xlex/xlex_lexer.hpp | 2 +-
   trunk/libs/wave/samples/waveidl/idllexer/idl_re2c_lexer.hpp | 2 +-
   9 files changed, 10 insertions(+), 10 deletions(-)

Modified: trunk/boost/fusion/adapted/struct/detail/define_struct_inline.hpp
==============================================================================
--- trunk/boost/fusion/adapted/struct/detail/define_struct_inline.hpp (original)
+++ trunk/boost/fusion/adapted/struct/detail/define_struct_inline.hpp 2013-01-03 20:43:06 EST (Thu, 03 Jan 2013)
@@ -36,7 +36,7 @@
 // an alternate implementation for these metafunctions is used that does not
 // require such specializations. The alternate implementation takes longer
 // to compile so its use is restricted to the offending compilers.
-// For MSVC, the bug was was reported at https://connect.microsoft.com/VisualStudio/feedback/details/757891/c-compiler-error-involving-partial-specializations-of-nested-templates
+// For MSVC, the bug was reported at https://connect.microsoft.com/VisualStudio/feedback/details/757891/c-compiler-error-involving-partial-specializations-of-nested-templates
 // For GCC, 4.4 and earlier are no longer maintained so there is no need
 // to report a bug.
 #if defined(BOOST_MSVC) || (defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ <= 4)))

Modified: trunk/boost/fusion/container/deque/deque.hpp
==============================================================================
--- trunk/boost/fusion/container/deque/deque.hpp (original)
+++ trunk/boost/fusion/container/deque/deque.hpp 2013-01-03 20:43:06 EST (Thu, 03 Jan 2013)
@@ -11,7 +11,7 @@
 #include <boost/config.hpp>
 
 ///////////////////////////////////////////////////////////////////////////////
-// With variadics, we will use the PP version version
+// With variadics, we will use the PP version
 ///////////////////////////////////////////////////////////////////////////////
 #if defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
 # include <boost/fusion/container/deque/detail/pp_deque.hpp>

Modified: trunk/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp
==============================================================================
--- trunk/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp (original)
+++ trunk/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp 2013-01-03 20:43:06 EST (Thu, 03 Jan 2013)
@@ -394,7 +394,7 @@
 //
 // This function is declared inside the cpp_lex_token.hpp file, which is
 // referenced by the source file calling the lexer and the source file, which
-// instantiates the lex_functor. But is is defined here, so it will be
+// instantiates the lex_functor. But it is defined here, so it will be
 // instantiated only while compiling the source file, which instantiates the
 // lex_functor. While the cpp_re2c_token.hpp file may be included everywhere,
 // this file (cpp_re2c_lexer.hpp) should be included only once. This allows

Modified: trunk/boost/wave/util/flex_string.hpp
==============================================================================
--- trunk/boost/wave/util/flex_string.hpp (original)
+++ trunk/boost/wave/util/flex_string.hpp 2013-01-03 20:43:06 EST (Thu, 03 Jan 2013)
@@ -344,7 +344,7 @@
             // 11-17-2000: comment added:
             // No need to allocate (capacity + 1) to
             // accommodate the terminating 0, because Data already
- // has one one character in there
+ // has one character in there
             pData_ = static_cast<Data*>(
                 malloc(sizeof(Data) + capacity * sizeof(E)));
             if (!pData_) boost::throw_exception(std::bad_alloc());

Modified: trunk/libs/fusion/doc/tuple.qbk
==============================================================================
--- trunk/libs/fusion/doc/tuple.qbk (original)
+++ trunk/libs/fusion/doc/tuple.qbk 2013-01-03 20:43:06 EST (Thu, 03 Jan 2013)
@@ -91,7 +91,7 @@
     template<typename T1, typename T2, ..., typename TN>
     tuple<T1&, T2&, ..., TN&> tie(T1& t1, T2& t2, ..., TN& tn);
 
-[*Returns]: tuple<T1&, T2&, ..., TN&>(t1, t2, ..., tN). When argument `ti` is `ignore`, assigning any value to the corresponding tuple element has has no effect.
+[*Returns]: tuple<T1&, T2&, ..., TN&>(t1, t2, ..., tN). When argument `ti` is `ignore`, assigning any value to the corresponding tuple element has no effect.
 
 [endsect]
 
@@ -254,7 +254,7 @@
 
 [*Type]: `T2`
 
-[*Value]: Returns thetype of the second element of the pair
+[*Value]: Returns the type of the second element of the pair
 
     template<int I, typename T1, typename T2>
     P& get(std::pair<T1, T2>& pr);

Modified: trunk/libs/wave/samples/cpp_tokens/slex/cpp_slex_lexer.hpp
==============================================================================
--- trunk/libs/wave/samples/cpp_tokens/slex/cpp_slex_lexer.hpp (original)
+++ trunk/libs/wave/samples/cpp_tokens/slex/cpp_slex_lexer.hpp 2013-01-03 20:43:06 EST (Thu, 03 Jan 2013)
@@ -780,7 +780,7 @@
 //
 // This function is declared inside the cpp_slex_token.hpp file, which is
 // referenced by the source file calling the lexer and the source file, which
-// instantiates the lex_functor. But is is defined here, so it will be
+// instantiates the lex_functor. But it is defined here, so it will be
 // instantiated only while compiling the source file, which instantiates the
 // lex_functor. While the cpp_slex_token.hpp file may be included everywhere,
 // this file (cpp_slex_lexer.hpp) should be included only once. This allows

Modified: trunk/libs/wave/samples/list_includes/lexertl/lexertl_lexer.hpp
==============================================================================
--- trunk/libs/wave/samples/list_includes/lexertl/lexertl_lexer.hpp (original)
+++ trunk/libs/wave/samples/list_includes/lexertl/lexertl_lexer.hpp 2013-01-03 20:43:06 EST (Thu, 03 Jan 2013)
@@ -782,7 +782,7 @@
 //
 // This function is declared inside the xlex_interface.hpp file, which is
 // referenced by the source file calling the lexer and the source file, which
-// instantiates the lex_functor. But is is defined here, so it will be
+// instantiates the lex_functor. But it is defined here, so it will be
 // instantiated only while compiling the source file, which instantiates the
 // lex_functor. While the xlex_interface.hpp file may be included everywhere,
 // this file (xlex_lexer.hpp) should be included only once. This allows

Modified: trunk/libs/wave/samples/token_statistics/xlex/xlex_lexer.hpp
==============================================================================
--- trunk/libs/wave/samples/token_statistics/xlex/xlex_lexer.hpp (original)
+++ trunk/libs/wave/samples/token_statistics/xlex/xlex_lexer.hpp 2013-01-03 20:43:06 EST (Thu, 03 Jan 2013)
@@ -557,7 +557,7 @@
 //
 // This function is declared inside the xlex_interface.hpp file, which is
 // referenced by the source file calling the lexer and the source file, which
-// instantiates the lex_functor. But is is defined here, so it will be
+// instantiates the lex_functor. But it is defined here, so it will be
 // instantiated only while compiling the source file, which instantiates the
 // lex_functor. While the xlex_interface.hpp file may be included everywhere,
 // this file (xlex_lexer.hpp) should be included only once. This allows

Modified: trunk/libs/wave/samples/waveidl/idllexer/idl_re2c_lexer.hpp
==============================================================================
--- trunk/libs/wave/samples/waveidl/idllexer/idl_re2c_lexer.hpp (original)
+++ trunk/libs/wave/samples/waveidl/idllexer/idl_re2c_lexer.hpp 2013-01-03 20:43:06 EST (Thu, 03 Jan 2013)
@@ -246,7 +246,7 @@
 //
 // This function is declared inside the cpp_slex_token.hpp file, which is
 // referenced by the source file calling the lexer and the source file, which
-// instantiates the lex_functor. But is is defined here, so it will be
+// instantiates the lex_functor. But it is defined here, so it will be
 // instantiated only while compiling the source file, which instantiates the
 // lex_functor. While the cpp_re2c_token.hpp file may be included everywhere,
 // this file (cpp_re2c_lexer.hpp) should be included only once. This allows


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk