ChangeLogTag: Wed Oct 26 18:37:00 2005 Boris Kolpackov <boris@kolpackov.net>

7 files changed, 20 insertions, 14 deletions

diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Typedef.cpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Typedef.cpp
index ce241b7434d..315b69d0e51 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Typedef.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Typedef.cpp
@@ -209,7 +209,7 @@ namespace CCF
           }
 
           Array& a (ctx.tu ().new_node<Array> ());
-          ctx.tu ().new_edge<Arguments> (*type_, a);
+          ctx.tu ().new_edge<ArgumentsWithType> (*type_, a);
 
           array_type_ = &a;
         }
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Array.hpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Array.hpp
index 64c7b70c20f..47542f6772a 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Array.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Array.hpp
@@ -49,8 +49,6 @@ namespace CCF
         {
           type_info (static_type_info ());
         }
-
-        using Specialization::add_edge_right;
       };
     }
   }
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Elements.cpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Elements.cpp
index 5a4caef8f2f..cae24c8a60f 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Elements.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Elements.cpp
@@ -372,6 +372,17 @@ namespace CCF
       TypeInfo const& Specialization::
       static_type_info () { return specialization_; }
 
+      void Specialization::
+      add_edge_right (ArgumentsWithType& e)
+      {
+        arguments_.push_back (&e);
+      }
+
+      void Specialization::
+      add_edge_right (ArgumentsWithValue& e)
+      {
+        arguments_.push_back (&e);
+      }
 
       // Arguments
       //
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Elements.hpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Elements.hpp
index a2418f20fa5..24a18fd3205 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Elements.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Elements.hpp
@@ -510,7 +510,7 @@ namespace CCF
         }
 
         void
-        add_edge_right (ArgumentsWithType&)
+        add_edge_left (ArgumentsWithType&)
         {
         }
 
@@ -605,6 +605,8 @@ namespace CCF
       //
       //
       class Arguments;
+      class ArgumentsWithType;
+      class ArgumentsWithValue;
 
       class Specialization: public virtual Type
       {
@@ -641,10 +643,10 @@ namespace CCF
         }
 
         void
-        add_edge_left (Arguments& e)
-        {
-          arguments_.push_back (&e);
-        }
+        add_edge_right (ArgumentsWithType& e);
+
+        void
+        add_edge_right (ArgumentsWithValue& e);
 
       private:
         Arguments_ arguments_;
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Sequence.hpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Sequence.hpp
index 569bda27778..f32c3d3b1b6 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Sequence.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Sequence.hpp
@@ -43,8 +43,6 @@ namespace CCF
         {
           type_info (static_type_info ());
         }
-
-        using Specialization::add_edge_right;
       };
 
 
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/String.hpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/String.hpp
index a6e8db402a1..a4f3e361272 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/String.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/String.hpp
@@ -44,8 +44,6 @@ namespace CCF
         {
           type_info (static_type_info ());
         }
-
-        using Specialization::add_edge_right;
       };
 
 
@@ -79,8 +77,6 @@ namespace CCF
         {
           type_info (static_type_info ());
         }
-
-        using Specialization::add_edge_right;
       };
     }
   }
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Union.hpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Union.hpp
index d5011d4c36f..a830760e28a 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Union.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Union.hpp
@@ -145,6 +145,7 @@ namespace CCF
         using Specialization::add_edge_left;
         using Specialization::add_edge_right;
         using Scope::add_edge_left;
+        using Scope::add_edge_right;
       };
     }
   }