[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] certi RTIA/ObjectManagement.cc RTIA/RTIA_federa...
From: |
certi-cvs |
Subject: |
[certi-cvs] certi RTIA/ObjectManagement.cc RTIA/RTIA_federa... |
Date: |
Tue, 27 May 2008 12:26:54 +0000 |
CVSROOT: /sources/certi
Module name: certi
Changes by: Mathé <jmm> 08/05/27 12:26:54
Modified files:
RTIA : ObjectManagement.cc RTIA_federate.cc
libCERTI : PrettyDebug.cc
Log message:
Fix bug #23358 : libgen.h missing
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/ObjectManagement.cc?cvsroot=certi&r1=3.44&r2=3.45
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/RTIA_federate.cc?cvsroot=certi&r1=3.78&r2=3.79
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/PrettyDebug.cc?cvsroot=certi&r1=4.8&r2=4.9
Patches:
Index: RTIA/ObjectManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/ObjectManagement.cc,v
retrieving revision 3.44
retrieving revision 3.45
diff -u -b -r3.44 -r3.45
--- RTIA/ObjectManagement.cc 27 May 2008 07:51:54 -0000 3.44
+++ RTIA/ObjectManagement.cc 27 May 2008 12:26:53 -0000 3.45
@@ -18,7 +18,6 @@
// along with this program ; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// $Id: ObjectManagement.cc,v 3.44 2008/05/27 07:51:54 rousse Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -711,7 +710,7 @@
G.Out(pdGendoc,"exit ObjectManagement::getObjectClassHandle");
return handle;
}
- catch (NameNotFound &e) {
+ catch (NameNotFound) {
G.Out(pdGendoc,"exit ObjectManagement::getObjectClassHandle on
NameNotFound");
throw NameNotFound(theName);
}
@@ -756,7 +755,7 @@
G.Out(pdGendoc,"exit ObjectManagement::getAttributeHandle");
return handle;
}
- catch (NameNotFound &e) {
+ catch (NameNotFound) {
G.Out(pdGendoc,"exit ObjectManagement::getAttributeHandle on
NameNotFound");
throw NameNotFound(theName);
}
@@ -819,5 +818,3 @@
}
}} // namespace certi/rtia
-
-// $Id: ObjectManagement.cc,v 3.44 2008/05/27 07:51:54 rousse Exp $
Index: RTIA/RTIA_federate.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/RTIA_federate.cc,v
retrieving revision 3.78
retrieving revision 3.79
diff -u -b -r3.78 -r3.79
--- RTIA/RTIA_federate.cc 27 May 2008 07:51:55 -0000 3.78
+++ RTIA/RTIA_federate.cc 27 May 2008 12:26:53 -0000 3.79
@@ -18,7 +18,6 @@
// along with this program ; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// $Id: RTIA_federate.cc,v 3.78 2008/05/27 07:51:55 rousse Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -49,7 +48,7 @@
#ifdef _WIN32
_timeb timev;
_ftime(&timev);
- result = timev.time + timev.millitm/1000;
+ result = static_cast<RTI::TickTime>(timev.time + timev.millitm/1000);
#else
struct timeval timev;
gettimeofday(&timev, NULL);
@@ -1435,5 +1434,3 @@
}
}} // namespace certi/rtia
-
-// $Id: RTIA_federate.cc,v 3.78 2008/05/27 07:51:55 rousse Exp $
Index: libCERTI/PrettyDebug.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/PrettyDebug.cc,v
retrieving revision 4.8
retrieving revision 4.9
diff -u -b -r4.8 -r4.9
--- libCERTI/PrettyDebug.cc 16 May 2008 08:54:16 -0000 4.8
+++ libCERTI/PrettyDebug.cc 27 May 2008 12:26:54 -0000 4.9
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: PrettyDebug.cc,v 4.8 2008/05/16 08:54:16 rousse Exp $
+// $Id: PrettyDebug.cc,v 4.9 2008/05/27 12:26:54 jmm Exp $
// ----------------------------------------------------------------------------
@@ -39,8 +39,8 @@
#include <sys/time.h>
#include <unistd.h>
#include <string>
+ #include <libgen.h>
#endif
-#include <libgen.h>
using std::cout ;
using std::cerr ;
@@ -275,4 +275,4 @@
#endif // NDEBUG
-// $Id: PrettyDebug.cc,v 4.8 2008/05/16 08:54:16 rousse Exp $
+// $Id: PrettyDebug.cc,v 4.9 2008/05/27 12:26:54 jmm Exp $