[openvrml-commit] openvrml/src/libopenvrml/openvrml browser.cpp,1.100,1.101

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

Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10303/src/libopenvrml/openvrml

Modified Files:
	browser.cpp 
Log Message:
Moved openvrml::abstract_proto_node::proto_exposedfield to openvrml::proto_node::proto_exposedfield.  externproto_node doesn't need this.

Index: browser.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.cpp,v
retrieving revision 1.100
retrieving revision 1.101
diff -C2 -d -r1.100 -r1.101
*** browser.cpp	27 Nov 2005 04:06:41 -0000	1.100
--- browser.cpp	27 Nov 2005 04:26:06 -0000	1.101
***************
*** 256,278 ****
              throw (std::bad_alloc);
  
-         template <typename FieldValue>
-         class proto_exposedfield : public proto_eventin<FieldValue>,
-                                    public proto_eventout<FieldValue> {
-         public:
-             proto_exposedfield(abstract_proto_node & node,
-                                const FieldValue & initial_value);
-             virtual ~proto_exposedfield() throw ();
- 
-         private:
-             virtual void do_process_event(const FieldValue & value,
-                                           double timestamp)
-                 throw (std::bad_alloc);
-         };
- 
-         static boost::shared_ptr<openvrml::event_listener>
-         create_exposedfield(const field_value & initial_value,
-                             abstract_proto_node & node)
-             throw (std::bad_alloc);
- 
          typedef boost::shared_ptr<openvrml::event_listener> eventin_ptr;
          typedef std::map<std::string, eventin_ptr> eventin_map_t;
--- 256,259 ----
***************
*** 369,372 ****
--- 350,372 ----
       */
      class OPENVRML_LOCAL proto_node : public abstract_proto_node {
+         template <typename FieldValue>
+         class proto_exposedfield : public proto_eventin<FieldValue>,
+                                    public proto_eventout<FieldValue> {
+         public:
+             proto_exposedfield(abstract_proto_node & node,
+                                const FieldValue & initial_value);
+             virtual ~proto_exposedfield() throw ();
+ 
+         private:
+             virtual void do_process_event(const FieldValue & value,
+                                           double timestamp)
+                 throw (std::bad_alloc);
+         };
+ 
+         static boost::shared_ptr<openvrml::event_listener>
+         create_exposedfield(const field_value & initial_value,
+                             abstract_proto_node & node)
+             throw (std::bad_alloc);
+ 
          boost::shared_ptr<openvrml::scope> proto_scope;
          std::vector<boost::intrusive_ptr<node> > impl_nodes;
***************
*** 1834,1838 ****
       */
      template <typename FieldValue>
!     abstract_proto_node::proto_exposedfield<FieldValue>::
      proto_exposedfield(abstract_proto_node & node,
                         const FieldValue & initial_value):
--- 1834,1838 ----
       */
      template <typename FieldValue>
!     proto_node::proto_exposedfield<FieldValue>::
      proto_exposedfield(abstract_proto_node & node,
                         const FieldValue & initial_value):
***************
*** 1847,1851 ****
       */
      template <typename FieldValue>
!     abstract_proto_node::proto_exposedfield<FieldValue>::~proto_exposedfield()
          throw ()
      {}
--- 1847,1851 ----
       */
      template <typename FieldValue>
!     proto_node::proto_exposedfield<FieldValue>::~proto_exposedfield()
          throw ()
      {}
***************
*** 1861,1865 ****
      template <typename FieldValue>
      void
!     abstract_proto_node::proto_exposedfield<FieldValue>::
      do_process_event(const FieldValue & value, const double timestamp)
          throw (std::bad_alloc)
--- 1861,1865 ----
      template <typename FieldValue>
      void
!     proto_node::proto_exposedfield<FieldValue>::
      do_process_event(const FieldValue & value, const double timestamp)
          throw (std::bad_alloc)
***************
*** 1882,1886 ****
       */
      boost::shared_ptr<event_listener>
!     abstract_proto_node::create_exposedfield(const field_value & initial_value,
                                               abstract_proto_node & node)
          throw (std::bad_alloc)
--- 1882,1886 ----
       */
      boost::shared_ptr<event_listener>
!     proto_node::create_exposedfield(const field_value & initial_value,
                                               abstract_proto_node & node)
          throw (std::bad_alloc)