Lazily initialize JobIdentifier's global variables

diff --git a/include/deal.II/base/job_identifier.h b/include/deal.II/base/job_identifier.h
index 7763c5e110878a396b1ee4d6f89760af68f7a6d3..82ed5496fca2247dab7e7d79ec30605f87ba8ecc 100644 (file)
--- a/include/deal.II/base/job_identifier.h
+++ b/include/deal.II/base/job_identifier.h
@@ -66,6 +66,12 @@ public:
   const std::string
   operator()() const;
 
+  /**
+   * Function to identify the presently running program.
+   */
+  static const JobIdentifier &
+  get_dealjobid();
+
 private:
   /**
    * String holding the identifier of the presently running program.
@@ -73,14 +79,6 @@ private:
   std::string id;
 };
 
-
-/*----------------------------- Inline functions ----------------------------*/
-
-
-/**
- * Global object to identify the presently running program.
- */
-extern JobIdentifier dealjobid;
 DEAL_II_NAMESPACE_CLOSE
 
 #endif

diff --git a/source/base/job_identifier.cc b/source/base/job_identifier.cc
index ef0f1c2ccff088c450f2aa3abf1029afe33f7c7c..885fa8651151fdfd616dce9f36d449f6ce87245b 100644 (file)
--- a/source/base/job_identifier.cc
+++ b/source/base/job_identifier.cc
@@ -24,7 +24,13 @@
 DEAL_II_NAMESPACE_OPEN
 
 
-JobIdentifier dealjobid;
+const JobIdentifier &
+JobIdentifier::get_dealjobid()
+{
+  static JobIdentifier dealjobid;
+  return dealjobid;
+}
+
 
 
 JobIdentifier::JobIdentifier()

diff --git a/source/base/logstream.cc b/source/base/logstream.cc
index 556bb5a1256bdd07f3715b342fadd60f1c78fc81..4ed0dfb64a605c7e2c82156bf1902c312f154aeb 100644 (file)
--- a/source/base/logstream.cc
+++ b/source/base/logstream.cc
@@ -223,7 +223,7 @@ LogStream::attach(std::ostream &                o,
   file = &o;
   o.setf(flags);
   if (print_job_id)
-    o << dealjobid();
+    o << JobIdentifier::get_dealjobid()();
 }
 
 

diff --git a/tests/base/base_name.cc b/tests/base/base_name.cc
index d747f604e12e3d1314250a1a094f7f402350be01..95ed29d11c85a6f08c58ca4d4987d8538c526bcc 100644 (file)
--- a/tests/base/base_name.cc
+++ b/tests/base/base_name.cc
@@ -22,9 +22,10 @@ main()
 {
   initlog();
 
-  deallog << dealjobid.base_name("mypath/test.cc") << std::endl;
-  ;
-  deallog << dealjobid.base_name("/foo.bar/mypath/test.cc") << std::endl;
+  deallog << JobIdentifier::get_dealjobid().base_name("mypath/test.cc")
+          << std::endl;
+  deallog << JobIdentifier::get_dealjobid().base_name("/foo.bar/mypath/test.cc")
+          << std::endl;
 
   return 0;
 }