From: <br...@us...> - 2009-05-28 02:43:55
|
Revision: 3911 http://openvrml.svn.sourceforge.net/openvrml/?rev=3911&view=rev Author: braden Date: 2009-05-28 02:43:46 +0000 (Thu, 28 May 2009) Log Message: ----------- Fixes to the conf refactoring to build with gcc on Linux. Modified Paths: -------------- trunk/ChangeLog trunk/src/Makefile.am trunk/src/libopenvrml/openvrml/local/conf.cpp trunk/src/libopenvrml/openvrml/local/conf.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-05-28 02:26:51 UTC (rev 3910) +++ trunk/ChangeLog 2009-05-28 02:43:46 UTC (rev 3911) @@ -1,5 +1,17 @@ 2009-05-27 Braden McDaniel <br...@en...> + Fixes to the conf refactoring to build with gcc on Linux. + + * src/Makefile.am + (libopenvrml_libopenvrml_la_SOURCES): Added entries for + conf.{cpp,h}. + * src/libopenvrml/openvrml/local/conf.cpp: Don't include + <exception>. + * src/libopenvrml/openvrml/local/conf.h: Include <stdexcept>; + added exception specifications. + +2009-05-27 Braden McDaniel <br...@en...> + On Windows, use the registry to get the default data directory, script module path, and node module path. Modified: trunk/src/Makefile.am =================================================================== --- trunk/src/Makefile.am 2009-05-28 02:26:51 UTC (rev 3910) +++ trunk/src/Makefile.am 2009-05-28 02:43:46 UTC (rev 3911) @@ -96,6 +96,8 @@ libopenvrml/openvrml/rendering_context.cpp \ libopenvrml/openvrml/frustum.cpp \ libopenvrml/openvrml/node_impl_util.cpp \ + libopenvrml/openvrml/local/conf.cpp \ + libopenvrml/openvrml/local/conf.h \ libopenvrml/openvrml/local/dl.cpp \ libopenvrml/openvrml/local/dl.h \ libopenvrml/openvrml/local/uri.cpp \ Modified: trunk/src/libopenvrml/openvrml/local/conf.cpp =================================================================== --- trunk/src/libopenvrml/openvrml/local/conf.cpp 2009-05-28 02:26:51 UTC (rev 3910) +++ trunk/src/libopenvrml/openvrml/local/conf.cpp 2009-05-28 02:43:46 UTC (rev 3911) @@ -27,7 +27,6 @@ # else # include <cstdlib> # endif -# include <exception> using namespace boost::multi_index::detail; // for scope_guard Modified: trunk/src/libopenvrml/openvrml/local/conf.h =================================================================== --- trunk/src/libopenvrml/openvrml/local/conf.h 2009-05-28 02:26:51 UTC (rev 3910) +++ trunk/src/libopenvrml/openvrml/local/conf.h 2009-05-28 02:43:46 UTC (rev 3911) @@ -22,6 +22,7 @@ # define OPENVRML_LOCAL_CONF_H # include <openvrml-common.h> +# include <stdexcept> # include <string> namespace openvrml { @@ -30,9 +31,12 @@ namespace conf { - OPENVRML_LOCAL const std::string datadir(); - OPENVRML_LOCAL const std::string node_path(); - OPENVRML_LOCAL const std::string script_path(); + OPENVRML_LOCAL const std::string datadir() + OPENVRML_THROW2(std::runtime_error, std::bad_alloc); + OPENVRML_LOCAL const std::string node_path() + OPENVRML_THROW2(std::runtime_error, std::bad_alloc); + OPENVRML_LOCAL const std::string script_path() + OPENVRML_THROW2(std::runtime_error, std::bad_alloc); } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |