SF.net SVN: openvrml:[4095] trunk

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

Revision: 4095
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4095&view=rev
Author:   braden
Date:     2010-02-13 20:12:35 +0000 (Sat, 13 Feb 2010)

Log Message:
-----------
Fixes for Windows.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj
    trunk/src/libopenvrml/openvrml/local/conf.cpp
    trunk/src/libopenvrml/openvrml/local/error.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-02-08 20:30:27 UTC (rev 4094)
+++ trunk/ChangeLog	2010-02-13 20:12:35 UTC (rev 4095)
@@ -1,3 +1,20 @@
+2010-02-13 Braden McDaniel  <br...@en...>
+
+	Fixes for Windows.
+
+	* src/libopenvrml/openvrml/local/conf.cpp
+	(const std::string query_registry_value(HKEY, const
+	std::string&)): Bring
+	openvrml::local::throw_runtime_error_from_win32_system_error into
+	scope.
+	(const std::string get_registry_setting(const std::string &)):
+	Bring openvrml::local::throw_runtime_error_from_win32_system_error
+	into scope.
+	* src/libopenvrml/openvrml/local/error.cpp: Include
+	<boost/multi_index/detail/scope_guard.hpp>.
+	* ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj:
+	Add src/libopenvrml/openvrml/local/error.{cpp,h} to the project.
+
 2010-02-08 Braden McDaniel  <br...@en...>
 
 	Remove dead code.

Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj	2010-02-08 20:30:27 UTC (rev 4094)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj	2010-02-13 20:12:35 UTC (rev 4095)
@@ -232,6 +232,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\local\error.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\event.cpp"
 				>
 			</File>
@@ -337,6 +341,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\local\error.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\event.h"
 				>
 			</File>

Modified: trunk/src/libopenvrml/openvrml/local/conf.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/local/conf.cpp	2010-02-08 20:30:27 UTC (rev 4094)
+++ trunk/src/libopenvrml/openvrml/local/conf.cpp	2010-02-13 20:12:35 UTC (rev 4095)
@@ -68,6 +68,8 @@
     const std::string query_registry_value(HKEY key, const std::string & name)
         OPENVRML_THROW2(std::runtime_error, std::bad_alloc)
     {
+        using openvrml::local::throw_runtime_error_from_win32_system_error;
+
         LONG result;
         static DWORD * const reserved;
         DWORD type;
@@ -100,6 +102,8 @@
     const std::string get_registry_setting(const std::string & name)
         OPENVRML_THROW2(std::runtime_error, std::bad_alloc)
     {
+        using openvrml::local::throw_runtime_error_from_win32_system_error;
+
         static const ULONG options = 0;
         HKEY key;
         LONG result = RegOpenKeyEx(HKEY_LOCAL_MACHINE,

Modified: trunk/src/libopenvrml/openvrml/local/error.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/local/error.cpp	2010-02-08 20:30:27 UTC (rev 4094)
+++ trunk/src/libopenvrml/openvrml/local/error.cpp	2010-02-13 20:12:35 UTC (rev 4095)
@@ -19,7 +19,12 @@
 //
 
 # include "error.h"
+# include <boost/multi_index/detail/scope_guard.hpp>
+# include <boost/ref.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)


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