From c7adc6246f2c7741f587c5ab66fd133b51ff43cb Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Wed, 28 Sep 2011 23:56:59 +0000
Subject: [PATCH] build on msvs2010

---
 dtool/src/dtoolutil/dSearchPath.cxx  | 1 +
 panda/src/display/graphicsEngine.cxx | 2 +-
 panda/src/express/multifile.cxx      | 1 +
 panda/src/express/virtualFile.cxx    | 1 +
 panda/src/pgraph/clipPlaneAttrib.cxx | 1 +
 panda/src/pgraph/lightAttrib.cxx     | 1 +
 panda/src/pgraph/renderEffects.cxx   | 1 +
 panda/src/putil/bamReader.cxx        | 2 +-
 8 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/dtool/src/dtoolutil/dSearchPath.cxx b/dtool/src/dtoolutil/dSearchPath.cxx
index 1c04b4407d..16984a48cf 100644
--- a/dtool/src/dtoolutil/dSearchPath.cxx
+++ b/dtool/src/dtoolutil/dSearchPath.cxx
@@ -16,6 +16,7 @@
 #include "filename.h"
 
 #include <algorithm>
+#include <iterator>
 
 ////////////////////////////////////////////////////////////////////
 //     Function: DSearchPath::Results::Constructor
diff --git a/panda/src/display/graphicsEngine.cxx b/panda/src/display/graphicsEngine.cxx
index ae3f77896a..fefa04b046 100644
--- a/panda/src/display/graphicsEngine.cxx
+++ b/panda/src/display/graphicsEngine.cxx
@@ -1366,7 +1366,7 @@ cull_to_bins(const GraphicsEngine::Windows &wlist, Thread *current_thread) {
           DisplayRegionPipelineReader *dr_reader = 
             new DisplayRegionPipelineReader(dr, current_thread);
           NodePath camera = dr_reader->get_camera();
-          AlreadyCulled::iterator aci = already_culled.insert(AlreadyCulled::value_type(camera, NULL)).first;
+          AlreadyCulled::iterator aci = already_culled.insert(AlreadyCulled::value_type(camera, (DisplayRegion *)NULL)).first;
           if ((*aci).second == NULL) {
             // We have not used this camera already in this thread.
             // Perform the cull operation.
diff --git a/panda/src/express/multifile.cxx b/panda/src/express/multifile.cxx
index 3d8b3be7ce..fcc7477001 100644
--- a/panda/src/express/multifile.cxx
+++ b/panda/src/express/multifile.cxx
@@ -24,6 +24,7 @@
 #include "virtualFile.h"
 
 #include <algorithm>
+#include <iterator>
 #include <time.h>
 
 // This sequence of bytes begins each Multifile to identify it as a
diff --git a/panda/src/express/virtualFile.cxx b/panda/src/express/virtualFile.cxx
index afac7f62bc..940b418640 100644
--- a/panda/src/express/virtualFile.cxx
+++ b/panda/src/express/virtualFile.cxx
@@ -17,6 +17,7 @@
 #include "virtualFileList.h"
 #include "config_express.h"
 #include "pvector.h"
+#include <iterator>
 
 TypeHandle VirtualFile::_type_handle;
 
diff --git a/panda/src/pgraph/clipPlaneAttrib.cxx b/panda/src/pgraph/clipPlaneAttrib.cxx
index a7c7bd4c37..db86bc915e 100644
--- a/panda/src/pgraph/clipPlaneAttrib.cxx
+++ b/panda/src/pgraph/clipPlaneAttrib.cxx
@@ -21,6 +21,7 @@
 #include "datagramIterator.h"
 #include "config_pgraph.h"
 #include "attribNodeRegistry.h"
+#include <iterator>
 
 CPT(RenderAttrib) ClipPlaneAttrib::_empty_attrib;
 CPT(RenderAttrib) ClipPlaneAttrib::_all_off_attrib;
diff --git a/panda/src/pgraph/lightAttrib.cxx b/panda/src/pgraph/lightAttrib.cxx
index 08b2806fee..da346664e2 100644
--- a/panda/src/pgraph/lightAttrib.cxx
+++ b/panda/src/pgraph/lightAttrib.cxx
@@ -23,6 +23,7 @@
 #include "config_pgraph.h"
 #include "attribNodeRegistry.h"
 #include "indent.h"
+#include <iterator>
 
 CPT(RenderAttrib) LightAttrib::_empty_attrib;
 int LightAttrib::_attrib_slot;
diff --git a/panda/src/pgraph/renderEffects.cxx b/panda/src/pgraph/renderEffects.cxx
index 4167d17ec7..6412eaa614 100644
--- a/panda/src/pgraph/renderEffects.cxx
+++ b/panda/src/pgraph/renderEffects.cxx
@@ -27,6 +27,7 @@
 #include "lightReMutexHolder.h"
 #include "lightMutexHolder.h"
 #include "thread.h"
+#include <iterator>
   
 LightReMutex *RenderEffects::_states_lock = NULL;
 RenderEffects::States *RenderEffects::_states = NULL;
diff --git a/panda/src/putil/bamReader.cxx b/panda/src/putil/bamReader.cxx
index 857fc534d5..f170b1bebe 100644
--- a/panda/src/putil/bamReader.cxx
+++ b/panda/src/putil/bamReader.cxx
@@ -1625,7 +1625,7 @@ finalize() {
         // Move the NULL data to the new table; remove the rest.
         AuxDataTable new_aux_data;
         AuxDataTable::iterator nti = 
-          new_aux_data.insert(AuxDataTable::value_type(NULL, AuxDataNames())).first;
+          new_aux_data.insert(AuxDataTable::value_type((TypedWritable *)NULL, AuxDataNames())).first;
         (*nti).second.swap((*ti).second);
         _aux_data.swap(new_aux_data);
       }