git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

diff --git a/core/StdAfx.h b/core/StdAfx.h
index 95c1d3489284c4cf4cb54a19b6c5827054ed07bb..3c02e672efdd484f05a6e6b6f9b24997ed768db7 100644 (file)
--- a/core/StdAfx.h
+++ b/core/StdAfx.h
@@ -60,7 +60,6 @@
 \r
 #include <common/utility/string.h>\r
 #include <common/memory/safe_ptr.h>\r
-//#include "../common/concurrency/executor.h" // Can't include this due to MSVC lambda bug\r
 \r
 #include <common/log/log.h>\r
 #include <common/exception/exceptions.h>\r

diff --git a/core/consumer/output.cpp b/core/consumer/output.cpp
index 3d852b0586c9b0942cfdf0d846690829ab2fdd48..db146f9cee84db0d1a03c866722939aa1d1a510e 100644 (file)
--- a/core/consumer/output.cpp
+++ b/core/consumer/output.cpp
@@ -30,10 +30,8 @@
 #include "../mixer/gpu/ogl_device.h"\r
 #include "../mixer/read_frame.h"\r
 \r
-#include <common/concurrency/executor.h>\r
 #include <common/utility/assert.h>\r
 #include <common/utility/timer.h>\r
-#include <common/memory/memshfl.h>\r
 \r
 #include <concrt_extras.h>\r
 \r

diff --git a/core/mixer/mixer.cpp b/core/mixer/mixer.cpp
index 2453253b1065d2b96068ece894bcbe52c60151a6..10a990622bae51ecb110d70ad4bcbb4bd2f7b566 100644 (file)
--- a/core/mixer/mixer.cpp
+++ b/core/mixer/mixer.cpp
@@ -28,7 +28,6 @@
 #include "image/image_mixer.h"\r
 \r
 #include <common/exception/exceptions.h>\r
-#include <common/concurrency/executor.h>\r
 #include <common/utility/tweener.h>\r
 #include <common/env.h>\r
 #include <common/gl/gl_check.h>\r

diff --git a/core/mixer/mixer.h b/core/mixer/mixer.h
index 2e77259eefed81ad46000743a1390606b5c5ce1b..0d9e1007c4c7898f378e67da682e6fc03c052d54 100644 (file)
--- a/core/mixer/mixer.h
+++ b/core/mixer/mixer.h
@@ -30,11 +30,7 @@
 \r
 #include <map>\r
 \r
-namespace caspar { \r
-\r
-class executor;\r
-       \r
-namespace core {\r
+namespace caspar { namespace core {\r
 \r
 class read_frame;\r
 class write_frame;\r

diff --git a/core/producer/frame_producer.h b/core/producer/frame_producer.h
index 19a8a6cdd28130b0b3a6aef257465d1f820470af..dfcdc168cd270f294a90d6bb31c88c605def9915 100644 (file)
--- a/core/producer/frame_producer.h
+++ b/core/producer/frame_producer.h
@@ -30,11 +30,7 @@
 #include <stdint.h>\r
 #include <numeric>\r
 \r
-namespace caspar { \r
-       \r
-class executor;\r
-       \r
-namespace core {\r
+namespace caspar { namespace core {\r
 \r
 class basic_frame;\r
 struct frame_factory;\r

diff --git a/core/producer/stage.cpp b/core/producer/stage.cpp
index 5f9bb2772aecf73eb80e03c7b61cb45ecb0632eb..94ea3716e98cb12a39879db2686398e87c95bbc5 100644 (file)
--- a/core/producer/stage.cpp
+++ b/core/producer/stage.cpp
@@ -27,9 +27,6 @@
 #include <core/producer/frame/basic_frame.h>\r
 #include <core/producer/frame/frame_factory.h>\r
 \r
-#include <common/concurrency/executor.h>\r
-#include <common/utility/move_on_copy.h>\r
-\r
 #include <boost/foreach.hpp>\r
 \r
 #include <agents.h>\r

diff --git a/modules/bluefish/StdAfx.h b/modules/bluefish/StdAfx.h
index a0c04774589b9d9c9beb5f4678a3edf6c5540011..8a14233ef5546def542b77e791cc005fe81608d2 100644 (file)
--- a/modules/bluefish/StdAfx.h
+++ b/modules/bluefish/StdAfx.h
@@ -45,7 +45,6 @@
 \r
 #include <common/utility/string.h>\r
 #include <common/memory/safe_ptr.h>\r
-//#include "../common/concurrency/executor.h" // Can't include this due to MSVC lambda bug\r
 \r
 #include <common/log/Log.h>\r
 #include <common/exception/exceptions.h>\r

diff --git a/modules/decklink/StdAfx.h b/modules/decklink/StdAfx.h
index fb6112a10231a992651aacc6e12a7d9a3f9e95ad..9243354fe59ac9c0cab0a43f20d1c7d5a2cdb2c0 100644 (file)
--- a/modules/decklink/StdAfx.h
+++ b/modules/decklink/StdAfx.h
@@ -49,7 +49,6 @@
 \r
 #include "../common/memory/safe_ptr.h"\r
 #include "../common/utility/string.h"\r
-//#include "../common/concurrency/executor.h" // Can't include this due to MSVC lambda bug\r
 \r
 #include "../common/exception/exceptions.h"\r
 #include "../common/exception/win32_exception.h"\r

diff --git a/modules/ffmpeg/StdAfx.h b/modules/ffmpeg/StdAfx.h
index 812dc8524e330c56d9bc37f71e4af6051f30ea4d..6f036b5005ac0912ea9d7557bffd33c1a6e8dad1 100644 (file)
--- a/modules/ffmpeg/StdAfx.h
+++ b/modules/ffmpeg/StdAfx.h
@@ -56,7 +56,6 @@
 #include <common/utility/string.h>\r
 #include <common/utility/assert.h>\r
 #include <common/memory/safe_ptr.h>\r
-//#include "../common/concurrency/executor.h" // Can't include this due to MSVC lambda bug\r
 \r
 #include <common/log/log.h>\r
 #include <common/exception/exceptions.h>\r

diff --git a/modules/flash/StdAfx.h b/modules/flash/StdAfx.h
index 54eefef86351086facdc3ecce2f4976f1ef2c907..1cc87245ed57307ab8f2850d593f2ebe260aa20a 100644 (file)
--- a/modules/flash/StdAfx.h
+++ b/modules/flash/StdAfx.h
@@ -52,7 +52,6 @@
 \r
 #include "../common/utility/string.h"\r
 #include "../common/memory/safe_ptr.h"\r
-//#include "../common/concurrency/executor.h" // Can't include this due to MSVC lambda bug\r
 \r
 #include "../common/log/Log.h"\r
 #include "../common/exception/exceptions.h"\r

diff --git a/protocol/StdAfx.h b/protocol/StdAfx.h
index e8440258eb7600b7cfc2fc1ca333786e984df028..e1abdc4079f553084e83b0a4fc28a2fb19bf15ce 100644 (file)
--- a/protocol/StdAfx.h
+++ b/protocol/StdAfx.h
@@ -60,7 +60,6 @@
 \r
 #include "../common/utility/string.h"\r
 #include "../common/memory/safe_ptr.h"\r
-//#include "../common/concurrency/executor.h" // Can't include this due to MSVC lambda bug\r
 \r
 #include "../common/log/Log.h"\r
 #include "../common/exception/exceptions.h"\r