Mon Jul 9 02:11:22 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>

17 files changed, 65 insertions, 78 deletions

diff --git a/CIAO/CCF/CCF/CodeGenerationKit/IndentationCxx.hpp b/CIAO/CCF/CCF/CodeGenerationKit/IndentationCxx.hpp
index b7451969555..6c4c05db38c 100644
--- a/CIAO/CCF/CCF/CodeGenerationKit/IndentationCxx.hpp
+++ b/CIAO/CCF/CCF/CodeGenerationKit/IndentationCxx.hpp
@@ -48,7 +48,7 @@ namespace Indentation
 
   public:
     virtual int_type
-    put (char_type c) throw (ExH::System::Exception)
+    put (char_type c)
     {
       int_type result = traits_type::to_int_type (c);
 
@@ -290,7 +290,7 @@ namespace Indentation
     }
 
     virtual void
-    unbuffer () throw (EndOfStream, ExH::System::Exception)
+    unbuffer ()
     {
       int_type result;
 
@@ -323,7 +323,7 @@ namespace Indentation
 
 
     void
-    output_indentation () throw (Full)
+    output_indentation ()
     {
       if (!hold_.empty () && hold_.back () == '\n')
       {
@@ -335,7 +335,7 @@ namespace Indentation
     }
 
     int_type
-    write (char_type c) throw (Full)
+    write (char_type c)
     {
       hold_.push_back (c);
 
diff --git a/CIAO/CCF/CCF/CodeGenerationKit/IndentationIDL.hpp b/CIAO/CCF/CCF/CodeGenerationKit/IndentationIDL.hpp
index 24f9866eac4..a17fe56e43a 100644
--- a/CIAO/CCF/CCF/CodeGenerationKit/IndentationIDL.hpp
+++ b/CIAO/CCF/CCF/CodeGenerationKit/IndentationIDL.hpp
@@ -45,7 +45,7 @@ namespace Indentation
 
   public:
     virtual int_type
-    put (char_type c) throw (ExH::System::Exception)
+    put (char_type c)
     {
       int_type result = traits_type::to_int_type (c);
 
@@ -187,7 +187,7 @@ namespace Indentation
     }
 
     virtual void
-    unbuffer () throw (EndOfStream, ExH::System::Exception)
+    unbuffer ()
     {
       int_type result;
 
@@ -219,7 +219,7 @@ namespace Indentation
 
 
     void
-    output_indentation () throw (Full)
+    output_indentation ()
     {
       if (!hold_.empty () && hold_.back () == '\n')
       {
@@ -231,7 +231,7 @@ namespace Indentation
     }
 
     int_type
-    write (char_type c) throw (Full)
+    write (char_type c)
     {
       hold_.push_back (c);
 
diff --git a/CIAO/CCF/CCF/CodeGenerationKit/IndentationImplanter.hpp b/CIAO/CCF/CCF/CodeGenerationKit/IndentationImplanter.hpp
index 40259a694f6..7a76adfe2d2 100644
--- a/CIAO/CCF/CCF/CodeGenerationKit/IndentationImplanter.hpp
+++ b/CIAO/CCF/CCF/CodeGenerationKit/IndentationImplanter.hpp
@@ -76,13 +76,13 @@ namespace Indentation
     }
 
     virtual int_type
-    put (char_type c) throw (Exception, ExH::System::Exception)
+    put (char_type c)
     {
       return buffer_.sputc (c);
     }
 
     virtual void
-    unbuffer () throw (ExH::System::Exception)
+    unbuffer ()
     {
       try
       {
diff --git a/CIAO/CCF/CCF/CodeGenerationKit/IndentationXML.hpp b/CIAO/CCF/CCF/CodeGenerationKit/IndentationXML.hpp
index 774a70e501f..ef1fff2bbe0 100644
--- a/CIAO/CCF/CCF/CodeGenerationKit/IndentationXML.hpp
+++ b/CIAO/CCF/CCF/CodeGenerationKit/IndentationXML.hpp
@@ -47,7 +47,7 @@ namespace Indentation
 
   public:
     virtual int_type
-    put (char_type c) throw (ExH::System::Exception)
+    put (char_type c)
     {
       int_type result = traits_type::to_int_type (c);
 
@@ -147,7 +147,7 @@ namespace Indentation
     }
 
     virtual void
-    unbuffer () throw (EndOfStream, ExH::System::Exception)
+    unbuffer ()
     {
       try
       {
@@ -162,7 +162,7 @@ namespace Indentation
     class Full {};
 
     void
-    flush_buffer () throw (Full)
+    flush_buffer ()
     {
       long delta = indentation_ - base_indent_;
 
@@ -183,7 +183,7 @@ namespace Indentation
     }
 
     void
-    output_indentation (unsigned long indentation) throw (Full)
+    output_indentation (unsigned long indentation)
     {
       for (unsigned long i = 0; i < indentation * spaces_; i++)
       {
@@ -192,7 +192,7 @@ namespace Indentation
     }
 
     int_type
-    write (int_type c) throw (Full)
+    write (int_type c)
     {
       int_type result;
 
diff --git a/CIAO/CCF/CCF/CompilerElements/Context.hpp b/CIAO/CCF/CCF/CompilerElements/Context.hpp
index fe799e32b48..bf58b2423cb 100644
--- a/CIAO/CCF/CCF/CompilerElements/Context.hpp
+++ b/CIAO/CCF/CCF/CompilerElements/Context.hpp
@@ -36,7 +36,7 @@ namespace CCF
 
       template <typename T>
       T const&
-      get (char const* key) const throw (NotFound, Typing)
+      get (char const* key) const
       {
         Map::const_iterator i = map_.find (key);
         if (i == map_.end ()) throw NotFound ();
@@ -54,7 +54,7 @@ namespace CCF
 
       template <typename T>
       T const&
-      get (char const* key, T const& def) const throw (Typing)
+      get (char const* key, T const& def) const
       {
         Map::const_iterator i = map_.find (key);
         if (i == map_.end ()) return def;
@@ -71,7 +71,7 @@ namespace CCF
 
       template <typename T>
       void
-      set (char const* key, T const& value) throw (Typing)
+      set (char const* key, T const& value)
       {
         try
         {
@@ -89,7 +89,7 @@ namespace CCF
       }
 
       void
-      remove (char const* key) throw (NotFound)
+      remove (char const* key)
       {
         Map::iterator i (map_.find (key));
 
diff --git a/CIAO/CCF/CCF/CompilerElements/Preprocessor.cpp b/CIAO/CCF/CCF/CompilerElements/Preprocessor.cpp
index e52750ba74e..e71e6eec6b6 100644
--- a/CIAO/CCF/CCF/CompilerElements/Preprocessor.cpp
+++ b/CIAO/CCF/CCF/CompilerElements/Preprocessor.cpp
@@ -126,7 +126,7 @@ namespace CCF
           class EOS {};
 
           InToken
-          get () throw (EOS)
+          get ()
           {
             if (ibuffer_.empty ())
             {
@@ -147,7 +147,7 @@ namespace CCF
           // Get first non-space token
           //
           InToken
-          get_ns () throw (EOS)
+          get_ns ()
           {
             InToken t (get ());
 
@@ -801,7 +801,7 @@ namespace CCF
         class EOS {};
 
         char_type
-        get () throw (EOS)
+        get ()
         {
           int_type i;
 
@@ -849,7 +849,7 @@ namespace CCF
         }
 
         Token
-        ls_get () throw (EOS)
+        ls_get ()
         {
           if (ls_buffer_.empty ())
           {
@@ -870,7 +870,7 @@ namespace CCF
         // Get first non-space token
         //
         Token
-        ls_get_ns () throw (EOS)
+        ls_get_ns () 
         {
           Token t (ls_get ());
 
diff --git a/CIAO/CCF/CCF/CompilerElements/PreprocessorToken.cpp b/CIAO/CCF/CCF/CompilerElements/PreprocessorToken.cpp
index 5f3e629243e..7fa6fd1236f 100644
--- a/CIAO/CCF/CCF/CompilerElements/PreprocessorToken.cpp
+++ b/CIAO/CCF/CCF/CompilerElements/PreprocessorToken.cpp
@@ -25,7 +25,7 @@ namespace CCF
       }
 
       Token::
-      operator char () const throw (EOS)
+      operator char () const
       {
         if (*this == eos) throw EOS ();
 
@@ -34,7 +34,7 @@ namespace CCF
 
 
       unsigned long Token::
-      line () const throw (EOS)
+      line () const 
       {
         if (*this == eos) throw EOS ();
 
diff --git a/CIAO/CCF/CCF/CompilerElements/PreprocessorToken.hpp b/CIAO/CCF/CCF/CompilerElements/PreprocessorToken.hpp
index 5c82076a01c..534fc26b4f2 100644
--- a/CIAO/CCF/CCF/CompilerElements/PreprocessorToken.hpp
+++ b/CIAO/CCF/CCF/CompilerElements/PreprocessorToken.hpp
@@ -27,10 +27,10 @@ namespace CCF
 
         class EOS {};
 
-        operator char () const throw (EOS);
+        operator char () const;
 
         unsigned long
-        line () const throw (EOS);
+        line () const;
 
         friend bool
         operator== (Token const& a, Token const& b);
diff --git a/CIAO/CCF/CCF/IDL2/LexicalAnalyzer.cpp b/CIAO/CCF/CCF/IDL2/LexicalAnalyzer.cpp
index b95ebe81c1f..31cbb4cf024 100644
--- a/CIAO/CCF/CCF/IDL2/LexicalAnalyzer.cpp
+++ b/CIAO/CCF/CCF/IDL2/LexicalAnalyzer.cpp
@@ -539,8 +539,7 @@ namespace CCF
       }
     }
 
-    pair<char, size_t> LexicalAnalyzer::
-    scan_char (char const* s) throw (Format)
+    pair<char, size_t> LexicalAnalyzer::scan_char (char const* s)
     {
       if (*s == '\0')
       {
@@ -667,8 +666,7 @@ namespace CCF
       }
     }
 
-    string LexicalAnalyzer::
-    scan_string (string const& s) throw (Format)
+    string LexicalAnalyzer::scan_string (string const& s)
     {
       string r;
 
@@ -805,7 +803,6 @@ namespace CCF
 
     unsigned long long LexicalAnalyzer::
     scan_integer (string const& s, unsigned short base)
-      throw (Format, Boundary)
     {
       unsigned long long const max (~0ULL);
       unsigned long long bound (max / base);
diff --git a/CIAO/CCF/CCF/IDL2/LexicalAnalyzer.hpp b/CIAO/CCF/CCF/IDL2/LexicalAnalyzer.hpp
index e75641e40c8..6a5700b06d7 100644
--- a/CIAO/CCF/CCF/IDL2/LexicalAnalyzer.hpp
+++ b/CIAO/CCF/CCF/IDL2/LexicalAnalyzer.hpp
@@ -76,14 +76,13 @@ namespace CCF
       class Boundary {};
 
       std::pair<char, std::size_t>
-      scan_char (char const* s) throw (Format);
+      scan_char (char const* s);
 
       std::string
-      scan_string (std::string const& s) throw (Format);
+      scan_string (std::string const& s);
 
       unsigned long long
-      scan_integer (std::string const& s, unsigned short base)
-        throw (Format, Boundary);
+      scan_integer (std::string const& s, unsigned short base);
 
     protected:
       virtual Char
diff --git a/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Elements.cpp b/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Elements.cpp
index 0076b9d757c..44b8c3b7fc6 100644
--- a/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Elements.cpp
+++ b/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Elements.cpp
@@ -30,7 +30,7 @@ namespace CCF
         Nameables
         resolve (TranslationUnit& tu,
                  ScopedName const& from,
-                 Name const& name) throw (NotFound)
+                 Name const& name)
         {
 
           if (trace) cerr << "resolve: starting resolution process for \'"
@@ -108,7 +108,7 @@ namespace CCF
         Nameable*
         lookup (SemanticGraph::TranslationUnit& tu,
                 SemanticGraph::Scope& in,
-                SemanticGraph::SimpleName const& name) throw (NotUnique)
+                SemanticGraph::SimpleName const& name)
         {
           Nameables r;
 
diff --git a/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Elements.hpp b/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Elements.hpp
index 51da2657b5d..629e3cff2ee 100644
--- a/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Elements.hpp
+++ b/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Elements.hpp
@@ -218,8 +218,7 @@ namespace CCF
           T&
           resolve (SemanticGraph::ScopedName const& from,
                    SemanticGraph::Name const& name,
-                   Flags::Value flags = Flags::none)
-            throw (NotFound, NotUnique, WrongType, NotDefined, NotComplete);
+                   Flags::Value flags = Flags::none);
 
 
           class AlreadyInherited_ {};
@@ -230,13 +229,11 @@ namespace CCF
 
           template<typename I>
           void
-          check_inheritance (I begin, I end, SemanticGraph::Nameable& t)
-            throw (AlreadyInherited);
+          check_inheritance (I begin, I end, SemanticGraph::Nameable& t);
 
           template<typename I>
           void
-          check_support (I begin, I end, SemanticGraph::Nameable& t)
-            throw (AlreadySupported);
+          check_support (I begin, I end, SemanticGraph::Nameable& t);
 
         protected:
           Context& ctx;
@@ -301,7 +298,7 @@ namespace CCF
         SemanticGraph::Nameables
         resolve (SemanticGraph::TranslationUnit& tu,
                  SemanticGraph::ScopedName const& from,
-                 SemanticGraph::Name const& name) throw (NotFound);
+                 SemanticGraph::Name const& name);
 
 
 
@@ -309,7 +306,7 @@ namespace CCF
         SemanticGraph::Nameable*
         lookup (SemanticGraph::TranslationUnit& tu,
                 SemanticGraph::Scope& in,
-                SemanticGraph::SimpleName const& name) throw (NotUnique);
+                SemanticGraph::SimpleName const& name);
       }
     }
   }
diff --git a/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Elements.tpp b/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Elements.tpp
index 13d4e8905d4..8697bd8b0a1 100644
--- a/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Elements.tpp
+++ b/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Elements.tpp
@@ -15,7 +15,6 @@ namespace CCF
         resolve (SemanticGraph::ScopedName const& from,
                  SemanticGraph::Name const& name,
                  Flags::Value flags)
-          throw (NotFound, NotUnique, WrongType, NotDefined, NotComplete)
         {
           using namespace SemanticGraph;
 
@@ -64,7 +63,6 @@ namespace CCF
         template<typename I>
         void Base::
         check_inheritance (I begin, I end, SemanticGraph::Nameable& t)
-          throw (AlreadyInherited)
         {
           for (;begin != end; ++begin)
           {
@@ -78,7 +76,6 @@ namespace CCF
         template<typename I>
         void Base::
         check_support (I begin, I end, SemanticGraph::Nameable& t)
-          throw (AlreadySupported)
         {
           for (;begin != end; ++begin)
           {
diff --git a/CIAO/CCF/CCF/IDL2/SemanticGraph/Name.cpp b/CIAO/CCF/CCF/IDL2/SemanticGraph/Name.cpp
index 374446661df..40faa29d0ec 100644
--- a/CIAO/CCF/CCF/IDL2/SemanticGraph/Name.cpp
+++ b/CIAO/CCF/CCF/IDL2/SemanticGraph/Name.cpp
@@ -25,7 +25,7 @@ namespace CCF
       //
 
       SimpleName::
-      SimpleName (char const* name) throw (InvalidName)
+      SimpleName (char const* name)
           : escaped_ (name[0] == '_'),
             name_ (escaped_ ? name + 1 : name)
       {
@@ -34,7 +34,7 @@ namespace CCF
       }
 
       SimpleName::
-      SimpleName (std::string const& name) throw (InvalidName)
+      SimpleName (std::string const& name)
           : escaped_ (name[0] == '_'),
             name_ (name, escaped_ ? 1 : 0)
       {
@@ -65,19 +65,19 @@ namespace CCF
       }
 
       Name::
-      Name (char const* name) throw (InvalidName)
+      Name (char const* name)
       {
         init (name);
       }
 
       Name::
-      Name (std::string const& name) throw (InvalidName)
+      Name (std::string const& name)
       {
         init (name);
       }
 
       void Name::
-      init (std::string const& name) throw (InvalidName)
+      init (std::string const& name)
       {
         // cerr << "parsing name \'" << name_cache_ << "\' {"<< endl;
 
@@ -117,7 +117,7 @@ namespace CCF
 
 
       Name::
-      Name (Iterator begin, Iterator end) throw (InvalidName)
+      Name (Iterator begin, Iterator end)
       {
         for (Iterator i (begin); i != end; ++i)
         {
@@ -146,28 +146,28 @@ namespace CCF
       //
 
       ScopedName::
-      ScopedName (char const* name) throw (InvalidName)
+      ScopedName (char const* name)
           : Name (name)
       {
         if (!scoped ()) throw InvalidName ();
       }
 
       ScopedName::
-      ScopedName (std::string const& name) throw (InvalidName)
+      ScopedName (std::string const& name)
           : Name (name)
       {
         if (!scoped ()) throw InvalidName ();
       }
 
       ScopedName::
-      ScopedName (Iterator begin, Iterator end) throw (InvalidName)
+      ScopedName (Iterator begin, Iterator end)
           : Name (begin, end)
       {
         if (!scoped ()) throw InvalidName ();
       }
 
       ScopedName::
-      ScopedName (Name const& name) throw (InvalidName)
+      ScopedName (Name const& name)
           : Name (name)
       {
         if (!scoped ()) throw InvalidName ();
@@ -175,7 +175,6 @@ namespace CCF
 
       ScopedName::
       ScopedName (ScopedName const& scope, Name const& name)
-        throw (InvalidName)
           : Name (scope.str () + "::" + name.str ())
       {
         if (!scoped ()) throw InvalidName ();
@@ -188,7 +187,7 @@ namespace CCF
       }
 
       ScopedName ScopedName::
-      scope_name () const throw (FileScope)
+      scope_name () const
       {
         Iterator end (this->end () - 1);
 
diff --git a/CIAO/CCF/CCF/IDL2/SemanticGraph/Name.hpp b/CIAO/CCF/CCF/IDL2/SemanticGraph/Name.hpp
index 50dd752aa6a..1de105e9d10 100644
--- a/CIAO/CCF/CCF/IDL2/SemanticGraph/Name.hpp
+++ b/CIAO/CCF/CCF/IDL2/SemanticGraph/Name.hpp
@@ -24,8 +24,8 @@ namespace CCF
       class SimpleName
       {
       public:
-        SimpleName (char const* name) throw (InvalidName);
-        SimpleName (std::string const& name) throw (InvalidName);
+        SimpleName (char const* name);
+        SimpleName (std::string const& name);
 
       public:
         // Comparisons are escape-insensitive.
@@ -93,14 +93,14 @@ namespace CCF
       public:
         Name (SimpleName const& name);
 
-        Name (char const* name) throw (InvalidName);
-        Name (std::string const& name) throw (InvalidName);
+        Name (char const* name);
+        Name (std::string const& name);
 
         typedef
         Name_::const_iterator
         Iterator;
 
-        Name (Iterator begin, Iterator end) throw (InvalidName);
+        Name (Iterator begin, Iterator end);
 
       public:
         // Comparisons are escape-insensitive.
@@ -163,7 +163,7 @@ namespace CCF
 
       private:
         void
-        init (std::string const& name) throw (InvalidName);
+        init (std::string const& name);
 
       private:
         Name_ name_;
@@ -177,17 +177,16 @@ namespace CCF
       class ScopedName : public Name
       {
       public:
-        ScopedName (char const* name) throw (InvalidName);
+        ScopedName (char const* name);
 
-        ScopedName (std::string const& name) throw (InvalidName);
+        ScopedName (std::string const& name);
 
-        ScopedName (Iterator begin, Iterator end) throw (InvalidName);
+        ScopedName (Iterator begin, Iterator end);
 
         explicit
-        ScopedName (Name const& name) throw (InvalidName);
+        ScopedName (Name const& name);
 
-        ScopedName (ScopedName const& scope, Name const& name)
-          throw (InvalidName);
+        ScopedName (ScopedName const& scope, Name const& name);
 
       public:
         SimpleName
@@ -196,7 +195,7 @@ namespace CCF
         class FileScope {};
 
         ScopedName
-        scope_name () const throw (FileScope);
+        scope_name () const;
       };
 
 
diff --git a/CIAO/CCF/Example/ComponentDeploymentDescriptor/SyntaxTree.hpp b/CIAO/CCF/Example/ComponentDeploymentDescriptor/SyntaxTree.hpp
index 3739826b27d..95f609bcf98 100644
--- a/CIAO/CCF/Example/ComponentDeploymentDescriptor/SyntaxTree.hpp
+++ b/CIAO/CCF/Example/ComponentDeploymentDescriptor/SyntaxTree.hpp
@@ -150,7 +150,7 @@ namespace CDD
       class AlreadyExist {};
 
       void
-      insert (PortInstancePtr const& d) throw (AlreadyExist)
+      insert (PortInstancePtr const& d)
       {
         if (!ports_.insert (d).second) throw AlreadyExist ();
       }
diff --git a/CIAO/CCF/Example/ComponentDeploymentDescriptor/Traversal.hpp b/CIAO/CCF/Example/ComponentDeploymentDescriptor/Traversal.hpp
index 2b6697abae9..ce1e464bf07 100644
--- a/CIAO/CCF/Example/ComponentDeploymentDescriptor/Traversal.hpp
+++ b/CIAO/CCF/Example/ComponentDeploymentDescriptor/Traversal.hpp
@@ -56,7 +56,6 @@ namespace CDD
       map (Introspection::TypeId id,
            TraverserInterface* t,
            bool suppress_ambiguity = false)
-        throw (Ambiguous)
       {
         if (!traversal_map_.insert (std::make_pair (id, t)).second)
         {
@@ -118,7 +117,7 @@ namespace CDD
     {
     public:
       virtual void
-      add (Dispatcher* d) throw (Ambiguous)
+      add (Dispatcher* d)
       {
         for (Iterator i = d->begin (); i != d->end (); i++)
         {