Module: ppl/ppl Branch: devel Commit: e8c5fcf766c67394a78790c8a9f016c15d38ae2e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e8c5fcf766c67... Author: Roberto Bagnara <roberto.bagnara@bugseng.com> Date: Sun Aug 9 18:43:08 2020 +0200 Fixed support for PPL_NO_AUTOMATIC_INITIALIZATION. --- src/Init.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Init.cc b/src/Init.cc index bc1788c69..e92315e36 100644 --- a/src/Init.cc +++ b/src/Init.cc @@ -155,33 +155,35 @@ Parma_Polyhedra_Library_thread_initializer_p; } // namespace -static void +#ifdef PPL_NO_AUTOMATIC_INITIALIZATION +void initialize_aux() { if (Parma_Polyhedra_Library_initializer_p == nullptr) { Parma_Polyhedra_Library_initializer_p = new Init(); } } -static void +void finalize_aux() { PPL_ASSERT(Parma_Polyhedra_Library_initializer_p != nullptr); delete Parma_Polyhedra_Library_initializer_p; Parma_Polyhedra_Library_initializer_p = nullptr; } -static void +void thread_initialize_aux() { if (Parma_Polyhedra_Library_thread_initializer_p == nullptr) { Parma_Polyhedra_Library_thread_initializer_p = new Thread_Init(); } } -static void +void thread_finalize_aux() { PPL_ASSERT(Parma_Polyhedra_Library_thread_initializer_p != nullptr); delete Parma_Polyhedra_Library_thread_initializer_p; Parma_Polyhedra_Library_thread_initializer_p = nullptr; } +#endif } // namespace Implementation