2.0. parallel_yadif: Reduced overhead.

[casparcg] / protocol / StdAfx.h

diff --git a/protocol/StdAfx.h b/protocol/StdAfx.h
index ab8c7fa583e0f97cc99ec07c824e32654dd09f32..e8440258eb7600b7cfc2fc1ca333786e984df028 100644 (file)
--- a/protocol/StdAfx.h
+++ b/protocol/StdAfx.h
@@ -25,8 +25,6 @@
 \r
 #pragma once\r
 \r
-#include "../common/compiler/vs/disable_silly_warnings.h"\r
-\r
 #define NOMINMAX\r
 \r
 #if defined(_MSC_VER)\r
@@ -38,13 +36,11 @@
 #      endif\r
 #endif\r
 \r
-#if !defined(AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_)\r
-#define AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_\r
-\r
 #ifdef _DEBUG\r
 #include <crtdbg.h>\r
 #endif\r
 \r
+#include <cstdint>\r
 #include <winsock2.h>\r
 #include <tchar.h>\r
 #include <sstream>\r
@@ -57,19 +53,12 @@
 #include <string>\r
 #include <math.h>\r
 \r
-#include <tbb/atomic.h>\r
-#include <tbb/concurrent_queue.h>\r
-#include <tbb/concurrent_unordered_map.h>\r
-#include <tbb/parallel_invoke.h>\r
-#include <tbb/parallel_for.h>\r
-#include <tbb/parallel_for_each.h>\r
-\r
 #include <boost/assign.hpp>\r
 #include <boost/filesystem.hpp>\r
 #include <boost/foreach.hpp>\r
 #include <boost/range/algorithm.hpp>\r
 \r
-#include "../common/utility/string_convert.h"\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
@@ -77,6 +66,4 @@
 #include "../common/exception/exceptions.h"\r
 #include "../common/exception/win32_exception.h"\r
 \r
-#include <assert.h>\r
-\r
-#endif\r
+#include <assert.h>
\ No newline at end of file