From 435a81a905ebda4eb55fa98ffb19cd146b966ae2 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 23 Jul 2015 14:37:17 +0000
Subject: [PATCH] From Pjotr Svetachov, buid fixes for VS2015.

git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@15021 16af8721-9629-0410-8352-f15c8da7e697
---
 include/osg/Types            | 2 +-
 include/osgViewer/ViewerBase | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

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<osgUtil::IncrementalCompileOperation>  _incrementalCompileOperation;
 
         osg::observer_ptr<osg::GraphicsContext>             _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; }
 };
 
 }