diff --git a/include/osg/ConvexPlanarOccluder b/include/osg/ConvexPlanarOccluder index 7eda3bea1..9d90b5f00 100644 --- a/include/osg/ConvexPlanarOccluder +++ b/include/osg/ConvexPlanarOccluder @@ -43,12 +43,6 @@ class SG_EXPORT ConvexPlanarOccluder : public Object const HoleList& getHoleList() const { return _holeList; } - void computeAttributes(); - - void computeBound(BoundingBox& bb) const; - - void computeBound(BoundingSphere& bs) const; - protected: ~ConvexPlanarOccluder() {} diff --git a/include/osg/GeoSet b/include/osg/GeoSet index 40ef9f2f2..b51134ced 100644 --- a/include/osg/GeoSet +++ b/include/osg/GeoSet @@ -78,12 +78,12 @@ class SG_EXPORT GeoSet : public Drawable }; - struct IndexPointer + struct SG_EXPORT IndexPointer { mutable uint _size; bool _is_ushort; - union + union _TPtr { GLushort* _ushort; GLuint* _uint; @@ -315,7 +315,7 @@ class SG_EXPORT GeoSet : public Drawable * momory attached to the GeoSet is owned by this GeoSet and can be deleted * using delete []. If this is not the cause derive your own AttributeDeleteFunctor * a specify your own memory deletion operation.*/ - struct AttributeDeleteFunctor : public osg::Referenced + struct SG_EXPORT AttributeDeleteFunctor : public osg::Referenced { // see GeoSet.cpp for implemention. virtual void operator() (GeoSet* gset); diff --git a/include/osg/Shape b/include/osg/Shape index 8c6b59798..fede89805 100644 --- a/include/osg/Shape +++ b/include/osg/Shape @@ -341,7 +341,17 @@ class Cylinder : public Shape class InfinitePlane : public Shape, public Plane { public: - + InfinitePlane() {} + + InfinitePlane(const InfinitePlane& plane,const CopyOp& copyop=CopyOp::SHALLOW_COPY): + Shape(plane,copyop), + Plane(plane) {} + + META_Shape(osg, InfinitePlane) + + protected: + + virtual ~InfinitePlane() {} }; class TriangleMesh : public Shape diff --git a/include/osgUtil/DisplayRequirementsVisitor b/include/osgUtil/DisplayRequirementsVisitor index 4ea59aff8..205d90852 100644 --- a/include/osgUtil/DisplayRequirementsVisitor +++ b/include/osgUtil/DisplayRequirementsVisitor @@ -2,7 +2,7 @@ //Distributed under the terms of the GNU Library General Public License (LGPL) //as published by the Free Software Foundation. -#ifndef OSGUTIL_DISPLAYEQUIREMENTSVISITOR +#ifndef OSGUTIL_DISPLAYREQUIREMENTSVISITOR #define OSGUTIL_DISPLAYREQUIREMENTSVISITOR 1 #include diff --git a/include/osgUtil/IntersectVisitor b/include/osgUtil/IntersectVisitor index 4d26b048e..c23d97fec 100644 --- a/include/osgUtil/IntersectVisitor +++ b/include/osgUtil/IntersectVisitor @@ -95,7 +95,7 @@ class OSGUTIL_EXPORT IntersectVisitor : public osg::NodeVisitor protected: - + /** \internal JAVA: SUPPRESS UNBRIDGABLE :JAVA */ class IntersectState : public osg::Referenced { public: