]> https://gitweb.dealii.org/ - dealii.git/commitdiff
fix compilation issue with gcc-5.4
authorasartori86 <alberto.sartori86@gmail.com>
Wed, 26 Jul 2017 14:57:10 +0000 (16:57 +0200)
committerWolfgang Bangerth <bangerth@colostate.edu>
Thu, 3 Aug 2017 13:50:55 +0000 (07:50 -0600)
doc/news/changes/minor/20170726AlbertoSartori [new file with mode: 0644]
include/deal.II/base/function_parser.h

diff --git a/doc/news/changes/minor/20170726AlbertoSartori b/doc/news/changes/minor/20170726AlbertoSartori
new file mode 100644 (file)
index 0000000..5e040ce
--- /dev/null
@@ -0,0 +1,3 @@
+Fixed: FunctionParser uses shared_ptr instead of unique_ptr in order to fix compilation issues with gcc-5.4.
+<br>
+(Alberto Sartori, 2017/07/26)
index 9e2e057078b59df40b75c386706cc11104189e50..5170af931aff6e408ddd6dd138ab1a94cf7d2a2b 100644 (file)
@@ -328,10 +328,11 @@ private:
 
   /**
    * The muParser objects for each thread (and one for each component). We are
-   * storing unique_ptr so that we don't need to include the definition of
+   * storing shared_ptr so that we don't need to include the definition of
    * mu::Parser in this header.
    */
-  mutable Threads::ThreadLocalStorage<std::vector<std::unique_ptr<mu::Parser> > > fp;
+  // std::unique_ptr does not compile with gcc-5.4
+  mutable Threads::ThreadLocalStorage<std::vector<std::shared_ptr<mu::Parser> > > fp;
 
   /**
    * An array to keep track of all the constants, required to initialize fp in

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.