Merge branch '2.1.0' of https://github.com/CasparCG/Server into Branch_dc5575b2004ed4...

[casparcg] / core / StdAfx.h

diff --git a/core/StdAfx.h b/core/StdAfx.h
index 31ea7b85850a7217a9f1c3d1038f4aa4287e0563..2173fffd7e3dfc8c81faada327054c08ad099991 100644 (file)
--- a/core/StdAfx.h
+++ b/core/StdAfx.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#ifdef _DEBUG
+#if defined _DEBUG && defined _MSC_VER
 #include <crtdbg.h>
 #endif
 
@@ -39,19 +39,18 @@
 #include <queue>
 #include <string>
 #include <vector>
+#include <set>
 
 #include <tbb/atomic.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_map.h>
 
-#include <boost/assign.hpp>
 #include <boost/circular_buffer.hpp>
-#include <boost/timer.hpp>
 #include <boost/filesystem.hpp>
-#include <boost/foreach.hpp>
 #include <boost/range.hpp>
 #include <boost/range/adaptors.hpp>
 #include <boost/range/algorithm.hpp>
+#include <boost/algorithm/string.hpp>
 #include <boost/thread.hpp>
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/xml_parser.hpp>
@@ -63,3 +62,4 @@
 
 #include <common/log.h>
 #include <common/except.h>
+#include <common/timer.h>