From cf74c01266f3a4b5d182a96bc6bb885da65315c5 Mon Sep 17 00:00:00 2001 From: kronbichler Date: Sat, 7 Apr 2012 18:58:04 +0000 Subject: [PATCH] Delete boost 1.46.1 and link in the new version 1.49.0. git-svn-id: https://svn.dealii.org/trunk@25395 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/configure | 4 +- deal.II/configure.in | 2 +- deal.II/doc/news/changes.h | 6 +++ deal.II/source/base/boost_serialization.cc | 56 +++++++++++----------- deal.II/source/base/boost_threads.cc | 8 ++-- 5 files changed, 41 insertions(+), 35 deletions(-) diff --git a/deal.II/configure b/deal.II/configure index 7a9c3ae9f1..686422604f 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 25300 . +# From configure.in Revision: 25333 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.68 for deal.II 7.2.pre. # @@ -10448,7 +10448,7 @@ $as_echo "" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: ---------------- configuring additional libs ----------------" >&5 $as_echo "---------------- configuring additional libs ----------------" >&6; } -BOOST_INCLUDE_DIR="-I$DEAL_II_PATH/contrib/boost-1.46.1/include" +BOOST_INCLUDE_DIR="-I$DEAL_II_PATH/contrib/boost-1.49.0/include" # Check whether --with-boost was given. diff --git a/deal.II/configure.in b/deal.II/configure.in index d7891c9c2d..0402549871 100644 --- a/deal.II/configure.in +++ b/deal.II/configure.in @@ -463,7 +463,7 @@ dnl Check for boost option and make sure we get all files. dnl Since we may want to use an external boost installation dnl this test needs to run after we determine whether -rpath dnl works -BOOST_INCLUDE_DIR="-I$DEAL_II_PATH/contrib/boost-1.46.1/include" +BOOST_INCLUDE_DIR="-I$DEAL_II_PATH/contrib/boost-1.49.0/include" DEAL_II_CHECK_BOOST DEAL_II_CHECK_BOOST_BIND_COMPILER_BUG DEAL_II_CHECK_BOOST_GRAPH_COMPILER_BUG diff --git a/deal.II/doc/news/changes.h b/deal.II/doc/news/changes.h index 6a78d5c444..7aa1778a3b 100644 --- a/deal.II/doc/news/changes.h +++ b/deal.II/doc/news/changes.h @@ -47,6 +47,12 @@ used for boundary indicators.
    +
  1. +Changed: The version of BOOST we ship with deal.II has been upgraded +to 1.49.0. +
    +(Martin Kronbichler, 2012/04/07) +
  2. New: We have added a brief section to the step-12 tutorial programs that compares the DG solution computed there with one that one would obtain by diff --git a/deal.II/source/base/boost_serialization.cc b/deal.II/source/base/boost_serialization.cc index b196db3253..934cbbd512 100644 --- a/deal.II/source/base/boost_serialization.cc +++ b/deal.II/source/base/boost_serialization.cc @@ -15,34 +15,34 @@ #ifndef DEAL_II_USE_EXTERNAL_BOOST -#include "../../contrib/boost-1.46.1/libs/serialization/src/basic_archive.cpp" -#include "../../contrib/boost-1.46.1/libs/serialization/src/basic_iarchive.cpp" -#include "../../contrib/boost-1.46.1/libs/serialization/src/basic_iserializer.cpp" -#include "../../contrib/boost-1.46.1/libs/serialization/src/basic_oarchive.cpp" -#include "../../contrib/boost-1.46.1/libs/serialization/src/basic_oserializer.cpp" -#include "../../contrib/boost-1.46.1/libs/serialization/src/basic_pointer_iserializer.cpp" -#include "../../contrib/boost-1.46.1/libs/serialization/src/basic_pointer_oserializer.cpp" -#include "../../contrib/boost-1.46.1/libs/serialization/src/basic_serializer_map.cpp" -#include "../../contrib/boost-1.46.1/libs/serialization/src/basic_text_iprimitive.cpp" -#include "../../contrib/boost-1.46.1/libs/serialization/src/basic_text_oprimitive.cpp" -#include "../../contrib/boost-1.46.1/libs/serialization/src/basic_xml_archive.cpp" -#include "../../contrib/boost-1.46.1/libs/serialization/src/binary_iarchive.cpp" +#include "../../contrib/boost-1.49.0/libs/serialization/src/basic_archive.cpp" +#include "../../contrib/boost-1.49.0/libs/serialization/src/basic_iarchive.cpp" +#include "../../contrib/boost-1.49.0/libs/serialization/src/basic_iserializer.cpp" +#include "../../contrib/boost-1.49.0/libs/serialization/src/basic_oarchive.cpp" +#include "../../contrib/boost-1.49.0/libs/serialization/src/basic_oserializer.cpp" +#include "../../contrib/boost-1.49.0/libs/serialization/src/basic_pointer_iserializer.cpp" +#include "../../contrib/boost-1.49.0/libs/serialization/src/basic_pointer_oserializer.cpp" +#include "../../contrib/boost-1.49.0/libs/serialization/src/basic_serializer_map.cpp" +#include "../../contrib/boost-1.49.0/libs/serialization/src/basic_text_iprimitive.cpp" +#include "../../contrib/boost-1.49.0/libs/serialization/src/basic_text_oprimitive.cpp" +#include "../../contrib/boost-1.49.0/libs/serialization/src/basic_xml_archive.cpp" +#include "../../contrib/boost-1.49.0/libs/serialization/src/binary_iarchive.cpp" -#include "../../contrib/boost-1.46.1/libs/serialization/src/binary_oarchive.cpp" -#include "../../contrib/boost-1.46.1/libs/serialization/src/extended_type_info.cpp" -#include "../../contrib/boost-1.46.1/libs/serialization/src/extended_type_info_typeid.cpp" -#include "../../contrib/boost-1.46.1/libs/serialization/src/extended_type_info_no_rtti.cpp" -#include "../../contrib/boost-1.46.1/libs/serialization/src/polymorphic_iarchive.cpp" -#include "../../contrib/boost-1.46.1/libs/serialization/src/polymorphic_oarchive.cpp" -#include "../../contrib/boost-1.46.1/libs/serialization/src/stl_port.cpp" -#include "../../contrib/boost-1.46.1/libs/serialization/src/text_iarchive.cpp" -#include "../../contrib/boost-1.46.1/libs/serialization/src/text_oarchive.cpp" -#include "../../contrib/boost-1.46.1/libs/serialization/src/void_cast.cpp" -#include "../../contrib/boost-1.46.1/libs/serialization/src/archive_exception.cpp" -#include "../../contrib/boost-1.46.1/libs/serialization/src/xml_grammar.cpp" -#include "../../contrib/boost-1.46.1/libs/serialization/src/xml_iarchive.cpp" -#include "../../contrib/boost-1.46.1/libs/serialization/src/xml_oarchive.cpp" -#include "../../contrib/boost-1.46.1/libs/serialization/src/xml_archive_exception.cpp" -#include "../../contrib/boost-1.46.1/libs/serialization/src/shared_ptr_helper.cpp" +#include "../../contrib/boost-1.49.0/libs/serialization/src/binary_oarchive.cpp" +#include "../../contrib/boost-1.49.0/libs/serialization/src/extended_type_info.cpp" +#include "../../contrib/boost-1.49.0/libs/serialization/src/extended_type_info_typeid.cpp" +#include "../../contrib/boost-1.49.0/libs/serialization/src/extended_type_info_no_rtti.cpp" +#include "../../contrib/boost-1.49.0/libs/serialization/src/polymorphic_iarchive.cpp" +#include "../../contrib/boost-1.49.0/libs/serialization/src/polymorphic_oarchive.cpp" +#include "../../contrib/boost-1.49.0/libs/serialization/src/stl_port.cpp" +#include "../../contrib/boost-1.49.0/libs/serialization/src/text_iarchive.cpp" +#include "../../contrib/boost-1.49.0/libs/serialization/src/text_oarchive.cpp" +#include "../../contrib/boost-1.49.0/libs/serialization/src/void_cast.cpp" +#include "../../contrib/boost-1.49.0/libs/serialization/src/archive_exception.cpp" +#include "../../contrib/boost-1.49.0/libs/serialization/src/xml_grammar.cpp" +#include "../../contrib/boost-1.49.0/libs/serialization/src/xml_iarchive.cpp" +#include "../../contrib/boost-1.49.0/libs/serialization/src/xml_oarchive.cpp" +#include "../../contrib/boost-1.49.0/libs/serialization/src/xml_archive_exception.cpp" +#include "../../contrib/boost-1.49.0/libs/serialization/src/shared_ptr_helper.cpp" #endif /* DEAL_II_USE_EXTERNAL_BOOST */ diff --git a/deal.II/source/base/boost_threads.cc b/deal.II/source/base/boost_threads.cc index ad83f5d26c..e07f70ee1f 100644 --- a/deal.II/source/base/boost_threads.cc +++ b/deal.II/source/base/boost_threads.cc @@ -32,11 +32,11 @@ # define UINTMAX_C(x) x ## ULL # endif -# include "../contrib/boost-1.46.1/libs/thread/src/pthread/once.cpp" -# include "../contrib/boost-1.46.1/libs/thread/src/pthread/thread.cpp" +# include "../contrib/boost-1.49.0/libs/thread/src/pthread/once.cpp" +# include "../contrib/boost-1.49.0/libs/thread/src/pthread/thread.cpp" # else -# include "../contrib/boost-1.46.1/libs/thread/src/win32/once.cpp" -# include "../contrib/boost-1.46.1/libs/thread/src/win32/thread.cpp" +# include "../contrib/boost-1.49.0/libs/thread/src/win32/once.cpp" +# include "../contrib/boost-1.49.0/libs/thread/src/win32/thread.cpp" # endif #endif -- 2.39.5