From: hartmut.kaiser_at_[hidden]
Date: 2008-01-25 20:40:40
Author: hkaiser
Date: 2008-01-25 20:40:39 EST (Fri, 25 Jan 2008)
New Revision: 42978
URL: http://svn.boost.org/trac/boost/changeset/42978
Log:
Wave: Fixed a problem in flex_string::compare() (#include_next was non-functional). Added new testcase.
Added:
branches/release/libs/wave/test/testwave/testfiles/t_9_019.cpp (contents, props changed)
branches/release/libs/wave/test/testwave/testfiles/t_9_019.hpp (contents, props changed)
Text files modified:
branches/release/boost/wave/util/flex_string.hpp | 2 +-
branches/release/libs/wave/ChangeLog | 1 +
branches/release/libs/wave/test/testwave/testfiles/test.cfg | 1 +
3 files changed, 3 insertions(+), 1 deletions(-)
Modified: branches/release/boost/wave/util/flex_string.hpp
==============================================================================
--- branches/release/boost/wave/util/flex_string.hpp (original)
+++ branches/release/boost/wave/util/flex_string.hpp 2008-01-25 20:40:39 EST (Fri, 25 Jan 2008)
@@ -2256,7 +2256,7 @@
{
Enforce(pos1 <= size(), (std::out_of_range*)0, "");
Procust(n1, size() - pos1);
- const int r = traits_type::compare(data(), s, Min(n1, n2));
+ const int r = traits_type::compare(data()+pos1, s, Min(n1, n2));
return
r != 0 ? r :
n1 > n2 ? 1 :
Modified: branches/release/libs/wave/ChangeLog
==============================================================================
--- branches/release/libs/wave/ChangeLog (original)
+++ branches/release/libs/wave/ChangeLog 2008-01-25 20:40:39 EST (Fri, 25 Jan 2008)
@@ -157,6 +157,7 @@
- Applied patch provided by Jens Seidel making sure every header compiles on
its own.
- Updates to the documentation.
+- Fixed a problem in flex_string::compare() (#include_next was non-functional).
Boost V1.34.0
- Wave Version 1.2.4
Added: branches/release/libs/wave/test/testwave/testfiles/t_9_019.cpp
==============================================================================
--- (empty file)
+++ branches/release/libs/wave/test/testwave/testfiles/t_9_019.cpp 2008-01-25 20:40:39 EST (Fri, 25 Jan 2008)
@@ -0,0 +1,15 @@
+/*=============================================================================
+ Boost.Wave: A Standard compliant C++ preprocessor library
+ http://www.boost.org/
+
+ Copyright (c) 2001-2008 Hartmut Kaiser. Distributed under the Boost
+ Software License, Version 1.0. (See accompanying file
+ LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+=============================================================================*/
+
+// tests, whether regression causing #include_next to infinitely recurse is
+// fixed
+
+//E t_9_019.cpp(14): error: could not find include file: t_9_019.hpp
+#include_next "t_9_019.hpp"
+
Added: branches/release/libs/wave/test/testwave/testfiles/t_9_019.hpp
==============================================================================
--- (empty file)
+++ branches/release/libs/wave/test/testwave/testfiles/t_9_019.hpp 2008-01-25 20:40:39 EST (Fri, 25 Jan 2008)
@@ -0,0 +1,10 @@
+/*=============================================================================
+ Boost.Wave: A Standard compliant C++ preprocessor library
+ http://www.boost.org/
+
+ Copyright (c) 2001-2008 Hartmut Kaiser. Distributed under the Boost
+ Software License, Version 1.0. (See accompanying file
+ LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+=============================================================================*/
+
+// this file intentionally has been left empty
Modified: branches/release/libs/wave/test/testwave/testfiles/test.cfg
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/test.cfg (original)
+++ branches/release/libs/wave/test/testwave/testfiles/test.cfg 2008-01-25 20:40:39 EST (Fri, 25 Jan 2008)
@@ -223,3 +223,4 @@
t_9_016.cpp
t_9_017.cpp
t_9_018.cpp
+t_9_019.cpp