Skip to content
Snippets Groups Projects
Commit 72bfd452 authored by Martin Nolte's avatar Martin Nolte
Browse files

[structure] rename cxx11.hh to std/constexpr.hh

The majority of developers favor individual headers for (emulation of) C++11
features over collecting them in a single header cxx11.hh. This patch
renames cxx11.hh to constexpr.hh and moves it into the subdirectory std.
This is the place most developers would like these headers in (see
http://users.dune-project.org/doodles/4).
parent af10873c
Branches
Tags
No related merge requests found
......@@ -32,6 +32,7 @@ AC_CONFIG_FILES([Makefile
dune/common/test/Makefile
dune/common/parallel/Makefile
dune/common/parallel/test/Makefile
dune/common/std/Makefile
doc/Makefile
doc/comm/Makefile
doc/comm/figures/Makefile
......
add_subdirectory("parallel")
add_subdirectory("std")
add_subdirectory("test" EXCLUDE_FROM_ALL)
#build the library dunecommon
......@@ -31,7 +32,6 @@ install(FILES
bitsetvector.hh
classname.hh
collectivecommunication.hh
cxx11.hh
debugallocator.hh
debugstream.hh
deprecated.hh
......
# $Id$
SUBDIRS = . test parallel
SUBDIRS = . test parallel std
# the standard debug streams are put into the libdune
noinst_LTLIBRARIES = libcommon.la
......@@ -28,7 +28,6 @@ commoninclude_HEADERS = \
bitsetvector.hh \
classname.hh \
collectivecommunication.hh \
cxx11.hh \
debugallocator.hh \
debugstream.hh \
deprecated.hh \
......
......@@ -8,12 +8,12 @@
#include <cstddef>
#include <iostream>
#include <dune/common/cxx11.hh>
#include <dune/common/exceptions.hh>
#include <dune/common/fvector.hh>
#include <dune/common/densematrix.hh>
#include <dune/common/precision.hh>
#include <dune/common/static_assert.hh>
#include <dune/common/std/constexpr.hh>
namespace Dune
{
......
......@@ -11,7 +11,7 @@
#include <cstring>
#include <utility>
#include <dune/common/cxx11.hh>
#include <dune/common/std/constexpr.hh>
#include "typetraits.hh"
#include "exceptions.hh"
......
install(FILES
constexpr.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/common/std)
# Install some test headers, because they get used by tests in other modules
# We do this here as test will not be considered for make install
install(FILES test/iteratortest.hh DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/common/test)
stdincludedir = $(includedir)/dune/common/std
stdinclude_HEADERS = \
constexpr.hh
EXTRA_DIST = CMakeLists.txt
include $(top_srcdir)/am/global-rules
#ifndef DUNE_COMMON_CXX11_HH
#define DUNE_COMMON_CXX11_HH
#ifndef DUNE_COMMON_STD_CONSTEXPR_HH
#define DUNE_COMMON_STD_CONSTEXPR_HH
#if HAVE_CONSTEXPR
#define DUNE_CONSTEXPR constexpr
......@@ -7,4 +7,4 @@
#define DUNE_CONSTEXPR
#endif // #else // #if HAVE_CONSTEXPR
#endif // #ifndef DUNE_COMMON_CXX11_HH
#endif // #ifndef DUNE_COMMON_STD_CONSTEXPR_HH
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment