[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] certi RTIG/Federation.cc include/certi.hh libCE...
|
From: |
certi-cvs |
|
Subject: |
[certi-cvs] certi RTIG/Federation.cc include/certi.hh libCE... |
|
Date: |
Tue, 24 Jun 2008 12:23:32 +0000 |
CVSROOT: /sources/certi
Module name: certi
Changes by: ROUSSELOT <rousse> 08/06/24 12:23:32
Modified files:
RTIG : Federation.cc
include : certi.hh
libCERTI : Interaction.cc Message.cc SecurityLevel.hh
Removed files:
libCERTI : ObjectBroadcastLine.hh
Log message:
Summer cleaning
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/Federation.cc?cvsroot=certi&r1=3.93&r2=3.94
http://cvs.savannah.gnu.org/viewcvs/certi/include/certi.hh?cvsroot=certi&r1=3.31&r2=3.32
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Interaction.cc?cvsroot=certi&r1=3.40&r2=3.41
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Message.cc?cvsroot=certi&r1=3.58&r2=3.59
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SecurityLevel.hh?cvsroot=certi&r1=3.9&r2=3.10
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectBroadcastLine.hh?cvsroot=certi&r1=3.5&r2=0
Patches:
Index: RTIG/Federation.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/Federation.cc,v
retrieving revision 3.93
retrieving revision 3.94
diff -u -b -r3.93 -r3.94
--- RTIG/Federation.cc 23 Jun 2008 13:25:06 -0000 3.93
+++ RTIG/Federation.cc 24 Jun 2008 12:23:31 -0000 3.94
@@ -18,7 +18,7 @@
// along with this program ; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// $Id: Federation.cc,v 3.93 2008/06/23 13:25:06 erk Exp $
+// $Id: Federation.cc,v 3.94 2008/06/24 12:23:31 rousse Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -404,7 +404,7 @@
// ----------------------------------------------------------------------------
/*! Add the Federate to the Federation, and return its new federate handle.
- MAX_FEDERATE is the maximum number of federates per federation. Also send
+ Also send
Null messages from all others federates to initialize its LBTS, and
finally a RequestPause message if the Federation is already paused.
*/
@@ -2279,5 +2279,5 @@
}} // namespace certi/rtig
-// $Id: Federation.cc,v 3.93 2008/06/23 13:25:06 erk Exp $
+// $Id: Federation.cc,v 3.94 2008/06/24 12:23:31 rousse Exp $
Index: include/certi.hh
===================================================================
RCS file: /sources/certi/certi/include/certi.hh,v
retrieving revision 3.31
retrieving revision 3.32
diff -u -b -r3.31 -r3.32
--- include/certi.hh 24 Jun 2008 08:56:48 -0000 3.31
+++ include/certi.hh 24 Jun 2008 12:23:31 -0000 3.32
@@ -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: certi.hh,v 3.31 2008/06/24 08:56:48 rousse Exp $
+// $Id: certi.hh,v 3.32 2008/06/24 12:23:31 rousse Exp $
// ----------------------------------------------------------------------------
#include <vector>
@@ -91,18 +91,6 @@
* The CERTI library contains CERTI specific HLA implementation
*/
-// Deprecated HLA macros still in use
-// Will be suppressed asap
-//#define MAX_BYTES_PER_VALUE 500
-//#define MAX_FEDERATE_NAME_LENGTH 64
-//#undef MAX_USER_TAG_LENGTH
-//#define MAX_USER_TAG_LENGTH 64
-//#undef MAX_ATTRIBUTES_PER_CLASS
-//#define MAX_ATTRIBUTES_PER_CLASS 50
-//#define MAX_BYTES_PER_VALUETYPE 128
-//#undef MAX_PARAMETERS_PER_CLASS
-//#define MAX_PARAMETERS_PER_CLASS 50
-
// next used in RTIG::processIncomingMessage method
#define BUFFER_EXCEPTION_REASON_SIZE 256
@@ -237,7 +225,6 @@
RTI_EXCEPT(NetworkError)
// Deprecated HLA types still in use
-//typedef char AttributeValue[MAX_BYTES_PER_VALUE + 1] ;
typedef char *AttributeValue ;
// typedef std::vector<char> AttributeValue;
@@ -247,8 +234,7 @@
typedef AttributeValue ParameterValue ;
typedef char *ParameterName ;
typedef AttributeValue ValueName ;
-//typedef char ValueType[MAX_BYTES_PER_VALUETYPE + 1] ;
-// typedef std::vector<char> ValueType;
+
struct Value {
ValueName name ;
ValueName value ;
@@ -384,4 +370,4 @@
(uint64_t) CERTI_INT64_CONSTANT(0xff00000000000000U)) >> 56)))
#endif // CERTI_HH_INCLUDED
-// $Id: certi.hh,v 3.31 2008/06/24 08:56:48 rousse Exp $
+// $Id: certi.hh,v 3.32 2008/06/24 12:23:31 rousse Exp $
Index: libCERTI/Interaction.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Interaction.cc,v
retrieving revision 3.40
retrieving revision 3.41
diff -u -b -r3.40 -r3.41
--- libCERTI/Interaction.cc 24 Jun 2008 08:56:49 -0000 3.40
+++ libCERTI/Interaction.cc 24 Jun 2008 12:23:31 -0000 3.41
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Interaction.cc,v 3.40 2008/06/24 08:56:49 rousse Exp $
+// $Id: Interaction.cc,v 3.41 2008/06/24 12:23:31 rousse Exp $
// ----------------------------------------------------------------------------
@@ -498,28 +498,6 @@
return ibList ;
}
-// ----------------------------------------------------------------------------
-//! Change the interaction name.
-// Name attribute access(GetName reference must be considered READ-ONLY).
-// NewName length must be lower or equal to MAX_USER_TAG_LENGTH.
-//void
-//Interaction::setName(const char *new_name)
-// throw (ValueLengthExceeded, RTIinternalError)
-//{
-// std::stringstream msg;
-//
-// if (strlen(new_name)>MAX_USER_TAG_LENGTH) {
-// msg <<"<"<< new_name <<"> length <"<< strlen(new_name)
-// <<"> exceed MAX_USER_TAG_LENGTH =
"<<MAX_USER_TAG_LENGTH;
-// throw ValueLengthExceeded(msg.str().c_str());
-// }
-//
-// if (new_name==0) {
-// Named::setName("");
-// } else {
-// Named::setName(new_name);
-// }
-//}
// ----------------------------------------------------------------------------
//! Change the level ID.
@@ -552,4 +530,4 @@
} // namespace certi
-// $Id: Interaction.cc,v 3.40 2008/06/24 08:56:49 rousse Exp $
+// $Id: Interaction.cc,v 3.41 2008/06/24 12:23:31 rousse Exp $
Index: libCERTI/Message.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Message.cc,v
retrieving revision 3.58
retrieving revision 3.59
diff -u -b -r3.58 -r3.59
--- libCERTI/Message.cc 24 Jun 2008 08:56:49 -0000 3.58
+++ libCERTI/Message.cc 24 Jun 2008 12:23:31 -0000 3.59
@@ -564,8 +564,8 @@
// ----------------------------------------------------------------------------
// setTag
-/** Store Tag into a Message (i.e. in tag, size is limited by
MAX_USER_TAG_LENGTH)
- @param new_tag tag (NULL tag is stored as an empty string)
+/** Store Tag into a Message
+ @param new_tag tag
*/
void
Message::setTag(std::string new_tag)
Index: libCERTI/SecurityLevel.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/SecurityLevel.hh,v
retrieving revision 3.9
retrieving revision 3.10
diff -u -b -r3.9 -r3.10
--- libCERTI/SecurityLevel.hh 16 Jun 2008 09:03:24 -0000 3.9
+++ libCERTI/SecurityLevel.hh 24 Jun 2008 12:23:31 -0000 3.10
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: SecurityLevel.hh,v 3.9 2008/06/16 09:03:24 rousse Exp $
+// $Id: SecurityLevel.hh,v 3.10 2008/06/24 12:23:31 rousse Exp $
// ----------------------------------------------------------------------------
#ifndef _CERTI_SECURITY_LEVEL_HH
@@ -32,7 +32,7 @@
#define MAX_SECURITYLEVELNAME 500
-typedef char *SecurityLevelName ; // Max length MAX_USER_TAG_LENGTH
+typedef char *SecurityLevelName ;
typedef unsigned short SecurityLevelID ;
#define PublicLevelID 0
@@ -68,4 +68,4 @@
#endif // _CERTI_SECURITY_LEVEL_HH
-// $Id: SecurityLevel.hh,v 3.9 2008/06/16 09:03:24 rousse Exp $
+// $Id: SecurityLevel.hh,v 3.10 2008/06/24 12:23:31 rousse Exp $
Index: libCERTI/ObjectBroadcastLine.hh
===================================================================
RCS file: libCERTI/ObjectBroadcastLine.hh
diff -N libCERTI/ObjectBroadcastLine.hh
--- libCERTI/ObjectBroadcastLine.hh 11 Mar 2005 13:42:17 -0000 3.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,48 +0,0 @@
-// ----------------------------------------------------------------------------
-// CERTI - HLA RunTime Infrastructure
-// Copyright (C) 2002, 2003 ONERA
-//
-// This file is part of CERTI-libCERTI
-//
-// CERTI-libCERTI is free software ; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public License
-// as published by the Free Software Foundation ; either version 2 of
-// the License, or (at your option) any later version.
-//
-// CERTI-libCERTI is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY ; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// 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: ObjectBroadcastLine.hh,v 3.5 2005/03/11 13:42:17 breholee Exp $
-// ----------------------------------------------------------------------------
-
-// Classe privee pour les listes de diffusion. Les *BroadcastLine
-// decrivent une ligne des listes de diffusion.
-
-#ifndef _CERTI_OBJECT_BROADCAST_LINE_HH
-#define _CERTI_OBJECT_BROADCAST_LINE_HH
-
-namespace certi {
-
-class ObjectBroadcastLine {
-public:
- enum State {
- sent, waiting, notSub
- };
-
- FederateHandle Federate ;
- State state[MAX_ATTRIBUTES_PER_CLASS + 1] ;
-
- ObjectBroadcastLine(FederateHandle theFederate,
- State theInitialState = notSub);
-};
-
-}
-
-#endif // _CERTI_OBJECT_BROADCAST_LINE_HH