Menu
▾
▴
SF.net SVN: openvrml:[4242] branches/0.18
|
From: <br...@us...> - 2011-07-24 07:20:30
|
Revision: 4242
http://openvrml.svn.sourceforge.net/openvrml/?rev=4242&view=rev
Author: braden
Date: 2011-07-24 07:20:19 +0000 (Sun, 24 Jul 2011)
Log Message:
-----------
Use Boost.ScopeExit instead of ScopeGuard.
Modified Paths:
--------------
branches/0.18/ChangeLog
branches/0.18/README
branches/0.18/configure-gcc-dbg
branches/0.18/src/libopenvrml/openvrml/browser.cpp
branches/0.18/src/libopenvrml/openvrml/browser.h
branches/0.18/src/libopenvrml/openvrml/local/conf.cpp
branches/0.18/src/libopenvrml/openvrml/local/error.cpp
branches/0.18/src/libopenvrml/openvrml/local/externproto.cpp
branches/0.18/src/libopenvrml/openvrml/local/node_metatype_registry_impl.cpp
branches/0.18/src/libopenvrml/openvrml/local/uri.cpp
branches/0.18/src/libopenvrml/openvrml/local/xml_reader.cpp
branches/0.18/src/libopenvrml/openvrml/scene.cpp
branches/0.18/src/libopenvrml/openvrml/script.cpp
branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.cpp
branches/0.18/src/mozilla-plugin/openvrml.cpp
branches/0.18/src/node/vrml97/grouping_node_base.h
branches/0.18/src/node/vrml97/image_stream_listener.cpp
branches/0.18/src/node/vrml97/text.cpp
branches/0.18/src/openvrml-player/curlbrowserhost.cpp
branches/0.18/src/openvrml-player/filechooserdialog.cpp
branches/0.18/src/openvrml-player/player.cpp
branches/0.18/src/openvrml-xembed/browser.cpp
branches/0.18/src/openvrml-xembed/browserfactory.cpp
branches/0.18/src/openvrml-xembed/main.cpp
branches/0.18/src/script/java.cpp
branches/0.18/src/script/javascript.cpp
branches/0.18/tests/browser.cpp
Property Changed:
----------------
branches/0.18/
branches/0.18/src/libopenvrml/openvrml/bad_url.cpp
branches/0.18/src/libopenvrml/openvrml/bad_url.h
branches/0.18/src/libopenvrml/openvrml/local/proto.cpp
branches/0.18/src/libopenvrml/openvrml/local/proto.h
branches/0.18/src/libopenvrml/openvrml/scene.cpp
branches/0.18/src/libopenvrml/openvrml/scene.h
branches/0.18/src/libopenvrml/openvrml/script.cpp
branches/0.18/src/mozilla-plugin/
branches/0.18/src/node/vrml97/register_node_metatypes.cpp
branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp
branches/0.18/src/node/x3d-cad-geometry/cad_face.h
branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp
branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h
branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp
branches/0.18/src/node/x3d-core/metadata_double.cpp
branches/0.18/src/node/x3d-core/metadata_double.h
branches/0.18/src/node/x3d-core/metadata_float.cpp
branches/0.18/src/node/x3d-core/metadata_float.h
branches/0.18/src/node/x3d-core/metadata_integer.cpp
branches/0.18/src/node/x3d-core/metadata_integer.h
branches/0.18/src/node/x3d-core/metadata_set.cpp
branches/0.18/src/node/x3d-core/metadata_set.h
branches/0.18/src/node/x3d-core/metadata_string.cpp
branches/0.18/src/node/x3d-core/metadata_string.h
branches/0.18/src/node/x3d-core/register_node_metatypes.cpp
branches/0.18/src/node/x3d-dis/espdu_transform.cpp
branches/0.18/src/node/x3d-dis/espdu_transform.h
branches/0.18/src/node/x3d-dis/receiver_pdu.cpp
branches/0.18/src/node/x3d-dis/receiver_pdu.h
branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp
branches/0.18/src/node/x3d-dis/signal_pdu.cpp
branches/0.18/src/node/x3d-dis/signal_pdu.h
branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp
branches/0.18/src/node/x3d-dis/transmitter_pdu.h
branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp
branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp
branches/0.18/src/node/x3d-environmental-effects/texture_background.h
branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp
branches/0.18/src/node/x3d-event-utilities/boolean_filter.h
branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp
branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h
branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp
branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h
branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp
branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h
branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp
branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h
branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp
branches/0.18/src/node/x3d-event-utilities/integer_trigger.h
branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp
branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp
branches/0.18/src/node/x3d-event-utilities/time_trigger.h
branches/0.18/src/node/x3d-geometry2d/arc2d.cpp
branches/0.18/src/node/x3d-geometry2d/arc2d.h
branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp
branches/0.18/src/node/x3d-geometry2d/arc_close2d.h
branches/0.18/src/node/x3d-geometry2d/circle2d.cpp
branches/0.18/src/node/x3d-geometry2d/circle2d.h
branches/0.18/src/node/x3d-geometry2d/disk2d.cpp
branches/0.18/src/node/x3d-geometry2d/disk2d.h
branches/0.18/src/node/x3d-geometry2d/polyline2d.cpp
branches/0.18/src/node/x3d-geometry2d/polyline2d.h
branches/0.18/src/node/x3d-geometry2d/polypoint2d.cpp
branches/0.18/src/node/x3d-geometry2d/polypoint2d.h
branches/0.18/src/node/x3d-geometry2d/rectangle2d.cpp
branches/0.18/src/node/x3d-geometry2d/rectangle2d.h
branches/0.18/src/node/x3d-geometry2d/register_node_metatypes.cpp
branches/0.18/src/node/x3d-geometry2d/triangle_set2d.cpp
branches/0.18/src/node/x3d-geometry2d/triangle_set2d.h
branches/0.18/src/node/x3d-geospatial/geo_coordinate.cpp
branches/0.18/src/node/x3d-geospatial/geo_coordinate.h
branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.cpp
branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.h
branches/0.18/src/node/x3d-geospatial/geo_location.cpp
branches/0.18/src/node/x3d-geospatial/geo_location.h
branches/0.18/src/node/x3d-geospatial/geo_lod.cpp
branches/0.18/src/node/x3d-geospatial/geo_lod.h
branches/0.18/src/node/x3d-geospatial/geo_metadata.cpp
branches/0.18/src/node/x3d-geospatial/geo_metadata.h
branches/0.18/src/node/x3d-geospatial/geo_origin.cpp
branches/0.18/src/node/x3d-geospatial/geo_origin.h
branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.cpp
branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.h
branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.cpp
branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.h
branches/0.18/src/node/x3d-geospatial/geo_viewpoint.cpp
branches/0.18/src/node/x3d-geospatial/geo_viewpoint.h
branches/0.18/src/node/x3d-geospatial/register_node_metatypes.cpp
branches/0.18/src/node/x3d-grouping/register_node_metatypes.cpp
branches/0.18/src/node/x3d-grouping/static_group.cpp
branches/0.18/src/node/x3d-grouping/static_group.h
branches/0.18/src/node/x3d-h-anim/h_anim_displacer.cpp
branches/0.18/src/node/x3d-h-anim/h_anim_displacer.h
branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.cpp
branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.h
branches/0.18/src/node/x3d-h-anim/h_anim_joint.cpp
branches/0.18/src/node/x3d-h-anim/h_anim_joint.h
branches/0.18/src/node/x3d-h-anim/h_anim_segment.cpp
branches/0.18/src/node/x3d-h-anim/h_anim_segment.h
branches/0.18/src/node/x3d-h-anim/h_anim_site.cpp
branches/0.18/src/node/x3d-h-anim/h_anim_site.h
branches/0.18/src/node/x3d-h-anim/register_node_metatypes.cpp
branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.cpp
branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.h
branches/0.18/src/node/x3d-interpolation/position_interpolator2d.cpp
branches/0.18/src/node/x3d-interpolation/position_interpolator2d.h
branches/0.18/src/node/x3d-interpolation/register_node_metatypes.cpp
branches/0.18/src/node/x3d-key-device-sensor/key_sensor.cpp
branches/0.18/src/node/x3d-key-device-sensor/key_sensor.h
branches/0.18/src/node/x3d-key-device-sensor/register_node_metatypes.cpp
branches/0.18/src/node/x3d-key-device-sensor/string_sensor.cpp
branches/0.18/src/node/x3d-key-device-sensor/string_sensor.h
branches/0.18/src/node/x3d-networking/load_sensor.cpp
branches/0.18/src/node/x3d-networking/load_sensor.h
branches/0.18/src/node/x3d-networking/register_node_metatypes.cpp
branches/0.18/src/node/x3d-nurbs/contour2d.cpp
branches/0.18/src/node/x3d-nurbs/contour2d.h
branches/0.18/src/node/x3d-nurbs/contour_polyline2d.cpp
branches/0.18/src/node/x3d-nurbs/contour_polyline2d.h
branches/0.18/src/node/x3d-nurbs/coordinate_double.cpp
branches/0.18/src/node/x3d-nurbs/coordinate_double.h
branches/0.18/src/node/x3d-nurbs/nurbs_curve.cpp
branches/0.18/src/node/x3d-nurbs/nurbs_curve.h
branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.cpp
branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.h
branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.cpp
branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.h
branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.cpp
branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.h
branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.cpp
branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.h
branches/0.18/src/node/x3d-nurbs/nurbs_set.cpp
branches/0.18/src/node/x3d-nurbs/nurbs_set.h
branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.cpp
branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.h
branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.cpp
branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.h
branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.cpp
branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.h
branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.cpp
branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.h
branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp
branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.h
branches/0.18/src/node/x3d-nurbs/register_node_metatypes.cpp
branches/0.18/src/node/x3d-rendering/color_rgba.cpp
branches/0.18/src/node/x3d-rendering/color_rgba.h
branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.cpp
branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.h
branches/0.18/src/node/x3d-rendering/indexed_triangle_set.cpp
branches/0.18/src/node/x3d-rendering/indexed_triangle_set.h
branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.cpp
branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.h
branches/0.18/src/node/x3d-rendering/register_node_metatypes.cpp
branches/0.18/src/node/x3d-rendering/triangle_fan_set.cpp
branches/0.18/src/node/x3d-rendering/triangle_fan_set.h
branches/0.18/src/node/x3d-rendering/triangle_set.cpp
branches/0.18/src/node/x3d-rendering/triangle_set.h
branches/0.18/src/node/x3d-rendering/triangle_strip_set.cpp
branches/0.18/src/node/x3d-rendering/triangle_strip_set.h
branches/0.18/src/node/x3d-shape/fill_properties.cpp
branches/0.18/src/node/x3d-shape/fill_properties.h
branches/0.18/src/node/x3d-shape/line_properties.cpp
branches/0.18/src/node/x3d-shape/line_properties.h
branches/0.18/src/node/x3d-shape/register_node_metatypes.cpp
branches/0.18/src/node/x3d-texturing/multi_texture.cpp
branches/0.18/src/node/x3d-texturing/multi_texture.h
branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.cpp
branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.h
branches/0.18/src/node/x3d-texturing/multi_texture_transform.cpp
branches/0.18/src/node/x3d-texturing/multi_texture_transform.h
branches/0.18/src/node/x3d-texturing/register_node_metatypes.cpp
branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.cpp
branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.h
Property changes on: branches/0.18
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236
+ /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236
Modified: branches/0.18/ChangeLog
===================================================================
--- branches/0.18/ChangeLog 2011-07-24 05:43:19 UTC (rev 4241)
+++ branches/0.18/ChangeLog 2011-07-24 07:20:19 UTC (rev 4242)
@@ -1,3 +1,31 @@
+2011-07-24 Braden McDaniel <br...@en...>
+
+ Use Boost.ScopeExit instead of ScopeGuard.
+
+ * README: Note Boost 1.38 requirement.
+ * src/libopenvrml/openvrml/browser.cpp
+ * src/libopenvrml/openvrml/local/conf.cpp
+ * src/libopenvrml/openvrml/local/error.cpp
+ * src/libopenvrml/openvrml/local/externproto.cpp
+ * src/libopenvrml/openvrml/local/node_metatype_registry_impl.cpp
+ * src/libopenvrml/openvrml/local/uri.cpp
+ * src/libopenvrml/openvrml/local/xml_reader.cpp
+ * src/libopenvrml/openvrml/script.cpp
+ * src/local/libopenvrml-dl/openvrml/local/dl.cpp
+ * src/mozilla-plugin/openvrml.cpp
+ * src/node/vrml97/grouping_node_base.h
+ * src/node/vrml97/image_stream_listener.cpp
+ * src/node/vrml97/text.cpp
+ * src/openvrml-player/curlbrowserhost.cpp
+ * src/openvrml-player/filechooserdialog.cpp
+ * src/openvrml-player/player.cpp
+ * src/openvrml-xembed/browser.cpp
+ * src/openvrml-xembed/browserfactory.cpp
+ * src/openvrml-xembed/main.cpp
+ * src/script/java.cpp
+ * src/script/javascript.cpp
+ * tests/browser.cpp
+
2011-04-21 Braden McDaniel <br...@en...>
Updates for 0.18.8 release.
Modified: branches/0.18/README
===================================================================
--- branches/0.18/README 2011-07-24 05:43:19 UTC (rev 4241)
+++ branches/0.18/README 2011-07-24 07:20:19 UTC (rev 4242)
@@ -136,7 +136,7 @@
At a minimum, OpenVRML requires these libraries to build:
- Boost (at least 1.37) <http://boost.org>
+ Boost (at least 1.38) <http://boost.org>
libltdl (non-Windows only) <http://www.gnu.org/software/libtool/>
libxml (non-Windows only) <http://xmlsoft.org>
Modified: branches/0.18/configure-gcc-dbg
===================================================================
--- branches/0.18/configure-gcc-dbg 2011-07-24 05:43:19 UTC (rev 4241)
+++ branches/0.18/configure-gcc-dbg 2011-07-24 07:20:19 UTC (rev 4242)
@@ -1,3 +1,3 @@
#!/bin/bash
-./$(dirname $0)/configure -C --prefix=$HOME --disable-static CXX='g++ -pipe' CPPFLAGS="-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC -DG_ERRORCHECK_MUTEXES -I$HOME/include -I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux" CXXFLAGS='-g3 -O0 -pedantic-errors -Wall -Wextra -Wno-missing-braces -Wno-missing-field-initializers -Wno-long-long' LDFLAGS="-L$HOME/lib64 -L$HOME/lib" JAVA_HOME=/usr/lib/jvm/jre "$*"
+./$(dirname $0)/configure -C --prefix=$HOME --disable-static CXX='g++ -pipe' CPPFLAGS="-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC -DG_ERRORCHECK_MUTEXES -I$HOME/include -I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux" CXXFLAGS='-g3 -O0 -Wall -Wextra -Wno-missing-braces -Wno-missing-field-initializers -Wno-long-long' LDFLAGS="-L$HOME/lib64 -L$HOME/lib" JAVA_HOME=/usr/lib/jvm/jre "$*"
Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236
+ /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236
Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801
/branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674
/trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236
+ /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801
/branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674
/trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236
Modified: branches/0.18/src/libopenvrml/openvrml/browser.cpp
===================================================================
--- branches/0.18/src/libopenvrml/openvrml/browser.cpp 2011-07-24 05:43:19 UTC (rev 4241)
+++ branches/0.18/src/libopenvrml/openvrml/browser.cpp 2011-07-24 07:20:19 UTC (rev 4242)
@@ -3,7 +3,8 @@
// OpenVRML
//
// Copyright 1998 Chris Morley
-// Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007 Braden McDaniel
+// Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+// Braden McDaniel
//
// This library is free software; you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License as published by
@@ -32,7 +33,7 @@
# include <boost/function.hpp>
# include <boost/functional.hpp>
# include <boost/lexical_cast.hpp>
-# include <boost/multi_index/detail/scope_guard.hpp>
+# include <boost/scope_exit.hpp>
# include <algorithm>
# include <functional>
# include <cerrno>
@@ -48,8 +49,6 @@
# include <config.h>
# endif
-using namespace boost::multi_index::detail; // for scope_guard
-
/**
* @file openvrml/browser.h
*
@@ -1873,18 +1872,6 @@
return this->scene_->url(); // Throws std::bad_alloc.
}
-void openvrml::browser::send_initialized()
-{
- using boost::shared_lock;
- using boost::shared_mutex;
-
- shared_lock<shared_mutex> listeners_lock(this->listeners_mutex_);
- for_each(this->listeners_.begin(), this->listeners_.end(),
- boost::bind2nd(
- boost::mem_fun(&browser_listener::browser_changed),
- browser_event(*this, browser_event::initialized)));
-}
-
/**
* @brief Set the world from a stream.
*
@@ -1903,9 +1890,18 @@
//
// Ensure that the "initialized" event is sent even if parsing throws.
//
- scope_guard initialized_event_guard =
- make_obj_guard(*this, &browser::send_initialized);
+ browser & self = *this;
+ shared_mutex & listeners_mutex = this->listeners_mutex_;
+ std::set<browser_listener *> & listeners = this->listeners_;
+ BOOST_SCOPE_EXIT((&self)(&listeners_mutex)(&listeners)) {
+ shared_lock<shared_mutex> listeners_lock(listeners_mutex);
+ for_each(listeners.begin(), listeners.end(),
+ boost::bind2nd(
+ boost::mem_fun(&browser_listener::browser_changed),
+ browser_event(self, browser_event::initialized)));
+ } BOOST_SCOPE_EXIT_END
+
{
using std::string;
using boost::upgrade_lock;
Modified: branches/0.18/src/libopenvrml/openvrml/browser.h
===================================================================
--- branches/0.18/src/libopenvrml/openvrml/browser.h 2011-07-24 05:43:19 UTC (rev 4241)
+++ branches/0.18/src/libopenvrml/openvrml/browser.h 2011-07-24 07:20:19 UTC (rev 4242)
@@ -215,8 +215,6 @@
std::vector<boost::intrusive_ptr<node> > & nodes,
std::map<std::string, std::string> & meta);
- OPENVRML_LOCAL void send_initialized();
-
boost::scoped_ptr<node_metatype_registry> node_metatype_registry_;
const boost::scoped_ptr<null_node_metatype> null_node_metatype_;
Modified: branches/0.18/src/libopenvrml/openvrml/local/conf.cpp
===================================================================
--- branches/0.18/src/libopenvrml/openvrml/local/conf.cpp 2011-07-24 05:43:19 UTC (rev 4241)
+++ branches/0.18/src/libopenvrml/openvrml/local/conf.cpp 2011-07-24 07:20:19 UTC (rev 4242)
@@ -2,7 +2,7 @@
//
// OpenVRML
//
-// Copyright 2009 Braden McDaniel
+// Copyright 2009, 2010 Braden McDaniel
//
// This library is free software; you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License as published by
@@ -20,7 +20,6 @@
# include "conf.h"
# include "error.h"
-# include <boost/multi_index/detail/scope_guard.hpp>
# include <boost/ref.hpp>
# include <boost/tokenizer.hpp>
# ifdef _WIN32
@@ -30,8 +29,6 @@
# include <cstdlib>
# endif
-using namespace boost::multi_index::detail; // for scope_guard
-
namespace {
class OPENVRML_LOCAL no_environment_var : public std::runtime_error {
Modified: branches/0.18/src/libopenvrml/openvrml/local/error.cpp
===================================================================
--- branches/0.18/src/libopenvrml/openvrml/local/error.cpp 2011-07-24 05:43:19 UTC (rev 4241)
+++ branches/0.18/src/libopenvrml/openvrml/local/error.cpp 2011-07-24 07:20:19 UTC (rev 4242)
@@ -2,7 +2,7 @@
//
// OpenVRML
//
-// Copyright 2009 Braden McDaniel
+// Copyright 2009, 2010 Braden McDaniel
//
// This library is free software; you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License as published by
@@ -19,21 +19,17 @@
//
# include "error.h"
-# include <boost/multi_index/detail/scope_guard.hpp>
-# include <boost/ref.hpp>
+# include <boost/scope_exit.hpp>
-using namespace boost::multi_index::detail; // for scope_guard
-
-
# ifdef _WIN32
void openvrml::local::throw_runtime_error_from_win32_system_error(LONG result)
OPENVRML_THROW1(std::runtime_error)
{
- using boost::ref;
-
static const LPCVOID source;
LPTSTR buf = 0;
- scope_guard buf_guard = make_guard(LocalFree, ref(buf));
+ BOOST_SCOPE_EXIT((&buf)) {
+ LocalFree(buf);
+ } BOOST_SCOPE_EXIT_END
FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM
| FORMAT_MESSAGE_ALLOCATE_BUFFER,
source,
Modified: branches/0.18/src/libopenvrml/openvrml/local/externproto.cpp
===================================================================
--- branches/0.18/src/libopenvrml/openvrml/local/externproto.cpp 2011-07-24 05:43:19 UTC (rev 4241)
+++ branches/0.18/src/libopenvrml/openvrml/local/externproto.cpp 2011-07-24 07:20:19 UTC (rev 4242)
@@ -2,7 +2,7 @@
//
// OpenVRML
//
-// Copyright 2009 Braden McDaniel
+// Copyright 2009, 2010 Braden McDaniel
//
// This library is free software; you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License as published by
@@ -25,10 +25,8 @@
# include <openvrml/scene.h>
# include <boost/function.hpp>
# include <boost/mpl/for_each.hpp>
-# include <boost/multi_index/detail/scope_guard.hpp>
+# include <boost/scope_exit.hpp>
-using namespace boost::multi_index::detail; // for scope_guard
-
struct OPENVRML_LOCAL openvrml::local::externproto_node_metatype::load_proto {
load_proto(externproto_node_metatype & externproto_class,
const openvrml::scene & scene,
@@ -52,12 +50,9 @@
using boost::shared_ptr;
using local::uri;
- scope_guard guard =
- make_obj_guard(
- *this->externproto_node_metatype_,
- &externproto_node_metatype::
- clear_externproto_node_types);
- boost::ignore_unused_variable_warning(guard);
+ BOOST_SCOPE_EXIT((&externproto_node_metatype_)) {
+ externproto_node_metatype_->clear_externproto_node_types();
+ } BOOST_SCOPE_EXIT_END
auto_ptr<resource_istream> in =
this->scene_->get_resource(this->alt_uris_);
Modified: branches/0.18/src/libopenvrml/openvrml/local/node_metatype_registry_impl.cpp
===================================================================
--- branches/0.18/src/libopenvrml/openvrml/local/node_metatype_registry_impl.cpp 2011-07-24 05:43:19 UTC (rev 4241)
+++ branches/0.18/src/libopenvrml/openvrml/local/node_metatype_registry_impl.cpp 2011-07-24 07:20:19 UTC (rev 4242)
@@ -2,7 +2,7 @@
//
// OpenVRML
//
-// Copyright 2008 Braden McDaniel
+// Copyright 2008, 2010 Braden McDaniel
//
// This library is free software; you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License as published by
@@ -21,12 +21,10 @@
# include "node_metatype_registry_impl.h"
# include "conf.h"
# include <openvrml/browser.h>
-# include <boost/multi_index/detail/scope_guard.hpp>
+# include <boost/scope_exit.hpp>
# include <iostream>
# include <sstream>
-using namespace boost::multi_index::detail; // for scope_guard
-
const std::string openvrml::local::node_metatype_registry_impl::sym =
"openvrml_register_node_metatypes";
@@ -43,7 +41,10 @@
std::cerr << dl::error() << std::endl;
return 0;
}
- scope_guard handle_guard = make_guard(dl::close, handle);
+ bool succeeded = false;
+ BOOST_SCOPE_EXIT((&succeeded)(handle)) {
+ if (!succeeded) { dl::close(handle); }
+ } BOOST_SCOPE_EXIT_END
//
// Make sure the module has what we're looking for.
@@ -52,9 +53,8 @@
dl::sym(handle, openvrml::local::node_metatype_registry_impl::sym);
if (!sym) { return 0; } // handle_guard will close the module.
- const bool succeeded = registry.module_handles_.insert(handle).second;
+ succeeded = registry.module_handles_.insert(handle).second;
assert(succeeded);
- handle_guard.dismiss();
return 0;
}
Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689
/branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688
/branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236
+ /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689
/branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688
/branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236
Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689
/branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688
/branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801
/trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236
+ /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689
/branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688
/branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801
/trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236
Modified: branches/0.18/src/libopenvrml/openvrml/local/uri.cpp
===================================================================
--- branches/0.18/src/libopenvrml/openvrml/local/uri.cpp 2011-07-24 05:43:19 UTC (rev 4241)
+++ branches/0.18/src/libopenvrml/openvrml/local/uri.cpp 2011-07-24 07:20:19 UTC (rev 4242)
@@ -2,7 +2,7 @@
//
// OpenVRML
//
-// Copyright 2008 Braden McDaniel
+// Copyright 2008, 2010 Braden McDaniel
//
// This library is free software; you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License as published by
@@ -23,8 +23,7 @@
# include <cerrno>
# include <cstring>
# ifdef _WIN32
-# include <boost/multi_index/detail/scope_guard.hpp>
-using namespace boost::multi_index::detail; // for scope_guard
+# include <boost/scope_exit.hpp>
# endif
openvrml::local::uri::uri() OPENVRML_THROW1(std::bad_alloc):
@@ -552,7 +551,9 @@
using boost::ref;
DWORD error = GetLastError();
void * msgBuf = 0;
- scope_guard msgBuf_guard = make_guard(LocalFree, ref(msgBuf));
+ BOOST_SCOPE_EXIT((&msgBuf)) {
+ LocalFree(msgBuf);
+ } BOOST_SCOPE_EXIT_END
FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER
| FORMAT_MESSAGE_FROM_SYSTEM
| FORMAT_MESSAGE_IGNORE_INSERTS,
@@ -578,7 +579,9 @@
using boost::ref;
DWORD error = GetLastError();
void * msgBuf = 0;
- scope_guard msgBuf_guard = make_guard(LocalFree, ref(msgBuf));
+ BOOST_SCOPE_EXIT((&msgBuf)) {
+ LocalFree(msgBuf);
+ } BOOST_SCOPE_EXIT_END
FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER
| FORMAT_MESSAGE_FROM_SYSTEM
| FORMAT_MESSAGE_IGNORE_INSERTS,
Modified: branches/0.18/src/libopenvrml/openvrml/local/xml_reader.cpp
===================================================================
--- branches/0.18/src/libopenvrml/openvrml/local/xml_reader.cpp 2011-07-24 05:43:19 UTC (rev 4241)
+++ branches/0.18/src/libopenvrml/openvrml/local/xml_reader.cpp 2011-07-24 07:20:19 UTC (rev 4242)
@@ -2,7 +2,7 @@
//
// OpenVRML
//
-// Copyright 2008 Braden McDaniel
+// Copyright 2008, 2010 Braden McDaniel
//
// This library is free software; you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License as published by
@@ -21,8 +21,7 @@
# include "xml_reader.h"
# ifdef _WIN32
# include <shlwapi.h>
-# include <boost/multi_index/detail/scope_guard.hpp>
-using namespace boost::multi_index::detail; // for scope_guard
+# include <boost/scope_exit.hpp>
# endif
/**
@@ -125,31 +124,33 @@
{
# ifdef _WIN32
HRESULT hr;
+ bool succeeded = false;
hr = SHCreateStreamOnFile(filename.c_str(), STGM_READ, &this->input);
+ BOOST_SCOPE_EXIT((&succeeded)(&input)) {
+ if (!succeeded && input) { input->Release(); }
+ } BOOST_SCOPE_EXIT_END
if (FAILED(hr)) {
throw std::runtime_error("failed to open file \"" + filename
+ '\"');
}
- scope_guard input_guard =
- make_obj_guard(*this->input, &IStream::Release);
hr = CreateXmlReader(__uuidof(IXmlReader),
reinterpret_cast<void **>(&this->reader),
0);
+ BOOST_SCOPE_EXIT((&succeeded)(&reader)) {
+ if (!succeeded && reader) { reader->Release(); }
+ } BOOST_SCOPE_EXIT_END
if (FAILED(hr)) {
throw std::runtime_error("failed to create XML reader");
}
- scope_guard reader_guard =
- make_obj_guard(*this->reader, &IXmlReader::Release);
hr = this->reader->SetInput(this->input);
if (FAILED(hr)) {
throw std::runtime_error("failed to set input for XML reader");
}
- input_guard.dismiss();
- reader_guard.dismiss();
+ succeeded = true;
# else
static const char * const encoding = 0;
static const int options = 0;
Modified: branches/0.18/src/libopenvrml/openvrml/scene.cpp
===================================================================
--- branches/0.18/src/libopenvrml/openvrml/scene.cpp 2011-07-24 05:43:19 UTC (rev 4241)
+++ branches/0.18/src/libopenvrml/openvrml/scene.cpp 2011-07-24 07:20:19 UTC (rev 4242)
@@ -25,14 +25,12 @@
# include <openvrml/local/parse_vrml.h>
# include <private.h>
# include <boost/function.hpp>
-# include <boost/multi_index/detail/scope_guard.hpp>
+# include <boost/scope_exit.hpp>
# ifdef HAVE_CONFIG_H
# include <config.h>
# endif
-using namespace boost::multi_index::detail; // for scope_guard
-
/**
* @file openvrml/scene.h
*
@@ -180,8 +178,10 @@
//
// Ensure that scene_loaded gets called even if parsing throws.
//
- scope_guard scene_loaded_guard =
- make_obj_guard(*this, &scene::scene_loaded);
+ scene & self = *this;
+ BOOST_SCOPE_EXIT((&self)) {
+ self.scene_loaded();
+ } BOOST_SCOPE_EXIT_END
{
using boost::unique_lock;
Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236
+ /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236
Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801
/trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236
+ /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801
/trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236
Modified: branches/0.18/src/libopenvrml/openvrml/script.cpp
===================================================================
--- branches/0.18/src/libopenvrml/openvrml/script.cpp 2011-07-24 05:43:19 UTC (rev 4241)
+++ branches/0.18/src/libopenvrml/openvrml/script.cpp 2011-07-24 07:20:19 UTC (rev 4242)
@@ -3,7 +3,8 @@
// OpenVRML
//
// Copyright 1998 Chris Morley
-// Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007 Braden McDaniel
+// Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+// Braden McDaniel
//
// This library is free software; you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License as published by
@@ -31,7 +32,7 @@
# include <boost/functional.hpp>
# include <boost/lexical_cast.hpp>
# include <boost/mpl/for_each.hpp>
-# include <boost/multi_index/detail/scope_guard.hpp>
+# include <boost/scope_exit.hpp>
# include <boost/utility.hpp>
# include <algorithm>
# include <functional>
@@ -40,9 +41,6 @@
# include <config.h>
# endif
-
-using namespace boost::multi_index::detail; // for scope_guard
-
/**
* @file openvrml/script.h
*
@@ -415,7 +413,10 @@
const dl::handle handle = dl::open(filename);
if (!handle) { return 0; } // Ignore things we can't open.
- scope_guard handle_guard = make_guard(dl::close, handle);
+ bool succeeded = false;
+ BOOST_SCOPE_EXIT((&succeeded)(handle)) {
+ if (!succeeded) { dl::close(handle); }
+ } BOOST_SCOPE_EXIT_END
//
// Make sure the module has what we're looking for.
@@ -423,9 +424,8 @@
const void * sym = dl::sym(handle, "openvrml_script_LTX_register_factory");
if (!sym) { return 0; } // handle_guard will close the module.
- const bool succeeded = registry.module_handles_.insert(handle).second;
+ succeeded = registry.module_handles_.insert(handle).second;
assert(succeeded);
- handle_guard.dismiss();
return 0;
}
@@ -1954,8 +1954,10 @@
// nodes.
//
this->add_ref();
- scope_guard guard = make_obj_guard(*this, &script_node::remove_ref);
- boost::ignore_unused_variable_warning(guard);
+ script_node & self = *this;
+ BOOST_SCOPE_EXIT((&self)) {
+ self.remove_ref();
+ } BOOST_SCOPE_EXIT_END
for (node_interface_set::const_iterator interface_ = interfaces.begin();
interface_ != interfaces.end();
Property changes on: branches/0.18/src/libopenvrml/openvrml/script.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236
+ /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236
Modified: branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.cpp
===================================================================
--- branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.cpp 2011-07-24 05:43:19 UTC (rev 4241)
+++ branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.cpp 2011-07-24 07:20:19 UTC (rev 4242)
@@ -2,7 +2,7 @@
//
// OpenVRML
//
-// Copyright 2008 Braden McDaniel
+// Copyright 2008, 2009, 2010 Braden McDaniel
//
// This library is free software; you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License as published by
@@ -21,12 +21,10 @@
# include "dl.h"
# include <boost/filesystem.hpp>
# include <boost/ref.hpp>
+# include <boost/scope_exit.hpp>
# include <boost/tokenizer.hpp>
-# include <boost/multi_index/detail/scope_guard.hpp>
# include <sstream>
-using namespace boost::multi_index::detail; // for scope_guard
-
int openvrml::local::dl::init()
{
# ifdef _WIN32
@@ -130,7 +128,9 @@
# ifdef _WIN32
const DWORD err = GetLastError();
char * buf = 0;
- scope_guard buf_guard = make_guard(LocalFree, boost::ref(buf));
+ BOOST_SCOPE_EXIT((buf)) {
+ LocalFree(buf);
+ } BOOST_SCOPE_EXIT_END
static const LPCVOID source = 0;
static const DWORD buf_size = 0;
static va_list * const args = 0;
Property changes on: branches/0.18/src/mozilla-plugin
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236
+ /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236
Modified: branches/0.18/src/mozilla-plugin/openvrml.cpp
===================================================================
--- branches/0.18/src/mozilla-plugin/openvrml.cpp 2011-07-24 05:43:19 UTC (rev 4241)
+++ branches/0.18/src/mozilla-plugin/openvrml.cpp 2011-07-24 07:20:19 UTC (rev 4242)
@@ -2,7 +2,7 @@
//
// OpenVRML Mozilla plug-in
//
-// Copyright 2004, 2005, 2006, 2007, 2008 Braden McDaniel
+// Copyright 2004, 2005, 2006, 2007, 2008, 2010 Braden McDaniel
//
// This program is free software; you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by the Free
@@ -25,9 +25,8 @@
# include <vector>
# include <sys/socket.h>
# include <sys/wait.h>
-# include <boost/concept_check.hpp>
# include <boost/lexical_cast.hpp>
-# include <boost/multi_index/detail/scope_guard.hpp>
+# include <boost/scope_exit.hpp>
# include <boost/noncopyable.hpp>
# include <boost/ref.hpp>
# include <boost/scoped_ptr.hpp>
@@ -75,8 +74,6 @@
# include "browser-factory-client-glue.h"
# include "browser-client-glue.h"
-using namespace boost::multi_index::detail; // for scope_guard
-
namespace {
void printerr(const char * str);
@@ -169,7 +166,9 @@
G_TYPE_NONE, 0);
GError * error = 0;
- scope_guard error_guard = make_guard(g_error_free, boost::ref(error));
+ BOOST_SCOPE_EXIT((&error)) {
+ if (error) { g_error_free(error); }
+ } BOOST_SCOPE_EXIT_END
klass->connection = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
if (!klass->connection) {
g_critical("Failed to open connection to bus: %s", error->message);
@@ -184,8 +183,9 @@
DBUS_SERVICE_DBUS,
DBUS_PATH_DBUS,
DBUS_INTERFACE_DBUS);
- scope_guard driver_proxy_guard = make_guard(g_object_unref, driver_proxy);
- boost::ignore_unused_variable_warning(driver_proxy_guard);
+ BOOST_SCOPE_EXIT((driver_proxy)) {
+ g_object_unref(driver_proxy);
+ } BOOST_SCOPE_EXIT_END
guint request_ret;
if (!org_freedesktop_DBus_request_name(driver_proxy,
@@ -200,7 +200,6 @@
dbus_g_object_type_install_info(
OPENVRML_NP_TYPE_BROWSER_HOST,
&dbus_glib_openvrml_np_browser_host_object_info);
- error_guard.dismiss();
}
int openvrml_np_browser_host_get_url(OpenvrmlNpBrowserHost * const host,
@@ -589,12 +588,10 @@
return pluginInstance.write(stream, len, buffer);
}
-void NPP_StreamAsFile(const NPP instance,
+void NPP_StreamAsFile(NPP,
NPStream *,
const char * /* fname */)
{
- boost::ignore_unused_variable_warning(instance);
- assert(instance);
}
void NPP_Print(const NPP instance, NPPrint * const printInfo)
@@ -1095,9 +1092,9 @@
"/org/openvrml/BrowserFactory",
"org.openvrml.BrowserFactory");
g_return_val_if_fail(browser_factory, 0);
- scope_guard browser_factory_guard =
- make_guard(g_object_unref, G_OBJECT(browser_factory));
- boost::ignore_unused_variable_warning(browser_factory_guard);
+ BOOST_SCOPE_EXIT((browser_factory)) {
+ g_object_unref(browser_factory);
+ } BOOST_SCOPE_EXIT_END
char * browser_path = 0;
if (!org_openvrml_BrowserFactory_create_control(browser_factory,
@@ -1140,7 +1137,9 @@
OPENVRML_NP_BROWSER_HOST_GET_CLASS(this->browser_host);
GError * error = 0;
- scope_guard error_guard = make_guard(g_error_free, boost::ref(error));
+ BOOST_SCOPE_EXIT((&error)) {
+ if (error) { g_error_free(error); }
+ } BOOST_SCOPE_EXIT_END
this->browser = get_browser(browser_host_class->connection,
browser_host_class->host_name,
@@ -1151,8 +1150,6 @@
g_critical("Browser creation failed: %s", error->message);
return;
}
-
- error_guard.dismiss();
}
NPError plugin_instance::new_stream(const NPMIMEType type,
@@ -1161,7 +1158,9 @@
if (!this->browser) { return NPERR_INVALID_INSTANCE_ERROR; }
GError * error = 0;
- scope_guard error_guard = make_guard(g_error_free, boost::ref(error));
+ BOOST_SCOPE_EXIT((&error)) {
+ if (error) { g_error_free(error); }
+ } BOOST_SCOPE_EXIT_END
gboolean result = org_openvrml_Browser_new_stream(this->browser,
guint64(stream),
type,
@@ -1172,7 +1171,6 @@
error->message);
return NPERR_GENERIC_ERROR;
}
- error_guard.dismiss();
return NPERR_NO_ERROR;
}
Modified: branches/0.18/src/node/vrml97/grouping_node_base.h
===================================================================
--- branches/0.18/src/node/vrml97/grouping_node_base.h 2011-07-24 05:43:19 UTC (rev 4241)
+++ branches/0.18/src/node/vrml97/grouping_node_base.h 2011-07-24 07:20:19 UTC (rev 4242)
@@ -2,7 +2,7 @@
//
// OpenVRML
//
-// Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007 Braden McDaniel
+// Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2010 Braden McDaniel
//
// This library is free software; you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License as published by
@@ -23,7 +23,7 @@
# include <openvrml/node_impl_util.h>
# include <openvrml/viewer.h>
-# include <boost/multi_index/detail/scope_guard.hpp>
+# include <boost/scope_exit.hpp>
namespace openvrml_node_vrml97 {
@@ -167,7 +167,6 @@
OPENVRML_THROW1(std::bad_alloc)
{
using namespace openvrml;
- using namespace boost::multi_index::detail; // for scope_guard
Derived & group = dynamic_cast<Derived &>(this->node());
@@ -190,19 +189,21 @@
// Throws std::bad_alloc.
//
children.push_back(*n);
- scope_guard guard =
- make_obj_guard(children, &children_t::pop_back);
+ bool succeeded = false;
+ BOOST_SCOPE_EXIT_TPL((&succeeded)(&children)) {
+ if (!succeeded) { children.pop_back(); }
+ } BOOST_SCOPE_EXIT_END
child_node * const child =
node_cast<child_node *>(n->get());
if (child) {
child->relocate(); // Throws std::bad_alloc.
}
- guard.dismiss();
+ succeeded = true;
}
}
}
- group.children_.mfnode::value(children);
+ group.children_.value(children);
group.node::modified(true);
group.bounding_volume_dirty(true);
@@ -353,7 +354,6 @@
OPENVRML_THROW1(std::bad_alloc)
{
using namespace openvrml;
- using namespace boost::multi_index::detail; // for scope_guard
typedef std::vector<boost::intrusive_ptr<openvrml::node> > children_t;
children_t children;
@@ -367,12 +367,14 @@
// least.
//
children.push_back(*n); // Throws std::bad_alloc.
- scope_guard guard =
- make_obj_guard(children, &children_t::pop_back);
+ bool succeeded = false;
+ BOOST_SCOPE_EXIT_TPL((&succeeded)(&children)) {
+ if (!succeeded) { children.pop_back(); }
+ } BOOST_SCOPE_EXIT_END
child_node * const child =
node_cast<child_node *>(n->get());
if (child) { child->relocate(); } // Throws std::bad_alloc.
- guard.dismiss();
+ succeeded = true;
}
this->children_.mfnode::value(children);
Modified: branches/0.18/src/node/vrml97/image_stream_listener.cpp
===================================================================
--- branches/0.18/src/node/vrml97/image_stream_listener.cpp 2011-07-24 05:43:19 UTC (rev 4241)
+++ branches/0.18/src/node/vrml97/image_stream_listener.cpp 2011-07-24 07:20:19 UTC (rev 4242)
@@ -2,7 +2,7 @@
//
// OpenVRML
//
-// Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007 Braden McDaniel
+// Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2010 Braden McDaniel
//
// This library is free software; you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License as published by
@@ -24,7 +24,7 @@
# include <sstream>
# include <boost/algorithm/string/predicate.hpp>
-# include <boost/multi_index/detail/scope_guard.hpp>
+# include <boost/scope_exit.hpp>
# include "image_stream_listener.h"
openvrml_node_vrml97::image_stream_listener::image_reader::~image_reader()
@@ -208,14 +208,15 @@
stream_listener(stream_listener),
gray_palette(false)
{
- using namespace boost::multi_index::detail; // for scope_guard
this->png_ptr_ =
png_create_read_struct(PNG_LIBPNG_VER_STRING, 0, 0, 0);
if (!this->png_ptr_) { throw std::bad_alloc(); }
- scope_guard guard = make_guard(&png_destroy_read_struct,
- &this->png_ptr_,
- &this->info_ptr_,
- png_infopp(0));
+ bool succeeded = false;
+ BOOST_SCOPE_EXIT((&succeeded)(&png_ptr_)(&info_ptr_)) {
+ if (!succeeded) {
+ png_destroy_read_struct(&png_ptr_, &info_ptr_, png_infopp(0));
+ }
+ } BOOST_SCOPE_EXIT_END
this->info_ptr_ = png_create_info_struct(this->png_ptr_);
if (!this->info_ptr_) { throw std::bad_alloc(); }
@@ -225,7 +226,7 @@
openvrml_png_info_callback,
openvrml_png_row_callback,
openvrml_png_end_callback);
- guard.dismiss();
+ succeeded = true;
}
openvrml_node_vrml97::image_stream_listener::png_reader::~png_reader()
Property changes on: branches/0.18/src/node/vrml97/register_node_metatypes.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689
/trunk/src/libopenvrml/open...
[truncated message content] |