Update of /cvsroot/boost/boost/libs/program_options/test
In directory 
sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31263/libs/program_options/test

Modified Files:
        Jamfile.v2 test_convert.cpp 
Log Message:
Allow building of shared versions of some Boost.Test libraries.
Adjust tests to use always use static linking to Boost.Test, since
linking to the shared version requires test changes.

Patch from Juergen Hunold.

Index: Jamfile.v2
===================================================================
RCS file: /cvsroot/boost/boost/libs/program_options/test/Jamfile.v2,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Jamfile.v2  13 Feb 2006 09:04:49 -0000      1.6
+++ Jamfile.v2  10 Nov 2006 19:09:56 -0000      1.7
@@ -2,7 +2,7 @@
 project
     : requirements 
     <library>../build//boost_program_options
-    <library>/boost/test//boost_test_exec_monitor
+    <library>/boost/test//boost_test_exec_monitor/<link>static
     <link>static
     
 #    <define>_GLIBCXX_CONCEPT_CHECKS

Index: test_convert.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/program_options/test/test_convert.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- test_convert.cpp    28 Feb 2006 22:56:33 -0000      1.2
+++ test_convert.cpp    10 Nov 2006 19:09:56 -0000      1.3
@@ -3,6 +3,7 @@
 // (See accompanying file LICENSE_1_0.txt
 // or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <cassert>
 #include <string>
 #include <fstream>
 #include <sstream>
@@ -14,6 +15,8 @@
 #include <boost/program_options/detail/convert.hpp>
 #include <boost/program_options/detail/utf8_codecvt_facet.hpp>
 
+#include <boost/test/test_tools.hpp>
+
 using namespace std;
 
 string file_content(const string& filename)
@@ -74,7 +77,7 @@
 void test_convert(const std::string& input, 
                   const std::string& expected_output)
 {
-    boost::program_options::detail::utf8_codecvt_facet<wchar_t, char> facet;
+    boost::program_options::detail::utf8_codecvt_facet facet;
     
     std::wstring output;
     { 


-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs

Reply via email to