From: bangerth Date: Wed, 25 Oct 2006 17:31:18 +0000 (+0000) Subject: Make two variables static so as to make icc happy. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40db60538078290ef2336a9fb40bda3ceee7b31f;p=dealii-svn.git Make two variables static so as to make icc happy. git-svn-id: https://svn.dealii.org/trunk@14091 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/source/fe/fe_tools.cc b/deal.II/deal.II/source/fe/fe_tools.cc index 633b9042e8..fdbfbde3ed 100644 --- a/deal.II/deal.II/source/fe/fe_tools.cc +++ b/deal.II/deal.II/source/fe/fe_tools.cc @@ -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 > > fe_name_map