Fixes for windows build.
This commit is contained in:
@@ -5,6 +5,8 @@
|
||||
#ifndef OSG_COPYOP
|
||||
#define OSG_COPYOP 1
|
||||
|
||||
#include <osg/Export>
|
||||
|
||||
namespace osg {
|
||||
|
||||
class Referenced;
|
||||
@@ -18,7 +20,7 @@ class Drawable;
|
||||
|
||||
/** Copy Op(erator) used to control the whether shallow or deep copy is used
|
||||
* during copy construction and clone operation.*/
|
||||
class CopyOp
|
||||
class SG_EXPORT CopyOp
|
||||
{
|
||||
|
||||
public:
|
||||
|
||||
@@ -198,7 +198,6 @@ class SG_EXPORT Drawable : public Object
|
||||
|
||||
protected:
|
||||
|
||||
Drawable(const Drawable&):Object() {}
|
||||
Drawable& operator = (const Drawable&) { return *this;}
|
||||
|
||||
virtual ~Drawable();
|
||||
|
||||
@@ -336,7 +336,6 @@ class SG_EXPORT GeoSet : public Drawable
|
||||
|
||||
protected:
|
||||
|
||||
GeoSet(const GeoSet&):Drawable() {}
|
||||
GeoSet& operator = (const GeoSet&) { return *this;}
|
||||
|
||||
virtual ~GeoSet();
|
||||
|
||||
@@ -86,8 +86,7 @@ class SG_EXPORT Image : public Object
|
||||
|
||||
virtual ~Image();
|
||||
|
||||
// Image(const Image&) {}
|
||||
// Image& operator = (const Image& image) {}
|
||||
Image& operator = (const Image& image) {}
|
||||
|
||||
std::string _fileName;
|
||||
int _s, _t, _r;
|
||||
|
||||
Reference in New Issue
Block a user