From 7d4acba0229d175d994683c4b71f91a8ac6d5868 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Fri, 9 Dec 2005 16:00:01 +0000
Subject: [PATCH] Changed constructors to use unsigned int to get round VS6.0 +
 wrapper problems.

---
 include/osg/PrimitiveSet             | 8 ++++----
 include/osgText/String               | 2 +-
 src/osgWrappers/osg/PrimitiveSet.cpp | 8 ++++----
 src/osgWrappers/osgText/String.cpp   | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/include/osg/PrimitiveSet b/include/osg/PrimitiveSet
index d79099319..9f815cffd 100644
--- a/include/osg/PrimitiveSet
+++ b/include/osg/PrimitiveSet
@@ -44,7 +44,7 @@ public:
     VectorGLsizei(): vector_type() {}
     VectorGLsizei(const VectorGLsizei &copy): vector_type(copy) {}
     VectorGLsizei(GLsizei* beg, GLsizei* end): vector_type(beg, end) {}
-    explicit VectorGLsizei(vector_type::size_type n): vector_type(n) {}
+    explicit VectorGLsizei(unsigned int n): vector_type(n) {}
 };
 
 class VectorGLubyte: public std::vector<GLubyte>
@@ -54,7 +54,7 @@ public:
     VectorGLubyte(): vector_type() {}
     VectorGLubyte(const VectorGLubyte &copy): vector_type(copy) {}
     VectorGLubyte(GLubyte* beg, GLubyte* end): vector_type(beg, end) {}
-    explicit VectorGLubyte(vector_type::size_type n): vector_type(n) {}
+    explicit VectorGLubyte(unsigned int n): vector_type(n) {}
 };
 
 class VectorGLushort: public std::vector<GLushort>
@@ -64,7 +64,7 @@ public:
     VectorGLushort(): vector_type() {}
     VectorGLushort(const VectorGLushort &copy): vector_type(copy) {}
     VectorGLushort(GLushort* beg, GLushort* end): vector_type(beg, end) {}
-    explicit VectorGLushort(vector_type::size_type n): vector_type(n) {}
+    explicit VectorGLushort(unsigned int n): vector_type(n) {}
 };
 
 class VectorGLuint: public std::vector<GLuint>
@@ -74,7 +74,7 @@ public:
     VectorGLuint(): vector_type() {}
     VectorGLuint(const VectorGLuint &copy): vector_type(copy) {}
     VectorGLuint(GLuint* beg, GLuint* end): vector_type(beg, end) {}
-    explicit VectorGLuint(vector_type::size_type n): vector_type(n) {}
+    explicit VectorGLuint(unsigned int n): vector_type(n) {}
 };
 
 // **************************************************************************
diff --git a/include/osgText/String b/include/osgText/String
index 914493ed5..49b7597a4 100644
--- a/include/osgText/String
+++ b/include/osgText/String
@@ -34,7 +34,7 @@ public:
     VectorUInt(): vector_type() {}
     VectorUInt(const VectorUInt &copy): vector_type(copy) {}
     VectorUInt(unsigned int* beg, unsigned int* end): vector_type(beg, end) {}
-    explicit VectorUInt(vector_type::size_type n): vector_type(n) {}
+    explicit VectorUInt(unsigned int n): vector_type(n) {}
 };
 
 // **************************************************************************
diff --git a/src/osgWrappers/osg/PrimitiveSet.cpp b/src/osgWrappers/osg/PrimitiveSet.cpp
index d2df64206..3c7b09ffb 100644
--- a/src/osgWrappers/osg/PrimitiveSet.cpp
+++ b/src/osgWrappers/osg/PrimitiveSet.cpp
@@ -252,7 +252,7 @@ BEGIN_OBJECT_REFLECTOR(osg::VectorGLsizei)
 	I_Constructor0();
 	I_Constructor1(IN, const osg::VectorGLsizei &, copy);
 	I_Constructor2(IN, GLsizei *, beg, IN, GLsizei *, end);
-	I_Constructor1(IN, osg::VectorGLsizei::size_type, n);
+	I_Constructor1(IN, unsigned int, n);
 END_REFLECTOR
 
 BEGIN_OBJECT_REFLECTOR(osg::VectorGLubyte)
@@ -260,7 +260,7 @@ BEGIN_OBJECT_REFLECTOR(osg::VectorGLubyte)
 	I_Constructor0();
 	I_Constructor1(IN, const osg::VectorGLubyte &, copy);
 	I_Constructor2(IN, GLubyte *, beg, IN, GLubyte *, end);
-	I_Constructor1(IN, osg::VectorGLubyte::size_type, n);
+	I_Constructor1(IN, unsigned int, n);
 END_REFLECTOR
 
 BEGIN_OBJECT_REFLECTOR(osg::VectorGLuint)
@@ -268,7 +268,7 @@ BEGIN_OBJECT_REFLECTOR(osg::VectorGLuint)
 	I_Constructor0();
 	I_Constructor1(IN, const osg::VectorGLuint &, copy);
 	I_Constructor2(IN, GLuint *, beg, IN, GLuint *, end);
-	I_Constructor1(IN, osg::VectorGLuint::size_type, n);
+	I_Constructor1(IN, unsigned int, n);
 END_REFLECTOR
 
 BEGIN_OBJECT_REFLECTOR(osg::VectorGLushort)
@@ -276,6 +276,6 @@ BEGIN_OBJECT_REFLECTOR(osg::VectorGLushort)
 	I_Constructor0();
 	I_Constructor1(IN, const osg::VectorGLushort &, copy);
 	I_Constructor2(IN, GLushort *, beg, IN, GLushort *, end);
-	I_Constructor1(IN, osg::VectorGLushort::size_type, n);
+	I_Constructor1(IN, unsigned int, n);
 END_REFLECTOR
 
diff --git a/src/osgWrappers/osgText/String.cpp b/src/osgWrappers/osgText/String.cpp
index ec0949eb1..1f57c307b 100644
--- a/src/osgWrappers/osgText/String.cpp
+++ b/src/osgWrappers/osgText/String.cpp
@@ -54,6 +54,6 @@ BEGIN_OBJECT_REFLECTOR(osgText::VectorUInt)
 	I_Constructor0();
 	I_Constructor1(IN, const osgText::VectorUInt &, copy);
 	I_Constructor2(IN, unsigned int *, beg, IN, unsigned int *, end);
-	I_Constructor1(IN, osgText::VectorUInt::size_type, n);
+	I_Constructor1(IN, unsigned int, n);
 END_REFLECTOR