From d32160abdecf886fe5e238683e53162fa43ad29b Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Fri, 27 Apr 2012 09:43:25 +0000
Subject: [PATCH] Added using base_class::set to the Matrix*Template class to
 enable the set() method from the base class to be used.

---
 include/osg/Uniform | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/include/osg/Uniform b/include/osg/Uniform
index 88fc6e317..dacab0557 100644
--- a/include/osg/Uniform
+++ b/include/osg/Uniform
@@ -132,6 +132,8 @@ class Matrix2Template : public MatrixTemplate<T, 2, 2>
         }
         ~Matrix2Template() {}
 
+        using base_class::set;
+
         void set(value_type a00, value_type a01,
                  value_type a10, value_type a11 )
          {
@@ -165,6 +167,8 @@ class Matrix2x3Template : public MatrixTemplate<T, 2, 3>
         }
         ~Matrix2x3Template() {}
 
+        using base_class::set;
+
         void set( value_type a00, value_type a01, value_type a02,
                   value_type a10, value_type a11, value_type a12 )
          {
@@ -192,6 +196,8 @@ class Matrix2x4Template : public MatrixTemplate<T, 2, 4>
         }
         ~Matrix2x4Template() {}
 
+        using base_class::set;
+
         void set( value_type a00, value_type a01, value_type a02, value_type a03,
                   value_type a10, value_type a11, value_type a12, value_type a13 )
          {
@@ -220,6 +226,8 @@ class Matrix3x2Template : public MatrixTemplate<T, 3, 2>
         }
         ~Matrix3x2Template() {}
 
+        using base_class::set;
+
         void set( value_type a00, value_type a01,
                   value_type a10, value_type a11,
                   value_type a20, value_type a21 )
@@ -250,6 +258,8 @@ class Matrix3Template : public MatrixTemplate<T, 3, 3>
         }
         ~Matrix3Template() {}
 
+        using base_class::set;
+
         void set( value_type a00, value_type a01, value_type a02,
                   value_type a10, value_type a11, value_type a12,
                   value_type a20, value_type a21, value_type a22 )
@@ -287,6 +297,8 @@ class Matrix3x4Template : public MatrixTemplate<T, 3, 4>
         }
         ~Matrix3x4Template() {}
 
+        using base_class::set;
+
         void set( value_type a00, value_type a01, value_type a02, value_type a03,
                   value_type a10, value_type a11, value_type a12, value_type a13,
                   value_type a20, value_type a21, value_type a22, value_type a23 )
@@ -319,6 +331,8 @@ class Matrix4x2Template : public MatrixTemplate<T, 4, 2>
         }
         ~Matrix4x2Template() {}
 
+        using base_class::set;
+
         void set( value_type a00, value_type a01,
                   value_type a10, value_type a11,
                   value_type a20, value_type a21,
@@ -353,6 +367,8 @@ class Matrix4x3Template : public MatrixTemplate<T, 4, 3>
         }
         ~Matrix4x3Template() {}
 
+        using base_class::set;
+
         void set( value_type a00, value_type a01, value_type a02,
                   value_type a10, value_type a11, value_type a12,
                   value_type a20, value_type a21, value_type a22,