Merge pull request 'Fix build for linux' (#100) from fix/iwork-build …

…into develop Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/100
ONLYOFFICE · Nov 22, 2024 · 6a930c5 · 6a930c5
2 parents 09b4ab5 + 6c0715c
commit 6a930c5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/Common/3dParty/apple/fetch.py b/Common/3dParty/apple/fetch.py
@@ -13,7 +13,16 @@
 
     #the linux code uses an implementation for c++ 17, so we just put this implementation
     if ("linux" == base.host_platform()):
-        base.replaceInFile("./mdds/include/mdds/global.hpp", "namespace mdds {", "namespace std { template<bool __v> using bool_constant = integral_constant<bool, __v>; }\n\nnamespace mdds {")
+        linux_cpp_version  = "#if __cplusplus < 201402L\n"
+        linux_cpp_version += "namespace std {\n"
+        linux_cpp_version += "  template<bool __v>\n"
+        linux_cpp_version += "    using bool_constant = integral_constant<bool, __v>;\n\n"
+        linux_cpp_version += "  template <class... _Types>\n"
+        linux_cpp_version += "    using void_t = void;\n"
+        linux_cpp_version += "}\n #endif\n\n"
+        linux_cpp_version += "namespace mdds {"
+
+        base.replaceInFile("./mdds/include/mdds/global.hpp", "namespace mdds {", linux_cpp_version)
 
 if not base.is_dir("librevenge"):
     base.cmd("git", ["clone", "https://github.com/Distrotech/librevenge.git"])

diff --git a/Common/3dParty/apple/module.version b/Common/3dParty/apple/module.version
@@ -0,0 +1 @@
+2