Menu
▾
▴
SF.net SVN: openvrml:[4178] trunk
|
From: <br...@us...> - 2010-08-14 09:03:04
|
Revision: 4178
http://openvrml.svn.sourceforge.net/openvrml/?rev=4178&view=rev
Author: braden
Date: 2010-08-14 09:02:54 +0000 (Sat, 14 Aug 2010)
Log Message:
-----------
Added Visual C++ 2010 project files. These files are now interspersed in the source directories.
Modified Paths:
--------------
trunk/ChangeLog
trunk/Makefile.am
trunk/examples/Makefile.am
trunk/examples/sdl_viewer.cpp
trunk/src/Makefile.am
trunk/src/libopenvrml/openvrml/basetypes.cpp
trunk/src/libopenvrml/openvrml/local/error.cpp
trunk/src/libopenvrml/openvrml/local/parse_vrml.cpp
trunk/src/libopenvrml/openvrml/local/proto.cpp
trunk/src/libopenvrml/openvrml/local/uri.cpp
trunk/src/libopenvrml/openvrml/node.h
trunk/src/libopenvrml/openvrml/node_impl_util.h
trunk/src/libopenvrml/openvrml/script.cpp
trunk/src/libopenvrml/openvrml-common.h
trunk/src/libopenvrml-gl/openvrml-gl-common.h
trunk/src/node/vrml97/grouping_node_base.h
trunk/tests/Makefile.am
Added Paths:
-----------
trunk/OpenVRML.sln
trunk/examples/pretty-print.vcxproj
trunk/examples/sdl-viewer.vcxproj
trunk/src/libopenvrml/openvrml-config-win32.h
trunk/src/libopenvrml/openvrml.rc
trunk/src/libopenvrml/openvrml.vcxproj
trunk/src/libopenvrml-gl/openvrml-gl-config-win32.h
trunk/src/libopenvrml-gl/openvrml-gl.rc
trunk/src/libopenvrml-gl/openvrml-gl.vcxproj
trunk/src/local/libopenvrml-dl/openvrml-dl.vcxproj
trunk/src/node/vrml97/vrml97.vcxproj
trunk/src/node/x3d-cad-geometry/x3d-cad-geometry.vcxproj
trunk/src/node/x3d-core/x3d-core.vcxproj
trunk/src/node/x3d-dis/x3d-dis.vcxproj
trunk/src/node/x3d-environmental-effects/x3d-environmental-effects.vcxproj
trunk/src/node/x3d-event-utilities/x3d-event-utilities.vcxproj
trunk/src/node/x3d-geometry2d/x3d-geometry2d.vcxproj
trunk/src/node/x3d-geospatial/x3d-geospatial.vcxproj
trunk/src/node/x3d-grouping/x3d-grouping.vcxproj
trunk/src/node/x3d-h-anim/x3d-h-anim.vcxproj
trunk/src/node/x3d-interpolation/x3d-interpolation.vcxproj
trunk/src/node/x3d-key-device-sensor/x3d-key-device-sensor.vcxproj
trunk/src/node/x3d-networking/x3d-networking.vcxproj
trunk/src/node/x3d-nurbs/x3d-nurbs.vcxproj
trunk/src/node/x3d-rendering/x3d-rendering.vcxproj
trunk/src/node/x3d-shape/x3d-shape.vcxproj
trunk/src/node/x3d-texturing/x3d-texturing.vcxproj
trunk/src/script/javascript.vcxproj
trunk/tests/parse-vrml97.vcxproj
trunk/tests/parse-x3dvrml.vcxproj
Removed Paths:
-------------
trunk/ide-projects/
Property Changed:
----------------
trunk/
trunk/examples/
trunk/src/libopenvrml/
trunk/src/libopenvrml-gl/
trunk/src/local/libopenvrml-dl/
trunk/src/node/vrml97/
trunk/src/node/x3d-cad-geometry/
trunk/src/node/x3d-core/
trunk/src/node/x3d-dis/
trunk/src/node/x3d-environmental-effects/
trunk/src/node/x3d-event-utilities/
trunk/src/node/x3d-geometry2d/
trunk/src/node/x3d-geospatial/
trunk/src/node/x3d-grouping/
trunk/src/node/x3d-h-anim/
trunk/src/node/x3d-interpolation/
trunk/src/node/x3d-key-device-sensor/
trunk/src/node/x3d-networking/
trunk/src/node/x3d-nurbs/
trunk/src/node/x3d-rendering/
trunk/src/node/x3d-shape/
trunk/src/node/x3d-texturing/
trunk/src/script/
trunk/tests/
Property changes on: trunk
___________________________________________________________________
Modified: svn:ignore
- Makefile
Makefile.in
aclocal.m4
autom4te*.cache
config.h
config.h.in
config.guess
config.sub
configure
depcomp
install-sh
ltmain.sh
missing
mkinstalldirs
stamp-h
stamp-h.in
stamp-h1
openvrml.pc
openvrml-gl.pc
+ Makefile
Makefile.in
aclocal.m4
autom4te*.cache
config.h
config.h.in
config.guess
config.sub
configure
depcomp
install-sh
ipch
ltmain.sh
missing
mkinstalldirs
stamp-h
stamp-h.in
stamp-h1
openvrml.pc
openvrml-gl.pc
OpenVRML.sdf
OpenVRML.opensdf
OpenVRML.suo
x64
Win32
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-08-13 07:51:33 UTC (rev 4177)
+++ trunk/ChangeLog 2010-08-14 09:02:54 UTC (rev 4178)
@@ -1,3 +1,156 @@
+2010-08-14 Braden McDaniel <br...@en...>
+
+ Added Visual C++ 2010 project files. These files are now
+ interspersed in the source directories.
+
+ * Makefile.am
+ (EXTRA_DIST): Add OpenVRML.sln.
+ * OpenVRML.sln: Added file.
+ * examples/sdl_viewer.cpp
+ (resource_fetcher::do_get_resource(const
+ std::string&)::file_resource_istream::do_type() const): Fully
+ qualify boost::next.
+ * examples/Makefile.am
+ (EXTRA_DIST): Add Visual Studio 2010 project files.
+ * examples/sdl-viewer.vcxproj: Added file.
+ * examples/pretty-print.vcxproj: Added file.
+ * ide-projects/Makefile.am: Removed file.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/OpenVRML.sln: Removed
+ file.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/javascript/javascript.vcproj:
+ Removed file.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc:
+ Moved to src/libopenvrml/openvrml.rc.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj:
+ Removed file.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml-config.h:
+ Moved to src/libopenvrml/openvrml-config-win32.h.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-dl/openvrml-dl.vcproj:
+ Removed file.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.vcproj:
+ Removed file.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc:
+ Moved to src/libopenvrml-gl/openvrml-gl.rc.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl-config.h:
+ Moved to src/libopenvrml-gl/openvrml-gl-config-win32.h.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/parse-vrml97/parse-vrml97.vcproj: Removed file.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/parse-x3dvrml/parse-x3dvrml.vcproj: Removed file.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/pretty-print/pretty-print.vcproj:
+ Removed file.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/sdl-viewer/sdl-viewer.vcproj:
+ Removed file.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/vrml97/vrml97.vcproj:
+ Removed file.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-cad-geometry/x3d-cad-geometry.vcproj: Removed file.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-core/x3d-core.vcproj:
+ Removed file.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-dis/x3d-dis.vcproj: Removed file.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-environmental-effects/x3d-environmental-effects.vcproj:
+ Removed file.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-event-utilities/x3d-event-utilities.vcproj:
+ Removed file.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-geometry2d/x3d-geometry2d.vcproj: Removed file.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-geospatial/x3d-geospatial.vcproj:
+ Removed file.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-grouping/x3d-grouping.vcproj:
+ Removed file.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-h-anim/x3d-h-anim.vcproj:
+ Removed file.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-interpolation/x3d-interpolation.vcproj:
+ Removed file.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-key-device-sensor/x3d-key-device-sensor.vcproj:
+ Removed file.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-networking/x3d-networking.vcproj:
+ Removed file.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-nurbs/x3d-nurbs.vcproj:
+ Removed file.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-rendering/x3d-rendering.vcproj: Removed file.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-shape/x3d-shape.vcproj:
+ Removed file.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/x3d-texturing/x3d-texturing.vcproj:
+ Removed file.
+ * src/Makefile.am
+ (EXTRA_DIST): Add Visual C++ project files, resource scripts, and
+ Windows-specific config headers.
+ * src/libopenvrml/openvrml/basetypes.cpp
+ (det3(const openvrml::mat4f &, size_t, size_t, size_t, size_t,
+ size_t, size_t)): Use size_t instead of int to suppress a warning
+ from the Microsoft compiler.
+ * src/libopenvrml/openvrml/local/error.cpp
+ (openvrml::local::throw_runtime_error_from_win32_system_error(LONG)):
+ Cast to DWORD to suppress a warning from the Microsoft compiler.
+ * src/libopenvrml/openvrml/local/parse_vrml.cpp
+ (error_handler::operator()(const ScannerT &, const ErrorT &)
+ const): static_cast to size_t to suppress warnings from the
+ Microsoft compiler.
+ * src/libopenvrml/openvrml/local/proto.cpp
+ (resolve_node_path(const node_path_t &, const
+ std::vector<boost::intrusive_ptr<openvrml::node> > &)): Fully
+ qualify boost::next.
+ (field_value_cloner::clone_node(const
+ boost::intrusive_ptr<openvrml::node> &)): Fully qualify
+ boost::bind.
+ * src/libopenvrml/openvrml/local/uri.cpp
+ (openvrml::local::uri::swap(uri &)): Use difference_type instead
+ of size_type to suppress a warning from the Microsoft compiler.
+ * src/libopenvrml/openvrml/script.cpp
+ (openvrml::script_node::script_node(script_node_metatype &, const
+ boost::shared_ptr<openvrml::scope> &, const node_interface_set &,
+ const initial_value_map &)): Initialize "succeeded" to suppress
+ warning.
+ * src/libopenvrml/openvrml/node_impl_util.h
+ (openvrml::node_impl_util::exposedfield<FieldValue>::exposedfield(openvrml::node&,
+ const typename FieldValue::value_type &)): cl 16.0 still has the
+ "typename" bustage.
+ * src/libopenvrml/openvrml/node.h
+ (openvrml::find_interface(const node_interface_set &, const
+ std::string &)): Fully qualify boost::bind.
+ * src/libopenvrml/openvrml.rc: Moved from
+ ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc.
+ * src/libopenvrml/openvrml-config-win32.h: Moved from
+ ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml-config.h.
+ * src/libopenvrml/openvrml.vcxproj: Added file.
+ * src/libopenvrml/openvrml-common.h: Include
+ <openvrml-config-win32.h> on Windows.
+ * src/libopenvrml-gl/openvrml-gl.rc: Moved from
+ ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc.
+ * src/libopenvrml-gl/openvrml-gl-config-win32.h: Moved from
+ ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml-gl-config.h.
+ * src/libopenvrml-gl/openvrml-gl.vcxproj: Added file.
+ * src/libopenvrml-gl/openvrml-gl-common.h: Include
+ <openvrml-gl-config-win32.h> on Windows.
+ * src/local/libopenvrml-dl/openvrml-dl.vcxproj: Added file.
+ * src/node/vrml97/grouping_node_base.h
+ (openvrml_node_vrml97::grouping_node_base<Derived>::add_children_listener::do_process_event(const
+ openvrml::mfnode &, double)): The Microsoft compiler requires
+ openvrml::node to be fully qualified here.
+ * src/node/vrml97/vrml97.vcxproj: Added file.
+ * src/node/x3d-cad-geometry/x3d-cad-geometry.vcxproj: Added file.
+ * src/node/x3d-core/x3d-core.vcxproj: Added file.
+ * src/node/x3d-dis/x3d-dis.vcxproj: Added file.
+ * src/node/x3d-environmental-effects/x3d-environmental-effects.vcxproj:
+ Added file.
+ * src/node/x3d-event-utilities/x3d-event-utilities.vcxproj: Added
+ file.
+ * src/node/x3d-geometry2d/x3d-geometry2d.vcxproj: Added file.
+ * src/node/x3d-geospatial/x3d-geospatial.vcxproj: Added file.
+ * src/node/x3d-grouping/x3d-grouping.vcxproj: Added file.
+ * src/node/x3d-h-anim/x3d-h-anim.vcxproj: Added file.
+ * src/node/x3d-interpolation/x3d-interpolation.vcxproj: Added
+ file.
+ * src/node/x3d-key-device-sensor/x3d-key-device-sensor.vcxproj:
+ Added file.
+ * src/node/x3d-networking/x3d-networking.vcxproj: Added file.
+ * src/node/x3d-nurbs/x3d-nurbs.vcxproj: Added file.
+ * src/node/x3d-rendering/x3d-rendering.vcxproj: Added file.
+ * src/node/x3d-shape/x3d-shape.vcxproj: Added file.
+ * src/node/x3d-texturing/x3d-texturing.vcxproj: Added file.
+ * src/script/javascript.vcxproj: Added file.
+ * tests/parse-vrml97.vcxproj: Added file.
+ * tests/parse-x3dvrml.vcxproj: Added file.
+ * tests/Makefile.am
+ (EXTRA_DIST): Add Visual Studio 2010 project files.
+
2010-08-13 Braden McDaniel <br...@en...>
* src/libopenvrml/openvrml/node_impl_util.cpp: Doc-comment
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2010-08-13 07:51:33 UTC (rev 4177)
+++ trunk/Makefile.am 2010-08-14 09:02:54 UTC (rev 4178)
@@ -1,10 +1,11 @@
-SUBDIRS = doc ide-projects models src data examples tests
+SUBDIRS = doc models src data examples tests
ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = \
openvrml.pc.in \
- openvrml-gl.pc.in
+ openvrml-gl.pc.in \
+ OpenVRML.sln
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = openvrml.pc
Added: trunk/OpenVRML.sln
===================================================================
--- trunk/OpenVRML.sln (rev 0)
+++ trunk/OpenVRML.sln 2010-08-14 09:02:54 UTC (rev 4178)
@@ -0,0 +1,268 @@
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual C++ Express 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "javascript", "src\script\javascript.vcxproj", "{FE4F0469-ADE7-4BC3-8501-590F810BF569}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openvrml-dl", "src\local\libopenvrml-dl\openvrml-dl.vcxproj", "{95FA0E9B-DF2F-48C3-B07D-AB3A93E44E5C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openvrml-gl", "src\libopenvrml-gl\openvrml-gl.vcxproj", "{141F90C2-6630-4D7A-834F-D5D57C6CFC24}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openvrml", "src\libopenvrml\openvrml.vcxproj", "{E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}"
+ ProjectSection(ProjectDependencies) = postProject
+ {95FA0E9B-DF2F-48C3-B07D-AB3A93E44E5C} = {95FA0E9B-DF2F-48C3-B07D-AB3A93E44E5C}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "parse-vrml97", "tests\parse-vrml97.vcxproj", "{B7ACAA17-A1BE-4221-8F9D-503EA2AF0EDF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "parse-x3dvrml", "tests\parse-x3dvrml.vcxproj", "{38979260-FBDB-49E6-A0AD-15E3C8C553A3}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pretty-print", "examples\pretty-print.vcxproj", "{EFCFAB14-FC2B-4816-AD49-DC0E6F4D04E1}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdl-viewer", "examples\sdl-viewer.vcxproj", "{2DD5D192-3E85-4E64-854B-DF7A1FF06B76}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vrml97", "src\node\vrml97\vrml97.vcxproj", "{5ED398C0-0529-40D5-AB2C-C7EF0769002B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x3d-cad-geometry", "src\node\x3d-cad-geometry\x3d-cad-geometry.vcxproj", "{D9D29F52-CFE0-42A1-A150-47CBAAE89030}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x3d-core", "src\node\x3d-core\x3d-core.vcxproj", "{78133A10-3ADF-474C-B32A-74124A976482}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x3d-dis", "src\node\x3d-dis\x3d-dis.vcxproj", "{D5FF853A-6BD3-49AC-A5B6-ACA754C766F5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x3d-environmental-effects", "src\node\x3d-environmental-effects\x3d-environmental-effects.vcxproj", "{12C5E485-59BD-40EB-9BE9-F856FBDC18B6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x3d-event-utilities", "src\node\x3d-event-utilities\x3d-event-utilities.vcxproj", "{CE946E0C-4880-4AB0-9170-42D6692791CC}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x3d-geometry2d", "src\node\x3d-geometry2d\x3d-geometry2d.vcxproj", "{61A31C6F-23A1-4243-A338-EF749912592A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x3d-geospatial", "src\node\x3d-geospatial\x3d-geospatial.vcxproj", "{3C7DA0E4-D769-4C8A-9911-BE5C2651ED30}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x3d-grouping", "src\node\x3d-grouping\x3d-grouping.vcxproj", "{1D32E4EB-6613-4270-8295-7113712BC6C5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x3d-h-anim", "src\node\x3d-h-anim\x3d-h-anim.vcxproj", "{3DA77516-5D3A-42AA-8D99-BF87643A75A2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x3d-interpolation", "src\node\x3d-interpolation\x3d-interpolation.vcxproj", "{BFF962C6-4CC1-4DD1-965A-163EADE74986}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x3d-key-device-sensor", "src\node\x3d-key-device-sensor\x3d-key-device-sensor.vcxproj", "{E20E0E24-C0B6-4448-82E0-32CCDBA88957}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x3d-networking", "src\node\x3d-networking\x3d-networking.vcxproj", "{430B1A48-8E64-43DF-8CC4-AD09C41BA735}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x3d-nurbs", "src\node\x3d-nurbs\x3d-nurbs.vcxproj", "{D884D3FB-79C4-497A-AD7C-7D7877F9768E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x3d-rendering", "src\node\x3d-rendering\x3d-rendering.vcxproj", "{7DAC4CA0-9382-4ED0-A26E-A5F84776054C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x3d-shape", "src\node\x3d-shape\x3d-shape.vcxproj", "{95D646C4-B759-469D-BDBB-A370A5778CA5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x3d-texturing", "src\node\x3d-texturing\x3d-texturing.vcxproj", "{20B850E9-E417-49A2-A66C-38827401597B}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
+ Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {FE4F0469-ADE7-4BC3-8501-590F810BF569}.Debug|Win32.ActiveCfg = Debug|Win32
+ {FE4F0469-ADE7-4BC3-8501-590F810BF569}.Debug|Win32.Build.0 = Debug|Win32
+ {FE4F0469-ADE7-4BC3-8501-590F810BF569}.Debug|x64.ActiveCfg = Debug|x64
+ {FE4F0469-ADE7-4BC3-8501-590F810BF569}.Debug|x64.Build.0 = Debug|x64
+ {FE4F0469-ADE7-4BC3-8501-590F810BF569}.Release|Win32.ActiveCfg = Release|Win32
+ {FE4F0469-ADE7-4BC3-8501-590F810BF569}.Release|Win32.Build.0 = Release|Win32
+ {FE4F0469-ADE7-4BC3-8501-590F810BF569}.Release|x64.ActiveCfg = Release|x64
+ {FE4F0469-ADE7-4BC3-8501-590F810BF569}.Release|x64.Build.0 = Release|x64
+ {95FA0E9B-DF2F-48C3-B07D-AB3A93E44E5C}.Debug|Win32.ActiveCfg = Debug|Win32
+ {95FA0E9B-DF2F-48C3-B07D-AB3A93E44E5C}.Debug|Win32.Build.0 = Debug|Win32
+ {95FA0E9B-DF2F-48C3-B07D-AB3A93E44E5C}.Debug|x64.ActiveCfg = Debug|x64
+ {95FA0E9B-DF2F-48C3-B07D-AB3A93E44E5C}.Debug|x64.Build.0 = Debug|x64
+ {95FA0E9B-DF2F-48C3-B07D-AB3A93E44E5C}.Release|Win32.ActiveCfg = Release|Win32
+ {95FA0E9B-DF2F-48C3-B07D-AB3A93E44E5C}.Release|Win32.Build.0 = Release|Win32
+ {95FA0E9B-DF2F-48C3-B07D-AB3A93E44E5C}.Release|x64.ActiveCfg = Release|x64
+ {95FA0E9B-DF2F-48C3-B07D-AB3A93E44E5C}.Release|x64.Build.0 = Release|x64
+ {141F90C2-6630-4D7A-834F-D5D57C6CFC24}.Debug|Win32.ActiveCfg = Debug|Win32
+ {141F90C2-6630-4D7A-834F-D5D57C6CFC24}.Debug|Win32.Build.0 = Debug|Win32
+ {141F90C2-6630-4D7A-834F-D5D57C6CFC24}.Debug|x64.ActiveCfg = Debug|x64
+ {141F90C2-6630-4D7A-834F-D5D57C6CFC24}.Debug|x64.Build.0 = Debug|x64
+ {141F90C2-6630-4D7A-834F-D5D57C6CFC24}.Release|Win32.ActiveCfg = Release|Win32
+ {141F90C2-6630-4D7A-834F-D5D57C6CFC24}.Release|Win32.Build.0 = Release|Win32
+ {141F90C2-6630-4D7A-834F-D5D57C6CFC24}.Release|x64.ActiveCfg = Release|x64
+ {141F90C2-6630-4D7A-834F-D5D57C6CFC24}.Release|x64.Build.0 = Release|x64
+ {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}.Debug|Win32.ActiveCfg = Debug|Win32
+ {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}.Debug|Win32.Build.0 = Debug|Win32
+ {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}.Debug|x64.ActiveCfg = Debug|x64
+ {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}.Debug|x64.Build.0 = Debug|x64
+ {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}.Release|Win32.ActiveCfg = Release|Win32
+ {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}.Release|Win32.Build.0 = Release|Win32
+ {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}.Release|x64.ActiveCfg = Release|x64
+ {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}.Release|x64.Build.0 = Release|x64
+ {B7ACAA17-A1BE-4221-8F9D-503EA2AF0EDF}.Debug|Win32.ActiveCfg = Debug|Win32
+ {B7ACAA17-A1BE-4221-8F9D-503EA2AF0EDF}.Debug|Win32.Build.0 = Debug|Win32
+ {B7ACAA17-A1BE-4221-8F9D-503EA2AF0EDF}.Debug|x64.ActiveCfg = Debug|x64
+ {B7ACAA17-A1BE-4221-8F9D-503EA2AF0EDF}.Debug|x64.Build.0 = Debug|x64
+ {B7ACAA17-A1BE-4221-8F9D-503EA2AF0EDF}.Release|Win32.ActiveCfg = Release|Win32
+ {B7ACAA17-A1BE-4221-8F9D-503EA2AF0EDF}.Release|Win32.Build.0 = Release|Win32
+ {B7ACAA17-A1BE-4221-8F9D-503EA2AF0EDF}.Release|x64.ActiveCfg = Release|x64
+ {B7ACAA17-A1BE-4221-8F9D-503EA2AF0EDF}.Release|x64.Build.0 = Release|x64
+ {38979260-FBDB-49E6-A0AD-15E3C8C553A3}.Debug|Win32.ActiveCfg = Debug|Win32
+ {38979260-FBDB-49E6-A0AD-15E3C8C553A3}.Debug|Win32.Build.0 = Debug|Win32
+ {38979260-FBDB-49E6-A0AD-15E3C8C553A3}.Debug|x64.ActiveCfg = Debug|x64
+ {38979260-FBDB-49E6-A0AD-15E3C8C553A3}.Debug|x64.Build.0 = Debug|x64
+ {38979260-FBDB-49E6-A0AD-15E3C8C553A3}.Release|Win32.ActiveCfg = Release|Win32
+ {38979260-FBDB-49E6-A0AD-15E3C8C553A3}.Release|Win32.Build.0 = Release|Win32
+ {38979260-FBDB-49E6-A0AD-15E3C8C553A3}.Release|x64.ActiveCfg = Release|x64
+ {38979260-FBDB-49E6-A0AD-15E3C8C553A3}.Release|x64.Build.0 = Release|x64
+ {EFCFAB14-FC2B-4816-AD49-DC0E6F4D04E1}.Debug|Win32.ActiveCfg = Debug|Win32
+ {EFCFAB14-FC2B-4816-AD49-DC0E6F4D04E1}.Debug|Win32.Build.0 = Debug|Win32
+ {EFCFAB14-FC2B-4816-AD49-DC0E6F4D04E1}.Debug|x64.ActiveCfg = Debug|x64
+ {EFCFAB14-FC2B-4816-AD49-DC0E6F4D04E1}.Debug|x64.Build.0 = Debug|x64
+ {EFCFAB14-FC2B-4816-AD49-DC0E6F4D04E1}.Release|Win32.ActiveCfg = Release|Win32
+ {EFCFAB14-FC2B-4816-AD49-DC0E6F4D04E1}.Release|Win32.Build.0 = Release|Win32
+ {EFCFAB14-FC2B-4816-AD49-DC0E6F4D04E1}.Release|x64.ActiveCfg = Release|x64
+ {EFCFAB14-FC2B-4816-AD49-DC0E6F4D04E1}.Release|x64.Build.0 = Release|x64
+ {2DD5D192-3E85-4E64-854B-DF7A1FF06B76}.Debug|Win32.ActiveCfg = Debug|Win32
+ {2DD5D192-3E85-4E64-854B-DF7A1FF06B76}.Debug|Win32.Build.0 = Debug|Win32
+ {2DD5D192-3E85-4E64-854B-DF7A1FF06B76}.Debug|x64.ActiveCfg = Debug|x64
+ {2DD5D192-3E85-4E64-854B-DF7A1FF06B76}.Debug|x64.Build.0 = Debug|x64
+ {2DD5D192-3E85-4E64-854B-DF7A1FF06B76}.Release|Win32.ActiveCfg = Release|Win32
+ {2DD5D192-3E85-4E64-854B-DF7A1FF06B76}.Release|Win32.Build.0 = Release|Win32
+ {2DD5D192-3E85-4E64-854B-DF7A1FF06B76}.Release|x64.ActiveCfg = Release|x64
+ {2DD5D192-3E85-4E64-854B-DF7A1FF06B76}.Release|x64.Build.0 = Release|x64
+ {5ED398C0-0529-40D5-AB2C-C7EF0769002B}.Debug|Win32.ActiveCfg = Debug|Win32
+ {5ED398C0-0529-40D5-AB2C-C7EF0769002B}.Debug|Win32.Build.0 = Debug|Win32
+ {5ED398C0-0529-40D5-AB2C-C7EF0769002B}.Debug|x64.ActiveCfg = Debug|x64
+ {5ED398C0-0529-40D5-AB2C-C7EF0769002B}.Debug|x64.Build.0 = Debug|x64
+ {5ED398C0-0529-40D5-AB2C-C7EF0769002B}.Release|Win32.ActiveCfg = Release|Win32
+ {5ED398C0-0529-40D5-AB2C-C7EF0769002B}.Release|Win32.Build.0 = Release|Win32
+ {5ED398C0-0529-40D5-AB2C-C7EF0769002B}.Release|x64.ActiveCfg = Release|x64
+ {5ED398C0-0529-40D5-AB2C-C7EF0769002B}.Release|x64.Build.0 = Release|x64
+ {D9D29F52-CFE0-42A1-A150-47CBAAE89030}.Debug|Win32.ActiveCfg = Debug|Win32
+ {D9D29F52-CFE0-42A1-A150-47CBAAE89030}.Debug|Win32.Build.0 = Debug|Win32
+ {D9D29F52-CFE0-42A1-A150-47CBAAE89030}.Debug|x64.ActiveCfg = Debug|x64
+ {D9D29F52-CFE0-42A1-A150-47CBAAE89030}.Debug|x64.Build.0 = Debug|x64
+ {D9D29F52-CFE0-42A1-A150-47CBAAE89030}.Release|Win32.ActiveCfg = Release|Win32
+ {D9D29F52-CFE0-42A1-A150-47CBAAE89030}.Release|Win32.Build.0 = Release|Win32
+ {D9D29F52-CFE0-42A1-A150-47CBAAE89030}.Release|x64.ActiveCfg = Release|x64
+ {D9D29F52-CFE0-42A1-A150-47CBAAE89030}.Release|x64.Build.0 = Release|x64
+ {78133A10-3ADF-474C-B32A-74124A976482}.Debug|Win32.ActiveCfg = Debug|Win32
+ {78133A10-3ADF-474C-B32A-74124A976482}.Debug|Win32.Build.0 = Debug|Win32
+ {78133A10-3ADF-474C-B32A-74124A976482}.Debug|x64.ActiveCfg = Debug|x64
+ {78133A10-3ADF-474C-B32A-74124A976482}.Debug|x64.Build.0 = Debug|x64
+ {78133A10-3ADF-474C-B32A-74124A976482}.Release|Win32.ActiveCfg = Release|Win32
+ {78133A10-3ADF-474C-B32A-74124A976482}.Release|Win32.Build.0 = Release|Win32
+ {78133A10-3ADF-474C-B32A-74124A976482}.Release|x64.ActiveCfg = Release|x64
+ {78133A10-3ADF-474C-B32A-74124A976482}.Release|x64.Build.0 = Release|x64
+ {D5FF853A-6BD3-49AC-A5B6-ACA754C766F5}.Debug|Win32.ActiveCfg = Debug|Win32
+ {D5FF853A-6BD3-49AC-A5B6-ACA754C766F5}.Debug|Win32.Build.0 = Debug|Win32
+ {D5FF853A-6BD3-49AC-A5B6-ACA754C766F5}.Debug|x64.ActiveCfg = Debug|x64
+ {D5FF853A-6BD3-49AC-A5B6-ACA754C766F5}.Debug|x64.Build.0 = Debug|x64
+ {D5FF853A-6BD3-49AC-A5B6-ACA754C766F5}.Release|Win32.ActiveCfg = Release|Win32
+ {D5FF853A-6BD3-49AC-A5B6-ACA754C766F5}.Release|Win32.Build.0 = Release|Win32
+ {D5FF853A-6BD3-49AC-A5B6-ACA754C766F5}.Release|x64.ActiveCfg = Release|x64
+ {D5FF853A-6BD3-49AC-A5B6-ACA754C766F5}.Release|x64.Build.0 = Release|x64
+ {12C5E485-59BD-40EB-9BE9-F856FBDC18B6}.Debug|Win32.ActiveCfg = Debug|Win32
+ {12C5E485-59BD-40EB-9BE9-F856FBDC18B6}.Debug|Win32.Build.0 = Debug|Win32
+ {12C5E485-59BD-40EB-9BE9-F856FBDC18B6}.Debug|x64.ActiveCfg = Debug|x64
+ {12C5E485-59BD-40EB-9BE9-F856FBDC18B6}.Debug|x64.Build.0 = Debug|x64
+ {12C5E485-59BD-40EB-9BE9-F856FBDC18B6}.Release|Win32.ActiveCfg = Release|Win32
+ {12C5E485-59BD-40EB-9BE9-F856FBDC18B6}.Release|Win32.Build.0 = Release|Win32
+ {12C5E485-59BD-40EB-9BE9-F856FBDC18B6}.Release|x64.ActiveCfg = Release|x64
+ {12C5E485-59BD-40EB-9BE9-F856FBDC18B6}.Release|x64.Build.0 = Release|x64
+ {CE946E0C-4880-4AB0-9170-42D6692791CC}.Debug|Win32.ActiveCfg = Debug|Win32
+ {CE946E0C-4880-4AB0-9170-42D6692791CC}.Debug|Win32.Build.0 = Debug|Win32
+ {CE946E0C-4880-4AB0-9170-42D6692791CC}.Debug|x64.ActiveCfg = Debug|x64
+ {CE946E0C-4880-4AB0-9170-42D6692791CC}.Debug|x64.Build.0 = Debug|x64
+ {CE946E0C-4880-4AB0-9170-42D6692791CC}.Release|Win32.ActiveCfg = Release|Win32
+ {CE946E0C-4880-4AB0-9170-42D6692791CC}.Release|Win32.Build.0 = Release|Win32
+ {CE946E0C-4880-4AB0-9170-42D6692791CC}.Release|x64.ActiveCfg = Release|x64
+ {CE946E0C-4880-4AB0-9170-42D6692791CC}.Release|x64.Build.0 = Release|x64
+ {61A31C6F-23A1-4243-A338-EF749912592A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {61A31C6F-23A1-4243-A338-EF749912592A}.Debug|Win32.Build.0 = Debug|Win32
+ {61A31C6F-23A1-4243-A338-EF749912592A}.Debug|x64.ActiveCfg = Debug|x64
+ {61A31C6F-23A1-4243-A338-EF749912592A}.Debug|x64.Build.0 = Debug|x64
+ {61A31C6F-23A1-4243-A338-EF749912592A}.Release|Win32.ActiveCfg = Release|Win32
+ {61A31C6F-23A1-4243-A338-EF749912592A}.Release|Win32.Build.0 = Release|Win32
+ {61A31C6F-23A1-4243-A338-EF749912592A}.Release|x64.ActiveCfg = Release|x64
+ {61A31C6F-23A1-4243-A338-EF749912592A}.Release|x64.Build.0 = Release|x64
+ {3C7DA0E4-D769-4C8A-9911-BE5C2651ED30}.Debug|Win32.ActiveCfg = Debug|Win32
+ {3C7DA0E4-D769-4C8A-9911-BE5C2651ED30}.Debug|Win32.Build.0 = Debug|Win32
+ {3C7DA0E4-D769-4C8A-9911-BE5C2651ED30}.Debug|x64.ActiveCfg = Debug|x64
+ {3C7DA0E4-D769-4C8A-9911-BE5C2651ED30}.Debug|x64.Build.0 = Debug|x64
+ {3C7DA0E4-D769-4C8A-9911-BE5C2651ED30}.Release|Win32.ActiveCfg = Release|Win32
+ {3C7DA0E4-D769-4C8A-9911-BE5C2651ED30}.Release|Win32.Build.0 = Release|Win32
+ {3C7DA0E4-D769-4C8A-9911-BE5C2651ED30}.Release|x64.ActiveCfg = Release|x64
+ {3C7DA0E4-D769-4C8A-9911-BE5C2651ED30}.Release|x64.Build.0 = Release|x64
+ {1D32E4EB-6613-4270-8295-7113712BC6C5}.Debug|Win32.ActiveCfg = Debug|Win32
+ {1D32E4EB-6613-4270-8295-7113712BC6C5}.Debug|Win32.Build.0 = Debug|Win32
+ {1D32E4EB-6613-4270-8295-7113712BC6C5}.Debug|x64.ActiveCfg = Debug|x64
+ {1D32E4EB-6613-4270-8295-7113712BC6C5}.Debug|x64.Build.0 = Debug|x64
+ {1D32E4EB-6613-4270-8295-7113712BC6C5}.Release|Win32.ActiveCfg = Release|Win32
+ {1D32E4EB-6613-4270-8295-7113712BC6C5}.Release|Win32.Build.0 = Release|Win32
+ {1D32E4EB-6613-4270-8295-7113712BC6C5}.Release|x64.ActiveCfg = Release|x64
+ {1D32E4EB-6613-4270-8295-7113712BC6C5}.Release|x64.Build.0 = Release|x64
+ {3DA77516-5D3A-42AA-8D99-BF87643A75A2}.Debug|Win32.ActiveCfg = Debug|Win32
+ {3DA77516-5D3A-42AA-8D99-BF87643A75A2}.Debug|Win32.Build.0 = Debug|Win32
+ {3DA77516-5D3A-42AA-8D99-BF87643A75A2}.Debug|x64.ActiveCfg = Debug|x64
+ {3DA77516-5D3A-42AA-8D99-BF87643A75A2}.Debug|x64.Build.0 = Debug|x64
+ {3DA77516-5D3A-42AA-8D99-BF87643A75A2}.Release|Win32.ActiveCfg = Release|Win32
+ {3DA77516-5D3A-42AA-8D99-BF87643A75A2}.Release|Win32.Build.0 = Release|Win32
+ {3DA77516-5D3A-42AA-8D99-BF87643A75A2}.Release|x64.ActiveCfg = Release|x64
+ {3DA77516-5D3A-42AA-8D99-BF87643A75A2}.Release|x64.Build.0 = Release|x64
+ {BFF962C6-4CC1-4DD1-965A-163EADE74986}.Debug|Win32.ActiveCfg = Debug|Win32
+ {BFF962C6-4CC1-4DD1-965A-163EADE74986}.Debug|Win32.Build.0 = Debug|Win32
+ {BFF962C6-4CC1-4DD1-965A-163EADE74986}.Debug|x64.ActiveCfg = Debug|x64
+ {BFF962C6-4CC1-4DD1-965A-163EADE74986}.Debug|x64.Build.0 = Debug|x64
+ {BFF962C6-4CC1-4DD1-965A-163EADE74986}.Release|Win32.ActiveCfg = Release|Win32
+ {BFF962C6-4CC1-4DD1-965A-163EADE74986}.Release|Win32.Build.0 = Release|Win32
+ {BFF962C6-4CC1-4DD1-965A-163EADE74986}.Release|x64.ActiveCfg = Release|x64
+ {BFF962C6-4CC1-4DD1-965A-163EADE74986}.Release|x64.Build.0 = Release|x64
+ {E20E0E24-C0B6-4448-82E0-32CCDBA88957}.Debug|Win32.ActiveCfg = Debug|Win32
+ {E20E0E24-C0B6-4448-82E0-32CCDBA88957}.Debug|Win32.Build.0 = Debug|Win32
+ {E20E0E24-C0B6-4448-82E0-32CCDBA88957}.Debug|x64.ActiveCfg = Debug|x64
+ {E20E0E24-C0B6-4448-82E0-32CCDBA88957}.Debug|x64.Build.0 = Debug|x64
+ {E20E0E24-C0B6-4448-82E0-32CCDBA88957}.Release|Win32.ActiveCfg = Release|Win32
+ {E20E0E24-C0B6-4448-82E0-32CCDBA88957}.Release|Win32.Build.0 = Release|Win32
+ {E20E0E24-C0B6-4448-82E0-32CCDBA88957}.Release|x64.ActiveCfg = Release|x64
+ {E20E0E24-C0B6-4448-82E0-32CCDBA88957}.Release|x64.Build.0 = Release|x64
+ {430B1A48-8E64-43DF-8CC4-AD09C41BA735}.Debug|Win32.ActiveCfg = Debug|Win32
+ {430B1A48-8E64-43DF-8CC4-AD09C41BA735}.Debug|Win32.Build.0 = Debug|Win32
+ {430B1A48-8E64-43DF-8CC4-AD09C41BA735}.Debug|x64.ActiveCfg = Debug|x64
+ {430B1A48-8E64-43DF-8CC4-AD09C41BA735}.Debug|x64.Build.0 = Debug|x64
+ {430B1A48-8E64-43DF-8CC4-AD09C41BA735}.Release|Win32.ActiveCfg = Release|Win32
+ {430B1A48-8E64-43DF-8CC4-AD09C41BA735}.Release|Win32.Build.0 = Release|Win32
+ {430B1A48-8E64-43DF-8CC4-AD09C41BA735}.Release|x64.ActiveCfg = Release|x64
+ {430B1A48-8E64-43DF-8CC4-AD09C41BA735}.Release|x64.Build.0 = Release|x64
+ {D884D3FB-79C4-497A-AD7C-7D7877F9768E}.Debug|Win32.ActiveCfg = Debug|Win32
+ {D884D3FB-79C4-497A-AD7C-7D7877F9768E}.Debug|Win32.Build.0 = Debug|Win32
+ {D884D3FB-79C4-497A-AD7C-7D7877F9768E}.Debug|x64.ActiveCfg = Debug|x64
+ {D884D3FB-79C4-497A-AD7C-7D7877F9768E}.Debug|x64.Build.0 = Debug|x64
+ {D884D3FB-79C4-497A-AD7C-7D7877F9768E}.Release|Win32.ActiveCfg = Release|Win32
+ {D884D3FB-79C4-497A-AD7C-7D7877F9768E}.Release|Win32.Build.0 = Release|Win32
+ {D884D3FB-79C4-497A-AD7C-7D7877F9768E}.Release|x64.ActiveCfg = Release|x64
+ {D884D3FB-79C4-497A-AD7C-7D7877F9768E}.Release|x64.Build.0 = Release|x64
+ {7DAC4CA0-9382-4ED0-A26E-A5F84776054C}.Debug|Win32.ActiveCfg = Debug|Win32
+ {7DAC4CA0-9382-4ED0-A26E-A5F84776054C}.Debug|Win32.Build.0 = Debug|Win32
+ {7DAC4CA0-9382-4ED0-A26E-A5F84776054C}.Debug|x64.ActiveCfg = Debug|x64
+ {7DAC4CA0-9382-4ED0-A26E-A5F84776054C}.Debug|x64.Build.0 = Debug|x64
+ {7DAC4CA0-9382-4ED0-A26E-A5F84776054C}.Release|Win32.ActiveCfg = Release|Win32
+ {7DAC4CA0-9382-4ED0-A26E-A5F84776054C}.Release|Win32.Build.0 = Release|Win32
+ {7DAC4CA0-9382-4ED0-A26E-A5F84776054C}.Release|x64.ActiveCfg = Release|x64
+ {7DAC4CA0-9382-4ED0-A26E-A5F84776054C}.Release|x64.Build.0 = Release|x64
+ {95D646C4-B759-469D-BDBB-A370A5778CA5}.Debug|Win32.ActiveCfg = Debug|Win32
+ {95D646C4-B759-469D-BDBB-A370A5778CA5}.Debug|Win32.Build.0 = Debug|Win32
+ {95D646C4-B759-469D-BDBB-A370A5778CA5}.Debug|x64.ActiveCfg = Debug|x64
+ {95D646C4-B759-469D-BDBB-A370A5778CA5}.Debug|x64.Build.0 = Debug|x64
+ {95D646C4-B759-469D-BDBB-A370A5778CA5}.Release|Win32.ActiveCfg = Release|Win32
+ {95D646C4-B759-469D-BDBB-A370A5778CA5}.Release|Win32.Build.0 = Release|Win32
+ {95D646C4-B759-469D-BDBB-A370A5778CA5}.Release|x64.ActiveCfg = Release|x64
+ {95D646C4-B759-469D-BDBB-A370A5778CA5}.Release|x64.Build.0 = Release|x64
+ {20B850E9-E417-49A2-A66C-38827401597B}.Debug|Win32.ActiveCfg = Debug|Win32
+ {20B850E9-E417-49A2-A66C-38827401597B}.Debug|Win32.Build.0 = Debug|Win32
+ {20B850E9-E417-49A2-A66C-38827401597B}.Debug|x64.ActiveCfg = Debug|x64
+ {20B850E9-E417-49A2-A66C-38827401597B}.Debug|x64.Build.0 = Debug|x64
+ {20B850E9-E417-49A2-A66C-38827401597B}.Release|Win32.ActiveCfg = Release|Win32
+ {20B850E9-E417-49A2-A66C-38827401597B}.Release|Win32.Build.0 = Release|Win32
+ {20B850E9-E417-49A2-A66C-38827401597B}.Release|x64.ActiveCfg = Release|x64
+ {20B850E9-E417-49A2-A66C-38827401597B}.Release|x64.Build.0 = Release|x64
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Property changes on: trunk/examples
___________________________________________________________________
Modified: svn:ignore
- Makefile
Makefile.in
sdl-viewer
+ Makefile
Makefile.in
sdl-viewer
*.vcxproj.user
x64
Win32
Modified: trunk/examples/Makefile.am
===================================================================
--- trunk/examples/Makefile.am 2010-08-13 07:51:33 UTC (rev 4177)
+++ trunk/examples/Makefile.am 2010-08-14 09:02:54 UTC (rev 4178)
@@ -29,4 +29,6 @@
-I$(top_srcdir)/src/libopenvrml
pretty_print_LDADD = $(top_builddir)/src/libopenvrml/libopenvrml.la
-EXTRA_DIST = $(sdl_viewer_SOURCES) $(pretty_print_SOURCES)
+EXTRA_DIST = $(sdl_viewer_SOURCES) $(pretty_print_SOURCES) \
+ pretty-print.vcxproj \
+ sdl-viewer.vcxproj
Added: trunk/examples/pretty-print.vcxproj
===================================================================
--- trunk/examples/pretty-print.vcxproj (rev 0)
+++ trunk/examples/pretty-print.vcxproj 2010-08-14 09:02:54 UTC (rev 4178)
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{EFCFAB14-FC2B-4816-AD49-DC0E6F4D04E1}</ProjectGuid>
+ <RootNamespace>prettyprint</RootNamespace>
+ <Keyword>Win32Proj</Keyword>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration" />
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\bin\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\bin\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\bin\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\bin\</OutDir>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <AdditionalIncludeDirectories>..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;_CONSOLE;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="pretty_print.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\src\libopenvrml\openvrml.vcxproj">
+ <Project>{e5287cd2-4bac-4341-af28-a1f9c0f5949c}</Project>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
Added: trunk/examples/sdl-viewer.vcxproj
===================================================================
--- trunk/examples/sdl-viewer.vcxproj (rev 0)
+++ trunk/examples/sdl-viewer.vcxproj 2010-08-14 09:02:54 UTC (rev 4178)
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{2DD5D192-3E85-4E64-854B-DF7A1FF06B76}</ProjectGuid>
+ <RootNamespace>sdl-viewer</RootNamespace>
+ <Keyword>Win32Proj</Keyword>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration" />
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\bin\</OutDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\bin\</OutDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\SDL-1.2.14\include;$(IncludePath)</IncludePath>
+ <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\SDL-1.2.14\lib;$(LibraryPath)</LibraryPath>
+ <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\SDL-1.2.14\include;$(IncludePath)</IncludePath>
+ <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\SDL-1.2.14\lib;$(LibraryPath)</LibraryPath>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\bin\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\bin\</OutDir>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\src\libopenvrml-gl;..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>OPENVRML_USE_DLL;OPENVRML_GL_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+ <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>opengl32.lib;glu32.lib;SDLmain.lib;SDL.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <IgnoreSpecificDefaultLibraries>msvcrt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <AdditionalIncludeDirectories>..\src\libopenvrml-gl;..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_SECURE_SCL=0;OPENVRML_USE_DLL;OPENVRML_GL_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+ <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>opengl32.lib;glu32.lib;SDLmain.lib;SDL.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="sdl_viewer.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\src\libopenvrml-gl\openvrml-gl.vcxproj">
+ <Project>{141f90c2-6630-4d7a-834f-d5d57c6cfc24}</Project>
+ </ProjectReference>
+ <ProjectReference Include="..\src\libopenvrml\openvrml.vcxproj">
+ <Project>{e5287cd2-4bac-4341-af28-a1f9c0f5949c}</Project>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
Modified: trunk/examples/sdl_viewer.cpp
===================================================================
--- trunk/examples/sdl_viewer.cpp 2010-08-13 07:51:33 UTC (rev 4177)
+++ trunk/examples/sdl_viewer.cpp 2010-08-14 09:02:54 UTC (rev 4178)
@@ -180,16 +180,15 @@
using std::find;
using std::string;
using boost::algorithm::iequals;
- using boost::next;
string media_type = "application/octet-stream";
const string::const_reverse_iterator dot_pos =
find(this->url_.rbegin(), this->url_.rend(), '.');
if (dot_pos == this->url_.rend()
- || next(dot_pos.base()) == this->url_.end()) {
+ || boost::next(dot_pos.base()) == this->url_.end()) {
return media_type;
}
const string::const_iterator hash_pos =
- find(next(dot_pos.base()), this->url_.end(), '#');
+ find(boost::next(dot_pos.base()), this->url_.end(), '#');
const string ext(dot_pos.base(), hash_pos);
if (iequals(ext, "wrl")) {
media_type = openvrml::vrml_media_type;
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2010-08-13 07:51:33 UTC (rev 4177)
+++ trunk/src/Makefile.am 2010-08-14 09:02:54 UTC (rev 4178)
@@ -919,7 +919,29 @@
EXTRA_DIST = \
libopenvrml/openvrml-config.h.in \
+ libopenvrml/openvrml-config-win32.h \
+ libopenvrml/openvrml.rc \
+ libopenvrml/openvrml.vcxproj \
libopenvrml-gl/openvrml-gl-config.h.in \
+ libopenvrml-gl/openvrml-gl-config-win32.h \
+ libopenvrml/openvrml-gl.rc \
+ libopenvrml/openvrml-gl.vcxproj \
+ node/vrml97/vrml97.vcxproj \
+ node/x3d-core/x3d-core.vcxproj \
+ node/x3d-event-utilities/x3d-event-utilities.vcxproj \
+ node/x3d-grouping/x3d-grouping.vcxproj \
+ node/x3d-shape/x3d-shape.vcxproj \
+ node/x3d-rendering/x3d-rendering.vcxproj \
+ node/x3d-geometry2d/x3d-geometry2d.vcxproj \
+ node/x3d-texturing/x3d-texturing.vcxproj \
+ node/x3d-environmental-effects/x3d-environmental-effects.vcxproj \
+ node/x3d-networking/x3d-networking.vcxproj \
+ node/x3d-key-device-sensor/x3d-key-device-sensor.vcxproj \
+ node/x3d-nurbs/x3d-nurbs.vcxproj \
+ node/x3d-geospatial/x3d-geospatial.vcxproj \
+ node/x3d-h-anim/x3d-h-anim.vcxproj \
+ node/x3d-dis/x3d-dis.vcxproj \
+ node/x3d-cad-geometry/x3d-cad-geometry.vcxproj \
openvrml-xembed/org.openvrml.BrowserControl.service.in
CLEANFILES = $(BUILT_SOURCES)
Property changes on: trunk/src/libopenvrml
___________________________________________________________________
Modified: svn:ignore
-
+ *.vcxproj.user
x64
Win32
Modified: trunk/src/libopenvrml/openvrml/basetypes.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/basetypes.cpp 2010-08-13 07:51:33 UTC (rev 4177)
+++ trunk/src/libopenvrml/openvrml/basetypes.cpp 2010-08-14 09:02:54 UTC (rev 4178)
@@ -3574,8 +3574,10 @@
namespace {
- OPENVRML_LOCAL float det3(const openvrml::mat4f & mat,
- int r1, int r2, int r3, int c1, int c2, int c3)
+ OPENVRML_LOCAL
+ float det3(const openvrml::mat4f & mat,
+ const size_t r1, const size_t r2, const size_t r3,
+ const size_t c1, const size_t c2, const size_t c3)
OPENVRML_NOTHROW
{
return mat[r1][c1] * mat[r2][c2] * mat[r3][c3]
Modified: trunk/src/libopenvrml/openvrml/local/error.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/local/error.cpp 2010-08-13 07:51:33 UTC (rev 4177)
+++ trunk/src/libopenvrml/openvrml/local/error.cpp 2010-08-14 09:02:54 UTC (rev 4178)
@@ -36,7 +36,7 @@
result,
LANG_USER_DEFAULT,
reinterpret_cast< LPTSTR >(&buf),
- 0,
+ DWORD(0),
0);
throw std::runtime_error(buf);
Modified: trunk/src/libopenvrml/openvrml/local/parse_vrml.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/local/parse_vrml.cpp 2010-08-13 07:51:33 UTC (rev 4177)
+++ trunk/src/libopenvrml/openvrml/local/parse_vrml.cpp 2010-08-14 09:02:54 UTC (rev 4178)
@@ -47,8 +47,8 @@
{}
template <typename ScannerT, typename ErrorT>
- boost::spirit::classic::error_status<> operator()(const ScannerT & scan,
- const ErrorT & err) const
+ boost::spirit::classic::error_status<>
+ operator()(const ScannerT & scan, const ErrorT & err) const
{
using std::endl;
using std::string;
@@ -79,8 +79,8 @@
// need enough information to create an invalid_vrml exception in
// parse_vrml.
//
- this->error_.line = fpos.line;
- this->error_.column = fpos.column;
+ this->error_.line = static_cast<size_t>(fpos.line);
+ this->error_.column = static_cast<size_t>(fpos.column);
this->error_.message = x3d_vrml_parse_error_msg(err.descriptor);
return error_status<>(error_status<>::fail);
Modified: trunk/src/libopenvrml/openvrml/local/proto.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/local/proto.cpp 2010-08-13 07:51:33 UTC (rev 4177)
+++ trunk/src/libopenvrml/openvrml/local/proto.cpp 2010-08-14 09:02:54 UTC (rev 4178)
@@ -376,7 +376,6 @@
const node_path_t & path,
const std::vector<boost::intrusive_ptr<openvrml::node> > & root)
{
- using boost::next;
using boost::prior;
using openvrml::node;
using openvrml::field_value;
@@ -396,7 +395,7 @@
} else if (path_element->field_type == field_value::mfnode_id)
{
result = result->field<mfnode>(path_element->field_id)
- .value()[next(path_element)->index].get();
+ .value()[boost::next(path_element)->index].get();
} else {
assert(!"invalid path_element->field_type");
}
@@ -676,15 +675,19 @@
//
node_interface_set::const_iterator
proto_interface =
- find_if(this->node_metatype.interfaces_.begin(),
- this->node_metatype.interfaces_.end(),
- bind(logical_or<bool>(),
- bind(node_interface_matches_exposedfield(),
- _1,
- is_mapping->first),
- bind(node_interface_matches_field(),
- _1,
- is_mapping->first)));
+ find_if(
+ this->node_metatype.interfaces_.begin(),
+ this->node_metatype.interfaces_.end(),
+ boost::bind(
+ logical_or<bool>(),
+ boost::bind(
+ node_interface_matches_exposedfield(),
+ _1,
+ is_mapping->first),
+ boost::bind(
+ node_interface_matches_field(),
+ _1,
+ is_mapping->first)));
if (proto_interface
!= this->node_metatype.interfaces_.end()) {
Modified: trunk/src/libopenvrml/openvrml/local/uri.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/local/uri.cpp 2010-08-13 07:51:33 UTC (rev 4177)
+++ trunk/src/libopenvrml/openvrml/local/uri.cpp 2010-08-14 09:02:54 UTC (rev 4178)
@@ -145,93 +145,96 @@
using std::string;
using std::swap;
- const string::size_type id_scheme_begin_distance =
+ typedef std::iterator_traits<string::const_iterator>::difference_type
+ diff_t;
+
+ const diff_t id_scheme_begin_distance =
distance<string::const_iterator>(id.str_.begin(), id.scheme_begin);
- const string::size_type id_scheme_end_distance =
+ const diff_t id_scheme_end_distance =
distance<string::const_iterator>(id.str_.begin(), id.scheme_end);
- const string::size_type id_scheme_specific_part_begin_distance =
+ const diff_t id_scheme_specific_part_begin_distance =
distance<string::const_iterator>(id.str_.begin(),
id.scheme_specific_part_begin);
- const string::size_type id_scheme_specific_part_end_distance =
+ const diff_t id_scheme_specific_part_end_distance =
distance<string::const_iterator>(id.str_.begin(),
id.scheme_specific_part_end);
- const string::size_type id_authority_begin_distance =
+ const diff_t id_authority_begin_distance =
distance<string::const_iterator>(id.str_.begin(), id.authority_begin);
- const string::size_type id_authority_end_distance =
+ const diff_t id_authority_end_distance =
distance<string::const_iterator>(id.str_.begin(), id.authority_end);
- const string::size_type id_userinfo_begin_distance =
+ const diff_t id_userinfo_begin_distance =
distance<string::const_iterator>(id.str_.begin(), id.userinfo_begin);
- const string::size_type id_userinfo_end_distance =
+ const diff_t id_userinfo_end_distance =
distance<string::const_iterator>(id.str_.begin(), id.userinfo_end);
- const string::size_type id_host_begin_distance =
+ const diff_t id_host_begin_distance =
distance<string::const_iterator>(id.str_.begin(), id.host_begin);
- const string::size_type id_host_end_distance =
+ const diff_t id_host_end_distance =
distance<string::const_iterator>(id.str_.begin(), id.host_end);
- const string::size_type id_port_begin_distance =
+ const diff_t id_port_begin_distance =
distance<string::const_iterator>(id.str_.begin(), id.port_begin);
- const string::size_type id_port_end_distance =
+ const diff_t id_port_end_distance =
distance<string::const_iterator>(id.str_.begin(), id.port_end);
- const string::size_type id_path_begin_distance =
+ const diff_t id_path_begin_distance =
distance<string::const_iterator>(id.str_.begin(), id.path_begin);
- const string::size_type id_path_end_distance =
+ const diff_t id_path_end_distance =
distance<string::const_iterator>(id.str_.begin(), id.path_end);
- const string::size_type id_query_begin_distance =
+ const diff_t id_query_begin_distance =
distance<string::const_iterator>(id.str_.begin(), id.query_begin);
- const string::size_type id_query_end_distance =
+ const diff_t id_query_end_distance =
distance<string::const_iterator>(id.str_.begin(), id.query_end);
- const string::size_type id_fragment_begin_distance =
+ const diff_t id_fragment_begin_distance =
distance<string::const_iterator>(id.str_.begin(), id.fragment_begin);
- const string::size_type id_fragment_end_distance =
+ const diff_t id_fragment_end_distance =
distance<string::const_iterator>(id.str_.begin(), id.fragment_end);
- const string::size_type this_scheme_begin_distance =
+ const diff_t this_scheme_begin_distance =
distance<string::const_iterator>(this->str_.begin(),
this->scheme_begin);
- const string::size_type this_scheme_end_distance =
+ const diff_t this_scheme_end_distance =
distance<string::const_iterator>(this->str_.begin(),
this->scheme_end);
- const string::size_type this_scheme_specific_part_begin_distance =
+ const diff_t this_scheme_specific_part_begin_distance =
distance<string::const_iterator>(this->str_.begin(),
this->scheme_specific_part_begin);
- const string::size_type this_scheme_specific_part_end_distance =
+ const diff_t this_scheme_specific_part_end_distance =
distance<string::const_iterator>(this->str_.begin(),
this->scheme_specific_part_end);
- const string::size_type this_authority_begin_distance =
+ const diff_t this_authority_begin_distance =
distance<string::const_iterator>(this->str_.begin(),
this->authority_begin);
- const string::size_type this_authority_end_distance =
+ const diff_t this_authority_end_distance =
distance<string::const_iterator>(this->str_.begin(),
this->authority_end);
- const string::size_type this_useri...
[truncated message content] |
