]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Make two variables static so as to make icc happy.
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 25 Oct 2006 17:31:18 +0000 (17:31 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 25 Oct 2006 17:31:18 +0000 (17:31 +0000)
git-svn-id: https://svn.dealii.org/trunk@14091 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/deal.II/source/fe/fe_tools.cc

index 633b9042e8b1fd5569ef7b8264a066ea00e0986f..fdbfbde3edd44079c0b3a4b046abf5c429c8b00f 100644 (file)
@@ -101,6 +101,16 @@ namespace
                                    // and accessing the fe_name_map
                                    // variable. make this lock local
                                    // to this file.
+                                  //
+                                  // this and the next variable are
+                                  // declared static (even though
+                                  // they're in an anonymous
+                                  // namespace) in order to make icc
+                                  // happy (which otherwise reports a
+                                  // multiply defined symbol when
+                                  // linking libraries for more than
+                                  // one space dimension together
+  static
   Threads::ThreadMutex fe_name_map_lock;
 
                                    // This is the map used by
@@ -122,6 +132,7 @@ namespace
                                    // there are no threads running,
                                    // there are no thread-safety
                                    // issues here
+  static
   std::map<const std::string,
           boost::shared_ptr<const FETools::FEFactoryBase<deal_II_dimension> > >
   fe_name_map

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.