SF.net SVN: openvrml:[3843] trunk

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

Revision: 3843
          http://openvrml.svn.sourceforge.net/openvrml/?rev=3843&view=rev
Author:   braden
Date:     2009-03-18 21:23:03 +0000 (Wed, 18 Mar 2009)

Log Message:
-----------
Fixes to build with gcc 4.0 (on Mac OS X 10.5).  This compiler appears to have some bugs with access rules and inner classes; interjecting some forwarding functions works around the problem.

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-03-18 03:49:02 UTC (rev 3842)
+++ trunk/ChangeLog	2009-03-18 21:23:03 UTC (rev 3843)
@@ -1,3 +1,10 @@
+2009-03-18 Braden McDaniel  <br...@en...>
+
+	* src/libopenvrml/openvrml/local/parse_vrml.h: Fixes to build with
+	gcc 4.0 (on Mac OS X 10.5).  This compiler appears to have some
+	bugs with access rules and inner classes; interjecting some
+	forwarding functions works around the problem.
+
 2009-03-17 Braden McDaniel  <br...@en...>
 
 	Rely on an installed GtkGLExt.

Modified: trunk/src/libopenvrml/openvrml/local/parse_vrml.h
===================================================================
--- trunk/src/libopenvrml/openvrml/local/parse_vrml.h	2009-03-18 03:49:02 UTC (rev 3842)
+++ trunk/src/libopenvrml/openvrml/local/parse_vrml.h	2009-03-18 21:23:03 UTC (rev 3843)
@@ -150,6 +150,11 @@
                 vrml97_parse_actions & actions_;
             } on_scene_finish;
 
+            static boost::thread_group & get_load_proto_thread_group(browser & b)
+            {
+                return b.load_proto_thread_group_;
+            }
+
             struct on_externproto_t {
                 explicit on_externproto_t(vrml97_parse_actions & actions):
                     actions_(actions)
@@ -209,8 +214,8 @@
                                     metatype_id,
                                     this->actions_.scene_,
                                     uri_list,
-                                    this->actions_.scene_.browser()
-                                    .load_proto_thread_group_));
+                                    get_load_proto_thread_group(
+                                        this->actions_.scene_.browser())));
 
                         this->actions_.scene_.browser().add_node_metatype(
                             externproto_class->id(),
@@ -534,6 +539,11 @@
                 vrml97_parse_actions & actions_;
             } on_node_start;
 
+            static script_node_metatype & get_script_node_metatype(browser & b)
+            {
+                return b.script_node_metatype_;
+            }
+
             struct on_node_finish_t {
                 explicit on_node_finish_t(vrml97_parse_actions & actions):
                     actions_(actions)
@@ -554,7 +564,8 @@
                         ? nd.type->create_node(ps.scope, nd.initial_values)
                         : intrusive_ptr<node>(
                             new script_node(
-                                this->actions_.scene_.browser().script_node_metatype_,
+                                get_script_node_metatype(
+                                    this->actions_.scene_.browser()),
                                 ps.scope,
                                 nd.script_interfaces,
                                 nd.initial_values));


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