FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Geoff Michel, compile fixes for VS6.0

Browse Source
This commit is contained in:
Robert Osfield
2005-10-26 09:22:13 +00:00
parent 9c51a3db8d
commit be07f48884
6 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/osg/CullingSet
View File

@@ -102,18 +102,18 @@ class OSG_EXPORT CullingSet : public Referenced
_frustum.setAndTransformProvidingInverse(cs._frustum,matrix);
for(StateFrustumList::iterator itr=_stateFrustumList.begin();
itr!=_stateFrustumList.end();
++itr)
for(StateFrustumList::iterator sitr=_stateFrustumList.begin();
sitr!=_stateFrustumList.end();
++sitr)
{
itr->second.transformProvidingInverse(matrix);
sitr->second.transformProvidingInverse(matrix);
}
for(OccluderList::iterator itr=_occluderList.begin();
itr!=_occluderList.end();
++itr)
for(OccluderList::iterator oitr=_occluderList.begin();
oitr!=_occluderList.end();
++oitr)
{
itr->transformProvidingInverse(matrix);
oitr->transformProvidingInverse(matrix);
}
}

2
include/osg/PrimitiveSet
View File

@@ -73,6 +73,7 @@ public:
// export template instances that are used as base classes
#ifdef _MSC_VER
#if (_MSC_VER>1300) // VS6 doesnt need these
template class __declspec(dllexport) std::allocator<GLsizei>;
template class __declspec(dllexport) std::vector<GLsizei, std::allocator<GLsizei> >;
template class __declspec(dllexport) std::allocator<GLubyte>;
@@ -82,6 +83,7 @@ template class __declspec(dllexport) std::vector<GLushort, std::allocator<GLusho
template class __declspec(dllexport) std::allocator<GLuint>;
template class __declspec(dllexport) std::vector<GLuint, std::allocator<GLuint> >;
#endif
#endif
class PrimitiveSet : public Object

2
include/osgProducer/GraphicsContextImplementation
View File

@@ -57,7 +57,7 @@ class OSGPRODUCER_EXPORT GraphicsContextImplementation : public osg::GraphicsCon
virtual void makeCurrentImplementation();
/** Make this graphics context current with specified read context.*/
virtual void makeContextCurrentImplementation(GraphicsContext* readContext);
virtual void makeContextCurrentImplementation(osg::GraphicsContext* readContext);
/** Bind the graphics context to associated texture.*/
virtual void bindPBufferToTextureImplementation(GLenum buffer);

2
include/osgText/String
View File

@@ -27,9 +27,11 @@ class Text;
// export template instances that are used as base classes
#ifdef _MSC_VER
#if (_MSC_VER>1300)
template class __declspec(dllexport) std::allocator<unsigned int>;
template class __declspec(dllexport) std::vector<unsigned int, std::allocator<unsigned int> >;
#endif
#endif
class OSGTEXT_EXPORT String : public osg::Referenced, public std::vector<unsigned int>
{