SF.net SVN: openvrml:[3883] trunk

[<br...@us...>]

Revision: 3883
          http://openvrml.svn.sourceforge.net/openvrml/?rev=3883&view=rev
Author:   braden
Date:     2009-04-05 05:12:57 +0000 (Sun, 05 Apr 2009)

Log Message:
-----------
Override openvrml::geometry_node::do_color instead of openvrml::geometry_node::color (which is now nonvirtual).

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/node/vrml97/abstract_indexed_set.h

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-04-05 01:07:30 UTC (rev 3882)
+++ trunk/ChangeLog	2009-04-05 05:12:57 UTC (rev 3883)
@@ -1,3 +1,10 @@
+2009-04-05 Braden McDaniel  <br...@en...>
+
+	* src/node/vrml97/abstract_indexed_set.h
+	(openvrml_node_vrml97::abstract_indexed_set_node<Derived>::do_color()
+	const): Override openvrml::geometry_node::do_color instead of
+	openvrml::geometry_node::color (which is now nonvirtual).
+
 2009-04-04 Braden McDaniel  <br...@en...>
 
 	Apply the nonvirtual interface pattern to openvrml::gl::viewer's

Modified: trunk/src/node/vrml97/abstract_indexed_set.h
===================================================================
--- trunk/src/node/vrml97/abstract_indexed_set.h	2009-04-05 01:07:30 UTC (rev 3882)
+++ trunk/src/node/vrml97/abstract_indexed_set.h	2009-04-05 05:12:57 UTC (rev 3883)
@@ -80,7 +80,7 @@
 
         virtual bool modified() const;
 
-        virtual const openvrml::color_node * color() const OPENVRML_NOTHROW;
+        virtual const openvrml::color_node * do_color() const OPENVRML_NOTHROW;
 
     protected:
         abstract_indexed_set_node(
@@ -283,7 +283,7 @@
      */
     template <typename Derived>
     const openvrml::color_node *
-    abstract_indexed_set_node<Derived>::color() const OPENVRML_NOTHROW
+    abstract_indexed_set_node<Derived>::do_color() const OPENVRML_NOTHROW
     {
         using openvrml::sfnode;
         return openvrml::node_cast<openvrml::color_node *>(


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.