From bf2759c5c01fef615269b8e9c8fb680031f73657 Mon Sep 17 00:00:00 2001
From: Thadeus Fleming <thadeus.j.fleming@gmail.com>
Date: Fri, 28 Jul 2017 20:49:42 -0500
Subject: [PATCH] Remove deprecated dynamic exception specifiers.

Resolves #461
---
 include/trick/Interpolator.hh                               | 6 +++---
 include/trick/MemoryManager.hh                              | 2 +-
 trick_sims/SIM_wheelbot/models/Motor/include/PWM.hh         | 4 ++--
 trick_sims/SIM_wheelbot/models/Motor/src/PWM.cpp            | 4 ++--
 trick_source/data_products/DPX/APPS/FXPLOT/fxplot.cpp       | 2 +-
 trick_source/data_products/DPX/DPC/DPC_delta_curve.cpp      | 2 +-
 trick_source/data_products/DPX/DPC/DPC_delta_curve.hh       | 2 +-
 trick_source/data_products/DPX/DPC/DPC_delta_plot.cpp       | 4 ++--
 trick_source/data_products/DPX/DPC/DPC_delta_plot.hh        | 4 ++--
 trick_source/data_products/DPX/DPC/DPC_page.cpp             | 2 +-
 trick_source/data_products/DPX/DPC/DPC_page.hh              | 2 +-
 trick_source/data_products/DPX/DPC/DPC_product.cpp          | 2 +-
 trick_source/data_products/DPX/DPC/DPC_product.hh           | 2 +-
 trick_source/data_products/DPX/DPC/DPC_standard_plot.cpp    | 2 +-
 trick_source/data_products/DPX/DPC/DPC_standard_plot.hh     | 2 +-
 trick_source/data_products/DPX/DPC/DPC_std_curve.cpp        | 2 +-
 trick_source/data_products/DPX/DPC/DPC_std_curve.hh         | 2 +-
 trick_source/data_products/DPX/DPC/DPC_table.cpp            | 2 +-
 trick_source/data_products/DPX/DPC/DPC_table.hh             | 2 +-
 trick_source/data_products/DPX/DPM/DPM_axis.cpp             | 2 +-
 trick_source/data_products/DPX/DPM/DPM_axis.hh              | 2 +-
 trick_source/data_products/DPX/DPM/DPM_column.cpp           | 2 +-
 trick_source/data_products/DPX/DPM/DPM_column.hh            | 2 +-
 trick_source/data_products/DPX/DPM/DPM_curve.cpp            | 2 +-
 trick_source/data_products/DPX/DPM/DPM_curve.hh             | 2 +-
 trick_source/data_products/DPX/DPM/DPM_extfn.cpp            | 2 +-
 trick_source/data_products/DPX/DPM/DPM_extfn.hh             | 2 +-
 trick_source/data_products/DPX/DPM/DPM_inputs.cpp           | 2 +-
 trick_source/data_products/DPX/DPM/DPM_inputs.hh            | 2 +-
 trick_source/data_products/DPX/DPM/DPM_measurement.cpp      | 2 +-
 trick_source/data_products/DPX/DPM/DPM_measurement.hh       | 2 +-
 trick_source/data_products/DPX/DPM/DPM_outputs.cpp          | 2 +-
 trick_source/data_products/DPX/DPM/DPM_outputs.hh           | 2 +-
 trick_source/data_products/DPX/DPM/DPM_parse_tree.cpp       | 2 +-
 trick_source/data_products/DPX/DPM/DPM_parse_tree.hh        | 2 +-
 trick_source/data_products/DPX/DPM/DPM_product.cpp          | 2 +-
 trick_source/data_products/DPX/DPM/DPM_product.hh           | 2 +-
 trick_source/data_products/DPX/DPM/DPM_relation.cpp         | 2 +-
 trick_source/data_products/DPX/DPM/DPM_relation.hh          | 2 +-
 trick_source/data_products/DPX/DPM/DPM_run.cpp              | 2 +-
 trick_source/data_products/DPX/DPM/DPM_run.hh               | 2 +-
 trick_source/data_products/DPX/DPM/DPM_session.cpp          | 2 +-
 trick_source/data_products/DPX/DPM/DPM_session.hh           | 2 +-
 trick_source/data_products/DPX/DPM/DPM_var.cpp              | 2 +-
 trick_source/data_products/DPX/DPM/DPM_var.hh               | 2 +-
 trick_source/sim_services/DataTypes/include/AllocInfo.hh    | 6 +++---
 .../sim_services/DataTypes/include/ArrayDataType.hh         | 4 ++--
 .../sim_services/DataTypes/include/CompositeDataType.hh     | 4 ++--
 trick_source/sim_services/DataTypes/include/EnumDataType.hh | 2 +-
 .../sim_services/DataTypes/include/EnumDictionary.hh        | 4 ++--
 .../sim_services/DataTypes/include/PointerDataType.hh       | 4 ++--
 .../sim_services/DataTypes/include/TypeDictionary.hh        | 2 +-
 trick_source/sim_services/DataTypes/src/AllocInfo.cpp       | 6 +++---
 trick_source/sim_services/DataTypes/src/ArrayDataType.cpp   | 4 ++--
 .../sim_services/DataTypes/src/CompositeDataType.cpp        | 4 ++--
 trick_source/sim_services/DataTypes/src/EnumDataType.cpp    | 2 +-
 trick_source/sim_services/DataTypes/src/EnumDictionary.cpp  | 4 ++--
 trick_source/sim_services/DataTypes/src/PointerDataType.cpp | 4 ++--
 trick_source/sim_services/DataTypes/src/TypeDictionary.cpp  | 2 +-
 trick_source/sim_services/MemoryManager/MemoryManager.cpp   | 2 +-
 trick_source/trick_utils/interpolator/src/Interpolator.cpp  | 6 +++---
 61 files changed, 81 insertions(+), 81 deletions(-)

diff --git a/include/trick/Interpolator.hh b/include/trick/Interpolator.hh
index 476a0fef..911f1bd8 100644
--- a/include/trick/Interpolator.hh
+++ b/include/trick/Interpolator.hh
@@ -15,13 +15,13 @@ namespace Trick {
       breakPointArraySizes(BreakPointArraySizes),
       nParams(NParams) {};
 
-    double eval (double param1, ...) throw(std::logic_error) ;
-    double eval (double params[]) throw(std::logic_error) ;
+    double eval (double param1, ...) ;
+    double eval (double params[]) ;
 
     private:
 
     Interpolator(){};
-    double eval (double param[], unsigned int param_index, unsigned int offset) throw(std::logic_error) ;
+    double eval (double param[], unsigned int param_index, unsigned int offset) ;
 
     // DATA MEMBERS
     double*  table;                  /**< Interpolation data. */
diff --git a/include/trick/MemoryManager.hh b/include/trick/MemoryManager.hh
index a20b64db..c49252b4 100644
--- a/include/trick/MemoryManager.hh
+++ b/include/trick/MemoryManager.hh
@@ -64,7 +64,7 @@ namespace Trick {
              @par NOTE:
              Only one instance of the MemoryManager is allowed to exist per process.
              */
-            MemoryManager() throw (std::logic_error) ;
+            MemoryManager() ;
 
             /**
              Memory Manager destructor.
diff --git a/trick_sims/SIM_wheelbot/models/Motor/include/PWM.hh b/trick_sims/SIM_wheelbot/models/Motor/include/PWM.hh
index 3c677ff6..f130c19f 100644
--- a/trick_sims/SIM_wheelbot/models/Motor/include/PWM.hh
+++ b/trick_sims/SIM_wheelbot/models/Motor/include/PWM.hh
@@ -17,11 +17,11 @@ class PWM {
 
     PWM( double HighVoltage,
          double LowVoltage,
-         double DutyCycle) throw (std::logic_error);
+         double DutyCycle);
 
     ~PWM() {}
 
-    void   setDutyCycle( double DutyCycle) throw (std::logic_error);
+    void   setDutyCycle( double DutyCycle);
     double getDutyCycle() const;
     double getAverageVoltage() const;
 
diff --git a/trick_sims/SIM_wheelbot/models/Motor/src/PWM.cpp b/trick_sims/SIM_wheelbot/models/Motor/src/PWM.cpp
index 75196d4c..29ae91ac 100644
--- a/trick_sims/SIM_wheelbot/models/Motor/src/PWM.cpp
+++ b/trick_sims/SIM_wheelbot/models/Motor/src/PWM.cpp
@@ -4,14 +4,14 @@
 
 PWM::PWM ( double HighVoltage,
            double LowVoltage,
-           double DutyCycle) throw (std::logic_error) {
+           double DutyCycle) {
 
    highVoltage = HighVoltage;
    lowVoltage  = LowVoltage;
    setDutyCycle( DutyCycle);
 }
 
-void PWM::setDutyCycle( double DutyCycle) throw (std::logic_error) {
+void PWM::setDutyCycle( double DutyCycle) {
    if (( DutyCycle >= 0.0 ) && ( DutyCycle <= 1.0 )) {
        dutyCycle = DutyCycle;
    } else {
diff --git a/trick_source/data_products/DPX/APPS/FXPLOT/fxplot.cpp b/trick_source/data_products/DPX/APPS/FXPLOT/fxplot.cpp
index 33951f6f..c78e0af8 100644
--- a/trick_source/data_products/DPX/APPS/FXPLOT/fxplot.cpp
+++ b/trick_source/data_products/DPX/APPS/FXPLOT/fxplot.cpp
@@ -492,7 +492,7 @@ class FplotArgs {
     char* device;
     const char* session_file;
 
-    FplotArgs(int argc, char* argv[]) throw (std::invalid_argument) {
+    FplotArgs(int argc, char* argv[]) {
         int ii;
         char* cp ;
 
diff --git a/trick_source/data_products/DPX/DPC/DPC_delta_curve.cpp b/trick_source/data_products/DPX/DPC/DPC_delta_curve.cpp
index de70ed9a..a77cc5db 100644
--- a/trick_source/data_products/DPX/DPC/DPC_delta_curve.cpp
+++ b/trick_source/data_products/DPX/DPC/DPC_delta_curve.cpp
@@ -9,7 +9,7 @@ DPC_delta_curve::DPC_delta_curve( DPM_curve*               Curve_spec,
                                   DPM_run*                 RUN1,
                                   DPM_run*                 RUN2,
                                   DPC_datastream_supplier *ds_supplier,
-                                  DPM_time_constraints    *Time_constraints ) throw (std::logic_error)
+                                  DPM_time_constraints    *Time_constraints )
     : DPC_curve()
 {
 
diff --git a/trick_source/data_products/DPX/DPC/DPC_delta_curve.hh b/trick_source/data_products/DPX/DPC/DPC_delta_curve.hh
index 38bc4b8c..08b64824 100644
--- a/trick_source/data_products/DPX/DPC/DPC_delta_curve.hh
+++ b/trick_source/data_products/DPX/DPC/DPC_delta_curve.hh
@@ -25,7 +25,7 @@ public:
                     DPM_run* RUN1,
                     DPM_run* RUN2,
                     DPC_datastream_supplier *ds_supplier,
-                    DPM_time_constraints* Time_constraints ) throw (std::logic_error);
+                    DPM_time_constraints* Time_constraints ) ;
 
     /**
      * Destructor.
diff --git a/trick_source/data_products/DPX/DPC/DPC_delta_plot.cpp b/trick_source/data_products/DPX/DPC/DPC_delta_plot.cpp
index 0d06e8e0..1d582103 100644
--- a/trick_source/data_products/DPX/DPC/DPC_delta_plot.cpp
+++ b/trick_source/data_products/DPX/DPC/DPC_delta_plot.cpp
@@ -11,7 +11,7 @@ DPC_delta_plot::DPC_delta_plot( DPC_datastream_supplier *DS_Supplier,
                                 DPM_run *Run1,
                                 DPM_run *Run2,
                                 DPM_relation            *Relation,
-                                DPM_time_constraints    *ParentTimeConstraints ) throw (std::invalid_argument)
+                                DPM_time_constraints    *ParentTimeConstraints )
     : DPC_plot( Relation)
 {
 
@@ -80,7 +80,7 @@ DPC_delta_plot::DPC_delta_plot( DPC_datastream_supplier *DS_Supplier,
 DPC_delta_plot::DPC_delta_plot( DPC_datastream_supplier *DS_Supplier,
                                 std::vector <DPM_run *> *RunListp,
                                 DPM_relation            *Relation,
-                                DPM_time_constraints    *ParentTimeConstraints ) throw (std::invalid_argument)
+                                DPM_time_constraints    *ParentTimeConstraints )
     : DPC_plot( Relation)
 {
 
diff --git a/trick_source/data_products/DPX/DPC/DPC_delta_plot.hh b/trick_source/data_products/DPX/DPC/DPC_delta_plot.hh
index 98b95ca1..1110b244 100644
--- a/trick_source/data_products/DPX/DPC/DPC_delta_plot.hh
+++ b/trick_source/data_products/DPX/DPC/DPC_delta_plot.hh
@@ -25,7 +25,7 @@ public:
                     DPM_run *Run2,
                     DPM_relation *Relation,
                     DPM_time_constraints *parent_time_constraints )
-        throw (std::invalid_argument);
+        ;
 
     /**
      * Constructor for Contrast session
@@ -34,7 +34,7 @@ public:
                     std::vector <DPM_run *> *RunListp,
                     DPM_relation *Relation,
                     DPM_time_constraints *parent_time_constraints )
-        throw (std::invalid_argument);
+        ;
 
     /**
      * Destructor.
diff --git a/trick_source/data_products/DPX/DPC/DPC_page.cpp b/trick_source/data_products/DPX/DPC/DPC_page.cpp
index 5d5f10c5..5c48b0f9 100644
--- a/trick_source/data_products/DPX/DPC/DPC_page.cpp
+++ b/trick_source/data_products/DPX/DPC/DPC_page.cpp
@@ -5,7 +5,7 @@
 DPC_page::DPC_page( DPC_datastream_supplier *DS_Supplier,
                     std::vector <DPM_run *> *RunListp,
                     DPM_page                *PageSpec,
-                    DPM_time_constraints    *ParentTimeConstraints )  throw (std::invalid_argument)
+                    DPM_time_constraints    *ParentTimeConstraints )
 {
 
     DPM_time_constraints *my_time_constraints;
diff --git a/trick_source/data_products/DPX/DPC/DPC_page.hh b/trick_source/data_products/DPX/DPC/DPC_page.hh
index e18052b6..d61ad3e1 100644
--- a/trick_source/data_products/DPX/DPC/DPC_page.hh
+++ b/trick_source/data_products/DPX/DPC/DPC_page.hh
@@ -25,7 +25,7 @@ public:
     DPC_page( DPC_datastream_supplier *DS_Supplier,
               std::vector <DPM_run *> *RunListp,
               DPM_page *PageSpec,
-              DPM_time_constraints *ParentTimeConstraints ) throw (std::invalid_argument) ;
+              DPM_time_constraints *ParentTimeConstraints )  ;
 
     /**
      * DESTRUCTOR.
diff --git a/trick_source/data_products/DPX/DPC/DPC_product.cpp b/trick_source/data_products/DPX/DPC/DPC_product.cpp
index 687e3039..fc23b25e 100644
--- a/trick_source/data_products/DPX/DPC/DPC_product.cpp
+++ b/trick_source/data_products/DPX/DPC/DPC_product.cpp
@@ -12,7 +12,7 @@
 
 DPC_product::DPC_product( DPM_session          *Session,
                           const char           *ProductFileName
-                          ) throw (std::invalid_argument) {
+                          )  {
 
     DPM_time_constraints *my_time_constraints;
     DPM_time_constraints *parentTimeConstraints;
diff --git a/trick_source/data_products/DPX/DPC/DPC_product.hh b/trick_source/data_products/DPX/DPC/DPC_product.hh
index 16b39545..7186dd4b 100644
--- a/trick_source/data_products/DPX/DPC/DPC_product.hh
+++ b/trick_source/data_products/DPX/DPC/DPC_product.hh
@@ -23,7 +23,7 @@ public:
     /**
      * CONSTRUCTOR.
      */
-    DPC_product( DPM_session *Session, const char *ProductFileName) throw (std::invalid_argument) ;
+    DPC_product( DPM_session *Session, const char *ProductFileName)  ;
 
     /**
      * DESTRUCTOR.
diff --git a/trick_source/data_products/DPX/DPC/DPC_standard_plot.cpp b/trick_source/data_products/DPX/DPC/DPC_standard_plot.cpp
index b1e954a6..f7c75f32 100644
--- a/trick_source/data_products/DPX/DPC/DPC_standard_plot.cpp
+++ b/trick_source/data_products/DPX/DPC/DPC_standard_plot.cpp
@@ -9,7 +9,7 @@ DPC_standard_plot::DPC_standard_plot(
                                      DPC_datastream_supplier *DS_Supplier,
                                      std::vector <DPM_run *> *RunListp,
                                      DPM_relation            *Relation,
-                                     DPM_time_constraints    *ParentTimeConstraints ) throw (std::invalid_argument)
+                                     DPM_time_constraints    *ParentTimeConstraints )
     : DPC_plot (Relation) {
 
     DPM_time_constraints *my_time_constraints;
diff --git a/trick_source/data_products/DPX/DPC/DPC_standard_plot.hh b/trick_source/data_products/DPX/DPC/DPC_standard_plot.hh
index 552d2877..529f9602 100644
--- a/trick_source/data_products/DPX/DPC/DPC_standard_plot.hh
+++ b/trick_source/data_products/DPX/DPC/DPC_standard_plot.hh
@@ -24,7 +24,7 @@ public:
 		       std::vector <DPM_run *> *RunListp,
 		       DPM_relation *Relation,
 		       DPM_time_constraints *parent_time_constraints )
-        throw (std::invalid_argument);
+        ;
     /**
      * Destructor.
      */
diff --git a/trick_source/data_products/DPX/DPC/DPC_std_curve.cpp b/trick_source/data_products/DPX/DPC/DPC_std_curve.cpp
index 4c741513..112e4465 100644
--- a/trick_source/data_products/DPX/DPC/DPC_std_curve.cpp
+++ b/trick_source/data_products/DPX/DPC/DPC_std_curve.cpp
@@ -11,7 +11,7 @@ DPC_std_curve::DPC_std_curve(
                              DPM_curve*               Curve_spec,
                              DPM_run*                 Run,
                              DPC_datastream_supplier *ds_supplier,
-                             DPM_time_constraints    *Time_constraints ) throw (std::logic_error)
+                             DPM_time_constraints    *Time_constraints )
     : DPC_curve() {
 
     char work[255];
diff --git a/trick_source/data_products/DPX/DPC/DPC_std_curve.hh b/trick_source/data_products/DPX/DPC/DPC_std_curve.hh
index 050ed275..536b6b00 100644
--- a/trick_source/data_products/DPX/DPC/DPC_std_curve.hh
+++ b/trick_source/data_products/DPX/DPC/DPC_std_curve.hh
@@ -25,7 +25,7 @@ public:
                   DPM_curve*  Curve_spec,
                   DPM_run*    Run,
                   DPC_datastream_supplier *ds_supplier,
-                  DPM_time_constraints* Time_constraints ) throw (std::logic_error);
+                  DPM_time_constraints* Time_constraints ) ;
 
     /**
      * Destructor.
diff --git a/trick_source/data_products/DPX/DPC/DPC_table.cpp b/trick_source/data_products/DPX/DPC/DPC_table.cpp
index b219a0c7..14900cd9 100644
--- a/trick_source/data_products/DPX/DPC/DPC_table.cpp
+++ b/trick_source/data_products/DPX/DPC/DPC_table.cpp
@@ -13,7 +13,7 @@ DPC_table::DPC_table( DPC_datastream_supplier *DS_Supplier,
                       DPM_run                 *Run,
                       DPM_table               *Table_spec,
                       DPM_time_constraints    *ParentTimeConstraints )
-    throw (std::invalid_argument) {
+     {
 
     DPM_time_constraints *my_time_constraints;
     DPM_time_constraints total_time_constraints;
diff --git a/trick_source/data_products/DPX/DPC/DPC_table.hh b/trick_source/data_products/DPX/DPC/DPC_table.hh
index b3ea9e1c..3a431266 100644
--- a/trick_source/data_products/DPX/DPC/DPC_table.hh
+++ b/trick_source/data_products/DPX/DPC/DPC_table.hh
@@ -30,7 +30,7 @@ public:
 		DPM_run   * Run,
 		DPM_table *Table,
 		DPM_time_constraints *parent_time_constraints )
-              throw (std::invalid_argument);
+              ;
 
   /**
    * Destructor.
diff --git a/trick_source/data_products/DPX/DPM/DPM_axis.cpp b/trick_source/data_products/DPX/DPM/DPM_axis.cpp
index 23fc05fc..6c7c3cdd 100644
--- a/trick_source/data_products/DPX/DPM/DPM_axis.cpp
+++ b/trick_source/data_products/DPX/DPM/DPM_axis.cpp
@@ -53,7 +53,7 @@ int DPM_axis::Initialize(xmlNode *base_node) {
 }
 
 // XML CONSTRUCTOR
-DPM_axis::DPM_axis(DPM_component *Parent, xmlNode *Base_node) throw  (std::invalid_argument)
+DPM_axis::DPM_axis(DPM_component *Parent, xmlNode *Base_node)
   : DPM_component (Parent, Base_node) {
 
   if ( Initialize(Base_node) < 0) {
diff --git a/trick_source/data_products/DPX/DPM/DPM_axis.hh b/trick_source/data_products/DPX/DPM/DPM_axis.hh
index 8cbefb0f..942da398 100644
--- a/trick_source/data_products/DPX/DPM/DPM_axis.hh
+++ b/trick_source/data_products/DPX/DPM/DPM_axis.hh
@@ -34,7 +34,7 @@ public:
    * @param axis_node this is a pointer to an xmlNode whose type is
    *        XML_ELEMENT_NODE and whose name is either "xaxis" or "yaxis".
    */
-  DPM_axis(DPM_component *parent, xmlNode *axis_node) throw (std::invalid_argument);
+  DPM_axis(DPM_component *parent, xmlNode *axis_node) ;
 
   /**
    * Destructor.
diff --git a/trick_source/data_products/DPX/DPM/DPM_column.cpp b/trick_source/data_products/DPX/DPM/DPM_column.cpp
index ac16e83f..f87297fa 100644
--- a/trick_source/data_products/DPX/DPM/DPM_column.cpp
+++ b/trick_source/data_products/DPX/DPM/DPM_column.cpp
@@ -57,7 +57,7 @@ int DPM_column::Initialize(xmlNode *base_node) {
 }
 
 // XML CONSTRUCTOR
-DPM_column::DPM_column(DPM_component *Parent, xmlNode *Base_node) throw  (std::invalid_argument)
+DPM_column::DPM_column(DPM_component *Parent, xmlNode *Base_node)
   : DPM_component (Parent, Base_node) {
 
   if ( Initialize(Base_node) < 0) {
diff --git a/trick_source/data_products/DPX/DPM/DPM_column.hh b/trick_source/data_products/DPX/DPM/DPM_column.hh
index ace15732..f1a8b29a 100644
--- a/trick_source/data_products/DPX/DPM/DPM_column.hh
+++ b/trick_source/data_products/DPX/DPM/DPM_column.hh
@@ -28,7 +28,7 @@ public:
    * @param column_node this is a pointer to an xmlNode whose type is
    *        XML_ELEMENT_NODE and whose name is "column".
    */
-  DPM_column(DPM_component *parent, xmlNode *column_node) throw (std::invalid_argument);
+  DPM_column(DPM_component *parent, xmlNode *column_node) ;
 
   /**
    * Destructor.
diff --git a/trick_source/data_products/DPX/DPM/DPM_curve.cpp b/trick_source/data_products/DPX/DPM/DPM_curve.cpp
index 7f012627..0e5006d6 100644
--- a/trick_source/data_products/DPX/DPM/DPM_curve.cpp
+++ b/trick_source/data_products/DPX/DPM/DPM_curve.cpp
@@ -128,7 +128,7 @@ int DPM_curve::Initialize(xmlNode *base_node) {
 }
 
 // XML CONSTRUCTOR
-DPM_curve::DPM_curve(DPM_component *Parent, xmlNode *Base_node)  throw (std::invalid_argument)
+DPM_curve::DPM_curve(DPM_component *Parent, xmlNode *Base_node)
   : DPM_component (Parent, Base_node) {
 
   if ( Initialize( Base_node) < 0) {
diff --git a/trick_source/data_products/DPX/DPM/DPM_curve.hh b/trick_source/data_products/DPX/DPM/DPM_curve.hh
index 4cb09622..434f4bbb 100644
--- a/trick_source/data_products/DPX/DPM/DPM_curve.hh
+++ b/trick_source/data_products/DPX/DPM/DPM_curve.hh
@@ -19,7 +19,7 @@ public:
    * @param curve_node a pointer to a libxml2 xmlNode of type XML_ELEMENT_NODE,
    * and whose name is "curve".
    */
-  DPM_curve(DPM_component *parent, xmlNode *curve_node) throw (std::invalid_argument);
+  DPM_curve(DPM_component *parent, xmlNode *curve_node) ;
   /**
    * Destructor for DPM_curve.
    */
diff --git a/trick_source/data_products/DPX/DPM/DPM_extfn.cpp b/trick_source/data_products/DPX/DPM/DPM_extfn.cpp
index e10a2650..488ff500 100644
--- a/trick_source/data_products/DPX/DPM/DPM_extfn.cpp
+++ b/trick_source/data_products/DPX/DPM/DPM_extfn.cpp
@@ -71,7 +71,7 @@ int DPM_extfn::Initialize( xmlNode *base_node) {
 }
 
 // XML CONSTRUCTOR
-DPM_extfn::DPM_extfn(DPM_component *Parent, xmlNode *Base_node) throw (std::invalid_argument)
+DPM_extfn::DPM_extfn(DPM_component *Parent, xmlNode *Base_node)
   : DPM_component (Parent, Base_node) {
 
   if ( Initialize( Base_node) < 0) {
diff --git a/trick_source/data_products/DPX/DPM/DPM_extfn.hh b/trick_source/data_products/DPX/DPM/DPM_extfn.hh
index 6b186ba1..390b4a9e 100644
--- a/trick_source/data_products/DPX/DPM/DPM_extfn.hh
+++ b/trick_source/data_products/DPX/DPM/DPM_extfn.hh
@@ -21,7 +21,7 @@ public:
   /**
    * XML constructor.
    */
-  DPM_extfn(DPM_component *parent, xmlNode *extfn_node) throw (std::invalid_argument);
+  DPM_extfn(DPM_component *parent, xmlNode *extfn_node) ;
 
   /**
    * Destructor.
diff --git a/trick_source/data_products/DPX/DPM/DPM_inputs.cpp b/trick_source/data_products/DPX/DPM/DPM_inputs.cpp
index 2119eb37..66ef071b 100644
--- a/trick_source/data_products/DPX/DPM/DPM_inputs.cpp
+++ b/trick_source/data_products/DPX/DPM/DPM_inputs.cpp
@@ -51,7 +51,7 @@ int DPM_inputs::Initialize( xmlNode *base_node) {
 }
 
 // CONSTRUCTOR
-DPM_inputs::DPM_inputs(DPM_component *Parent, xmlNode *Base_node) throw (std::invalid_argument)
+DPM_inputs::DPM_inputs(DPM_component *Parent, xmlNode *Base_node)
      : DPM_component(Parent, Base_node) {
 
   if ( Initialize( Base_node) < 0) {
diff --git a/trick_source/data_products/DPX/DPM/DPM_inputs.hh b/trick_source/data_products/DPX/DPM/DPM_inputs.hh
index 8fc00735..c5d49b8a 100644
--- a/trick_source/data_products/DPX/DPM/DPM_inputs.hh
+++ b/trick_source/data_products/DPX/DPM/DPM_inputs.hh
@@ -21,7 +21,7 @@ public:
   /**
    * Constructor.
    */
-  DPM_inputs(DPM_component *parent, xmlNode *inputs_node) throw (std::invalid_argument);
+  DPM_inputs(DPM_component *parent, xmlNode *inputs_node) ;
 
   /**
    * Destructor.
diff --git a/trick_source/data_products/DPX/DPM/DPM_measurement.cpp b/trick_source/data_products/DPX/DPM/DPM_measurement.cpp
index aeb9edf2..71fba007 100644
--- a/trick_source/data_products/DPX/DPM/DPM_measurement.cpp
+++ b/trick_source/data_products/DPX/DPM/DPM_measurement.cpp
@@ -66,7 +66,7 @@ int DPM_measurement::Initialize( xmlNode *base_node) {
 }
 
 // CONSTRUCTOR
-DPM_measurement::DPM_measurement(DPM_component *Parent, xmlNode *Base_node) throw (std::invalid_argument)
+DPM_measurement::DPM_measurement(DPM_component *Parent, xmlNode *Base_node)
      : DPM_component (Parent, Base_node) {
 
      if ( Initialize( Base_node) < 0) {
diff --git a/trick_source/data_products/DPX/DPM/DPM_measurement.hh b/trick_source/data_products/DPX/DPM/DPM_measurement.hh
index c74fec50..194eda2c 100644
--- a/trick_source/data_products/DPX/DPM/DPM_measurement.hh
+++ b/trick_source/data_products/DPX/DPM/DPM_measurement.hh
@@ -20,7 +20,7 @@ public:
    * @param measurement_node this is a pointer to an xmlNode whose type is
    *        XML_ELEMENT_NODE and whose name is "measurement".
    */
-  DPM_measurement(DPM_component *parent, xmlNode *measurement_node) throw (std::invalid_argument);
+  DPM_measurement(DPM_component *parent, xmlNode *measurement_node) ;
 
   /**
    * Destructor.
diff --git a/trick_source/data_products/DPX/DPM/DPM_outputs.cpp b/trick_source/data_products/DPX/DPM/DPM_outputs.cpp
index 62f1243e..527a28a9 100644
--- a/trick_source/data_products/DPX/DPM/DPM_outputs.cpp
+++ b/trick_source/data_products/DPX/DPM/DPM_outputs.cpp
@@ -48,7 +48,7 @@ int DPM_outputs::Initialize( xmlNode *base_node) {
 }
 
 // CONSTRUCTOR
-DPM_outputs::DPM_outputs(DPM_component *Parent, xmlNode *Base_node) throw (std::invalid_argument)
+DPM_outputs::DPM_outputs(DPM_component *Parent, xmlNode *Base_node)
   : DPM_component (Parent, Base_node) {
 
   Initialize( Base_node);
diff --git a/trick_source/data_products/DPX/DPM/DPM_outputs.hh b/trick_source/data_products/DPX/DPM/DPM_outputs.hh
index 7e82b93b..85825bac 100644
--- a/trick_source/data_products/DPX/DPM/DPM_outputs.hh
+++ b/trick_source/data_products/DPX/DPM/DPM_outputs.hh
@@ -21,7 +21,7 @@ public:
   /**
    * XML based constructor.
    */
-  DPM_outputs(DPM_component *parent, xmlNode *outputs_node) throw (std::invalid_argument);
+  DPM_outputs(DPM_component *parent, xmlNode *outputs_node) ;
 
   /**
    * Destructor.
diff --git a/trick_source/data_products/DPX/DPM/DPM_parse_tree.cpp b/trick_source/data_products/DPX/DPM/DPM_parse_tree.cpp
index 8796d9aa..ead513c7 100644
--- a/trick_source/data_products/DPX/DPM/DPM_parse_tree.cpp
+++ b/trick_source/data_products/DPX/DPM/DPM_parse_tree.cpp
@@ -45,7 +45,7 @@ int DPM_parse_tree::Initialize(const char *XMLFileName) {
 
 
 // CONSTRUCTOR
-DPM_parse_tree::DPM_parse_tree(const char *XMLFileName) throw (std::invalid_argument) {
+DPM_parse_tree::DPM_parse_tree(const char *XMLFileName)  {
 
     if ( Initialize( XMLFileName) < 0) {
         throw std::invalid_argument("DPM_parse_tree is un-usable.");
diff --git a/trick_source/data_products/DPX/DPM/DPM_parse_tree.hh b/trick_source/data_products/DPX/DPM/DPM_parse_tree.hh
index 858ff21a..241aefb2 100644
--- a/trick_source/data_products/DPX/DPM/DPM_parse_tree.hh
+++ b/trick_source/data_products/DPX/DPM/DPM_parse_tree.hh
@@ -17,7 +17,7 @@ public:
   /**
    * Constructor.
    */
-  DPM_parse_tree(const char *XMLFileName) throw (std::invalid_argument);
+  DPM_parse_tree(const char *XMLFileName) ;
 
   /**
    * Destructor
diff --git a/trick_source/data_products/DPX/DPM/DPM_product.cpp b/trick_source/data_products/DPX/DPM/DPM_product.cpp
index 6b335378..8087ae41 100644
--- a/trick_source/data_products/DPX/DPM/DPM_product.cpp
+++ b/trick_source/data_products/DPX/DPM/DPM_product.cpp
@@ -98,7 +98,7 @@ int DPM_product::Initialize( xmlNode *base_node) {
 }
 
 // XML CONSTRUCTOR
-DPM_product::DPM_product(DPM_component *Parent, xmlNode *Base_node) throw (std::invalid_argument)
+DPM_product::DPM_product(DPM_component *Parent, xmlNode *Base_node)
   : DPM_component (Parent, Base_node) {
 
   if ( Initialize( Base_node) < 0) {
diff --git a/trick_source/data_products/DPX/DPM/DPM_product.hh b/trick_source/data_products/DPX/DPM/DPM_product.hh
index 4f0900e9..d455df74 100644
--- a/trick_source/data_products/DPX/DPM/DPM_product.hh
+++ b/trick_source/data_products/DPX/DPM/DPM_product.hh
@@ -21,7 +21,7 @@ public:
   /**
    * XML Constructor.
    */
-  DPM_product(DPM_component *parent, xmlNode *product_node) throw (std::invalid_argument);
+  DPM_product(DPM_component *parent, xmlNode *product_node) ;
 
   /**
    * Destructor
diff --git a/trick_source/data_products/DPX/DPM/DPM_relation.cpp b/trick_source/data_products/DPX/DPM/DPM_relation.cpp
index b56980b9..0af39c8e 100644
--- a/trick_source/data_products/DPX/DPM/DPM_relation.cpp
+++ b/trick_source/data_products/DPX/DPM/DPM_relation.cpp
@@ -92,7 +92,7 @@ int DPM_relation::Initialize(xmlNode *base_node) {
 }
 
 // XML CONSTRUCTOR
-DPM_relation::DPM_relation(DPM_component *Parent, xmlNode *Base_node)  throw (std::invalid_argument)
+DPM_relation::DPM_relation(DPM_component *Parent, xmlNode *Base_node)
   : DPM_component (Parent, Base_node) {
 
   if ( Initialize( Base_node) < 0) {
diff --git a/trick_source/data_products/DPX/DPM/DPM_relation.hh b/trick_source/data_products/DPX/DPM/DPM_relation.hh
index 227aaf9e..7da18ba4 100644
--- a/trick_source/data_products/DPX/DPM/DPM_relation.hh
+++ b/trick_source/data_products/DPX/DPM/DPM_relation.hh
@@ -24,7 +24,7 @@ public:
    * @param plot_node a pointer to a libxml2 xmlNode of type XML_ELEMENT_NODE,
    * and whose name is "plot".
    */
-  DPM_relation(DPM_component *parent, xmlNode *plot_node) throw (std::invalid_argument);
+  DPM_relation(DPM_component *parent, xmlNode *plot_node) ;
   /**
    * Destructor for DPM_relation.
    */
diff --git a/trick_source/data_products/DPX/DPM/DPM_run.cpp b/trick_source/data_products/DPX/DPM/DPM_run.cpp
index 55920c3d..362838f7 100644
--- a/trick_source/data_products/DPX/DPM/DPM_run.cpp
+++ b/trick_source/data_products/DPX/DPM/DPM_run.cpp
@@ -40,7 +40,7 @@ int DPM_run::Initialize( xmlNode *base_node) {
 }
 
 // CONSTRUCTOR
-DPM_run::DPM_run(DPM_component *Parent, xmlNode *Base_node) throw (std::invalid_argument)
+DPM_run::DPM_run(DPM_component *Parent, xmlNode *Base_node)
      : DPM_component (Parent, Base_node) {
 
      if ( Initialize( Base_node) < 0) {
diff --git a/trick_source/data_products/DPX/DPM/DPM_run.hh b/trick_source/data_products/DPX/DPM/DPM_run.hh
index 2ce33d5f..bde9fc22 100644
--- a/trick_source/data_products/DPX/DPM/DPM_run.hh
+++ b/trick_source/data_products/DPX/DPM/DPM_run.hh
@@ -20,7 +20,7 @@ public:
    * @param RunNode is a pointer to an xmlNode whose type is
    *        XML_ELEMENT_NODE and whose name is "run".
    */
-  DPM_run(DPM_component *parent, xmlNode *RunNode) throw (std::invalid_argument);
+  DPM_run(DPM_component *parent, xmlNode *RunNode) ;
 
   /**
    * Destructor.
diff --git a/trick_source/data_products/DPX/DPM/DPM_session.cpp b/trick_source/data_products/DPX/DPM/DPM_session.cpp
index d80f747a..0e227074 100644
--- a/trick_source/data_products/DPX/DPM/DPM_session.cpp
+++ b/trick_source/data_products/DPX/DPM/DPM_session.cpp
@@ -120,7 +120,7 @@ int DPM_session::Initialize( xmlNode *SessionNode ) {
     return 0;
 }
 
-DPM_session::DPM_session(DPM_component *Parent, xmlNode *SessionNode) throw (std::invalid_argument)
+DPM_session::DPM_session(DPM_component *Parent, xmlNode *SessionNode)
  : DPM_component(Parent, SessionNode) {
 
   if ( Initialize( SessionNode) < 0) {
diff --git a/trick_source/data_products/DPX/DPM/DPM_session.hh b/trick_source/data_products/DPX/DPM/DPM_session.hh
index d531e2ea..ee61b9b4 100644
--- a/trick_source/data_products/DPX/DPM/DPM_session.hh
+++ b/trick_source/data_products/DPX/DPM/DPM_session.hh
@@ -26,7 +26,7 @@ public:
   /**
    * XML Constructor.
    */
-  DPM_session(DPM_component *parent, xmlNode *SessionNode) throw (std::invalid_argument);
+  DPM_session(DPM_component *parent, xmlNode *SessionNode) ;
 
   /**
    * Destructor
diff --git a/trick_source/data_products/DPX/DPM/DPM_var.cpp b/trick_source/data_products/DPX/DPM/DPM_var.cpp
index 46487186..1f102591 100644
--- a/trick_source/data_products/DPX/DPM/DPM_var.cpp
+++ b/trick_source/data_products/DPX/DPM/DPM_var.cpp
@@ -24,7 +24,7 @@ int DPM_var::Initialize( xmlNode *base_node) {
 }
 
 // CONSTRUCTOR
-DPM_var::DPM_var(DPM_component *Parent, xmlNode *Base_node) throw (std::invalid_argument)
+DPM_var::DPM_var(DPM_component *Parent, xmlNode *Base_node)
      : DPM_component (Parent, Base_node) {
 
      if ( Initialize( Base_node) < 0) {
diff --git a/trick_source/data_products/DPX/DPM/DPM_var.hh b/trick_source/data_products/DPX/DPM/DPM_var.hh
index e779b471..61b07a61 100644
--- a/trick_source/data_products/DPX/DPM/DPM_var.hh
+++ b/trick_source/data_products/DPX/DPM/DPM_var.hh
@@ -27,7 +27,7 @@ class DPM_var:public DPM_component {
      * @param VarNode is a pointer to an xmlNode whose type is
      *        XML_ELEMENT_NODE and whose name is "var".
      */
-    DPM_var(DPM_component * parent, xmlNode * VarNode) throw(std::invalid_argument);
+    DPM_var(DPM_component * parent, xmlNode * VarNode) ;
 
     /**
      * Destructor.
diff --git a/trick_source/sim_services/DataTypes/include/AllocInfo.hh b/trick_source/sim_services/DataTypes/include/AllocInfo.hh
index bbda96b4..950c287c 100644
--- a/trick_source/sim_services/DataTypes/include/AllocInfo.hh
+++ b/trick_source/sim_services/DataTypes/include/AllocInfo.hh
@@ -46,13 +46,13 @@ class AllocInfo {
                unsigned int       dimensionsCount,
                int*               dimensions,
                TypeDictionary*    typeDictionary,
-               void*              suppliedAllocation = 0) throw (std::logic_error) ;
+               void*              suppliedAllocation = 0)  ;
     /**
       AllocInfo destructor.
      */
     AllocInfo( const std::string& declaration,
                TypeDictionary*    typeDictionary,
-               void*              suppliedAllocation = 0) throw (std::logic_error) ;
+               void*              suppliedAllocation = 0)  ;
     /**
       AllocInfo destructor.
      */
@@ -165,7 +165,7 @@ class AllocInfo {
                      unsigned int       dimensionsCount,
                      int *              dimensions,
                      TypeDictionary*    typeDictionary,
-                     void*              suppliedAllocation ) throw (std::logic_error) ;
+                     void*              suppliedAllocation )  ;
 
     std::string     name;                        /**< ** Object name */
     void*           start;                       /**< ** Address where this allocation starts */
diff --git a/trick_source/sim_services/DataTypes/include/ArrayDataType.hh b/trick_source/sim_services/DataTypes/include/ArrayDataType.hh
index 52cd186c..a357de1d 100644
--- a/trick_source/sim_services/DataTypes/include/ArrayDataType.hh
+++ b/trick_source/sim_services/DataTypes/include/ArrayDataType.hh
@@ -26,7 +26,7 @@ class ArrayDataType : public DataType {
     ArrayDataType( TypeDictionary* typeDictionary,
                    std::string typeSpecifierName,
                    unsigned int n_dims,
-                   int dims[] ) throw (std::logic_error) ;
+                   int dims[] )  ;
     /**
      Constructor for ArrayDataType.
      @param typeDictionary The Type Dictionary.
@@ -35,7 +35,7 @@ class ArrayDataType : public DataType {
      */
     ArrayDataType( TypeDictionary* typeDictionary,
                    std::string typeSpecName,
-                   unsigned int dimensionSize ) throw (std::logic_error);
+                   unsigned int dimensionSize ) ;
 
     /**
      Create an ArrayDataType with a different elementCount, but otherwise
diff --git a/trick_source/sim_services/DataTypes/include/CompositeDataType.hh b/trick_source/sim_services/DataTypes/include/CompositeDataType.hh
index 08ffd297..668f9418 100644
--- a/trick_source/sim_services/DataTypes/include/CompositeDataType.hh
+++ b/trick_source/sim_services/DataTypes/include/CompositeDataType.hh
@@ -126,7 +126,7 @@ public:
                            int offset,
                            std::string typeName,
                            unsigned n_dims,
-                           int dims[]) throw (std::logic_error);
+                           int dims[]) ;
 
     /**
      Add a static data member to the CompositeDataType.
@@ -141,7 +141,7 @@ public:
                          void * memberAddress,
                          std::string typeSpecName,
                          unsigned int n_dims,
-                         int dims[] ) throw (std::logic_error);
+                         int dims[] ) ;
 
     /**
      Add a bitfield data member to the CompositeDataType.
diff --git a/trick_source/sim_services/DataTypes/include/EnumDataType.hh b/trick_source/sim_services/DataTypes/include/EnumDataType.hh
index 883b151f..6a424418 100644
--- a/trick_source/sim_services/DataTypes/include/EnumDataType.hh
+++ b/trick_source/sim_services/DataTypes/include/EnumDataType.hh
@@ -118,7 +118,7 @@ public:
      the struct, union or class.
      @param type_decl TypeDeclaration of the data-member.
      */
-    void addEnumerator( std::string member_name, int value) throw(std::logic_error) ;
+    void addEnumerator( std::string member_name, int value)  ;
 
 private:
     EnumDataType() {};
diff --git a/trick_source/sim_services/DataTypes/include/EnumDictionary.hh b/trick_source/sim_services/DataTypes/include/EnumDictionary.hh
index 50c4a912..59624a72 100644
--- a/trick_source/sim_services/DataTypes/include/EnumDictionary.hh
+++ b/trick_source/sim_services/DataTypes/include/EnumDictionary.hh
@@ -17,12 +17,12 @@ public:
     /**
      Add a name/value pair to the dictionary.
      */
-    void addEnumerator(std::string name, int value) throw(std::logic_error);
+    void addEnumerator(std::string name, int value) ;
 
     /**
      Get the value associated with the given string.i FIXME: what of string not found?
      */
-    int getValue(std::string name) throw(std::logic_error) ;
+    int getValue(std::string name)  ;
 
     /**
      */
diff --git a/trick_source/sim_services/DataTypes/include/PointerDataType.hh b/trick_source/sim_services/DataTypes/include/PointerDataType.hh
index f7804a6a..d5109551 100644
--- a/trick_source/sim_services/DataTypes/include/PointerDataType.hh
+++ b/trick_source/sim_services/DataTypes/include/PointerDataType.hh
@@ -22,7 +22,7 @@ class PointerDataType : public DataType {
     PointerDataType( TypeDictionary * typeDictionary,
                      std::string typeSpecifierName,
                      unsigned int n_dims,
-                     int dims[] ) throw (std::logic_error);
+                     int dims[] ) ;
     /**
      Constructor for ArrayDataType.
      @param typeDictionary The Type Dictionary.
@@ -30,7 +30,7 @@ class PointerDataType : public DataType {
      @param dims dimension sizes.
      */
     PointerDataType( TypeDictionary * typeDictionary,
-                     std::string typeSpecifierName ) throw (std::logic_error);
+                     std::string typeSpecifierName ) ;
 
     /* ==================================================================== */
     /*                         RULE OF THREE INTERFACE                      */
diff --git a/trick_source/sim_services/DataTypes/include/TypeDictionary.hh b/trick_source/sim_services/DataTypes/include/TypeDictionary.hh
index 68700f12..cca937c7 100644
--- a/trick_source/sim_services/DataTypes/include/TypeDictionary.hh
+++ b/trick_source/sim_services/DataTypes/include/TypeDictionary.hh
@@ -25,7 +25,7 @@ class TypeDictionary {
      Add a type definiton to the dictionary.
      */
     void addTypeDefinition(std::string name, DataType * typeSpec)
-         throw(std::logic_error);
+         ;
 
     /**
      */
diff --git a/trick_source/sim_services/DataTypes/src/AllocInfo.cpp b/trick_source/sim_services/DataTypes/src/AllocInfo.cpp
index fc948d07..6e3ba14d 100644
--- a/trick_source/sim_services/DataTypes/src/AllocInfo.cpp
+++ b/trick_source/sim_services/DataTypes/src/AllocInfo.cpp
@@ -21,7 +21,7 @@ void AllocInfo::initialize( const std::string& varName,
                             unsigned int       dimsCount,
                             int *              dims,
                             TypeDictionary*    typeDictionary,
-                            void*              suppliedAllocation) throw (std::logic_error) {
+                            void*              suppliedAllocation)  {
 
     // Because they can be resized, all allocations are really arrays,
     // whether they have 0, 1, or many elements.
@@ -86,7 +86,7 @@ AllocInfo::AllocInfo( const std::string& varName,
                       unsigned int       dimsCount,
                       int *              dims,
                       TypeDictionary*    typeDictionary,
-                      void*              suppliedAllocation) throw (std::logic_error) {
+                      void*              suppliedAllocation)  {
 
     initialize(varName, typeSpecName, dimsCount, dims, typeDictionary, suppliedAllocation);
 }
@@ -94,7 +94,7 @@ AllocInfo::AllocInfo( const std::string& varName,
 // CONSTRUCTOR
 AllocInfo::AllocInfo( const std::string& declaration,
                       TypeDictionary*    typeDictionary,
-                      void*              suppliedAllocation) throw (std::logic_error) {
+                      void*              suppliedAllocation)  {
 
     int dims[TRICK_MAX_INDEX];
     ParsedDeclaration* parsedDeclaration = new ParsedDeclaration( declaration );
diff --git a/trick_source/sim_services/DataTypes/src/ArrayDataType.cpp b/trick_source/sim_services/DataTypes/src/ArrayDataType.cpp
index 2f21f2fd..1ca69db7 100644
--- a/trick_source/sim_services/DataTypes/src/ArrayDataType.cpp
+++ b/trick_source/sim_services/DataTypes/src/ArrayDataType.cpp
@@ -38,7 +38,7 @@ bool ArrayDataType::initArrayDataType( TypeDictionary* typeDictionary, std::stri
 }
 
 // CONSTRUCTOR
-ArrayDataType:: ArrayDataType( TypeDictionary* typeDictionary, std::string typeSpecName, unsigned int n_dims, int dims[] ) throw (std::logic_error) {
+ArrayDataType:: ArrayDataType( TypeDictionary* typeDictionary, std::string typeSpecName, unsigned int n_dims, int dims[] )  {
 
     if( this->initArrayDataType( typeDictionary, typeSpecName, n_dims, dims) ) {
         throw std::logic_error("ArrayDataType constructor(1) error.");
@@ -46,7 +46,7 @@ ArrayDataType:: ArrayDataType( TypeDictionary* typeDictionary, std::string typeS
 }
 
 // CONSTRUCTOR
-ArrayDataType:: ArrayDataType( TypeDictionary* typeDictionary, std::string typeSpecName, unsigned int dimensionSize ) throw (std::logic_error) {
+ArrayDataType:: ArrayDataType( TypeDictionary* typeDictionary, std::string typeSpecName, unsigned int dimensionSize )  {
 
     int n = dimensionSize;
     if( this->initArrayDataType( typeDictionary, typeSpecName, 1, &n) ) {
diff --git a/trick_source/sim_services/DataTypes/src/CompositeDataType.cpp b/trick_source/sim_services/DataTypes/src/CompositeDataType.cpp
index 50a25c07..0d38c784 100644
--- a/trick_source/sim_services/DataTypes/src/CompositeDataType.cpp
+++ b/trick_source/sim_services/DataTypes/src/CompositeDataType.cpp
@@ -235,7 +235,7 @@ void CompositeDataType::addRegularMember( std::string memberName,
                                                int member_offset,
                                                std::string typeSpecName,
                                                unsigned int n_dims,
-                                               int dims[] ) throw(std::logic_error) {
+                                               int dims[] )  {
 
     int memberCount = memberList.size() ;
     for (int ii=0 ; ii < memberCount ; ii++) {
@@ -256,7 +256,7 @@ void CompositeDataType::addStaticMember( std::string memberName,
                                          void * memberAddress,
                                          std::string typeSpecName,
                                          unsigned int n_dims,
-                                         int dims[] ) throw(std::logic_error) {
+                                         int dims[] )  {
 
     int memberCount = memberList.size() ;
     for (int ii=0 ; ii < memberCount ; ii++) {
diff --git a/trick_source/sim_services/DataTypes/src/EnumDataType.cpp b/trick_source/sim_services/DataTypes/src/EnumDataType.cpp
index 20011d22..0336262d 100644
--- a/trick_source/sim_services/DataTypes/src/EnumDataType.cpp
+++ b/trick_source/sim_services/DataTypes/src/EnumDataType.cpp
@@ -178,7 +178,7 @@ std::string EnumDataType::getTypeSpecName() const {
     return name;
 }
 
-void EnumDataType::addEnumerator( std::string name, int value) throw(std::logic_error) {
+void EnumDataType::addEnumerator( std::string name, int value)  {
 
     Enumerator* enumerator = new Enumerator( name, value );
     enum_list.push_back(enumerator);
diff --git a/trick_source/sim_services/DataTypes/src/EnumDictionary.cpp b/trick_source/sim_services/DataTypes/src/EnumDictionary.cpp
index 46500272..b7f0a85e 100644
--- a/trick_source/sim_services/DataTypes/src/EnumDictionary.cpp
+++ b/trick_source/sim_services/DataTypes/src/EnumDictionary.cpp
@@ -2,7 +2,7 @@
 #include <sstream>
 #include "EnumDictionary.hh"
 
-int EnumDictionary::getValue(std::string name ) throw(std::logic_error) {
+int EnumDictionary::getValue(std::string name )  {
 
     enumDictionaryIterator = enumDictionary.find(name);
     if (enumDictionaryIterator == enumDictionary.end()) {
@@ -14,7 +14,7 @@ int EnumDictionary::getValue(std::string name ) throw(std::logic_error) {
     }
 }
 
-void EnumDictionary::addEnumerator(std::string name, int value) throw(std::logic_error) {
+void EnumDictionary::addEnumerator(std::string name, int value)  {
 
     enumDictionaryIterator = enumDictionary.find(name);
     if (enumDictionaryIterator == enumDictionary.end()) {
diff --git a/trick_source/sim_services/DataTypes/src/PointerDataType.cpp b/trick_source/sim_services/DataTypes/src/PointerDataType.cpp
index 2d47d4c6..0caf4afe 100644
--- a/trick_source/sim_services/DataTypes/src/PointerDataType.cpp
+++ b/trick_source/sim_services/DataTypes/src/PointerDataType.cpp
@@ -36,7 +36,7 @@ bool PointerDataType::initPointerDataType( TypeDictionary * typeDictionary, std:
 }
 
 // CONSTRUCTOR
-PointerDataType:: PointerDataType( TypeDictionary * typeDictionary, std::string typeSpecName, unsigned int n_dims, int dims[]) throw (std::logic_error) {
+PointerDataType:: PointerDataType( TypeDictionary * typeDictionary, std::string typeSpecName, unsigned int n_dims, int dims[])  {
 
    if( this->initPointerDataType( typeDictionary, typeSpecName, n_dims, dims) ) {
        throw std::logic_error("PointerDataType constructor(1) error.");
@@ -44,7 +44,7 @@ PointerDataType:: PointerDataType( TypeDictionary * typeDictionary, std::string
 }
 
 // CONSTRUCTOR
-PointerDataType::PointerDataType( TypeDictionary* typeDictionary, std::string typeSpecifierName) throw (std::logic_error) {
+PointerDataType::PointerDataType( TypeDictionary* typeDictionary, std::string typeSpecifierName)  {
 
    int dims[1] = {-1};
    if( this->initPointerDataType( typeDictionary, typeSpecName, 1, dims) ) {
diff --git a/trick_source/sim_services/DataTypes/src/TypeDictionary.cpp b/trick_source/sim_services/DataTypes/src/TypeDictionary.cpp
index c8f4a018..6842aabd 100644
--- a/trick_source/sim_services/DataTypes/src/TypeDictionary.cpp
+++ b/trick_source/sim_services/DataTypes/src/TypeDictionary.cpp
@@ -38,7 +38,7 @@ const DataType* TypeDictionary::getDataType(std::string name ) {
 }
 
 // MEMBER FUNCTION
-void TypeDictionary::addTypeDefinition(std::string name, DataType * typeSpec) throw (std::logic_error) {
+void TypeDictionary::addTypeDefinition(std::string name, DataType * typeSpec)  {
 
     const DataType* preExistingDataType = getDataType(name);
 
diff --git a/trick_source/sim_services/MemoryManager/MemoryManager.cpp b/trick_source/sim_services/MemoryManager/MemoryManager.cpp
index 0ff7f4cc..3326d82d 100644
--- a/trick_source/sim_services/MemoryManager/MemoryManager.cpp
+++ b/trick_source/sim_services/MemoryManager/MemoryManager.cpp
@@ -11,7 +11,7 @@ int Trick::MemoryManager::instance_count = 0;
 
 // CONSTRUCTOR
 Trick::MemoryManager::MemoryManager()
-    throw (std::logic_error) {
+{
 
 
     // The MemoryManager is a singleton. That is only one instance of it is allowed.
diff --git a/trick_source/trick_utils/interpolator/src/Interpolator.cpp b/trick_source/trick_utils/interpolator/src/Interpolator.cpp
index b27ad6ee..fc2a8a19 100644
--- a/trick_source/trick_utils/interpolator/src/Interpolator.cpp
+++ b/trick_source/trick_utils/interpolator/src/Interpolator.cpp
@@ -5,7 +5,7 @@
 #include "trick/Interpolator.hh"
 
 double Trick::Interpolator::eval (double param[], unsigned int param_index, unsigned int offset)
-        throw (std::logic_error) {
+{
 
     double x, x_lower, x_upper;
     double f_x, f_x_lower, f_x_upper;
@@ -46,13 +46,13 @@ double Trick::Interpolator::eval (double param[], unsigned int param_index, unsi
 }
 
 double Trick::Interpolator::eval (double params[])
-       throw (std::logic_error) {
+{
 
     return ( eval( params, 0,0));
 }
 
 double Trick::Interpolator::eval (double param1, ...)
-       throw (std::logic_error) {
+{
 
     double params[256];
     va_list ap;