SF.net SVN: openvrml:[4278] trunk

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

Revision: 4278
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4278&view=rev
Author:   braden
Date:     2012-04-29 19:23:58 +0000 (Sun, 29 Apr 2012)
Log Message:
-----------
Make initialization of thread_id_ conditional on NDEBUG.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/script/javascript.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2012-04-29 08:06:42 UTC (rev 4277)
+++ trunk/ChangeLog	2012-04-29 19:23:58 UTC (rev 4278)
@@ -1,5 +1,12 @@
 2012-04-29 Braden McDaniel  <br...@en...>
 
+	* src/script/javascript.cpp
+	(script::script(openvrml::script_node &, const
+	boost::shared_ptr<openvrml::resource_istream> &)): Make
+	initialization of thread_id_ conditional on NDEBUG.
+
+2012-04-29 Braden McDaniel  <br...@en...>
+
 	* src/script/javascript.cpp: As of XULRunner 12.0, JSRuntime
 	should now be used by a single thread.  For now, at least, employ
 	a JSRuntime for each Script node.

Modified: trunk/src/script/javascript.cpp
===================================================================
--- trunk/src/script/javascript.cpp	2012-04-29 08:06:42 UTC (rev 4277)
+++ trunk/src/script/javascript.cpp	2012-04-29 19:23:58 UTC (rev 4278)
@@ -1035,8 +1035,10 @@
         cx(0),
         sfnode_class(this->direct_output()
                      ? SFNode::direct_output_jsclass
-                     : SFNode::jsclass),
-        thread_id_(boost::this_thread::get_id())
+                     : SFNode::jsclass)
+# ifndef NDEBUG
+        ,thread_id_(boost::this_thread::get_id())
+# endif
     {
         using std::bad_alloc;
 

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