Menu
▾
▴
SF.net SVN: openvrml:[3738] trunk
|
From: <br...@us...> - 2008-10-14 05:30:19
|
Revision: 3738
http://openvrml.svn.sourceforge.net/openvrml/?rev=3738&view=rev
Author: braden
Date: 2008-10-14 05:30:14 +0000 (Tue, 14 Oct 2008)
Log Message:
-----------
Moved the boost::mpl::vector of field value types to the openvrml::local namespace.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/Makefile.am
trunk/src/libopenvrml/openvrml/browser.cpp
trunk/src/libopenvrml/openvrml/field_value.cpp
trunk/src/libopenvrml/openvrml/local/proto.cpp
trunk/src/libopenvrml/openvrml/node.cpp
trunk/src/libopenvrml/openvrml/script.cpp
trunk/src/libopenvrml/private.h
Added Paths:
-----------
trunk/src/libopenvrml/openvrml/local/field_value_types.h
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-10-14 03:00:33 UTC (rev 3737)
+++ trunk/ChangeLog 2008-10-14 05:30:14 UTC (rev 3738)
@@ -1,3 +1,26 @@
+2008-10-14 Braden McDaniel <br...@en...>
+
+ Moved the boost::mpl::vector of field value types to the
+ openvrml::local namespace.
+
+ * src/libopenvrml/private.h: Moved field_value_types to the
+ openvrml::local namespace;
+ * src/libopenvrml/openvrml/local/proto.cpp: Use
+ openvrml::local::field_value_types.
+ * src/libopenvrml/openvrml/local/field_value_types.h: Added file;
+ contains the declaration of openvrml::local::field_value_types.
+ * src/libopenvrml/openvrml/node.cpp: Use
+ openvrml::local::field_value_types.
+ * src/libopenvrml/openvrml/browser.cpp: Use
+ openvrml::local::field_value_types.
+ * src/libopenvrml/openvrml/script.cpp: Use
+ openvrml::local::field_value_types.
+ * src/libopenvrml/openvrml/field_value.cpp: Use
+ openvrml::local::field_value_types.
+ * src/Makefile.am
+ (libopenvrml_libopenvrml_la_SOURCES): Added
+ libopenvrml/openvrml/local/field_value_types.h.
+
2008-10-13 Braden McDaniel <br...@en...>
Use the implementation of ScopeGuard buried in Boost.MultiIndex
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2008-10-14 03:00:33 UTC (rev 3737)
+++ trunk/src/Makefile.am 2008-10-14 05:30:14 UTC (rev 3738)
@@ -157,7 +157,8 @@
libopenvrml/openvrml/local/xml_reader.cpp \
libopenvrml/openvrml/local/xml_reader.h \
libopenvrml/openvrml/local/proto.cpp \
- libopenvrml/openvrml/local/proto.h
+ libopenvrml/openvrml/local/proto.h \
+ libopenvrml/openvrml/local/field_value_types.h
libopenvrml_libopenvrml_la_LDFLAGS = \
-version-info $(LIBOPENVRML_LIBRARY_VERSION) \
Modified: trunk/src/libopenvrml/openvrml/browser.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/browser.cpp 2008-10-14 03:00:33 UTC (rev 3737)
+++ trunk/src/libopenvrml/openvrml/browser.cpp 2008-10-14 05:30:14 UTC (rev 3738)
@@ -42,6 +42,7 @@
# include "x3d_cad_geometry.h"
# include <openvrml/local/uri.h>
# include <openvrml/local/xml_reader.h>
+# include <openvrml/local/field_value_types.h>
# include <openvrml/local/proto.h>
# include <private.h>
# include <boost/algorithm/string/predicate.hpp>
@@ -2807,7 +2808,7 @@
OPENVRML_THROW1(std::bad_alloc)
{
using boost::mpl::for_each;
- using openvrml_::field_value_types;
+ using openvrml::local::field_value_types;
boost::shared_ptr<field_value> result;
for_each<field_value_types>(externproto_exposedfield_creator(node,
@@ -2949,7 +2950,7 @@
map_entry != this->eventin_map.end();
++map_entry) {
using boost::mpl::for_each;
- using openvrml_::field_value_types;
+ using openvrml::local::field_value_types;
openvrml::event_listener & eventin =
this->proto_node_->event_listener(map_entry->first);
@@ -2963,7 +2964,7 @@
map_entry != this->eventout_map.end();
++map_entry) {
using boost::mpl::for_each;
- using openvrml_::field_value_types;
+ using openvrml::local::field_value_types;
openvrml::event_emitter & eventout =
this->proto_node_->event_emitter(map_entry->first);
Modified: trunk/src/libopenvrml/openvrml/field_value.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/field_value.cpp 2008-10-14 03:00:33 UTC (rev 3737)
+++ trunk/src/libopenvrml/openvrml/field_value.cpp 2008-10-14 05:30:14 UTC (rev 3738)
@@ -19,18 +19,18 @@
// along with this library; if not, see <http://www.gnu.org/licenses/>.
//
+# include "field_value.h"
+# include "node.h"
+# include <openvrml/local/field_value_types.h>
+# include <boost/array.hpp>
+# include <boost/mpl/for_each.hpp>
+# include <algorithm>
+# include <numeric>
+
# ifdef HAVE_CONFIG_H
# include <config.h>
# endif
-# include <algorithm>
-# include <numeric>
-# include <boost/array.hpp>
-# include <private.h>
-# include <boost/mpl/for_each.hpp>
-# include "field_value.h"
-# include "node.h"
-
/**
* @file openvrml/field_value.h
*
@@ -442,7 +442,7 @@
OPENVRML_THROW1(std::bad_alloc)
{
using boost::mpl::for_each;
- using openvrml_::field_value_types;
+ using openvrml::local::field_value_types;
std::auto_ptr<field_value> result;
for_each<field_value_types>(create_field_value(type, result));
Added: trunk/src/libopenvrml/openvrml/local/field_value_types.h
===================================================================
--- trunk/src/libopenvrml/openvrml/local/field_value_types.h (rev 0)
+++ trunk/src/libopenvrml/openvrml/local/field_value_types.h 2008-10-14 05:30:14 UTC (rev 3738)
@@ -0,0 +1,96 @@
+// -*- mode: c++; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*-
+//
+// OpenVRML
+//
+// Copyright 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
+// the Free Software Foundation; either version 3 of the License, or (at your
+// option) any later version.
+//
+// This library is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this library; if not, see <http://www.gnu.org/licenses/>.
+//
+
+# ifndef OPENVRML_LOCAL_FIELD_VALUE_TYPES_H
+# define OPENVRML_LOCAL_FIELD_VALUE_TYPES_H
+
+# include <openvrml-common.h>
+# include <boost/mpl/vector.hpp>
+
+namespace openvrml {
+
+ class sfbool;
+ class sfcolor;
+ class sfcolorrgba;
+ class sfdouble;
+ class sffloat;
+ class sfimage;
+ class sfint32;
+ class sfnode;
+ class sfrotation;
+ class sfstring;
+ class sftime;
+ class sfvec2d;
+ class sfvec2f;
+ class sfvec3d;
+ class sfvec3f;
+ class mfbool;
+ class mfcolor;
+ class mfcolorrgba;
+ class mfdouble;
+ class mffloat;
+ class mfimage;
+ class mfint32;
+ class mfnode;
+ class mfrotation;
+ class mfstring;
+ class mftime;
+ class mfvec2d;
+ class mfvec2f;
+ class mfvec3d;
+ class mfvec3f;
+
+ namespace local {
+
+ typedef boost::mpl::vector<openvrml::sfbool,
+ openvrml::sfcolor,
+ openvrml::sfcolorrgba,
+ openvrml::sfdouble,
+ openvrml::sffloat,
+ openvrml::sfimage,
+ openvrml::sfint32,
+ openvrml::sfnode,
+ openvrml::sfrotation,
+ openvrml::sfstring,
+ openvrml::sftime,
+ openvrml::sfvec2d,
+ openvrml::sfvec2f,
+ openvrml::sfvec3d,
+ openvrml::sfvec3f,
+ openvrml::mfbool,
+ openvrml::mfcolor,
+ openvrml::mfcolorrgba,
+ openvrml::mfdouble,
+ openvrml::mffloat,
+ openvrml::mfimage,
+ openvrml::mfint32,
+ openvrml::mfnode,
+ openvrml::mfrotation,
+ openvrml::mfstring,
+ openvrml::mftime,
+ openvrml::mfvec2d,
+ openvrml::mfvec2f,
+ openvrml::mfvec3d,
+ openvrml::mfvec3f>
+ field_value_types;
+ }
+}
+
+# endif // ifndef OPENVRML_LOCAL_FIELD_VALUE_TYPES_H
Property changes on: trunk/src/libopenvrml/openvrml/local/field_value_types.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/src/libopenvrml/openvrml/local/proto.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/local/proto.cpp 2008-10-14 03:00:33 UTC (rev 3737)
+++ trunk/src/libopenvrml/openvrml/local/proto.cpp 2008-10-14 05:30:14 UTC (rev 3738)
@@ -20,6 +20,7 @@
//
# include "proto.h"
+# include "field_value_types.h"
# include <private.h>
# include <openvrml/scope.h>
# include <boost/mpl/for_each.hpp>
@@ -912,7 +913,7 @@
OPENVRML_THROW1(std::bad_alloc)
{
using boost::mpl::for_each;
- using openvrml_::field_value_types;
+ using openvrml::local::field_value_types;
boost::shared_ptr<openvrml::event_listener> result;
for_each<field_value_types>(proto_eventin_creator(type, node, result));
@@ -936,7 +937,7 @@
OPENVRML_THROW1(std::bad_alloc)
{
using boost::mpl::for_each;
- using openvrml_::field_value_types;
+ using openvrml::local::field_value_types;
boost::shared_ptr<openvrml::event_emitter> result;
for_each<field_value_types>(proto_eventout_creator(type, node, result));
@@ -1027,7 +1028,7 @@
OPENVRML_THROW1(std::bad_alloc)
{
using boost::mpl::for_each;
- using openvrml_::field_value_types;
+ using openvrml::local::field_value_types;
boost::shared_ptr<openvrml::event_listener> result;
for_each<field_value_types>(proto_exposedfield_creator(initial_value,
@@ -1135,7 +1136,7 @@
is_mapping->second.impl_node_interface;
try {
using boost::mpl::for_each;
- using openvrml_::field_value_types;
+ using openvrml::local::field_value_types;
openvrml::event_listener & impl_eventin =
impl_node->event_listener(impl_node_interface);
@@ -1171,7 +1172,7 @@
is_mapping->second.impl_node_interface;
try {
using boost::mpl::for_each;
- using openvrml_::field_value_types;
+ using openvrml::local::field_value_types;
openvrml::event_emitter & impl_eventout =
impl_node->event_emitter(impl_node_interface);
@@ -1217,7 +1218,7 @@
is_mapping->second.impl_node_interface;
try {
using boost::mpl::for_each;
- using openvrml_::field_value_types;
+ using openvrml::local::field_value_types;
openvrml::event_listener & impl_eventin =
impl_node->event_listener(impl_node_interface);
Modified: trunk/src/libopenvrml/openvrml/node.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/node.cpp 2008-10-14 03:00:33 UTC (rev 3737)
+++ trunk/src/libopenvrml/openvrml/node.cpp 2008-10-14 05:30:14 UTC (rev 3738)
@@ -22,7 +22,7 @@
# include "browser.h"
# include "scope.h"
# include <openvrml/local/uri.h>
-# include <private.h>
+# include <openvrml/local/field_value_types.h>
# include <boost/array.hpp>
# include <boost/lexical_cast.hpp>
# include <boost/mpl/for_each.hpp>
@@ -2633,7 +2633,7 @@
{
using namespace openvrml;
using boost::mpl::for_each;
- using openvrml_::field_value_types;
+ using openvrml::local::field_value_types;
if (interface_.type == node_interface::exposedfield_id
|| interface_.type == node_interface::field_id) {
this->out << std::string(this->indent + indent_increment_, ' ')
@@ -2812,7 +2812,7 @@
bool added_route = false;
try {
using boost::mpl::for_each;
- using openvrml_::field_value_types;
+ using openvrml::local::field_value_types;
for_each<field_value_types>(add_listener(emitter,
listener,
added_route));
@@ -2878,7 +2878,7 @@
bool deleted_route = false;
try {
using boost::mpl::for_each;
- using openvrml_::field_value_types;
+ using openvrml::local::field_value_types;
for_each<field_value_types>(remove_listener(emitter,
listener,
deleted_route));
Modified: trunk/src/libopenvrml/openvrml/script.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/script.cpp 2008-10-14 03:00:33 UTC (rev 3737)
+++ trunk/src/libopenvrml/openvrml/script.cpp 2008-10-14 05:30:14 UTC (rev 3738)
@@ -24,6 +24,7 @@
# include "scene.h"
# include <openvrml/local/dl.h>
# include <openvrml/local/uri.h>
+# include <openvrml/local/field_value_types.h>
# include <private.h>
# include <boost/array.hpp>
# include <boost/functional.hpp>
@@ -300,7 +301,7 @@
output != this->direct_output_map_.end();
++output) {
using boost::mpl::for_each;
- using openvrml_::field_value_types;
+ using openvrml::local::field_value_types;
for_each<field_value_types>(direct_output_processor(*output->first,
*output->second,
timestamp));
@@ -1385,7 +1386,7 @@
OPENVRML_THROW1(std::bad_alloc)
{
using boost::mpl::for_each;
- using openvrml_::field_value_types;
+ using openvrml::local::field_value_types;
boost::shared_ptr<openvrml::event_listener> listener;
for_each<field_value_types>(
script_event_listener_creator(type, id, node, listener));
@@ -1530,7 +1531,7 @@
OPENVRML_THROW1(std::bad_alloc)
{
using boost::mpl::for_each;
- using openvrml_::field_value_types;
+ using openvrml::local::field_value_types;
std::auto_ptr<openvrml::event_emitter> emitter;
for_each<field_value_types>(
script_event_emitter_creator(node, value, emitter));
Modified: trunk/src/libopenvrml/private.h
===================================================================
--- trunk/src/libopenvrml/private.h 2008-10-14 03:00:33 UTC (rev 3737)
+++ trunk/src/libopenvrml/private.h 2008-10-14 05:30:14 UTC (rev 3738)
@@ -63,41 +63,7 @@
# include <functional>
# include <limits>
# include <boost/concept_check.hpp>
-# include <boost/mpl/vector.hpp>
-namespace openvrml {
- class sfbool;
- class sfcolor;
- class sfcolorrgba;
- class sfdouble;
- class sffloat;
- class sfimage;
- class sfint32;
- class sfnode;
- class sfrotation;
- class sfstring;
- class sftime;
- class sfvec2d;
- class sfvec2f;
- class sfvec3d;
- class sfvec3f;
- class mfbool;
- class mfcolor;
- class mfcolorrgba;
- class mfdouble;
- class mffloat;
- class mfimage;
- class mfint32;
- class mfnode;
- class mfrotation;
- class mfstring;
- class mftime;
- class mfvec2d;
- class mfvec2f;
- class mfvec3d;
- class mfvec3f;
-}
-
namespace {
namespace openvrml_ {
@@ -147,41 +113,6 @@
};
const fgreater_equal_t fgreater_equal = fgreater_equal_t();
-
-
- typedef boost::mpl::vector<openvrml::sfbool,
- openvrml::sfcolor,
- openvrml::sfcolorrgba,
- openvrml::sfdouble,
- openvrml::sffloat,
- openvrml::sfimage,
- openvrml::sfint32,
- openvrml::sfnode,
- openvrml::sfrotation,
- openvrml::sfstring,
- openvrml::sftime,
- openvrml::sfvec2d,
- openvrml::sfvec2f,
- openvrml::sfvec3d,
- openvrml::sfvec3f,
- openvrml::mfbool,
- openvrml::mfcolor,
- openvrml::mfcolorrgba,
- openvrml::mfdouble,
- openvrml::mffloat,
- openvrml::mfimage,
- openvrml::mfint32,
- openvrml::mfnode,
- openvrml::mfrotation,
- openvrml::mfstring,
- openvrml::mftime,
- openvrml::mfvec2d,
- openvrml::mfvec2f,
- openvrml::mfvec3d,
- openvrml::mfvec3f>
- field_value_types;
-
-
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
