Fix broken Mac OS X build.

c-lipka · c-lipka · commit 162aa58a385f · 2019-02-19T00:11:54.000+01:00
diff --git a/source/backend/control/scene.cpp b/source/backend/control/scene.cpp
@@ -42,7 +42,6 @@
 // C++ standard header files
 #include <algorithm>
 #include <sstream>
-#include <thread>
 
 // Boost header files
 #include <boost/bind.hpp>
diff --git a/source/backend/control/scene.h b/source/backend/control/scene.h
@@ -45,11 +45,11 @@
 
 // C++ standard header files
 #include <memory>
-// <thread> not required for `std::thread` because we forward-declare it in `base/base_fwd.h`
+#include <thread>
 #include <vector>
 
 // POV-Ray header files (base module)
-#include "base/base_fwd.h"
+//  (none at the moment)
 
 // POV-Ray header files (core module)
 #include "core/core_fwd.h"
diff --git a/source/backend/povray.cpp b/source/backend/povray.cpp
@@ -41,7 +41,6 @@
 
 // C++ standard header files
 #include <string>
-#include <thread>
 
 // Boost header files
 #include <boost/bind.hpp>
diff --git a/source/backend/povray.h b/source/backend/povray.h
@@ -49,13 +49,12 @@
 //  (none at the moment)
 
 // C++ standard header files
-// <thread> not required for `std::thread` because we forward-declare it in `base/base_fwd.h`
+#include <thread>
 
 // Boost header files
 #include <boost/function.hpp>
 
 // POV-Ray header files (base module)
-#include "base/base_fwd.h"
 #include "base/version_info.h"
 
 // POV-Ray header files (backend module)
diff --git a/source/backend/scene/view.cpp b/source/backend/scene/view.cpp
@@ -42,7 +42,6 @@
 // C++ standard header files
 #include <algorithm>
 #include <chrono>
-#include <thread>
 
 // Boost header files
 #include <boost/bind.hpp>
diff --git a/source/backend/scene/view.h b/source/backend/scene/view.h
@@ -47,11 +47,10 @@
 #include <condition_variable>
 #include <memory>
 #include <mutex>
-// <thread> not required for `std::thread` because we forward-declare it in `base/base_fwd.h`
+#include <thread>
 #include <vector>
 
 // POV-Ray header files (base module)
-#include "base/base_fwd.h"
 #include "base/types.h" // TODO - only appears to be pulled in for POVRect - can we avoid this?
 
 // POV-Ray header files (core module)
diff --git a/source/backend/support/task.cpp b/source/backend/support/task.cpp
@@ -41,7 +41,6 @@
 
 // C++ standard header files
 #include <stdexcept>
-#include <thread>
 
 // Boost header files
 #include <boost/bind.hpp>
diff --git a/source/backend/support/task.h b/source/backend/support/task.h
@@ -45,7 +45,7 @@
 // C++ standard header files
 #include <memory>
 #include <queue>
-// <thread> not required for `std::thread` because we forward-declare it in `base/base_fwd.h`
+#include <thread>
 
 // Boost header files
 #include <boost/function.hpp>
diff --git a/source/base/base_fwd.h b/source/base/base_fwd.h
@@ -40,14 +40,6 @@
 /// @note
 ///     This file should not pull in any POV-Ray header whatsoever.
 
-// Forward-declare the standard library's thread type, rather than pulling in
-// `<thread>`, and all the other headers it might want in turn.
-namespace std
-{
-class thread;
-}
-// end of namespace std
-
 namespace pov_base
 {
 
diff --git a/vfe/vfesession.cpp b/vfe/vfesession.cpp
@@ -42,8 +42,6 @@
 
 #include "vfe.h"
 
-#include <thread>
-
 #include <boost/bind.hpp>
 
 #include "backend/povray.h"
diff --git a/vfe/vfesession.h b/vfe/vfesession.h
@@ -43,13 +43,12 @@
 #include <memory>
 #include <mutex>
 #include <queue>
-// <thread> not required for `std::thread` because we forward-declare it in `base/base_fwd.h`
+#include <thread>
 #include <vector>
 
 #include <boost/format.hpp>
 #include <boost/function.hpp>
 
-#include "base/base_fwd.h"
 #include "base/stringutilities.h"
 
 #include "frontend/simplefrontend.h"
