Menu
▾
▴
SF.net SVN: openvrml:[3627] trunk
|
From: <br...@us...> - 2008-09-16 02:22:27
|
Revision: 3627
http://openvrml.svn.sourceforge.net/openvrml/?rev=3627&view=rev
Author: braden
Date: 2008-09-16 02:22:37 +0000 (Tue, 16 Sep 2008)
Log Message:
-----------
Define BOOST_SPIRIT_THREADSAFE, BOOST_SPIRIT_CLOSURE_LIMIT, and PHOENIX_LIMIT in openvrml-common.h since we need to ensure these get set for client code.
Modified Paths:
--------------
trunk/ChangeLog
trunk/examples/Makefile.am
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/parse-vrml97/parse-vrml97.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/parse-x3dvrml/parse-x3dvrml.vcproj
trunk/ide-projects/Windows/VisualC9_0/OpenVRML/pretty-print/pretty-print.vcproj
trunk/src/Makefile.am
trunk/src/libopenvrml/openvrml/vrml97_grammar.h
trunk/src/libopenvrml/openvrml-common.h
trunk/tests/Makefile.am
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-09-15 22:13:19 UTC (rev 3626)
+++ trunk/ChangeLog 2008-09-16 02:22:37 UTC (rev 3627)
@@ -1,5 +1,40 @@
2008-09-15 Braden McDaniel <br...@en...>
+ Define BOOST_SPIRIT_THREADSAFE, BOOST_SPIRIT_CLOSURE_LIMIT, and
+ PHOENIX_LIMIT in openvrml-common.h since we need to ensure these
+ get set for client code.
+
+ * src/Makefile.am
+ (libopenvrml_libopenvrml_la_CPPFLAGS): Removed flags defining
+ BOOST_SPIRIT_THREADSAFE, BOOST_SPIRIT_CLOSURE_LIMIT, and
+ PHOENIX_LIMIT.
+ * src/libopenvrml/openvrml/vrml97_grammar.h: Reordered includes to
+ ensure that openvrml-common.h gets included before Boost headers.
+ * src/libopenvrml/openvrml-common.h: Define
+ BOOST_SPIRIT_THREADSAFE, BOOST_SPIRIT_CLOSURE_LIMIT, and
+ PHOENIX_LIMIT.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj:
+ Removed flags defining BOOST_SPIRIT_THREADSAFE,
+ BOOST_SPIRIT_CLOSURE_LIMIT, and PHOENIX_LIMIT.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/parse-vrml97/parse-vrml97.vcproj:
+ Removed flags defining BOOST_SPIRIT_THREADSAFE,
+ BOOST_SPIRIT_CLOSURE_LIMIT, and PHOENIX_LIMIT.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/parse-x3dvrml/parse-x3dvrml.vcproj:
+ Removed flags defining BOOST_SPIRIT_THREADSAFE,
+ BOOST_SPIRIT_CLOSURE_LIMIT, and PHOENIX_LIMIT.
+ * ide-projects/Windows/VisualC9_0/OpenVRML/pretty-print/pretty-print.vcproj:
+ Removed flags defining BOOST_SPIRIT_THREADSAFE,
+ BOOST_SPIRIT_CLOSURE_LIMIT, and PHOENIX_LIMIT.
+ * tests/Makefile.am
+ (AM_CPPFLAGS): Removed flags defining BOOST_SPIRIT_THREADSAFE,
+ BOOST_SPIRIT_CLOSURE_LIMIT, and PHOENIX_LIMIT.
+ * examples/Makefile.am
+ (pretty_print_CPPFLAGS): Removed flags defining
+ BOOST_SPIRIT_THREADSAFE, BOOST_SPIRIT_CLOSURE_LIMIT, and
+ PHOENIX_LIMIT.
+
+2008-09-15 Braden McDaniel <br...@en...>
+
* src/libopenvrml/openvrml/vrml97node.cpp: Explicitly instantiate
std::vector<boost::intrusive_ptr<openvrml::node> >::pop_back. gcc
4.0.1 seems to need this (on Mac OS X 10.5, at least) and it
Modified: trunk/examples/Makefile.am
===================================================================
--- trunk/examples/Makefile.am 2008-09-15 22:13:19 UTC (rev 3626)
+++ trunk/examples/Makefile.am 2008-09-16 02:22:37 UTC (rev 3627)
@@ -26,10 +26,7 @@
pretty_print_SOURCES = pretty_print.cpp
pretty_print_CPPFLAGS = \
-I$(top_builddir)/src/libopenvrml \
- -I$(top_srcdir)/src/libopenvrml \
- -DBOOST_SPIRIT_THREADSAFE \
- -DBOOST_SPIRIT_CLOSURE_LIMIT=6 \
- -DPHOENIX_LIMIT=6
+ -I$(top_srcdir)/src/libopenvrml
pretty_print_LDFLAGS = $(OPENVRML_RPATH)
pretty_print_LDADD = $(top_builddir)/src/libopenvrml/libopenvrml.la
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj 2008-09-15 22:13:19 UTC (rev 3626)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj 2008-09-16 02:22:37 UTC (rev 3627)
@@ -42,7 +42,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml"
- PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;BOOST_SPIRIT_THREADSAFE;BOOST_SPIRIT_CLOSURE_LIMIT=6;PHOENIX_LIMIT=6;PACKAGE_VERSION=\"0.17.8\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_ENABLE_PNG_TEXTURES;OPENVRML_ENABLE_RENDER_TEXT_NODE;OPENVRML_FT_CONST="const";OPENVRML_PKGDATADIR_=\"\";OPENVRML_PKGLIBDIR_=\"\""
+ PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION=\"0.17.8\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_ENABLE_PNG_TEXTURES;OPENVRML_ENABLE_RENDER_TEXT_NODE;OPENVRML_FT_CONST="const";OPENVRML_PKGDATADIR_=\"\";OPENVRML_PKGLIBDIR_=\"\""
MinimalRebuild="false"
BasicRuntimeChecks="0"
RuntimeLibrary="3"
@@ -127,7 +127,7 @@
InlineFunctionExpansion="1"
OmitFramePointers="true"
AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml"
- PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;BOOST_SPIRIT_THREADSAFE;PACKAGE_VERSION=\"0.17.8\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_SPIRIT_CLOSURE_LIMIT=6;PHOENIX_LIMIT=6;OPENVRML_BUILD_DLL;OPENVRML_ENABLE_PNG_TEXTURES;OPENVRML_ENABLE_RENDER_TEXT_NODE;OPENVRML_FT_CONST="const";OPENVRML_PKGDATADIR_=\"\";OPENVRML_PKGLIBDIR_=\"\";NDEBUG"
+ PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION=\"0.17.8\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_ENABLE_PNG_TEXTURES;OPENVRML_ENABLE_RENDER_TEXT_NODE;OPENVRML_FT_CONST="const";OPENVRML_PKGDATADIR_=\"\";OPENVRML_PKGLIBDIR_=\"\";NDEBUG"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/parse-vrml97/parse-vrml97.vcproj
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/parse-vrml97/parse-vrml97.vcproj 2008-09-15 22:13:19 UTC (rev 3626)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/parse-vrml97/parse-vrml97.vcproj 2008-09-16 02:22:37 UTC (rev 3627)
@@ -42,7 +42,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_SPIRIT_THREADSAFE;BOOST_SPIRIT_CLOSURE_LIMIT=6;PHOENIX_LIMIT=6;OPENVRML_USE_DLL"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;OPENVRML_USE_DLL"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/parse-x3dvrml/parse-x3dvrml.vcproj
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/parse-x3dvrml/parse-x3dvrml.vcproj 2008-09-15 22:13:19 UTC (rev 3626)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/parse-x3dvrml/parse-x3dvrml.vcproj 2008-09-16 02:22:37 UTC (rev 3627)
@@ -42,7 +42,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_SPIRIT_THREADSAFE;BOOST_SPIRIT_CLOSURE_LIMIT=6;PHOENIX_LIMIT=6;OPENVRML_USE_DLL"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;OPENVRML_USE_DLL"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -119,7 +119,7 @@
InlineFunctionExpansion="1"
OmitFramePointers="true"
AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;BOOST_SPIRIT_THREADSAFE;BOOST_SPIRIT_CLOSURE_LIMIT=6;PHOENIX_LIMIT=6;OPENVRML_USE_DLL"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;OPENVRML_USE_DLL"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/pretty-print/pretty-print.vcproj
===================================================================
--- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/pretty-print/pretty-print.vcproj 2008-09-15 22:13:19 UTC (rev 3626)
+++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/pretty-print/pretty-print.vcproj 2008-09-16 02:22:37 UTC (rev 3627)
@@ -42,7 +42,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_SPIRIT_THREADSAFE;BOOST_SPIRIT_CLOSURE_LIMIT=6;PHOENIX_LIMIT=6;OPENVRML_USE_DLL"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;OPENVRML_USE_DLL"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -118,7 +118,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;BOOST_SPIRIT_THREADSAFE;BOOST_SPIRIT_CLOSURE_LIMIT=6;PHOENIX_LIMIT=6;OPENVRML_USE_DLL"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;OPENVRML_USE_DLL"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2008-09-15 22:13:19 UTC (rev 3626)
+++ trunk/src/Makefile.am 2008-09-16 02:22:37 UTC (rev 3627)
@@ -89,10 +89,7 @@
-DOPENVRML_PKGDATADIR_=\"$(pkgdatadir)\" \
-DOPENVRML_PKGLIBDIR_=\"$(pkglibdir)\" \
-DBOOST_MPL_CFG_NO_PREPROCESSED_HEADERS \
- -DBOOST_MPL_LIMIT_VECTOR_SIZE=30 \
- -DBOOST_SPIRIT_THREADSAFE \
- -DBOOST_SPIRIT_CLOSURE_LIMIT=6 \
- -DPHOENIX_LIMIT=6
+ -DBOOST_MPL_LIMIT_VECTOR_SIZE=30
libopenvrml_libopenvrml_la_CXXFLAGS = \
$(FREETYPE_CFLAGS) \
$(PTHREAD_CFLAGS) \
Modified: trunk/src/libopenvrml/openvrml/vrml97_grammar.h
===================================================================
--- trunk/src/libopenvrml/openvrml/vrml97_grammar.h 2008-09-15 22:13:19 UTC (rev 3626)
+++ trunk/src/libopenvrml/openvrml/vrml97_grammar.h 2008-09-16 02:22:37 UTC (rev 3627)
@@ -21,13 +21,13 @@
# ifndef OPENVRML_VRML97_GRAMMAR_H
# define OPENVRML_VRML97_GRAMMAR_H
-# include <stack>
+# include <openvrml/browser.h>
# include <boost/spirit.hpp>
# include <boost/spirit/actor.hpp>
# include <boost/spirit/dynamic.hpp>
# include <boost/spirit/phoenix.hpp>
# include <boost/test/floating_point_comparison.hpp>
-# include <openvrml/browser.h>
+# include <stack>
namespace openvrml {
Modified: trunk/src/libopenvrml/openvrml-common.h
===================================================================
--- trunk/src/libopenvrml/openvrml-common.h 2008-09-15 22:13:19 UTC (rev 3626)
+++ trunk/src/libopenvrml/openvrml-common.h 2008-09-16 02:22:37 UTC (rev 3627)
@@ -2,7 +2,7 @@
//
// OpenVRML
//
-// Copyright 2005, 2006, 2007 Braden McDaniel
+// Copyright 2005, 2006, 2007, 2008 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,6 +23,18 @@
# include <openvrml-config.h>
+# ifndef BOOST_SPIRIT_THREADSAFE
+# define BOOST_SPIRIT_THREADSAFE
+# endif
+
+# ifndef BOOST_SPIRIT_CLOSURE_LIMIT
+# define BOOST_SPIRIT_CLOSURE_LIMIT 6
+# endif
+
+# ifndef PHOENIX_LIMIT
+# define PHOENIX_LIMIT 6
+# endif
+
# if OPENVRML_ENABLE_EXCEPTION_SPECS
# define OPENVRML_NOTHROW throw ()
# define OPENVRML_THROW1(ex_) throw (ex_)
Modified: trunk/tests/Makefile.am
===================================================================
--- trunk/tests/Makefile.am 2008-09-15 22:13:19 UTC (rev 3626)
+++ trunk/tests/Makefile.am 2008-09-16 02:22:37 UTC (rev 3627)
@@ -1,9 +1,6 @@
AM_CPPFLAGS = \
-I$(top_builddir)/src/libopenvrml \
-I$(top_srcdir)/src/libopenvrml \
- -DBOOST_SPIRIT_THREADSAFE \
- -DBOOST_SPIRIT_CLOSURE_LIMIT=6 \
- -DPHOENIX_LIMIT=6 \
-DBOOST_TEST_DYN_LINK
AM_CXXFLAGS = $(PTHREAD_CFLAGS)
AM_LDFLAGS = $(OPENVRML_RPATH)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
