From 4945e03bcbeaa4921291c88ebf31fadc23488e4e Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Fri, 19 Dec 2014 11:00:31 +0000
Subject: [PATCH] Windows build error and warning fixes

git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14626 16af8721-9629-0410-8352-f15c8da7e697
---
 src/osg/DisplaySettings.cpp    | 1 +
 src/osgPlugins/dae/daeReader.h | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/osg/DisplaySettings.cpp b/src/osg/DisplaySettings.cpp
index 4e7ddbc83..f52dacf50 100644
--- a/src/osg/DisplaySettings.cpp
+++ b/src/osg/DisplaySettings.cpp
@@ -24,6 +24,7 @@ using namespace osg;
 using namespace std;
 
 #if defined(WIN32) && !defined(__CYGWIN__)
+#include<Windows.h>
 extern "C" { _declspec(dllexport) DWORD NvOptimusEnablement=0x00000001; }
 #else
 extern "C" { int NvOptimusEnablement=0x00000001; }
diff --git a/src/osgPlugins/dae/daeReader.h b/src/osgPlugins/dae/daeReader.h
index 5c051cf65..634f7d8a3 100644
--- a/src/osgPlugins/dae/daeReader.h
+++ b/src/osgPlugins/dae/daeReader.h
@@ -253,7 +253,7 @@ public:
     typedef std::map< int, osg::Array*, std::less<int> > ArrayMap;
 
     typedef std::multimap< osgAnimation::Target*, osg::ref_ptr<ChannelPart> > TargetChannelPartMap;
-    typedef std::multimap<std::pair<const domMesh*, unsigned>, std::pair<osg::ref_ptr<osg::Geometry>, GLuint> > OldToNewIndexMap;
+    typedef std::multimap<std::pair<const domMesh*, size_t>, std::pair<osg::ref_ptr<osg::Geometry>, GLuint> > OldToNewIndexMap;
 
 private:
     bool processDocument( const std::string& );