Merge pull request #616 from thelfer/615-mfront-c++-interface-missing…

…-declaration-of-the-physicalconstants-class

Fix Issue #615

docs/web/CMakeLists.txt

@@ -171,6 +171,7 @@ pandoc_html(release-notes-4.0   "--toc" "--toc-depth=2" "--number-sections")
 pandoc_html(release-notes-4.0.1 "--toc" "--toc-depth=2" "--number-sections")
 pandoc_html(release-notes-4.0.2 "--toc" "--toc-depth=2" "--number-sections")
 pandoc_html(release-notes-4.0.3 "--toc" "--toc-depth=2" "--number-sections")
+pandoc_html(release-notes-4.0.4 "--toc" "--toc-depth=2" "--number-sections")
 pandoc_html(release-notes-4.1   "--toc" "--toc-depth=2" "--number-sections")
 pandoc_html(release-notes-4.1.1 "--toc" "--toc-depth=2" "--number-sections")
 pandoc_html(release-notes-4.1.2 "--toc" "--toc-depth=2" "--number-sections")

docs/web/mfront-template.html

@@ -163,6 +163,8 @@
 		    <li><a href="release-notes-4.0.html">Version 4.0.0</a></li>
 		    <li><a href="release-notes-4.0.1.html">Version 4.0.1</a></li>
 		    <li><a href="release-notes-4.0.2.html">Version 4.0.2</a></li>
+		    <li><a href="release-notes-4.0.3.html">Version 4.0.3</a></li>
+		    <li><a href="release-notes-4.0.4.html">Version 4.0.4</a></li>
 		  </ul>
 		</li>
 		<li><a>Versions 4.1.x</a>

mfront/src/CppMaterialPropertyInterface.cxx

@@ -438,7 +438,21 @@ namespace mfront {
       }
     }
     src << ") const\n{\n"
-        << "using namespace std;\n";
+        << "using namespace std;\n"
+        << "using tfel::math::invert_type;\n"
+        << "using tfel::math::result_type;\n"
+        << "using tfel::math::derivative_type;\n";
+    if (useQuantities(mpd)) {
+      src << "using PhysicalConstants [[maybe_unused]] = "
+          << "tfel::PhysicalConstants<double, true>;\n";
+    } else {
+      src << "using PhysicalConstants [[maybe_unused]] = "
+          << "tfel::PhysicalConstants<double, false>;\n";
+    }
+    src << "[[maybe_unused]] auto min = [](const auto a, const auto b) "
+	<< "{ return a < b ? a : b; };\n"
+	<< "[[maybe_unused]] auto max = [](const auto a, const auto b) "
+	<< "{ return a > b ? a : b; };\n";
     writeMaterialLaws(src, mpd.materialLaws);
     writeStaticVariables(src, mpd.staticVars, fd.fileName);
     for (const auto& i : mpd.inputs) {