SF.net SVN: openvrml:[3867] trunk

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

Revision: 3867
          http://openvrml.svn.sourceforge.net/openvrml/?rev=3867&view=rev
Author:   braden
Date:     2009-03-25 16:15:50 +0000 (Wed, 25 Mar 2009)

Log Message:
-----------
Avoid overusing the "proto_node_metatype" identifier.  The Microsoft compiler doesn't like it and it's just not pretty.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/libopenvrml/openvrml/local/externproto.cpp
    trunk/src/libopenvrml/openvrml/local/externproto.h

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-03-24 05:49:46 UTC (rev 3866)
+++ trunk/ChangeLog	2009-03-25 16:15:50 UTC (rev 3867)
@@ -1,3 +1,17 @@
+2009-03-25 Braden McDaniel  <br...@en...>
+
+	Avoid overusing the "proto_node_metatype" identifier.  The
+	Microsoft compiler doesn't like it and it's just not pretty.
+
+	* src/libopenvrml/openvrml/local/externproto.h
+	(openvrml::local::externproto_node_metatype::set_proto_node_metatype(const
+	boost::weak_ptr<proto_node_metatype> &)): Avoid overusing
+	"proto_node_metatype" identifier.
+	* src/libopenvrml/openvrml/local/externproto.h
+	(openvrml::local::externproto_node_metatype::set_proto_node_metatype(const
+	boost::weak_ptr<proto_node_metatype> &)): Avoid overusing
+	"proto_node_metatype" identifier.
+
 2009-03-24 Braden McDaniel  <br...@en...>
 
 	Moved Mozilla plug-in build into the big nonrecursive makefile.

Modified: trunk/src/libopenvrml/openvrml/local/externproto.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/local/externproto.cpp	2009-03-24 05:49:46 UTC (rev 3866)
+++ trunk/src/libopenvrml/openvrml/local/externproto.cpp	2009-03-25 16:15:50 UTC (rev 3867)
@@ -199,8 +199,7 @@
 
 void
 openvrml::local::externproto_node_metatype::
-set_proto_node_metatype(
-    const boost::weak_ptr<openvrml::local::proto_node_metatype> & proto_node_metatype)
+set_proto_node_metatype(const boost::weak_ptr<proto_node_metatype> & metatype)
     OPENVRML_THROW1(std::bad_alloc)
 {
     boost::mutex::scoped_lock lock(this->mutex_);
@@ -208,15 +207,15 @@
     using boost::shared_ptr;
     using boost::static_pointer_cast;
 
-    this->proto_node_metatype_ = proto_node_metatype;
+    this->proto_node_metatype_ = metatype;
 
     //
     // Now that we have a proto_node_metatype, we need to tell all the
     // externproto_node_types we've created so that they can in turn
     // tell the externproto_nodes they've created.
     //
-    const shared_ptr<openvrml::local::proto_node_metatype> shared_proto_node_metatype =
-        proto_node_metatype.lock();
+    const shared_ptr<proto_node_metatype> shared_proto_node_metatype =
+        metatype.lock();
     assert(shared_proto_node_metatype);
     for (externproto_node_types::const_iterator node_type =
              this->externproto_node_types_.begin();

Modified: trunk/src/libopenvrml/openvrml/local/externproto.h
===================================================================
--- trunk/src/libopenvrml/openvrml/local/externproto.h	2009-03-24 05:49:46 UTC (rev 3866)
+++ trunk/src/libopenvrml/openvrml/local/externproto.h	2009-03-25 16:15:50 UTC (rev 3867)
@@ -72,7 +72,8 @@
             virtual void do_shutdown(double time) OPENVRML_NOTHROW;
 
             void set_proto_node_metatype(
-                const boost::weak_ptr<proto_node_metatype> & proto_node_metatype = boost::weak_ptr<proto_node_metatype>())
+                const boost::weak_ptr<proto_node_metatype> & metatype =
+                    boost::weak_ptr<proto_node_metatype>())
                 OPENVRML_THROW1(std::bad_alloc);
 
             void clear_externproto_node_types() OPENVRML_NOTHROW;


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