[certi-cvs] certi/libRTI RTIambPrivateRefs.cc RTIambassador...

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Petr Gotthard <gotthardp>       09/06/12 08:59:29

Modified files:
        libRTI         : RTIambPrivateRefs.cc RTIambassador.cc 
                         RTItypesImp.cc 

Log message:
        Bugfix: Only RTI exceptions may be used libRTI.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/RTIambPrivateRefs.cc?cvsroot=certi&r1=3.19&r2=3.20
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/RTIambassador.cc?cvsroot=certi&r1=3.103&r2=3.104
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/RTItypesImp.cc?cvsroot=certi&r1=3.4&r2=3.5

Patches:
Index: RTIambPrivateRefs.cc
===================================================================
RCS file: /sources/certi/certi/libRTI/RTIambPrivateRefs.cc,v
retrieving revision 3.19
retrieving revision 3.20
diff -u -b -r3.19 -r3.20
--- RTIambPrivateRefs.cc        21 Apr 2009 13:54:02 -0000      3.19
+++ RTIambPrivateRefs.cc        12 Jun 2009 08:59:28 -0000      3.20
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: RTIambPrivateRefs.cc,v 3.19 2009/04/21 13:54:02 siron Exp $
+// $Id: RTIambPrivateRefs.cc,v 3.20 2009/06/12 08:59:28 gotthardp Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -578,7 +578,7 @@
 }
 
 #define CATCH_FEDERATE_AMBASSADOR_EXCEPTIONS(service) \
-    catch (Exception &e) { \
+    catch (RTI::Exception &e) { \
         std::stringstream msg; \
         msg << "Error in " << service << ": " << e._name << "[" << e._reason 
<< "]"; \
         throw RTI::RTIinternalError(msg.str().c_str()); \
@@ -912,4 +912,4 @@
     }
 }
 
-// $Id: RTIambPrivateRefs.cc,v 3.19 2009/04/21 13:54:02 siron Exp $
+// $Id: RTIambPrivateRefs.cc,v 3.20 2009/06/12 08:59:28 gotthardp Exp $

Index: RTIambassador.cc
===================================================================
RCS file: /sources/certi/certi/libRTI/RTIambassador.cc,v
retrieving revision 3.103
retrieving revision 3.104
diff -u -b -r3.103 -r3.104
--- RTIambassador.cc    7 Jun 2009 15:08:46 -0000       3.103
+++ RTIambassador.cc    12 Jun 2009 08:59:28 -0000      3.104
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: RTIambassador.cc,v 3.103 2009/06/07 15:08:46 gotthardp Exp $
+// $Id: RTIambassador.cc,v 3.104 2009/06/12 08:59:28 gotthardp Exp $
 // ----------------------------------------------------------------------------
 
 #include "RTI.hh"
@@ -233,8 +233,8 @@
  */
 RTI::Boolean
 RTI::RTIambassador::tick()
-    throw (SpecifiedSaveLabelDoesNotExist,
-           ConcurrentAccessAttempted,
+    throw (RTI::SpecifiedSaveLabelDoesNotExist,
+           RTI::ConcurrentAccessAttempted,
            RTI::RTIinternalError)
 {
    __tick_kernel(RTI_FALSE, 0.0, 0.0);
@@ -1937,9 +1937,9 @@
        region.commit();
     }
     catch (std::bad_cast) {
-       throw RegionNotKnown("");
+       throw RTI::RegionNotKnown("");
     }
-    catch (Exception &e) {
+    catch (RTI::Exception &e) {
        throw ;
     }
 }
@@ -2948,4 +2948,4 @@
     privateRefs->executeService(&req, &rep);
 }
 
-// $Id: RTIambassador.cc,v 3.103 2009/06/07 15:08:46 gotthardp Exp $
+// $Id: RTIambassador.cc,v 3.104 2009/06/12 08:59:28 gotthardp Exp $

Index: RTItypesImp.cc
===================================================================
RCS file: /sources/certi/certi/libRTI/RTItypesImp.cc,v
retrieving revision 3.4
retrieving revision 3.5
diff -u -b -r3.4 -r3.5
--- RTItypesImp.cc      7 Jun 2009 15:08:46 -0000       3.4
+++ RTItypesImp.cc      12 Jun 2009 08:59:28 -0000      3.5
@@ -16,7 +16,7 @@
 // License along with this program ; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 //
-// $Id: RTItypesImp.cc,v 3.4 2009/06/07 15:08:46 gotthardp Exp $
+// $Id: RTItypesImp.cc,v 3.5 2009/06/12 08:59:28 gotthardp Exp $
 // ----------------------------------------------------------------------------
 
 #include "certi.hh"
@@ -557,9 +557,9 @@
 void RegionImp::commit()
 {
     if (extents.size() != effectiveExtents.size())
-        throw InvalidExtents("Different number of extents");
+        throw RTI::InvalidExtents("Different number of extents");
 
     effectiveExtents = extents;
 }
 
-// $Id: RTItypesImp.cc,v 3.4 2009/06/07 15:08:46 gotthardp Exp $
+// $Id: RTItypesImp.cc,v 3.5 2009/06/12 08:59:28 gotthardp Exp $