diff --git a/include/osg/Types b/include/osg/Types index 9613dfb92..9fec3305d 100644 --- a/include/osg/Types +++ b/include/osg/Types @@ -14,7 +14,7 @@ #ifndef __OSG_TYPES #define __OSG_TYPES -#ifdef _MSC_VER +#if defined(_MSC_VER) && _MSC_VER <= 1800 typedef __int8 int8_t; typedef unsigned __int8 uint8_t; typedef __int16 int16_t; diff --git a/include/osgViewer/ViewerBase b/include/osgViewer/ViewerBase index f1e743c8b..e221e9581 100644 --- a/include/osgViewer/ViewerBase +++ b/include/osgViewer/ViewerBase @@ -335,6 +335,12 @@ class OSGVIEWER_EXPORT ViewerBase : public virtual osg::Object osg::ref_ptr _incrementalCompileOperation; osg::observer_ptr _currentContext; + + private: + + // Define private copy constructor + // otherwsie VS2015 will construct it's own which will call the private copy operator from osg::Object resulting in an compile error. + ViewerBase& operator = (const ViewerBase&) { return *this; } }; }