dolfin team mailing list archive

[Harish Narayanan <harish.mlists@xxxxxxxxx>]

Please consider the attached patch which allows one (me) to force the
use of gcc's deprecated hash_set extension in an environment (Mac OS X)
which contains a buggy unordered_set implementation.

If someone else needs to do this, configure DOLFIN via:
scons configure enableHashset=yes

Harish

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: hnarayanan@xxxxxxxxx-20100205185425-jzui5vig88qwwqb5
# target_branch: lp:dolfin
# testament_sha1: fedfff60fce7b8225fc2dddeb91c48fda29103de
# timestamp: 2010-02-05 18:58:02 +0000
# base_revision_id: gnw20@xxxxxxxxx-20100205173702-yxi8dkhuhmtgx5s6
# 
# Begin patch
=== modified file 'SConstruct'
--- SConstruct	2010-02-04 00:03:02 +0000
+++ SConstruct	2010-02-05 18:54:25 +0000
@@ -106,6 +106,7 @@
     BoolVariable("enableLapack", "Compile with support for LAPACK", "yes"),
     BoolVariable("enablePython", "Compile the Python wrappers", "yes"),
     BoolVariable("enablePydolfin", "Compile the Python wrappers of DOLFIN *deprecated*", "yes"),
+    BoolVariable("enableHashset", "Force the use of gcc's deprecated hash_set extension", "no"),
     # some of the above may need extra options (like petscDir), should we
     # try to get that from pkg-config?
     # It may be neccessary to specify the installation path to the above packages.
@@ -299,6 +300,17 @@
     # try to use g++ as default:
     env["CXX"] = "g++"
 
+  if env['enableHashset']:
+    if configure.checkCxxHeader('ext/hash_set'):
+      env.Append(CPPDEFINES=["HAVE_HASH_SET"])  
+  else:
+    if configure.checkCxxHeader('unordered_set'):
+      env.Append(CPPDEFINES=["HAVE_UNORDERED_SET"])
+    elif configure.checkCxxHeader('tr1/unordered_set'):
+      env.Append(CPPDEFINES=["HAVE_TR1_UNORDERED_SET"])
+    elif configure.checkCxxHeader('ext/hash_set'):
+      env.Append(CPPDEFINES=["HAVE_HASH_SET"])
+
   # process list of packages to be included in allowed Dependencies.
   # Do we need this any more? I think we rather pick up (external) packages from
   # the scons.cfg files. Actually, I doubt usePackages is ever used?

=== modified file 'dolfin/fem/DofMapBuilder.h'
--- dolfin/fem/DofMapBuilder.h	2010-02-05 17:04:45 +0000
+++ dolfin/fem/DofMapBuilder.h	2010-02-05 18:54:25 +0000
@@ -10,9 +10,19 @@
 #define __DOF_MAP_BUILDER_H
 
 #include <set>
+//#include <boost/unordered_set.hpp>
+//#include <tr1/unordered_set>
+#ifdef HAVE_TR1_UNORDERED_SET
 #include <tr1/unordered_set>
-//#include <boost/unordered_set.hpp>
-
+#else 
+#ifdef HAVE_UNORDERED_SET
+#include <unordered_set>
+#else
+#ifdef HAVE_HASH_SET
+#include <ext/hash_set>
+#endif
+#endif
+#endif
 #include <dolfin/common/Set.h>
 
 namespace dolfin
@@ -32,8 +42,22 @@
     //typedef std::set<dolfin::uint>::const_iterator set_iterator;
     //typedef Set<dolfin::uint> set;
     //typedef Set<dolfin::uint>::const_iterator set_iterator;
+    #ifdef HAVE_TR1_UNORDERED_SET
     typedef std::tr1::unordered_set<dolfin::uint> set;
     typedef std::tr1::unordered_set<dolfin::uint>::const_iterator set_iterator;
+    #else
+    #ifdef HAVE_UNORDERED_SET
+    typedef std::unordered_set<dolfin::uint> set;
+    typedef std::unordered_set<dolfin::uint>::const_iterator set_iterator;
+    #else
+    #ifdef HAVE_HASH_SET
+    typedef __gnu_cxx::hash_set<dolfin::uint> set;
+    typedef __gnu_cxx::hash_set<dolfin::uint>::const_iterator set_iterator;
+    #endif
+    #endif
+    #endif
+    //typedef std::tr1::unordered_set<dolfin::uint> set;
+    //typedef std::tr1::unordered_set<dolfin::uint>::const_iterator set_iterator;
     //typedef boost::unordered_set<dolfin::uint> set;
     //typedef boost::unordered_set<dolfin::uint>::const_iterator set_iterator;
 

# Begin bundle
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
i7kinChIE1d+fAA=