X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=protocol%2FStdAfx.h;h=67b6ccabcefb6b3dcc4a7838edb6fafc6ecb71e7;hb=6ffec46963e28a3bbddf6da4ec2292a1cf6a339b;hp=6f7d529d73f169eac1172f4300b3eb4cff029f7e;hpb=7375c653d8ffbdd5bd5a4bbd116b00f207b9a4f6;p=casparcg

diff --git a/protocol/StdAfx.h b/protocol/StdAfx.h
index 6f7d529d7..67b6ccabc 100644
--- a/protocol/StdAfx.h
+++ b/protocol/StdAfx.h
@@ -1,32 +1,26 @@
 /*
-* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>
+* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>
 *
-*  This file is part of CasparCG.
+* This file is part of CasparCG (www.casparcg.com).
 *
-*    CasparCG is free software: you can redistribute it and/or modify
-*    it under the terms of the GNU General Public License as published by
-*    the Free Software Foundation, either version 3 of the License, or
-*    (at your option) any later version.
+* CasparCG is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
 *
-*    CasparCG is distributed in the hope that it will be useful,
-*    but WITHOUT ANY WARRANTY; without even the implied warranty of
-*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*    GNU General Public License for more details.
-
-*    You should have received a copy of the GNU General Public License
-*    along with CasparCG.  If not, see <http://www.gnu.org/licenses/>.
+* CasparCG is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.
 *
+* Author: Nicklas P Andersson
 */
- 
-// stdafx.h : include file for standard system include files,
-//  or project specific include files that are used frequently, but
-//      are changed infrequently
-//
 
 #pragma once
 
-#include "../common/compiler/vs/disable_silly_warnings.h"
-
 #define NOMINMAX
 
 #if defined(_MSC_VER)
@@ -38,11 +32,6 @@
 #	endif
 #endif
 
-#if !defined(AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_)
-#define AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_
-
-#define BOOST_PARAMETER_MAX_ARITY 7
-
 #ifdef _DEBUG
 #include <crtdbg.h>
 #endif
@@ -60,13 +49,6 @@
 #include <string>
 #include <math.h>
 
-#include <tbb/atomic.h>
-#include <tbb/concurrent_queue.h>
-#include <tbb/concurrent_unordered_map.h>
-#include <tbb/parallel_invoke.h>
-#include <tbb/parallel_for.h>
-#include <tbb/parallel_for_each.h>
-
 #include <boost/assign.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/foreach.hpp>
@@ -80,6 +62,4 @@
 #include "../common/exception/exceptions.h"
 #include "../common/exception/win32_exception.h"
 
-#include <assert.h>
-
-#endif
+#include <assert.h>
\ No newline at end of file