Branch for merging Boost.Build and Boost.Jam completely.

[SVN r59143]
Suppressing warnings. Please report any problems (may have broken something!)
2025-10-10 15:45:20 +02:00 · 2010-01-19 20:47:20 +00:00 · 2009-12-01 02:16:50 +00:00 · 2009-11-08 18:53:59 +00:00 · 2009-10-17 02:07:38 +00:00 · 2009-10-03 09:18:26 +00:00
12 changed files with 28 additions and 97 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,37 +0,0 @@
-#
-# Copyright Troy D. Straszheim
-#
-# Distributed under the Boost Software License, Version 1.0.
-# See http://www.boost.org/LICENSE_1_0.txt
-#
-#----------------------------------------------------------------------------
-# This file was automatically generated from the original CMakeLists.txt file
-# Add a variable to hold the headers for the library
-set (lib_headers
-    assert.hpp
-    call_traits.hpp
-    checked_delete.hpp
-    compressed_pair.hpp
-    current_function.hpp
-    operators.hpp
-    throw_exception.hpp
-    utility.hpp
-    utility
-)
-
-# Add a library target to the build system
-boost_library_project(
-  utility
-  #  SRCDIRS 
-  TESTDIRS  test
-  HEADERS ${lib_headers}
-  #  DOCDIRS 
-  DESCRIPTION  "Various small utilities for C++ programming."
-  MODULARIZED 
-  AUTHORS  "David Abrahams <dave -at- boostpro.com>"
-           "Brad King"
-           "Douglas Gregor <doug.gregor -at- gmail.com>"
-  #  MAINTAINERS 
-)
-
-
--- a/base_from_member_test.cpp
+++ b/base_from_member_test.cpp
@@ -281,7 +281,7 @@ object_id_compare::operator ()
        }
        else
        {
-            return a.second->before( *b.second );
+            return a.second->before( *b.second ) != 0;
        }
    }
 }
--- a/binary_test.cpp
+++ b/binary_test.cpp
@@ -11,6 +11,10 @@
 #include <algorithm>
 #include <cstddef>

+#ifdef BOOST_MSVC
+#pragma warning(disable:4996) // warning C4996: 'std::equal': Function call with parameters that may be unsafe - this call relies on the caller to check that the passed values are correct. To disable this warning, use -D_SCL_SECURE_NO_WARNINGS. See documentation on how to use Visual C++ 'Checked Iterators'
+#endif
+
 /*
 Note: This file tests every single valid bit-grouping on its own, and some
      random combinations of bit-groupings.
--- a/call_traits_test.cpp
+++ b/call_traits_test.cpp
@@ -21,6 +21,10 @@
 #include <libs/type_traits/test/test.hpp>
 #include <libs/type_traits/test/check_type.hpp>

+#ifdef BOOST_MSVC
+#pragma warning(disable:4181) // : warning C4181: qualifier applied to reference type; ignored
+#endif
+
 // a way prevent warnings for unused variables
 template<class T> inline void unused_variable(const T&) {}

@@ -52,7 +56,8 @@ struct contained
   const_reference const_get()const { return v_; }
   // pass value:
   void call(param_type){}
-
+private:
+   contained& operator=(const contained&);
 };

 #ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
@@ -77,6 +82,8 @@ struct contained<T[N]>
   reference get() { return v_; }
   const_reference const_get()const { return v_; }
   void call(param_type){}
+private:
+   contained& operator=(const contained&);
 };
 #endif

@@ -197,7 +204,7 @@ struct comparible_UDT
   bool operator == (const comparible_UDT& v){ return v.i_ == i_; }
 };

-int main(int argc, char *argv[ ])
+int main()
 {
   call_traits_checker<comparible_UDT> c1;
   comparible_UDT u;
--- a/include/boost/exception.hpp
+++ b/include/boost/exception.hpp
@@ -6,8 +6,6 @@
 #ifndef UUID_1D94A7C6054E11DB9804B622A1EF5492
 #define UUID_1D94A7C6054E11DB9804B622A1EF5492

-//The header <boost/exception.hpp> has been deprecated.
-//Please #include <boost/exception/all.hpp> instead.
-#include <boost/exception/all.hpp>
+#error The header <boost/exception.hpp> has been deprecated. Please #include <boost/exception/all.hpp> instead.

 #endif
--- a/module.cmake
+++ b/module.cmake
@@ -1 +0,0 @@
-boost_module(utility DEPENDS iterator exception detail )
--- a/ref_test.cpp
+++ b/ref_test.cpp
@@ -70,7 +70,7 @@ struct ref_wrapper

 struct copy_counter {
  static int count_;
-  copy_counter(copy_counter const& other) {
+  copy_counter(copy_counter const& /*other*/) {
    ++count_;
  }
  copy_counter() {}
--- a/swap.html
+++ b/swap.html
@@ -7,7 +7,11 @@
   </head>
  <body>
    <!-- Page header -->
+    <h2>
    <img src="../../boost.png" alt="C++ Boost" align="middle" width="277" height="86"/>
+      Header &lt;<a href="../../boost/swap.hpp">boost/swap.hpp</a>&gt;
+    </h2>
+
    <h1>Swap</h1>
    
    <p>
@@ -84,9 +88,9 @@

    <!-- Copyright info -->    
    <hr/>
-    <p>Revised: 15 November 2008</p>
+    <p>Revised: 08 September 2009</p>
    <p>
-      Copyright 2007, 2008 Joseph Gauterin. Use, modification, and distribution are subject to the Boost Software License, Version 1.0.
+      Copyright 2007 - 2009 Joseph Gauterin. Use, modification, and distribution are subject to the Boost Software License, Version 1.0.
      (See accompanying file <a href="../../LICENSE_1_0.txt">LICENSE_1_0.txt</a> or a copy at &lt;<a href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</a>&gt;.)
    </p>
    
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,44 +0,0 @@
-#
-# Copyright Troy D. Straszheim
-#
-# Distributed under the Boost Software License, Version 1.0.
-# See http://www.boost.org/LICENSE_1_0.txt
-#
-boost_additional_test_dependencies(utility BOOST_DEPENDS test)
-
-boost_test_run(addressof_test ../addressof_test.cpp)
-boost_test_run(assert_test ../assert_test.cpp)
-boost_test_run(base_from_member_test ../base_from_member_test.cpp)
-boost_test_run(binary_search_test ../binary_search_test.cpp)
-boost_test_run(call_traits_test ../call_traits_test.cpp ARGS -u)
-boost_test_compile_fail(checked_delete_test ../checked_delete_test.cpp)
-boost_test_run(compressed_pair_test 
-  ../compressed_pair_test 
-  DEPENDS boost_test_exec_monitor)
-boost_test_run(current_function_test ../current_function_test.cpp)
-boost_test_run(iterators_test 
-  ../iterators_test.cpp 
-  DEPENDS boost_test_exec_monitor)
-boost_test_run(next_prior_test DEPENDS boost_test_exec_monitor)
-boost_test_compile_fail(noncopyable_test ../noncopyable_test.cpp)
-boost_test_run(numeric_traits_test ../numeric_traits_test.cpp)
-if (${CMAKE_SYSTEM} MATCHES "FreeBSD-.*")
-boost_test_compile_fail("operators_test_compilerbug")
-elseif(${CMAKE_SYSTEM} MATCHES "FreeBSD-.*")
-boost_test_run(operators_test 
-  ../operators_test.cpp
-  DEPENDS boost_test_exec_monitor)
-endif(${CMAKE_SYSTEM} MATCHES "FreeBSD-.*")
-boost_test_compile(ref_ct_test ../ref_ct_test.cpp)
-boost_test_run(ref_test 
-  ../ref_test.cpp
-  DEPENDS boost_test_exec_monitor)
-boost_test_compile(result_of_test)
-boost_test_run(shared_iterator_test ../shared_iterator_test.cpp)
-boost_test_run(value_init_test ../value_init_test.cpp)
-boost_test_compile_fail(value_init_test_fail1 
-  ../value_init_test_fail1.cpp)
-boost_test_compile_fail(value_init_test_fail2
-  ../value_init_test_fail2.cpp)
-boost_test_compile_fail(value_init_test_fail3
-  ../value_init_test_fail3.cpp)
--- a/test/next_prior_test.cpp
+++ b/test/next_prior_test.cpp
--- a/value_init.htm
+++ b/value_init.htm
@@ -313,7 +313,7 @@ non-member    function <code>get()</code>:  </p>
                    
 <h3>Warning:</h3>
                   
-<p>The <code>value_initialized</code> implementation of Boost version 1.39.0 and older
+<p>The <code>value_initialized</code> implementation of Boost version 1.40.0 and older
 allowed <i>non-const</i> access to the wrapped object, from a constant wrapper,
 both by its conversion operator and its <code>data()</code> member function. For example:</p>
                   
@@ -407,7 +407,7 @@ for Boost release version 1.35 (2008), offering a workaround to various compiler
     </p>
                    
 <hr>          
-<p>Revised 28 June 2009</p>
+<p>Revised 03 October 2009</p>
                   
 <p>&copy; Copyright Fernando Cacciola, 2002, 2009.</p>
                   
@@ -418,4 +418,4 @@ for Boost release version 1.35 (2008), offering a workaround to various compiler
 <br>
    
 </body>
-</html>
+</html>
--- a/value_init_test.cpp
+++ b/value_init_test.cpp
@@ -29,9 +29,9 @@
 //
 struct POD
 {
-  POD () : c(0), i(0), f(0) {}
+  POD () : f(0), c(0), i(0){}

-  POD ( char c_, int i_, float f_ ) : c(c_), i(i_), f(f_) {}
+  POD ( char c_, int i_, float f_ ) : f(f_), c(c_), i(i_) {}

  friend std::ostream& operator << ( std::ostream& os, POD const& pod )
    { return os << '(' << pod.c << ',' << pod.i << ',' << pod.f << ')' ; }
@@ -291,7 +291,7 @@ int test_main(int, char **)
 {
  BOOST_CHECK ( test( 0,1234 ) ) ;
  BOOST_CHECK ( test( 0.0,12.34 ) ) ;
-  BOOST_CHECK ( test( POD(0,0,0.0), POD('a',1234,56.78) ) ) ;
+  BOOST_CHECK ( test( POD(0,0,0.0), POD('a',1234,56.78f) ) ) ;
  BOOST_CHECK ( test( NonPOD( std::string() ), NonPOD( std::string("something") ) ) ) ;

  NonPOD NonPOD_object( std::string("NonPOD_object") );
Author	SHA1	Message	Date
Vladimir Prus	4e1128e55c	Branch for merging Boost.Build and Boost.Jam completely. [SVN r59143]	2010-01-19 20:47:20 +00:00
Emil Dotchevski	3de5974419	Suppressing warnings. Please report any problems (may have broken something!) [SVN r58072]	2009-12-01 02:16:50 +00:00
John Maddock	7eb1536590	Suppress/fix some msvc and gcc compiler warnings. [SVN r57494]	2009-11-08 18:53:59 +00:00
Troy D. Straszheim	9339431e03	rm cmake from trunk. I'm not entirely sure this is necessary to satisfy the inspect script, but I'm not taking any chances, and it is easy to put back [SVN r56942]	2009-10-17 02:07:38 +00:00
Niels Dekker	f2349baf7d	Updated value_init documentation, because the fix of #2548 was not yet included with Boost release 1.40.0. [SVN r56544]	2009-10-03 09:18:26 +00:00
Niels Dekker	8745ca628a	Updated revision date of Boost Swap documentation [SVN r56108]	2009-09-08 17:07:13 +00:00
Niels Dekker	ba61e9d796	Mentioned swap.hpp header, as requested by Thorsten Ottosen <http://lists.boost.org/Archives/boost/2009/06/153477.php > and David Abrahams <http://lists.boost.org/Archives/boost/2009/09/156064.php > [SVN r56107]	2009-09-08 16:54:54 +00:00
				`@@ -1 +0,0 @@`
				`boost_module(utility DEPENDS iterator exception detail )`