SF.net SVN: openvrml:[4253] trunk

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

Revision: 4253
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4253&view=rev
Author:   braden
Date:     2012-04-24 02:01:18 +0000 (Tue, 24 Apr 2012)
Log Message:
-----------
gcc 4.7 insists that intrusive_ptr_add_ref/release declarations occur before inclusion of <boost/intrusive_ptr.hpp>.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/openvrml-xembed/browserfactory.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2012-04-23 08:22:36 UTC (rev 4252)
+++ trunk/ChangeLog	2012-04-24 02:01:18 UTC (rev 4253)
@@ -1,3 +1,9 @@
+2012-04-23 Tom Callaway <tca...@re...>
+
+	* src/openvrml-xembed/browserfactory.cpp: gcc 4.7 insists that
+	intrusive_ptr_add_ref/release declarations occur before inclusion
+	of <boost/intrusive_ptr.hpp>.
+
 2012-04-23 Braden McDaniel  <br...@en...>
 
 	* src/script/javascript.cpp: More fallout from SpiderMonkey moves

Modified: trunk/src/openvrml-xembed/browserfactory.cpp
===================================================================
--- trunk/src/openvrml-xembed/browserfactory.cpp	2012-04-23 08:22:36 UTC (rev 4252)
+++ trunk/src/openvrml-xembed/browserfactory.cpp	2012-04-24 02:01:18 UTC (rev 4253)
@@ -18,7 +18,6 @@
 // with this library; if not, see <http://www.gnu.org/licenses/>.
 //
 
-# include <boost/intrusive_ptr.hpp>
 # include <boost/scope_exit.hpp>
 # include <boost/ref.hpp>
 # include <gtk/gtk.h>
@@ -34,6 +33,20 @@
 # include "browser-factory-server-glue.h"
 # include "browser.h"
 
+namespace {
+    G_GNUC_INTERNAL void intrusive_ptr_add_ref(GObject * const obj)
+    {
+        g_object_ref(obj);
+    }
+
+    G_GNUC_INTERNAL void intrusive_ptr_release(GObject * const obj)
+    {
+        g_object_unref(obj);
+    }
+}
+
+# include <boost/intrusive_ptr.hpp>
+
 G_DEFINE_TYPE(OpenvrmlXembedBrowserFactory,
               openvrml_xembed_browser_factory,
               G_TYPE_OBJECT)
@@ -51,18 +64,6 @@
                                                       GParamSpec * pspec);
 }
 
-namespace {
-    G_GNUC_INTERNAL void intrusive_ptr_add_ref(GObject * const obj)
-    {
-        g_object_ref(obj);
-    }
-
-    G_GNUC_INTERNAL void intrusive_ptr_release(GObject * const obj)
-    {
-        g_object_unref(obj);
-    }
-}
-
 //
 // hosts maps the unique bus identifiers of hosts to a controls_map_t; a
 // controls_map_t maps an object path to an OpenvrmlXembedBrowser instance.

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