[boost] Re: [1.32 release] TODO list synchronization - string_algo update

From: Daniel James (daniel_at_[hidden])
Date: 2004-07-16 08:10:42

Pavol Droba wrote:
> As I said, from tomorrow on, I will be offline. I have tried my best to put the library in the
> reasonable shape. I don't expect any sudden showstoppers to occur. If there will be any
> problem (bug or typo of anything else) fell free to fix it, just drop me an email about that.

I've attached some small patches. boost/algorithm/string/config.hpp uses 
BOOST_WORKAROUND but doesn't include the necessary header, patch-1 adds 
that. patch-2 changes the unit tests so that the header being tested 
comes first, so that errors like this will be detected. patch-3 adds a 
missing import to your test Jamfile.v2.

If Pavol can't deal with this, can somebody else check in them in?

thanks,

Daniel

Index: string/config.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/algorithm/string/config.hpp,v
retrieving revision 1.3
diff -u -r1.3 config.hpp
--- string/config.hpp	3 Jul 2004 10:31:01 -0000	1.3
+++ string/config.hpp	16 Jul 2004 12:49:35 -0000
@@ -11,6 +11,7 @@
 #define BOOST_STRING_CONFIG_HPP
 
 #include <boost/config.hpp>
+#include <boost/detail/workaround.hpp>
 
 #ifdef BOOST_STRING_DEDUCED_TYPENAME
 #   error "macro already defined!"

Index: string/test/container_test.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/algorithm/string/test/container_test.cpp,v
retrieving revision 1.1
diff -u -r1.1 container_test.cpp
--- string/test/container_test.cpp	4 Mar 2004 22:12:19 -0000	1.1
+++ string/test/container_test.cpp	16 Jul 2004 12:49:58 -0000
@@ -7,6 +7,10 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
+#include <boost/algorithm/string/collection_traits.hpp>
+// equals predicate is used for result comparison
+#include <boost/algorithm/string/predicate.hpp>
+
 // Include unit test framework
 #include <boost/test/included/test_exec_monitor.hpp>
 
@@ -14,12 +18,8 @@
 #include <utility>
 #include <vector>
 
-#include <boost/algorithm/string/collection_traits.hpp>
 #include <boost/type_traits.hpp>
 
-// equals predicate is used for result comparison
-#include <boost/algorithm/string/predicate.hpp>
-
 // test tools
 #include <boost/test/test_tools.hpp>
 
Index: string/test/conv_test.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/algorithm/string/test/conv_test.cpp,v
retrieving revision 1.3
diff -u -r1.3 conv_test.cpp
--- string/test/conv_test.cpp	9 Mar 2004 18:25:03 -0000	1.3
+++ string/test/conv_test.cpp	16 Jul 2004 12:49:58 -0000
@@ -7,13 +7,14 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
+#include <boost/algorithm/string/case_conv.hpp>
+
 // Include unit test framework
 #include <boost/test/included/test_exec_monitor.hpp>
 
 #include <string>
 #include <iostream>
 #include <algorithm>
-#include <boost/algorithm/string/case_conv.hpp>
 #include <boost/test/test_tools.hpp>
 
 using namespace std;
Index: string/test/find_test.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/algorithm/string/test/find_test.cpp,v
retrieving revision 1.1
diff -u -r1.1 find_test.cpp
--- string/test/find_test.cpp	4 Mar 2004 22:12:19 -0000	1.1
+++ string/test/find_test.cpp	16 Jul 2004 12:49:59 -0000
@@ -7,6 +7,9 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
+#include <boost/algorithm/string/find.hpp>
+#include <boost/algorithm/string/classification.hpp>
+
 // Include unit test framework
 #include <boost/test/included/test_exec_monitor.hpp>
 
@@ -15,8 +18,6 @@
 #include <iostream>
 #include <iterator>
 #include <sstream>
-#include <boost/algorithm/string/find.hpp>
-#include <boost/algorithm/string/classification.hpp>
 #include <boost/test/test_tools.hpp>
 
 using namespace std;
Index: string/test/predicate_test.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/algorithm/string/test/predicate_test.cpp,v
retrieving revision 1.2
diff -u -r1.2 predicate_test.cpp
--- string/test/predicate_test.cpp	9 Mar 2004 18:25:03 -0000	1.2
+++ string/test/predicate_test.cpp	16 Jul 2004 12:49:59 -0000
@@ -7,6 +7,9 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
+#include <boost/algorithm/string/predicate.hpp>
+#include <boost/algorithm/string/classification.hpp>
+
 // Include unit test framework
 #include <boost/test/included/test_exec_monitor.hpp>
 
@@ -14,8 +17,6 @@
 #include <vector>
 #include <iostream>
 #include <functional>
-#include <boost/algorithm/string/predicate.hpp>
-#include <boost/algorithm/string/classification.hpp>
 #include <boost/test/test_tools.hpp>
 
 using namespace std;
Index: string/test/regex_test.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/algorithm/string/test/regex_test.cpp,v
retrieving revision 1.3
diff -u -r1.3 regex_test.cpp
--- string/test/regex_test.cpp	2 Apr 2004 16:56:21 -0000	1.3
+++ string/test/regex_test.cpp	16 Jul 2004 12:50:00 -0000
@@ -7,6 +7,9 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
+#include <boost/algorithm/string/regex.hpp>
+#include <boost/algorithm/string/sequence_traits.hpp>
+
 // Include unit test framework
 #include <boost/test/included/test_exec_monitor.hpp>
 
@@ -14,8 +17,6 @@
 #include <vector>
 #include <iostream>
 #include <boost/regex.hpp>
-#include <boost/algorithm/string/sequence_traits.hpp>
-#include <boost/algorithm/string/regex.hpp>
 #include <boost/test/test_tools.hpp>
 
 using namespace std;
Index: string/test/replace_test.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/algorithm/string/test/replace_test.cpp,v
retrieving revision 1.4
diff -u -r1.4 replace_test.cpp
--- string/test/replace_test.cpp	2 Apr 2004 16:56:25 -0000	1.4
+++ string/test/replace_test.cpp	16 Jul 2004 12:50:00 -0000
@@ -7,6 +7,11 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
+#include <boost/algorithm/string/replace.hpp>
+#include <boost/algorithm/string/erase.hpp>
+#include <boost/algorithm/string/std/list_traits.hpp>
+#include <boost/algorithm/string/std/string_traits.hpp>
+
 // Include unit test framework
 #include <boost/test/included/test_exec_monitor.hpp>
 
@@ -15,11 +20,6 @@
 #include <list>
 #include <iostream>
 
-#include <boost/algorithm/string/std/list_traits.hpp>
-#include <boost/algorithm/string/std/string_traits.hpp>
-#include <boost/algorithm/string/replace.hpp>
-#include <boost/algorithm/string/erase.hpp>
-
 // equals predicate is used for result comparison
 #include <boost/algorithm/string/predicate.hpp>
 
Index: string/test/split_test.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/algorithm/string/test/split_test.cpp,v
retrieving revision 1.3
diff -u -r1.3 split_test.cpp
--- string/test/split_test.cpp	16 Jul 2004 09:08:21 -0000	1.3
+++ string/test/split_test.cpp	16 Jul 2004 12:50:01 -0000
@@ -7,6 +7,11 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
+#include <boost/algorithm/string/split.hpp>
+#include <boost/algorithm/string/classification.hpp>
+// equals predicate is used for result comparison
+#include <boost/algorithm/string/predicate.hpp>
+
 // Include unit test framework
 #include <boost/test/included/test_exec_monitor.hpp>
 
@@ -15,11 +20,6 @@
 #include <iostream>
 
 #include <boost/test/test_tools.hpp>
-#include <boost/algorithm/string/split.hpp>
-#include <boost/algorithm/string/classification.hpp>
-
-// equals predicate is used for result comparison
-#include <boost/algorithm/string/predicate.hpp>
 
 
 using namespace std;
Index: string/test/trim_test.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/algorithm/string/test/trim_test.cpp,v
retrieving revision 1.1
diff -u -r1.1 trim_test.cpp
--- string/test/trim_test.cpp	4 Mar 2004 22:12:19 -0000	1.1
+++ string/test/trim_test.cpp	16 Jul 2004 12:50:01 -0000
@@ -7,12 +7,13 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
+#include <boost/algorithm/string/trim.hpp>
+
 // Include unit test framework
 #include <boost/test/included/test_exec_monitor.hpp>
 
 #include <string>
 #include <iostream>
-#include <boost/algorithm/string/trim.hpp>
 #include <boost/test/test_tools.hpp>
 
 using namespace std;

Index: string/test/Jamfile.v2
===================================================================
RCS file: /cvsroot/boost/boost/libs/algorithm/string/test/Jamfile.v2,v
retrieving revision 1.1
diff -u -r1.1 Jamfile.v2
--- string/test/Jamfile.v2	10 Jun 2004 10:02:02 -0000	1.1
+++ string/test/Jamfile.v2	16 Jul 2004 12:49:57 -0000
@@ -7,6 +7,8 @@
 #
 #  See http://www.boost.org for updates, documentation, and revision history.
 
+import testing ;
+
 test-suite string_algo
     : [ run
             container_test.cpp