From: Alexey Ozeritsky <aozeritsky@yandex-team.ru>
Date: Wed, 19 Apr 2017 09:35:26 +0000 (+0300)
Subject: MSVC: fix compilation with tbb
X-Git-Tag: v9.0.0-rc1~1665^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38008cac24658c8eb2bd9a9b34f3a00134955f38;p=dealii.git

MSVC: fix compilation with tbb
---

diff --git a/include/deal.II/base/function_parser.h b/include/deal.II/base/function_parser.h
index 1499e919bb..c0d63888ce 100644
--- 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 60026df181..32d27baed2 100644
--- 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 301ec99aba..8e58d34cd9 100644
--- 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