From 8788d0239e558c72e996c7e18d0378865238699d Mon Sep 17 00:00:00 2001 From: bangerth Date: Tue, 13 Jan 2009 14:44:20 +0000 Subject: [PATCH] Make sure we can use namespace std_cxx0x=std in C++0x mode. git-svn-id: https://svn.dealii.org/trunk@18210 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/base/include/base/config.h.in | 11 ++++++++++- deal.II/configure.in | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/deal.II/base/include/base/config.h.in b/deal.II/base/include/base/config.h.in index 816a099780..eca10363c9 100644 --- a/deal.II/base/include/base/config.h.in +++ b/deal.II/base/include/base/config.h.in @@ -5,7 +5,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -523,5 +523,14 @@ #include +/** + * If the compiler supports the upcoming C++0x standard, allow us to refer + * to things in namespace std through namespace std_cxx0x (the namespace + * into which we import BOOST components if we don't have C++0x support). + */ +#ifdef DEAL_II_CAN_USE_CXX0X +namespace std_cxx0x = std; +#endif + #endif diff --git a/deal.II/configure.in b/deal.II/configure.in index 8e162ebc85..4a3a6430f5 100644 --- a/deal.II/configure.in +++ b/deal.II/configure.in @@ -622,7 +622,7 @@ AH_TOP( // $Id$ // Version: $Name$ // -// Copyright (C) 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -672,6 +672,15 @@ AH_BOTTOM( #include +/** + * If the compiler supports the upcoming C++0x standard, allow us to refer + * to things in namespace std through namespace std_cxx0x (the namespace + * into which we import BOOST components if we don't have C++0x support). + */ +#ifdef DEAL_II_CAN_USE_CXX0X +namespace std_cxx0x = std; +#endif + #endif ]) -- 2.39.5