From 5ce9acc263f1028a3e2e8e4af26b7bb8932c46bb Mon Sep 17 00:00:00 2001
From: Ykkrosh <philip@wildfiregames.com>
Date: Tue, 25 May 2010 18:44:33 +0000
Subject: [PATCH] MSVC warning fixes

This was SVN commit r7580.
---
 source/scriptinterface/AutoRooters.h                  |  5 +++--
 source/simulation2/serialization/BinarySerializer.cpp | 11 +++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/source/scriptinterface/AutoRooters.h b/source/scriptinterface/AutoRooters.h
index 9dd2488524..7096c0a309 100644
--- a/source/scriptinterface/AutoRooters.h
+++ b/source/scriptinterface/AutoRooters.h
@@ -18,9 +18,9 @@
 #ifndef INCLUDED_AUTOROOTERS
 #define INCLUDED_AUTOROOTERS
 
-#include "js/jsapi.h"
+#include "scriptinterface/ScriptTypes.h"
 
-class ScriptInterface;
+#include "js/jsapi.h"
 
 // Exception-safety and GC-safety wrapper for JSIdArray
 // (TODO: it'd be nicer to use the existing js::AutoIdArray but currently that
@@ -54,6 +54,7 @@ public:
  */
 class AutoGCRooter
 {
+	NONCOPYABLE(AutoGCRooter);
 public:
 	AutoGCRooter(ScriptInterface& scriptInterface);
 	~AutoGCRooter();
diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
index fdcd998221..da5cae46c6 100644
--- a/source/simulation2/serialization/BinarySerializer.cpp
+++ b/source/simulation2/serialization/BinarySerializer.cpp
@@ -29,8 +29,19 @@
 #include "scriptinterface/ScriptInterface.h"
 #include "scriptinterface/AutoRooters.h"
 
+// Shut up some warnings triggered by jsobj.h
+#if MSC_VERSION
+# pragma warning(push)
+# pragma warning(disable:4512)	// assignment operator could not be generated
+# pragma warning(disable:4800)	// forcing value to bool 'true' or 'false' (performance warning)
+#endif
+
 #include "js/jsobj.h"
 
+#if MSC_VERSION
+# pragma warning(pop)
+#endif
+
 CBinarySerializer::CBinarySerializer(ScriptInterface& scriptInterface) :
 	m_ScriptInterface(scriptInterface), m_ScriptBackrefsNext(1), m_Rooter(scriptInterface)
 {