From: bangerth Date: Mon, 8 Feb 2010 23:54:21 +0000 (+0000) Subject: Make sure we use the included boost library. This isn't going to work if X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b28193fd3728e1b71545ea02ca2010327d5fd95;p=dealii-svn.git Make sure we use the included boost library. This isn't going to work if someone tries to use an external boost version, but I can't see right now how that would work in the first place. At least we'd have to test this once or twice. git-svn-id: https://svn.dealii.org/trunk@20523 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/base/source/boost_threads.cc b/deal.II/base/source/boost_threads.cc index fca2fd45ac..f73346769b 100644 --- a/deal.II/base/source/boost_threads.cc +++ b/deal.II/base/source/boost_threads.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2009 by the deal.II authors +// Copyright (C) 2009, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -31,11 +31,11 @@ # define UINTMAX_C(x) x ## ULL # endif -# include <../libs/thread/src/pthread/once.cpp> -# include <../libs/thread/src/pthread/thread.cpp> +# include "../contrib/boost/libs/thread/src/pthread/once.cpp" +# include "../contrib/boost/libs/thread/src/pthread/thread.cpp" # else -# include <../libs/thread/src/win32/once.cpp> -# include <../libs/thread/src/win32/thread.cpp> +# include "../contrib/boost/libs/thread/src/win32/once.cpp" +# include "../contrib/boost/libs/thread/src/win32/thread.cpp" # endif #endif