[openvrml-commit] openvrml/src/libopenvrml/openvrml browser.cpp,1.98,1.99

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

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

Modified Files:
	browser.cpp 
Log Message:
Moved ::proto_node_class::proto_node_type to ::proto_node_type.

Index: browser.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.cpp,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -d -r1.98 -r1.99
*** browser.cpp	27 Nov 2005 03:05:51 -0000	1.98
--- browser.cpp	27 Nov 2005 03:29:37 -0000	1.99
***************
*** 75,78 ****
--- 75,79 ----
  
      class proto_node;
+     class proto_node_type;
      class proto_impl_cloner;
  
***************
*** 82,92 ****
       * @brief <code>node_class</code> for <code>PROTO</code>s.
       *
!      * The proto_node_class is OpenVRML's in-memory representation of a
!      * <code>PROTO</code> (as opposed to a <code>PROTO</code> instance).
!      * Through the <code>proto_node::proto_node_type</code> intermediary, it
!      * facilitates spawning any number of <code>proto_node</code> instances.
       */
      class OPENVRML_LOCAL proto_node_class : public node_class {
          friend class proto_node;
          friend class proto_impl_cloner;
  
--- 83,95 ----
       * @brief <code>node_class</code> for <code>PROTO</code>s.
       *
!      * The <code>proto_node_class</code> is %OpenVRML's in-memory
!      * representation of a <code>PROTO</code> (as opposed to a
!      * <code>PROTO</code> instance).  Through the <code>proto_node_type</code>
!      * intermediary, it facilitates spawning any number of
!      * <code>proto_node</code> instances.
       */
      class OPENVRML_LOCAL proto_node_class : public node_class {
          friend class proto_node;
+         friend class proto_node_type;
          friend class proto_impl_cloner;
  
***************
*** 126,148 ****
          is_map_t is_map;
  
-         class proto_node_type : public node_type {
-             node_interface_set interfaces_;
- 
-         public:
-             proto_node_type(const proto_node_class & node_class,
-                             const std::string & id,
-                             const node_interface_set & interfaces)
-                 throw (unsupported_interface, std::bad_alloc);
-             virtual ~proto_node_type() throw ();
- 
-         private:
-             virtual const node_interface_set & do_interfaces() const throw ();
-             virtual const boost::intrusive_ptr<node>
-             do_create_node(const boost::shared_ptr<openvrml::scope> & scope,
-                            const initial_value_map & initial_values) const
-                 throw (std::bad_alloc);
-         };
- 
- 
      public:
          proto_node_class(
--- 129,132 ----
***************
*** 162,165 ****
--- 146,173 ----
  
  
+     /**
+      * @internal
+      *
+      * @brief <code>node_type</code> for PROTO node instances.
+      */
+     class OPENVRML_LOCAL proto_node_type : public node_type {
+         node_interface_set interfaces_;
+ 
+     public:
+         proto_node_type(const proto_node_class & node_class,
+                         const std::string & id,
+                         const node_interface_set & interfaces)
+             throw (unsupported_interface, std::bad_alloc);
+         virtual ~proto_node_type() throw ();
+ 
+     private:
+         virtual const node_interface_set & do_interfaces() const throw ();
+         virtual const boost::intrusive_ptr<node>
+         do_create_node(const boost::shared_ptr<openvrml::scope> & scope,
+                        const initial_value_map & initial_values) const
+             throw (std::bad_alloc);
+     };
+ 
+ 
      class OPENVRML_LOCAL abstract_proto_node : public openvrml::node {
      public:
***************
*** 936,940 ****
       * @exception std::bad_alloc        if memory allocation fails.
       */
-     proto_node_class::
      proto_node_type::proto_node_type(const proto_node_class & node_class,
                                       const std::string & id,
--- 944,947 ----
***************
*** 963,967 ****
       * @brief Destroy.
       */
!     proto_node_class::proto_node_type::~proto_node_type() throw ()
      {}
  
--- 970,974 ----
       * @brief Destroy.
       */
!     proto_node_type::~proto_node_type() throw ()
      {}
  
***************
*** 972,976 ****
       */
      const node_interface_set &
!     proto_node_class::proto_node_type::do_interfaces() const throw ()
      {
          return this->interfaces_;
--- 979,983 ----
       */
      const node_interface_set &
!     proto_node_type::do_interfaces() const throw ()
      {
          return this->interfaces_;
***************
*** 978,982 ****
  
      const boost::intrusive_ptr<node>
!     proto_node_class::proto_node_type::
      do_create_node(const boost::shared_ptr<openvrml::scope> & scope,
                     const initial_value_map & initial_values) const
--- 985,989 ----
  
      const boost::intrusive_ptr<node>
!     proto_node_type::
      do_create_node(const boost::shared_ptr<openvrml::scope> & scope,
                     const initial_value_map & initial_values) const