Author: logari81
Date: Fri Mar 14 18:39:22 2014
New Revision: 4536
URL: http://svn.gna.org/viewcvs/getfem?rev=4536&view=rev
Log:
do not enable C++11 mode for gcc by default
Modified:
trunk/getfem/configure.ac
trunk/getfem/src/getfem/getfem_mesh_region.h
Modified: trunk/getfem/configure.ac
URL:
http://svn.gna.org/viewcvs/getfem/trunk/getfem/configure.ac?rev=4536&r1=4535&r2=4536&view=diff
==============================================================================
--- trunk/getfem/configure.ac (original)
+++ trunk/getfem/configure.ac Fri Mar 14 18:39:22 2014
@@ -159,8 +159,6 @@
AC_CHECK_CXX_FLAG([-fmessage-length=0],CXXFLAGS)
AC_CHECK_CXX_FLAG([-ftemplate-depth-40],CXXFLAGS)
AC_CHECK_CXX_FLAG([-pedantic],CXXFLAGS)
- AC_CHECK_CXX_FLAG([-std=c++0x],CXXFLAGS)
- AC_CHECK_CXX_FLAG([-std=c++11],CXXFLAGS)
AC_CHECK_CXX_FLAG([-Wshadow],CXXFLAGS)
AC_CHECK_CXX_FLAG([-Wno-unknown-pragmas],CXXFLAGS)
AC_CHECK_CXX_FLAG([-Wpointer-arith],CXXFLAGS)
Modified: trunk/getfem/src/getfem/getfem_mesh_region.h
URL:
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem/getfem_mesh_region.h?rev=4536&r1=4535&r2=4536&view=diff
==============================================================================
--- trunk/getfem/src/getfem/getfem_mesh_region.h (original)
+++ trunk/getfem/src/getfem/getfem_mesh_region.h Fri Mar 14 18:39:22 2014
@@ -38,7 +38,11 @@
#ifndef GETFEM_MESH_REGION
#define GETFEM_MESH_REGION
+#if __cplusplus <= 199711L
+#include <map>
+#else
#include <unordered_map>
+#endif
#include <bitset>
#include <iostream>
#include "dal_bit_vector.h"
@@ -57,7 +61,11 @@
class mesh_region {
public:
typedef std::bitset<MAX_FACES_PER_CV+1> face_bitset;
+#if __cplusplus <= 199711L
+ typedef std::map<size_type,face_bitset> map_t;
+#else
typedef std::unordered_map<size_type,face_bitset> map_t;
+#endif
private:
struct impl {
mutable dal::bit_vector index_;
_______________________________________________
Getfem-commits mailing list
[email protected]
https://mail.gna.org/listinfo/getfem-commits
