From: maier Date: Tue, 7 Aug 2012 22:33:08 +0000 (+0000) Subject: Some minor changes so that the library compiles :) X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=beaa9224903b4d0c94fcf510828494daa9224746;p=dealii-svn.git Some minor changes so that the library compiles :) git-svn-id: https://svn.dealii.org/branches/branch_cmake@25767 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/CMakeLists.txt b/deal.II/CMakeLists.txt index 2aa76debe5..99388eaa34 100644 --- a/deal.II/CMakeLists.txt +++ b/deal.II/CMakeLists.txt @@ -6,6 +6,7 @@ SET (CMAKE_CXX_FLAGS "-std=c++0x -D_REENTRANT -fPIC -O2 -march=native -Wall -Wfa INCLUDE_DIRECTORIES( "${CMAKE_SOURCE_DIR}/contrib/tbb/tbb30_104oss/include" #TODO + "${CMAKE_SOURCE_DIR}/contrib" #TODO "${CMAKE_SOURCE_DIR}/include/" ) diff --git a/deal.II/include/deal.II/numerics/point_value_history.h b/deal.II/include/deal.II/numerics/point_value_history.h index 1db7ab4041..09ed874c07 100644 --- a/deal.II/include/deal.II/numerics/point_value_history.h +++ b/deal.II/include/deal.II/numerics/point_value_history.h @@ -26,8 +26,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/deal.II/source/base/boost_serialization.cc b/deal.II/source/base/boost_serialization.cc index 934cbbd512..09d9d7e546 100644 --- a/deal.II/source/base/boost_serialization.cc +++ b/deal.II/source/base/boost_serialization.cc @@ -15,34 +15,35 @@ #ifndef DEAL_II_USE_EXTERNAL_BOOST -#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" +// TODO +// #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.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" +// #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 */