TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-05 11:28:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

build on msvs2010

Browse Source
This commit is contained in:
David Rose 2011-09-28 23:56:59 +00:00
parent ac0a33e65c
commit c7adc6246f
8 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dtool/src/dtoolutil/dSearchPath.cxx
View File

@ -16,6 +16,7 @@
#include "filename.h" #include "filename.h"
#include <algorithm> #include <algorithm>
#include <iterator>
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Function: DSearchPath::Results::Constructor // Function: DSearchPath::Results::Constructor

2
panda/src/display/graphicsEngine.cxx
View File

@ -1366,7 +1366,7 @@ cull_to_bins(const GraphicsEngine::Windows &wlist, Thread *current_thread) {
DisplayRegionPipelineReader *dr_reader = DisplayRegionPipelineReader *dr_reader =
new DisplayRegionPipelineReader(dr, current_thread); new DisplayRegionPipelineReader(dr, current_thread);
NodePath camera = dr_reader->get_camera(); 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) { if ((*aci).second == NULL) {
// We have not used this camera already in this thread. // We have not used this camera already in this thread.
// Perform the cull operation. // Perform the cull operation.

1
panda/src/express/multifile.cxx
View File

@ -24,6 +24,7 @@
#include "virtualFile.h" #include "virtualFile.h"
#include <algorithm> #include <algorithm>
#include <iterator>
#include <time.h> #include <time.h>
// This sequence of bytes begins each Multifile to identify it as a // This sequence of bytes begins each Multifile to identify it as a

1
panda/src/express/virtualFile.cxx
View File

@ -17,6 +17,7 @@
#include "virtualFileList.h" #include "virtualFileList.h"
#include "config_express.h" #include "config_express.h"
#include "pvector.h" #include "pvector.h"
#include <iterator>
TypeHandle VirtualFile::_type_handle; TypeHandle VirtualFile::_type_handle;

1
panda/src/pgraph/clipPlaneAttrib.cxx
View File

@ -21,6 +21,7 @@
#include "datagramIterator.h" #include "datagramIterator.h"
#include "config_pgraph.h" #include "config_pgraph.h"
#include "attribNodeRegistry.h" #include "attribNodeRegistry.h"
#include <iterator>
CPT(RenderAttrib) ClipPlaneAttrib::_empty_attrib; CPT(RenderAttrib) ClipPlaneAttrib::_empty_attrib;
CPT(RenderAttrib) ClipPlaneAttrib::_all_off_attrib; CPT(RenderAttrib) ClipPlaneAttrib::_all_off_attrib;

1
panda/src/pgraph/lightAttrib.cxx
View File

@ -23,6 +23,7 @@
#include "config_pgraph.h" #include "config_pgraph.h"
#include "attribNodeRegistry.h" #include "attribNodeRegistry.h"
#include "indent.h" #include "indent.h"
#include <iterator>
CPT(RenderAttrib) LightAttrib::_empty_attrib; CPT(RenderAttrib) LightAttrib::_empty_attrib;
int LightAttrib::_attrib_slot; int LightAttrib::_attrib_slot;

1
panda/src/pgraph/renderEffects.cxx
View File

@ -27,6 +27,7 @@
#include "lightReMutexHolder.h" #include "lightReMutexHolder.h"
#include "lightMutexHolder.h" #include "lightMutexHolder.h"
#include "thread.h" #include "thread.h"
#include <iterator>
LightReMutex *RenderEffects::_states_lock = NULL; LightReMutex *RenderEffects::_states_lock = NULL;
RenderEffects::States *RenderEffects::_states = NULL; RenderEffects::States *RenderEffects::_states = NULL;

2
panda/src/putil/bamReader.cxx
View File

@ -1625,7 +1625,7 @@ finalize() {
// Move the NULL data to the new table; remove the rest. // Move the NULL data to the new table; remove the rest.
AuxDataTable new_aux_data; AuxDataTable new_aux_data;
AuxDataTable::iterator nti = 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); (*nti).second.swap((*ti).second);
_aux_data.swap(new_aux_data); _aux_data.swap(new_aux_data);
} }