MSVC: fix compilation with tbb

diff --git a/include/deal.II/base/function_parser.h b/include/deal.II/base/function_parser.h
index 1499e919bbc5ca18b88a3afc14c6b46a9c017735..c0d63888cefd57e72fdad4032eac366d810109e2 100644 (file)
--- a/include/deal.II/base/function_parser.h
+++ b/include/deal.II/base/function_parser.h
@@ -26,10 +26,11 @@
 #include <vector>
 #include <map>
 
-namespace mu
-{
-  class Parser;
-}
+#ifdef DEAL_II_WITH_MUPARSER
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
+#include <muParser.h>
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
+#endif
 
 DEAL_II_NAMESPACE_OPEN
 

diff --git a/source/base/multithread_info.cc b/source/base/multithread_info.cc
index 60026df181231e68c3bd41ad0ca38b68008d4986..32d27baed2b2eee2c5c51aa84c2a3c9f86e4febd 100644 (file)
--- a/source/base/multithread_info.cc
+++ b/source/base/multithread_info.cc
@@ -25,6 +25,7 @@
 #  include <sys/sysctl.h>
 #endif
 
+#include <algorithm>
 
 #ifdef DEAL_II_WITH_THREADS
 #  include <deal.II/base/thread_management.h>

diff --git a/source/base/utilities.cc b/source/base/utilities.cc
index 301ec99aba32b272fdbda5aafe5dfa39efa5b56b..8e58d34cd96099d0e0f57b20e6f1cf07bd50bced 100644 (file)
--- a/source/base/utilities.cc
+++ b/source/base/utilities.cc
@@ -13,6 +13,14 @@
 //
 // ---------------------------------------------------------------------
 
+#include <deal.II/base/config.h>
+
+// It's necessary to include winsock2.h before thread_local_storage.h,
+// because Intel implementation of TBB includes winsock.h,
+// and we'll get a conflict between winsock.h and winsock2.h otherwise.
+#ifdef DEAL_II_MSVC
+#  include <winsock2.h>
+#endif
 
 #include <deal.II/base/utilities.h>
 #include <deal.II/base/mpi.h>
@@ -42,10 +50,6 @@ DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 #  include <stdlib.h>
 #endif
 
-#ifdef DEAL_II_MSVC
-#  include <winsock2.h>
-#endif
-
 
 DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #ifdef DEAL_II_WITH_TRILINOS