[Boost-commit] svn:boost r49054 - in branches/bcbboost/libs: graph/build mpi/build pool/test

Subject: [Boost-commit] svn:boost r49054 - in branches/bcbboost/libs: graph/build mpi/build pool/test
From: nicola.musatti_at_[hidden]
Date: 2008-09-29 18:03:40

Author: nmusatti
Date: 2008-09-29 18:03:39 EDT (Mon, 29 Sep 2008)
New Revision: 49054
URL: http://svn.boost.org/trac/boost/changeset/49054

Log:
Merge from trunk
Text files modified: 
   branches/bcbboost/libs/graph/build/Jamfile.v2        |    27 ++++++++++++++++-----------             
   branches/bcbboost/libs/mpi/build/Jamfile.v2          |    10 ++++++----                              
   branches/bcbboost/libs/pool/test/test_pool_alloc.cpp |    17 +++++++++++++++++                       
   3 files changed, 39 insertions(+), 15 deletions(-)

Modified: branches/bcbboost/libs/graph/build/Jamfile.v2
==============================================================================
--- branches/bcbboost/libs/graph/build/Jamfile.v2	(original)
+++ branches/bcbboost/libs/graph/build/Jamfile.v2	2008-09-29 18:03:39 EDT (Mon, 29 Sep 2008)
@@ -23,23 +23,30 @@
     ECHO "Expat library directory: $(EXPAT_LIBPATH)" ;
   }
 
-  optional_sources += graphml.cpp ;
-  optional_reqs += <include>$(EXPAT_INCLUDE) 
-                   <library-path>$(EXPAT_LIBPATH) 
-                   <find-shared-library>expat
-                ;
+  alias graphml
+      : graphml.cpp
+      : # requirements
+      : # default built
+      : # usage requirements
+        <include>$(EXPAT_INCLUDE)
+        <library-path>$(EXPAT_LIBPATH)
+        <find-shared-library>expat
+      ;
 }
 else
 {
-  ECHO "warning: Graph library does not contain optional GraphML reader." ;
-  ECHO "note: to enable GraphML support, set EXPAT_INCLUDE and EXPAT_LIBPATH to the" ;
-  ECHO "note: directories containing the Expat headers and libraries, respectively." ;
+    message graphml
+      : "warning: Graph library does not contain optional GraphML reader."
+      : "note: to enable GraphML support, set EXPAT_INCLUDE and EXPAT_LIBPATH to the"
+      : "note: directories containing the Expat headers and libraries, respectively."
+      ;
 }
+explicit graphml ;
 
 lib boost_graph
     :
     read_graphviz_spirit.cpp
-    $(optional_sources)
+    graphml
     :
     <define>BOOST_GRAPH_NO_LIB=1
     <link>shared:<define>BOOST_GRAPH_DYN_LINK=1
@@ -48,8 +55,6 @@
     # Without these flags, MSVC 7.1 and 8.0 crash
     <toolset>msvc-7.1:<cxxflags>-GR-
     <toolset>msvc-8.0:<cxxflags>-GR-
-    # Requirements for any "optional" sources
-    $(optional_reqs)
     ;
 
 boost-install boost_graph ;
\ No newline at end of file

Modified: branches/bcbboost/libs/mpi/build/Jamfile.v2
==============================================================================
--- branches/bcbboost/libs/mpi/build/Jamfile.v2	(original)
+++ branches/bcbboost/libs/mpi/build/Jamfile.v2	2008-09-29 18:03:39 EDT (Mon, 29 Sep 2008)
@@ -104,10 +104,12 @@
 }
 else if ! ( --without-mpi in  [ modules.peek : ARGV ] )
 {
-  ECHO "warning: skipping optional Message Passing Interface (MPI) library." ;
-  ECHO "note: to enable MPI support, add \"using mpi ;\" to user-config.jam." ;
-  ECHO "note: to suppress this message, pass \"--without-mpi\" to bjam." ;
-  ECHO "note: otherwise, you can safely ignore this message." ;
+  message boost_mpi   
+      : "warning: skipping optional Message Passing Interface (MPI) library."
+      : "note: to enable MPI support, add \"using mpi ;\" to user-config.jam."
+      : "note: to suppress this message, pass \"--without-mpi\" to bjam."
+      : "note: otherwise, you can safely ignore this message." 
+      ;
 }
 
 boost-install $(libraries) ;
\ No newline at end of file

Modified: branches/bcbboost/libs/pool/test/test_pool_alloc.cpp
==============================================================================
--- branches/bcbboost/libs/pool/test/test_pool_alloc.cpp	(original)
+++ branches/bcbboost/libs/pool/test/test_pool_alloc.cpp	2008-09-29 18:03:39 EDT (Mon, 29 Sep 2008)
@@ -304,11 +304,28 @@
     std::cout << "Memory error" << std::endl;
 }
 
+void test_void()
+{
+#ifdef VERBOSE
+    std::cout << "Testing void specialization. . ." << std::endl;
+#endif
+
+    typedef boost::pool_allocator<void> void_allocator;
+    typedef boost::fast_pool_allocator<void> fast_void_allocator;
+
+    typedef void_allocator::rebind<int>::other int_allocator;
+    typedef fast_void_allocator::rebind<int>::other fast_int_allocator;
+
+    std::vector<int, int_allocator> v1;
+    std::vector<int, fast_int_allocator> v2;
+}
+
 int test_main(int, char * [])
 {
   test();
   test_alloc();
   test_mem_usage();
+  test_void();
 
 #ifdef VERBOSE
   std::cout << "main() exiting. . ." << std::endl;