[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] certi RTIG/FederationsList.cc RTIG/Federation.c...
|
From: |
certi-cvs |
|
Subject: |
[certi-cvs] certi RTIG/FederationsList.cc RTIG/Federation.c... |
|
Date: |
Sun, 07 Mar 2010 21:30:31 +0000 |
CVSROOT: /sources/certi
Module name: certi
Changes by: Eric NOULARD <erk> 10/03/07 21:30:31
Modified files:
RTIG : FederationsList.cc Federation.cc
FederationsList.hh Federation.hh
libCERTI : Extent.hh Dimension.cc FedRegion.cc
Interaction.cc InteractionSet.hh ObjectClass.cc
Interaction.hh InteractionSet.cc
NetworkMessage.cc BaseRegion.hh BaseRegion.cc
GAV.hh GAV.cc Dimension.hh Extent.cc
FedRegion.hh ObjectSet.cc ObjectSet.hh
NetworkMessage.hh ObjectClassBroadcastList.cc
RTIA : DeclarationManagement.cc ObjectManagement.cc
RTIA_network.cc ObjectManagement.hh
include : certi.hh
Log message:
Suppress ULong UShort types and
use stdint "normalized" types: uint32_t / uint16_t etc...
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/FederationsList.cc?cvsroot=certi&r1=3.68&r2=3.69
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/Federation.cc?cvsroot=certi&r1=3.122&r2=3.123
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/FederationsList.hh?cvsroot=certi&r1=3.52&r2=3.53
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/Federation.hh?cvsroot=certi&r1=3.63&r2=3.64
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Extent.hh?cvsroot=certi&r1=3.11&r2=3.12
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Dimension.cc?cvsroot=certi&r1=3.8&r2=3.9
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/FedRegion.cc?cvsroot=certi&r1=3.5&r2=3.6
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Interaction.cc?cvsroot=certi&r1=3.59&r2=3.60
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/InteractionSet.hh?cvsroot=certi&r1=3.26&r2=3.27
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectClass.cc?cvsroot=certi&r1=3.77&r2=3.78
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Interaction.hh?cvsroot=certi&r1=3.40&r2=3.41
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/InteractionSet.cc?cvsroot=certi&r1=3.31&r2=3.32
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NetworkMessage.cc?cvsroot=certi&r1=3.44&r2=3.45
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/BaseRegion.hh?cvsroot=certi&r1=3.2&r2=3.3
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/BaseRegion.cc?cvsroot=certi&r1=3.5&r2=3.6
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/GAV.hh?cvsroot=certi&r1=3.15&r2=3.16
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/GAV.cc?cvsroot=certi&r1=3.21&r2=3.22
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Dimension.hh?cvsroot=certi&r1=3.9&r2=3.10
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Extent.cc?cvsroot=certi&r1=3.13&r2=3.14
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/FedRegion.hh?cvsroot=certi&r1=3.4&r2=3.5
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectSet.cc?cvsroot=certi&r1=3.27&r2=3.28
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectSet.hh?cvsroot=certi&r1=3.15&r2=3.16
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NetworkMessage.hh?cvsroot=certi&r1=3.57&r2=3.58
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectClassBroadcastList.cc?cvsroot=certi&r1=3.27&r2=3.28
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/DeclarationManagement.cc?cvsroot=certi&r1=3.30&r2=3.31
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/ObjectManagement.cc?cvsroot=certi&r1=3.65&r2=3.66
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/RTIA_network.cc?cvsroot=certi&r1=3.33&r2=3.34
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/ObjectManagement.hh?cvsroot=certi&r1=3.32&r2=3.33
http://cvs.savannah.gnu.org/viewcvs/certi/include/certi.hh?cvsroot=certi&r1=3.44&r2=3.45
Patches:
Index: RTIG/FederationsList.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/FederationsList.cc,v
retrieving revision 3.68
retrieving revision 3.69
diff -u -b -r3.68 -r3.69
--- RTIG/FederationsList.cc 20 Nov 2009 22:43:46 -0000 3.68
+++ RTIG/FederationsList.cc 7 Mar 2010 21:30:30 -0000 3.69
@@ -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: FederationsList.cc,v 3.68 2009/11/20 22:43:46 erk Exp $
+// $Id: FederationsList.cc,v 3.69 2010/03/07 21:30:30 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -499,7 +499,7 @@
ObjectHandle id,
std::vector <AttributeHandle> &attributes,
std::vector <AttributeValue_t> &values,
- UShort list_size,
+ uint16_t list_size,
FederationTime time,
const std::string& tag)
throw (FederateNotExecutionMember,
@@ -526,7 +526,7 @@
ObjectHandle id,
std::vector <AttributeHandle> &attributes,
std::vector <AttributeValue_t> &values,
- UShort list_size,
+ uint16_t list_size,
const std::string& tag)
throw (FederateNotExecutionMember,
FederationExecutionDoesNotExist,
@@ -551,7 +551,7 @@
InteractionClassHandle interaction,
std::vector <ParameterHandle> ¶meters,
std::vector <ParameterValue_t> &values,
- UShort list_size,
+ uint16_t list_size,
FederationTime time,
RegionHandle region,
const std::string& tag)
@@ -584,7 +584,7 @@
InteractionClassHandle interaction,
std::vector <ParameterHandle> ¶meters,
std::vector <ParameterValue_t> &values,
- UShort list_size,
+ uint16_t list_size,
RegionHandle region,
const std::string& tag)
throw (FederateNotExecutionMember,
@@ -742,7 +742,7 @@
FederateHandle federate,
ObjectClassHandle object_class,
std::vector <AttributeHandle> &attributes,
- UShort list_size,
+ uint16_t list_size,
bool pub)
throw (ObjectClassNotDefined,
AttributeNotDefined,
@@ -789,7 +789,7 @@
FederateHandle federate,
ObjectClassHandle object_class,
std::vector <AttributeHandle> &attributes,
- UShort list_size)
+ uint16_t list_size)
throw (ObjectClassNotDefined,
AttributeNotDefined,
FederationExecutionDoesNotExist,
@@ -951,7 +951,7 @@
FederateHandle federate,
ObjectHandle id,
std::vector <AttributeHandle>
&attributes,
- UShort list_size,
+ uint16_t list_size,
const std::string& tag)
throw (FederateNotExecutionMember,
ObjectNotKnown,
@@ -977,7 +977,7 @@
FederateHandle federate,
ObjectHandle id,
std::vector <AttributeHandle> &attributes,
- UShort list_size)
+ uint16_t list_size)
throw (ObjectNotKnown,
ObjectClassNotPublished,
AttributeNotDefined,
@@ -1002,7 +1002,7 @@
FederateHandle federate,
ObjectHandle id,
std::vector <AttributeHandle> &attributes,
- UShort list_size)
+ uint16_t list_size)
throw (ObjectNotKnown,
AttributeNotDefined,
AttributeNotOwned,
@@ -1023,7 +1023,7 @@
FederateHandle federate,
ObjectHandle id,
std::vector <AttributeHandle> &attributes,
- UShort list_size,
+ uint16_t list_size,
const std::string& tag)
throw (ObjectNotKnown,
ObjectClassNotPublished,
@@ -1048,7 +1048,7 @@
FederateHandle federate,
ObjectHandle id,
std::vector <AttributeHandle> &attributes,
- UShort list_size)
+ uint16_t list_size)
throw (ObjectNotKnown, AttributeNotDefined, AttributeNotOwned,
AttributeDivestitureWasNotRequested, FederateNotExecutionMember,
SaveInProgress, RestoreInProgress, RTIinternalError)
@@ -1069,7 +1069,7 @@
FederateHandle federate,
ObjectHandle id,
std::vector <AttributeHandle> &attributes,
- UShort list_size)
+ uint16_t list_size)
throw (ObjectNotKnown,
AttributeNotDefined,
AttributeNotOwned,
@@ -1094,7 +1094,7 @@
FederateHandle federate,
ObjectHandle id,
std::vector <AttributeHandle> &attributes,
- UShort list_size)
+ uint16_t list_size)
throw (ObjectNotKnown,
AttributeNotDefined,
AttributeAlreadyOwned,
@@ -1380,7 +1380,7 @@
FederateHandle federate,
ObjectHandle id,
std::vector <AttributeHandle> &attributes,
- UShort list_size)
+ uint16_t list_size)
throw (ObjectNotKnown,
FederationExecutionDoesNotExist,
RTIinternalError)
@@ -1395,5 +1395,5 @@
}} // certi::rtig
-// EOF $Id: FederationsList.cc,v 3.68 2009/11/20 22:43:46 erk Exp $
+// EOF $Id: FederationsList.cc,v 3.69 2010/03/07 21:30:30 erk Exp $
Index: RTIG/Federation.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/Federation.cc,v
retrieving revision 3.122
retrieving revision 3.123
diff -u -b -r3.122 -r3.123
--- RTIG/Federation.cc 1 Mar 2010 16:44:28 -0000 3.122
+++ RTIG/Federation.cc 7 Mar 2010 21:30:30 -0000 3.123
@@ -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.122 2010/03/01 16:44:28 erk Exp $
+// $Id: Federation.cc,v 3.123 2010/03/07 21:30:30 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -837,7 +837,7 @@
InteractionClassHandle interaction,
std::vector <ParameterHandle>
¶meter_handles,
std::vector <ParameterValue_t>
¶meter_values,
- UShort list_size,
+ uint16_t list_size,
FederationTime time,
RegionHandle region_handle,
const std::string& tag)
@@ -886,7 +886,7 @@
InteractionClassHandle interaction,
std::vector <ParameterHandle>
¶meter_handles,
std::vector <ParameterValue_t>
¶meter_values,
- UShort list_size,
+ uint16_t list_size,
RegionHandle region_handle,
const std::string& tag)
throw (FederateNotExecutionMember,
@@ -1538,7 +1538,7 @@
Federation::publishObject(FederateHandle federate,
ObjectClassHandle object,
std::vector <AttributeHandle> &attributes,
- UShort list_size,
+ uint16_t list_size,
bool pub)
throw (ObjectClassNotDefined,
AttributeNotDefined,
@@ -1769,7 +1769,7 @@
Federation::subscribeObject(FederateHandle federate,
ObjectClassHandle object,
std::vector <AttributeHandle> &attributes,
- UShort list_size)
+ uint16_t list_size)
throw (ObjectClassNotDefined,
AttributeNotDefined,
FederateNotExecutionMember,
@@ -1885,7 +1885,7 @@
ObjectHandle objectHandle,
std::vector <AttributeHandle> &attributes,
std::vector <AttributeValue_t> &values,
- UShort list_size,
+ uint16_t list_size,
FederationTime time,
const std::string& tag)
throw (FederateNotExecutionMember,
@@ -1920,7 +1920,7 @@
ObjectHandle objectHandle,
std::vector <AttributeHandle> &attributes,
std::vector <AttributeValue_t> &values,
- UShort list_size,
+ uint16_t list_size,
const std::string& tag)
throw (FederateNotExecutionMember,
ObjectNotKnown,
@@ -2026,7 +2026,7 @@
Federation::negotiateDivestiture(FederateHandle federate,
ObjectHandle objectHandle,
std::vector <AttributeHandle> &attribs,
- UShort list_size,
+ uint16_t list_size,
const std::string& tag)
throw (FederateNotExecutionMember,
ObjectNotKnown,
@@ -2054,7 +2054,7 @@
Federation::acquireIfAvailable(FederateHandle federate,
ObjectHandle objectHandle,
std::vector <AttributeHandle> &attribs,
- UShort list_size)
+ uint16_t list_size)
throw (ObjectNotKnown,
ObjectClassNotPublished,
AttributeNotDefined,
@@ -2083,7 +2083,7 @@
Federation::divest(FederateHandle federate,
ObjectHandle objectHandle,
std::vector <AttributeHandle> &attrs,
- UShort list_size)
+ uint16_t list_size)
throw (ObjectNotKnown,
AttributeNotDefined,
AttributeNotOwned,
@@ -2109,7 +2109,7 @@
Federation::acquire(FederateHandle federate,
ObjectHandle objectHandle,
std::vector <AttributeHandle> &attributes,
- UShort list_size,
+ uint16_t list_size,
const std::string& tag)
throw (ObjectNotKnown,
ObjectClassNotPublished,
@@ -2140,7 +2140,7 @@
Federation::cancelDivestiture(FederateHandle federate,
ObjectHandle id,
std::vector <AttributeHandle> &attributes,
- UShort list_size)
+ uint16_t list_size)
throw (ObjectNotKnown,
AttributeNotDefined,
AttributeNotOwned,
@@ -2169,7 +2169,7 @@
Federation::respondRelease(FederateHandle federate,
ObjectHandle objectHandle,
std::vector <AttributeHandle> &attributes,
- UShort list_size)
+ uint16_t list_size)
throw (ObjectNotKnown,
AttributeNotDefined,
AttributeNotOwned,
@@ -2198,7 +2198,7 @@
Federation::cancelAcquisition(FederateHandle federate,
ObjectHandle objectHandle,
std::vector <AttributeHandle> &attributes,
- UShort list_size)
+ uint16_t list_size)
throw (ObjectNotKnown,
AttributeNotDefined,
AttributeAlreadyOwned,
@@ -2505,7 +2505,7 @@
xmlSetProp(federation, (const xmlChar *) "name", (const xmlChar *)
name.c_str());
char t[10] ;
- sprintf(t, "%ld", handle);
+ sprintf(t, "%u", handle);
xmlSetProp(federation, (const xmlChar *) "handle", (const xmlChar *) t);
xmlNodePtr federate ;
@@ -2517,7 +2517,7 @@
(const xmlChar *) "name",
(const xmlChar *) i->second.getName().c_str());
- sprintf(t, "%ld", i->second.getHandle());
+ sprintf(t, "%u", i->second.getHandle());
xmlSetProp(federate, (const xmlChar *) "handle", (const xmlChar *) t);
xmlSetProp(federate,
@@ -2542,7 +2542,7 @@
Federation::requestObjectOwner(FederateHandle theFederateHandle,
ObjectHandle theObject,
std::vector <AttributeHandle> &theAttributeList,
- UShort theListSize)
+ uint16_t theListSize)
throw (ObjectNotKnown)
{
FederateHandle theOwnerHandle ;
@@ -2582,5 +2582,5 @@
}} // namespace certi/rtig
-// $Id: Federation.cc,v 3.122 2010/03/01 16:44:28 erk Exp $
+// $Id: Federation.cc,v 3.123 2010/03/07 21:30:30 erk Exp $
Index: RTIG/FederationsList.hh
===================================================================
RCS file: /sources/certi/certi/RTIG/FederationsList.hh,v
retrieving revision 3.52
retrieving revision 3.53
diff -u -b -r3.52 -r3.53
--- RTIG/FederationsList.hh 20 Nov 2009 22:43:46 -0000 3.52
+++ RTIG/FederationsList.hh 7 Mar 2010 21:30:30 -0000 3.53
@@ -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: FederationsList.hh,v 3.52 2009/11/20 22:43:46 erk Exp $
+// $Id: FederationsList.hh,v 3.53 2010/03/07 21:30:30 erk Exp $
// ----------------------------------------------------------------------------
#ifndef _CERTI_RTIG_FEDERATIONS_LIST_HH
@@ -290,7 +290,7 @@
FederateHandle theFederateHandle,
ObjectClassHandle theObjectHandle,
std::vector <AttributeHandle> &theAttributeList,
- UShort theListSize,
+ uint16_t theListSize,
bool pub)
throw (ObjectClassNotDefined,
AttributeNotDefined,
@@ -305,7 +305,7 @@
FederateHandle theFederateHandle,
ObjectClassHandle theObjectHandle,
std::vector <AttributeHandle> &theAttributeList,
- UShort theListSize)
+ uint16_t theListSize)
throw (ObjectClassNotDefined,
AttributeNotDefined,
FederationExecutionDoesNotExist,
@@ -332,7 +332,7 @@
FederateHandle federate,
ObjectHandle id,
std::vector <AttributeHandle> &attributes,
- UShort list_size)
+ uint16_t list_size)
throw (ObjectNotKnown,
FederationExecutionDoesNotExist,
RTIinternalError);
@@ -369,7 +369,7 @@
ObjectHandle theObjectHandle,
std::vector <AttributeHandle> &theAttributeList,
std::vector <AttributeValue_t> &theValueList,
- UShort theListSize,
+ uint16_t theListSize,
FederationTime theTime,
const std::string& theTag)
throw (FederateNotExecutionMember,
@@ -386,7 +386,7 @@
ObjectHandle theObjectHandle,
std::vector <AttributeHandle> &theAttributeList,
std::vector <AttributeValue_t> &theValueList,
- UShort theListSize,
+ uint16_t theListSize,
const std::string& theTag)
throw (FederateNotExecutionMember,
FederationExecutionDoesNotExist,
@@ -430,7 +430,7 @@
InteractionClassHandle theInteractionHandle,
std::vector <ParameterHandle> &theParameterList,
std::vector <ParameterValue_t> &theValueList,
- UShort theListSize,
+ uint16_t theListSize,
FederationTime theTime,
RegionHandle,
const std::string& theTag)
@@ -448,7 +448,7 @@
InteractionClassHandle theInteractionHandle,
std::vector <ParameterHandle> &theParameterList,
std::vector <ParameterValue_t> &theValueList,
- UShort theListSize,
+ uint16_t theListSize,
RegionHandle,
const std::string& theTag)
throw (FederateNotExecutionMember,
@@ -489,7 +489,7 @@
FederateHandle,
ObjectHandle,
std::vector <AttributeHandle>&,
- UShort,
+ uint16_t,
const std::string& )
throw (FederateNotExecutionMember,
ObjectNotKnown,
@@ -504,7 +504,7 @@
FederateHandle,
ObjectHandle,
std::vector <AttributeHandle>&,
- UShort)
+ uint16_t)
throw (ObjectNotKnown,
ObjectClassNotPublished,
AttributeNotDefined,
@@ -520,7 +520,7 @@
FederateHandle,
ObjectHandle,
std::vector <AttributeHandle>&,
- UShort)
+ uint16_t)
throw (ObjectNotKnown,
AttributeNotDefined,
AttributeNotOwned,
@@ -533,7 +533,7 @@
FederateHandle theFederateHandle,
ObjectHandle theObjectHandle,
std::vector <AttributeHandle> &theAttributeList,
- UShort theListSize,
+ uint16_t theListSize,
const std::string& theTag)
throw (ObjectNotKnown,
ObjectClassNotPublished,
@@ -549,7 +549,7 @@
FederateHandle theFederateHandle,
ObjectHandle theObjectHandle,
std::vector <AttributeHandle> &theAttributeList,
- UShort theListSize)
+ uint16_t theListSize)
throw (ObjectNotKnown,
AttributeNotDefined,
AttributeNotOwned,
@@ -563,7 +563,7 @@
FederateHandle theFederateHandle,
ObjectHandle theObjectHandle,
std::vector <AttributeHandle>
&theAttributeList,
- UShort theListSize)
+ uint16_t theListSize)
throw (ObjectNotKnown,
AttributeNotDefined,
AttributeNotOwned,
@@ -577,7 +577,7 @@
FederateHandle theFederateHandle,
ObjectHandle theObjectHandle,
std::vector <AttributeHandle> &theAttributeList,
- UShort theListSize)
+ uint16_t theListSize)
throw (ObjectNotKnown,
AttributeNotDefined,
AttributeAlreadyOwned,
@@ -661,4 +661,4 @@
#endif // _CERTI_RTIG_FEDERATIONS_LIST_HH
-// $Id: FederationsList.hh,v 3.52 2009/11/20 22:43:46 erk Exp $
+// $Id: FederationsList.hh,v 3.53 2010/03/07 21:30:30 erk Exp $
Index: RTIG/Federation.hh
===================================================================
RCS file: /sources/certi/certi/RTIG/Federation.hh,v
retrieving revision 3.63
retrieving revision 3.64
diff -u -b -r3.63 -r3.64
--- RTIG/Federation.hh 7 Feb 2010 00:19:12 -0000 3.63
+++ RTIG/Federation.hh 7 Mar 2010 21:30:30 -0000 3.64
@@ -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.hh,v 3.63 2010/02/07 00:19:12 erk Exp $
+// $Id: Federation.hh,v 3.64 2010/03/07 21:30:30 erk Exp $
// ----------------------------------------------------------------------------
#ifndef _CERTI_RTIG_FEDERATION_HH
@@ -270,7 +270,7 @@
void publishObject(FederateHandle theFederateHandle,
ObjectClassHandle theObjectHandle,
std::vector <AttributeHandle> &theAttributeList,
- UShort theListSize,
+ uint16_t theListSize,
bool PubOrUnpub)
throw (ObjectClassNotDefined,
AttributeNotDefined,
@@ -295,7 +295,7 @@
FederateHandle requestObjectOwner(FederateHandle theFederateHandle,
ObjectHandle theObject,
std::vector <AttributeHandle>
&theAttributeList,
- UShort theListSize)
+ uint16_t theListSize)
throw (ObjectNotKnown);
/**
@@ -310,7 +310,7 @@
void subscribeObject(FederateHandle theFederateHandle,
ObjectClassHandle theObjectHandle,
std::vector <AttributeHandle> &theAttributeList,
- UShort theListSize)
+ uint16_t theListSize)
throw (ObjectClassNotDefined,
AttributeNotDefined,
FederateNotExecutionMember,
@@ -323,7 +323,7 @@
ObjectHandle theObjectHandle,
std::vector <AttributeHandle> &theAttributeList,
std::vector <AttributeValue_t> &theValueList,
- UShort theListSize,
+ uint16_t theListSize,
FederationTime theTime,
const std::string& theTag)
throw (FederateNotExecutionMember,
@@ -338,7 +338,7 @@
ObjectHandle theObjectHandle,
std::vector <AttributeHandle> &theAttributeList,
std::vector <AttributeValue_t> &theValueList,
- UShort theListSize,
+ uint16_t theListSize,
const std::string& theTag)
throw (FederateNotExecutionMember,
ObjectNotKnown,
@@ -356,7 +356,7 @@
InteractionClassHandle theInteractionHandle,
std::vector <ParameterHandle> &theParameterList,
std::vector <ParameterValue_t> &theValueList,
- UShort theListSize,
+ uint16_t theListSize,
FederationTime theTime,
RegionHandle,
const std::string& theTag)
@@ -372,7 +372,7 @@
InteractionClassHandle theInteractionHandle,
std::vector <ParameterHandle> &theParameterList,
std::vector <ParameterValue_t> &theValueList,
- UShort theListSize,
+ uint16_t theListSize,
RegionHandle,
const std::string& theTag)
throw (FederateNotExecutionMember,
@@ -431,7 +431,7 @@
void negotiateDivestiture(FederateHandle theFederateHandle,
ObjectHandle theObjectHandle,
std::vector <AttributeHandle> &theAttributeList,
- UShort theListSize,
+ uint16_t theListSize,
const std::string& theTag)
throw (FederateNotExecutionMember,
ObjectNotKnown,
@@ -445,7 +445,7 @@
void acquireIfAvailable(FederateHandle theFederateHandle,
ObjectHandle theObjectHandle,
std::vector <AttributeHandle> &theAttributeList,
- UShort theListSize)
+ uint16_t theListSize)
throw (ObjectNotKnown,
ObjectClassNotPublished,
AttributeNotDefined,
@@ -460,7 +460,7 @@
void divest(FederateHandle theFederateHandle,
ObjectHandle theObjectHandle,
std::vector <AttributeHandle> &theAttributeList,
- UShort theListSize)
+ uint16_t theListSize)
throw (ObjectNotKnown,
AttributeNotDefined,
AttributeNotOwned,
@@ -472,7 +472,7 @@
void acquire(FederateHandle theFederateHandle,
ObjectHandle theObjectHandle,
std::vector <AttributeHandle> &theAttributeList,
- UShort theListSize,
+ uint16_t theListSize,
const std::string& theTag)
throw (ObjectNotKnown,
ObjectClassNotPublished,
@@ -487,7 +487,7 @@
void cancelDivestiture(FederateHandle theFederateHandle,
ObjectHandle theObjectHandle,
std::vector <AttributeHandle> &theAttributeList,
- UShort theListSize)
+ uint16_t theListSize)
throw (ObjectNotKnown,
AttributeNotDefined,
AttributeNotOwned,
@@ -500,7 +500,7 @@
AttributeHandleSet* respondRelease(FederateHandle theFederateHandle,
ObjectHandle theObjectHandle,
std::vector <AttributeHandle>
&theAttributeList,
- UShort theListSize)
+ uint16_t theListSize)
throw (ObjectNotKnown,
AttributeNotDefined,
AttributeNotOwned,
@@ -513,7 +513,7 @@
void cancelAcquisition(FederateHandle theFederateHandle,
ObjectHandle theObjectHandle,
std::vector <AttributeHandle> &theAttributeList,
- UShort theListSize)
+ uint16_t theListSize)
throw (ObjectNotKnown,
AttributeNotDefined,
AttributeAlreadyOwned,
@@ -683,4 +683,4 @@
#endif // _CERTI_RTIG_FEDERATION_HH
-// $Id: Federation.hh,v 3.63 2010/02/07 00:19:12 erk Exp $
+// $Id: Federation.hh,v 3.64 2010/03/07 21:30:30 erk Exp $
Index: libCERTI/Extent.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/Extent.hh,v
retrieving revision 3.11
retrieving revision 3.12
diff -u -b -r3.11 -r3.12
--- libCERTI/Extent.hh 27 Feb 2010 16:53:35 -0000 3.11
+++ libCERTI/Extent.hh 7 Mar 2010 21:30:30 -0000 3.12
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Extent.hh,v 3.11 2010/02/27 16:53:35 erk Exp $
+// $Id: Extent.hh,v 3.12 2010/03/07 21:30:30 erk Exp $
// ----------------------------------------------------------------------------
#ifndef CERTI_EXTENT_HH
@@ -34,7 +34,7 @@
namespace certi {
-typedef std::pair<ULong, ULong> Range ;
+typedef std::pair<uint32_t, uint32_t> Range ;
typedef std::vector<Range> RangeSet ;
/**
@@ -54,19 +54,19 @@
Extent(size_t n);
/** Get range lower bound */
- ULong getRangeLowerBound(DimensionHandle) const
+ uint32_t getRangeLowerBound(DimensionHandle) const
throw (ArrayIndexOutOfBounds);
/** Get range upper bound */
- ULong getRangeUpperBound(DimensionHandle) const
+ uint32_t getRangeUpperBound(DimensionHandle) const
throw (ArrayIndexOutOfBounds);
/** Set range upper bound */
- void setRangeUpperBound(DimensionHandle, ULong)
+ void setRangeUpperBound(DimensionHandle, uint32_t)
throw (ArrayIndexOutOfBounds);
/** Set range lower bound */
- void setRangeLowerBound(DimensionHandle, ULong)
+ void setRangeLowerBound(DimensionHandle, uint32_t)
throw (ArrayIndexOutOfBounds);
/** Check whether both extents overlap */
@@ -83,4 +83,4 @@
#endif // CERTI_EXTENT_HH
-// $Id: Extent.hh,v 3.11 2010/02/27 16:53:35 erk Exp $
+// $Id: Extent.hh,v 3.12 2010/03/07 21:30:30 erk Exp $
Index: libCERTI/Dimension.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Dimension.cc,v
retrieving revision 3.8
retrieving revision 3.9
diff -u -b -r3.8 -r3.9
--- libCERTI/Dimension.cc 12 Jun 2008 07:39:49 -0000 3.8
+++ libCERTI/Dimension.cc 7 Mar 2010 21:30:30 -0000 3.9
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Dimension.cc,v 3.8 2008/06/12 07:39:49 erk Exp $
+// $Id: Dimension.cc,v 3.9 2010/03/07 21:30:30 erk Exp $
// ----------------------------------------------------------------------------
#include "Dimension.hh"
@@ -27,8 +27,8 @@
namespace certi {
-ULong Dimension::axisLowerBound = 0 ;
-ULong Dimension::axisUpperBound = LONG_MAX ;
+uint32_t Dimension::axisLowerBound = 0 ;
+uint32_t Dimension::axisUpperBound = UINT_MAX ;
Dimension::Dimension(DimensionHandle dimensionHandle)
{
@@ -38,20 +38,20 @@
// ----------------------------------------------------------------------------
void
-Dimension::setLowerBound(ULong lowerBound)
+Dimension::setLowerBound(uint32_t lowerBound)
{
Dimension::axisLowerBound = lowerBound ;
}
// ----------------------------------------------------------------------------
void
-Dimension::setUpperBound(ULong upperBound)
+Dimension::setUpperBound(uint32_t upperBound)
{
Dimension::axisUpperBound = upperBound ;
}
} // namespace certi
-// $Id: Dimension.cc,v 3.8 2008/06/12 07:39:49 erk Exp $
+// $Id: Dimension.cc,v 3.9 2010/03/07 21:30:30 erk Exp $
Index: libCERTI/FedRegion.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/FedRegion.cc,v
retrieving revision 3.5
retrieving revision 3.6
diff -u -b -r3.5 -r3.6
--- libCERTI/FedRegion.cc 6 Jul 2007 09:25:17 -0000 3.5
+++ libCERTI/FedRegion.cc 7 Mar 2010 21:30:30 -0000 3.6
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: FedRegion.cc,v 3.5 2007/07/06 09:25:17 erk Exp $
+// $Id: FedRegion.cc,v 3.6 2010/03/07 21:30:30 erk Exp $
// ----------------------------------------------------------------------------
@@ -52,7 +52,7 @@
}
// ----------------------------------------------------------------------------
-ULong
+uint32_t
FedRegion::getRangeLowerBound(ExtentIndex index,
DimensionHandle dimension) const
throw (ArrayIndexOutOfBounds)
@@ -61,7 +61,7 @@
}
// ----------------------------------------------------------------------------
-ULong
+uint32_t
FedRegion::getRangeUpperBound(ExtentIndex index,
DimensionHandle dimension) const
throw (ArrayIndexOutOfBounds)
@@ -73,7 +73,7 @@
void
FedRegion::setRangeLowerBound(ExtentIndex index,
DimensionHandle dimension,
- ULong val)
+ uint32_t val)
throw (ArrayIndexOutOfBounds)
{
BaseRegion::setRangeLowerBound(index, dimension, val);
@@ -83,7 +83,7 @@
void
FedRegion::setRangeUpperBound(ExtentIndex index,
DimensionHandle dimension,
- ULong val)
+ uint32_t val)
throw (ArrayIndexOutOfBounds)
{
BaseRegion::setRangeUpperBound(index, dimension, val);
@@ -92,7 +92,7 @@
// ----------------------------------------------------------------------------
// getRangeLowerBoundNotificationLimit
//
-ULong
+uint32_t
FedRegion::getRangeLowerBoundNotificationLimit(ExtentIndex index,
DimensionHandle dimension) const
throw (ArrayIndexOutOfBounds)
@@ -108,7 +108,7 @@
// ----------------------------------------------------------------------------
// getRangeUpperBoundNotificationLimit
//
-ULong
+uint32_t
FedRegion::getRangeUpperBoundNotificationLimit(ExtentIndex index,
DimensionHandle dimension) const
throw (ArrayIndexOutOfBounds)
@@ -122,7 +122,7 @@
}
// ----------------------------------------------------------------------------
-ULong
+uint32_t
FedRegion::getNumberOfExtents() const
throw ()
{
@@ -140,4 +140,4 @@
} // namespace certi
-// $Id: FedRegion.cc,v 3.5 2007/07/06 09:25:17 erk Exp $
+// $Id: FedRegion.cc,v 3.6 2010/03/07 21:30:30 erk Exp $
Index: libCERTI/Interaction.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Interaction.cc,v
retrieving revision 3.59
retrieving revision 3.60
diff -u -b -r3.59 -r3.60
--- libCERTI/Interaction.cc 27 Feb 2010 16:53:35 -0000 3.59
+++ libCERTI/Interaction.cc 7 Mar 2010 21:30:30 -0000 3.60
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Interaction.cc,v 3.59 2010/02/27 16:53:35 erk Exp $
+// $Id: Interaction.cc,v 3.60 2010/03/07 21:30:30 erk Exp $
// ----------------------------------------------------------------------------
@@ -326,7 +326,7 @@
void
Interaction::isReady(FederateHandle federate_handle,
const std::vector <ParameterHandle> ¶meter_list,
- UShort list_size)
+ uint16_t list_size)
throw (FederateNotPublishing,
InteractionParameterNotDefined,
RTIinternalError)
@@ -336,7 +336,7 @@
throw FederateNotPublishing("");
// Are Parameters Defined?
- for (UShort i = 0 ; i < list_size ; i++)
+ for (uint16_t i = 0 ; i < list_size ; i++)
getParameterByHandle(parameter_list[i]);
}
@@ -400,7 +400,7 @@
Interaction::sendInteraction(FederateHandle federate_handle,
std::vector <ParameterHandle> ¶meter_list,
std::vector <ParameterValue_t> &value_list,
- UShort list_size,
+ uint16_t list_size,
FederationTime time,
const RTIRegion *region,
const std::string& the_tag)
@@ -461,7 +461,7 @@
Interaction::sendInteraction(FederateHandle federate_handle,
std::vector <ParameterHandle> ¶meter_list,
std::vector <ParameterValue_t> &value_list,
- UShort list_size,
+ uint16_t list_size,
const RTIRegion *region,
const std::string& the_tag)
throw (FederateNotPublishing,
@@ -543,4 +543,4 @@
} // namespace certi
-// $Id: Interaction.cc,v 3.59 2010/02/27 16:53:35 erk Exp $
+// $Id: Interaction.cc,v 3.60 2010/03/07 21:30:30 erk Exp $
Index: libCERTI/InteractionSet.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/InteractionSet.hh,v
retrieving revision 3.26
retrieving revision 3.27
diff -u -b -r3.26 -r3.27
--- libCERTI/InteractionSet.hh 27 Feb 2010 16:53:35 -0000 3.26
+++ libCERTI/InteractionSet.hh 7 Mar 2010 21:30:30 -0000 3.27
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: InteractionSet.hh,v 3.26 2010/02/27 16:53:35 erk Exp $
+// $Id: InteractionSet.hh,v 3.27 2010/03/07 21:30:30 erk Exp $
// ----------------------------------------------------------------------------
#ifndef _CERTI_INTERACTION_SET_HH
@@ -117,7 +117,7 @@
void isReady(FederateHandle theFederateHandle,
InteractionClassHandle theInteraction,
const std::vector <ParameterHandle> ¶mArray,
- UShort paramArraySize)
+ uint16_t paramArraySize)
throw (FederateNotPublishing,
InteractionClassNotDefined,
InteractionParameterNotDefined,
@@ -127,7 +127,7 @@
InteractionClassHandle theInteractionHandle,
std::vector <ParameterHandle> &theParameterList,
std::vector <ParameterValue_t> &theValueList,
- UShort theListSize,
+ uint16_t theListSize,
FederationTime theTime,
const RTIRegion *,
const std::string& theTag)
@@ -140,7 +140,7 @@
InteractionClassHandle theInteractionHandle,
std::vector <ParameterHandle> &theParameterList,
std::vector <ParameterValue_t> &theValueList,
- UShort theListSize,
+ uint16_t theListSize,
const RTIRegion *,
const std::string& theTag)
throw (FederateNotPublishing,
@@ -157,4 +157,4 @@
#endif // _CERTI_INTERACTION_SET_HH
-// $Id: InteractionSet.hh,v 3.26 2010/02/27 16:53:35 erk Exp $
+// $Id: InteractionSet.hh,v 3.27 2010/03/07 21:30:30 erk Exp $
Index: libCERTI/ObjectClass.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectClass.cc,v
retrieving revision 3.77
retrieving revision 3.78
diff -u -b -r3.77 -r3.78
--- libCERTI/ObjectClass.cc 27 Feb 2010 16:53:35 -0000 3.77
+++ libCERTI/ObjectClass.cc 7 Mar 2010 21:30:30 -0000 3.78
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: ObjectClass.cc,v 3.77 2010/02/27 16:53:35 erk Exp $
+// $Id: ObjectClass.cc,v 3.78 2010/03/07 21:30:30 erk Exp $
// ----------------------------------------------------------------------------
#include "Object.hh"
@@ -604,7 +604,7 @@
theFederateHandle);
// Do all attribute handles exist ? It may throw AttributeNotDefined.
- for (UShort index = 0 ; index < theListSize ; index++)
+ for (uint16_t index = 0 ; index < theListSize ; index++)
getAttribute(theAttributeList[index]);
// Check Security Levels
@@ -622,7 +622,7 @@
// Publish attributes one by one.
ObjectClassAttribute * attribute ;
- for (UShort i = 0 ; i < theListSize ; i++) {
+ for (uint16_t i = 0 ; i < theListSize ; i++) {
D.Out(pdInit, "ObjectClass %d: Federate %d publishes attribute %d.",
handle, theFederateHandle, theAttributeList[i]);
attribute = getAttribute(theAttributeList[i]);
@@ -1720,4 +1720,4 @@
} // namespace certi
-// $Id: ObjectClass.cc,v 3.77 2010/02/27 16:53:35 erk Exp $
+// $Id: ObjectClass.cc,v 3.78 2010/03/07 21:30:30 erk Exp $
Index: libCERTI/Interaction.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/Interaction.hh,v
retrieving revision 3.40
retrieving revision 3.41
diff -u -b -r3.40 -r3.41
--- libCERTI/Interaction.hh 27 Feb 2010 16:53:35 -0000 3.40
+++ libCERTI/Interaction.hh 7 Mar 2010 21:30:30 -0000 3.41
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Interaction.hh,v 3.40 2010/02/27 16:53:35 erk Exp $
+// $Id: Interaction.hh,v 3.41 2010/03/07 21:30:30 erk Exp $
// ----------------------------------------------------------------------------
#ifndef _CERTI_INTERACTION_HH
@@ -165,7 +165,7 @@
// -- Instance Broadcasting --
void isReady(FederateHandle federate_handle,
const std::vector <ParameterHandle> ¶meter_list,
- UShort list_size)
+ uint16_t list_size)
throw (FederateNotPublishing,
InteractionParameterNotDefined,
RTIinternalError);
@@ -174,7 +174,7 @@
sendInteraction(FederateHandle federate_handle,
std::vector <ParameterHandle> ¶meter_list,
std::vector <ParameterValue_t> &value_list,
- UShort list_size,
+ uint16_t list_size,
FederationTime the_time,
const RTIRegion *,
const std::string& the_tag)
@@ -187,7 +187,7 @@
sendInteraction(FederateHandle federate_handle,
std::vector <ParameterHandle> ¶meter_list,
std::vector <ParameterValue_t> &value_list,
- UShort list_size,
+ uint16_t list_size,
const RTIRegion *,
const std::string& the_tag)
throw (FederateNotPublishing,
@@ -213,7 +213,7 @@
//std::list<InteractionClassHandle> children ;
- UShort depth ;
+ uint16_t depth ;
/*! Interaction messages' Transport Type(Reliable, Best Effort),
Currently not used.
@@ -265,4 +265,4 @@
#endif // _CERTI_INTERACTION.HH
-// $Id: Interaction.hh,v 3.40 2010/02/27 16:53:35 erk Exp $
+// $Id: Interaction.hh,v 3.41 2010/03/07 21:30:30 erk Exp $
Index: libCERTI/InteractionSet.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/InteractionSet.cc,v
retrieving revision 3.31
retrieving revision 3.32
diff -u -b -r3.31 -r3.32
--- libCERTI/InteractionSet.cc 27 Feb 2010 16:53:35 -0000 3.31
+++ libCERTI/InteractionSet.cc 7 Mar 2010 21:30:30 -0000 3.32
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: InteractionSet.cc,v 3.31 2010/02/27 16:53:35 erk Exp $
+// $Id: InteractionSet.cc,v 3.32 2010/03/07 21:30:30 erk Exp $
// ----------------------------------------------------------------------------
#include "Interaction.hh"
@@ -65,7 +65,7 @@
InteractionClassHandle interaction_handle,
std::vector <ParameterHandle> ¶meter_list,
std::vector <ParameterValue_t> &value_list,
- UShort list_size,
+ uint16_t list_size,
FederationTime the_time,
const RTIRegion *region,
const std::string& the_tag)
@@ -114,7 +114,7 @@
InteractionClassHandle interaction_handle,
std::vector <ParameterHandle> ¶meter_list,
std::vector <ParameterValue_t> &value_list,
- UShort list_size,
+ uint16_t list_size,
const RTIRegion *region,
const std::string& the_tag)
throw (FederateNotPublishing,
@@ -206,7 +206,7 @@
InteractionSet::isReady(FederateHandle federate_handle,
InteractionClassHandle the_interaction,
const std::vector <ParameterHandle> ¶m_array,
- UShort param_array_size)
+ uint16_t param_array_size)
throw (FederateNotPublishing,
InteractionClassNotDefined,
InteractionParameterNotDefined,
@@ -272,4 +272,4 @@
} // namespace certi
-// $Id: InteractionSet.cc,v 3.31 2010/02/27 16:53:35 erk Exp $
+// $Id: InteractionSet.cc,v 3.32 2010/03/07 21:30:30 erk Exp $
Index: libCERTI/NetworkMessage.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/NetworkMessage.cc,v
retrieving revision 3.44
retrieving revision 3.45
diff -u -b -r3.44 -r3.45
--- libCERTI/NetworkMessage.cc 30 Jan 2010 18:41:37 -0000 3.44
+++ libCERTI/NetworkMessage.cc 7 Mar 2010 21:30:30 -0000 3.45
@@ -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: NetworkMessage.cc,v 3.44 2010/01/30 18:41:37 erk Exp $
+// $Id: NetworkMessage.cc,v 3.45 2010/03/07 21:30:30 erk Exp $
// ----------------------------------------------------------------------------
@@ -65,7 +65,7 @@
// ----------------------------------------------------------------------------
void
-NetworkMessage::removeAttribute(UShort Rank)
+NetworkMessage::removeAttribute(uint16_t Rank)
{
if (Rank >= valueArray.size())
throw RTIinternalError("Bad Rank while removing Nmessage attribute.");
@@ -78,7 +78,7 @@
// ----------------------------------------------------------------------------
void
-NetworkMessage::removeParameter(UShort Rank)
+NetworkMessage::removeParameter(uint16_t Rank)
{
if (Rank >= valueArray.size())
throw RTIinternalError("Bad Rank while removing Nmessage parameter.");
@@ -126,4 +126,4 @@
} // namespace certi
-// $Id: NetworkMessage.cc,v 3.44 2010/01/30 18:41:37 erk Exp $
+// $Id: NetworkMessage.cc,v 3.45 2010/03/07 21:30:30 erk Exp $
Index: libCERTI/BaseRegion.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/BaseRegion.hh,v
retrieving revision 3.2
retrieving revision 3.3
diff -u -b -r3.2 -r3.3
--- libCERTI/BaseRegion.hh 22 Jun 2007 08:51:36 -0000 3.2
+++ libCERTI/BaseRegion.hh 7 Mar 2010 21:30:30 -0000 3.3
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: BaseRegion.hh,v 3.2 2007/06/22 08:51:36 erk Exp $
+// $Id: BaseRegion.hh,v 3.3 2010/03/07 21:30:30 erk Exp $
// ----------------------------------------------------------------------------
#ifndef CERTI_BASE_REGION_HH
@@ -40,19 +40,19 @@
BaseRegion(RegionHandle);
virtual ~BaseRegion();
- virtual ULong getRangeLowerBound(ExtentIndex, DimensionHandle) const
+ virtual uint32_t getRangeLowerBound(ExtentIndex, DimensionHandle) const
throw (ArrayIndexOutOfBounds);
- virtual ULong getRangeUpperBound(ExtentIndex, DimensionHandle) const
+ virtual uint32_t getRangeUpperBound(ExtentIndex, DimensionHandle) const
throw (ArrayIndexOutOfBounds);
- virtual void setRangeLowerBound(ExtentIndex, DimensionHandle, ULong)
+ virtual void setRangeLowerBound(ExtentIndex, DimensionHandle, uint32_t)
throw (ArrayIndexOutOfBounds);
- virtual void setRangeUpperBound(ExtentIndex, DimensionHandle, ULong)
+ virtual void setRangeUpperBound(ExtentIndex, DimensionHandle, uint32_t)
throw (ArrayIndexOutOfBounds);
- virtual ULong getNumberOfExtents() const
+ virtual uint32_t getNumberOfExtents() const
throw ();
virtual SpaceHandle getSpaceHandle() const
Index: libCERTI/BaseRegion.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/BaseRegion.cc,v
retrieving revision 3.5
retrieving revision 3.6
diff -u -b -r3.5 -r3.6
--- libCERTI/BaseRegion.cc 6 Jul 2007 09:25:18 -0000 3.5
+++ libCERTI/BaseRegion.cc 7 Mar 2010 21:30:30 -0000 3.6
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: BaseRegion.cc,v 3.5 2007/07/06 09:25:18 erk Exp $
+// $Id: BaseRegion.cc,v 3.6 2010/03/07 21:30:30 erk Exp $
// ----------------------------------------------------------------------------
@@ -41,7 +41,7 @@
}
// ----------------------------------------------------------------------------
-ULong
+uint32_t
BaseRegion::getNumberOfExtents() const
throw ()
{
@@ -49,7 +49,7 @@
}
// ----------------------------------------------------------------------------
-ULong
+uint32_t
BaseRegion::getRangeLowerBound(ExtentIndex index,
DimensionHandle dimension) const
throw (ArrayIndexOutOfBounds)
@@ -63,7 +63,7 @@
}
// ----------------------------------------------------------------------------
-ULong
+uint32_t
BaseRegion::getRangeUpperBound(ExtentIndex index,
DimensionHandle dimension) const
throw (ArrayIndexOutOfBounds)
@@ -80,7 +80,7 @@
void
BaseRegion::setRangeLowerBound(ExtentIndex index,
DimensionHandle dimension,
- ULong val)
+ uint32_t val)
throw (ArrayIndexOutOfBounds)
{
if (index >= extents.size()) {
@@ -95,7 +95,7 @@
void
BaseRegion::setRangeUpperBound(ExtentIndex index,
DimensionHandle dimension,
- ULong val)
+ uint32_t val)
throw (ArrayIndexOutOfBounds)
{
if (index >= extents.size()) {
@@ -156,4 +156,4 @@
} // namespace certi
-// $Id: BaseRegion.cc,v 3.5 2007/07/06 09:25:18 erk Exp $
+// $Id: BaseRegion.cc,v 3.6 2010/03/07 21:30:30 erk Exp $
Index: libCERTI/GAV.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/GAV.hh,v
retrieving revision 3.15
retrieving revision 3.16
diff -u -b -r3.15 -r3.16
--- libCERTI/GAV.hh 4 Apr 2009 13:53:25 -0000 3.15
+++ libCERTI/GAV.hh 7 Mar 2010 21:30:30 -0000 3.16
@@ -30,12 +30,12 @@
class CERTI_EXPORT AttributeHandleSet
{
public:
- AttributeHandleSet(ULong size);
+ AttributeHandleSet(uint32_t size);
virtual ~AttributeHandleSet();
- virtual ULong size() const ;
+ virtual uint32_t size() const ;
- virtual AttributeHandle getHandle(ULong i) const
+ virtual AttributeHandle getHandle(uint32_t i) const
throw (ArrayIndexOutOfBounds);
virtual void add(AttributeHandle h)
@@ -56,12 +56,12 @@
class FederateHandleSet
{
public:
- FederateHandleSet(ULong size);
+ FederateHandleSet(uint32_t size);
virtual ~FederateHandleSet();
- virtual ULong size() const ;
+ virtual uint32_t size() const ;
- virtual FederateHandle getHandle(ULong i) const
+ virtual FederateHandle getHandle(uint32_t i) const
throw (ArrayIndexOutOfBounds);
virtual void add(FederateHandle h)
@@ -83,14 +83,14 @@
// ATTRIBUTES
public:
Handle _handle ;
- ULong _valueLength ;
+ uint32_t _valueLength ;
char *_value ;
// METHODS
public :
AttributeHandleValuePair(Handle handle,
const char *value,
- ULong value_length);
+ uint32_t value_length);
~AttributeHandleValuePair();
};
@@ -103,36 +103,36 @@
// METHODS
public:
- AttributeHandleValuePairSet(ULong size);
+ AttributeHandleValuePairSet(uint32_t size);
virtual ~AttributeHandleValuePairSet();
- virtual ULong size() const ;
- virtual Handle getHandle(ULong i) const throw (ArrayIndexOutOfBounds);
- virtual ULong getValueLength(ULong i) const throw (ArrayIndexOutOfBounds);
+ virtual uint32_t size() const ;
+ virtual Handle getHandle(uint32_t i) const throw (ArrayIndexOutOfBounds);
+ virtual uint32_t getValueLength(uint32_t i) const throw
(ArrayIndexOutOfBounds);
- virtual void getValue(ULong i, char *buff, ULong& valueLength) const
+ virtual void getValue(uint32_t i, char *buff, uint32_t& valueLength) const
throw (ArrayIndexOutOfBounds);
- virtual char *getValuePointer(ULong i, ULong& valueLength) const
+ virtual char *getValuePointer(uint32_t i, uint32_t& valueLength) const
throw (ArrayIndexOutOfBounds);
- virtual TransportType getTransportType(ULong i) const
+ virtual TransportType getTransportType(uint32_t i) const
throw (InvalidHandleValuePairSetContext);
- virtual OrderType getOrderType(ULong i) const
+ virtual OrderType getOrderType(uint32_t i) const
throw (ArrayIndexOutOfBounds, InvalidHandleValuePairSetContext);
- virtual void add(Handle h, const char *buff, ULong valueLength)
+ virtual void add(Handle h, const char *buff, uint32_t valueLength)
throw (ValueLengthExceeded, ValueCountExceeded);
virtual void remove(Handle h) throw (ArrayIndexOutOfBounds);
- virtual void moveFrom(const AttributeHandleValuePairSet& ahvps, ULong& i)
+ virtual void moveFrom(const AttributeHandleValuePairSet& ahvps, uint32_t&
i)
throw (ValueCountExceeded, ArrayIndexOutOfBounds);
virtual void empty();
- virtual ULong start() const ;
- virtual ULong valid(ULong i) const ;
- virtual ULong next(ULong i) const ;
+ virtual uint32_t start() const ;
+ virtual uint32_t valid(uint32_t i) const ;
+ virtual uint32_t next(uint32_t i) const ;
protected:
std::list<AttributeHandleValuePair *> _set;
@@ -142,10 +142,10 @@
{
public:
Handle _handle ;
- ULong _valueLength ;
+ uint32_t _valueLength ;
char *_value ;
- ParameterHandleValuePair(Handle handle, const char *value, ULong length);
+ ParameterHandleValuePair(Handle handle, const char *value, uint32_t
length);
~ParameterHandleValuePair();
};
@@ -156,19 +156,19 @@
TransportType _transport ;
public:
- ParameterHandleValuePairSet(ULong size);
+ ParameterHandleValuePairSet(uint32_t size);
virtual ~ParameterHandleValuePairSet();
- virtual ULong size() const ;
+ virtual uint32_t size() const ;
- virtual Handle getHandle(ULong i) const throw (ArrayIndexOutOfBounds);
+ virtual Handle getHandle(uint32_t i) const throw (ArrayIndexOutOfBounds);
- virtual ULong getValueLength(ULong i) const throw (ArrayIndexOutOfBounds);
+ virtual uint32_t getValueLength(uint32_t i) const throw
(ArrayIndexOutOfBounds);
- virtual void getValue(ULong i, char *buff, ULong& valueLength) const
+ virtual void getValue(uint32_t i, char *buff, uint32_t& valueLength) const
throw (ArrayIndexOutOfBounds);
- virtual char *getValuePointer(ULong i, ULong& valueLength) const
+ virtual char *getValuePointer(uint32_t i, uint32_t& valueLength) const
throw (ArrayIndexOutOfBounds);
virtual TransportType getTransportType() const
@@ -177,18 +177,18 @@
virtual OrderType getOrderType() const
throw (InvalidHandleValuePairSetContext);
- virtual void add(Handle h, const char *buff, ULong valueLength)
+ virtual void add(Handle h, const char *buff, uint32_t valueLength)
throw (ValueLengthExceeded, ValueCountExceeded);
virtual void remove(Handle h) throw (ArrayIndexOutOfBounds);
- virtual void moveFrom(const ParameterHandleValuePairSet& phvps, ULong& i)
+ virtual void moveFrom(const ParameterHandleValuePairSet& phvps, uint32_t&
i)
throw (ValueCountExceeded, ArrayIndexOutOfBounds);
virtual void empty();
- virtual ULong start() const ;
- virtual ULong valid(ULong i) const ;
- virtual ULong next(ULong i) const ;
+ virtual uint32_t start() const ;
+ virtual uint32_t valid(uint32_t i) const ;
+ virtual uint32_t next(uint32_t i) const ;
protected:
std::list<ParameterHandleValuePair *> _set;
Index: libCERTI/GAV.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/GAV.cc,v
retrieving revision 3.21
retrieving revision 3.22
diff -u -b -r3.21 -r3.22
--- libCERTI/GAV.cc 21 Oct 2009 18:56:28 -0000 3.21
+++ libCERTI/GAV.cc 7 Mar 2010 21:30:30 -0000 3.22
@@ -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: GAV.cc,v 3.21 2009/10/21 18:56:28 erk Exp $
+// $Id: GAV.cc,v 3.22 2010/03/07 21:30:30 erk Exp $
// ----------------------------------------------------------------------------
#include "GAV.hh"
@@ -41,7 +41,7 @@
// ----------------------------------------------------------------------------
AttributeHandleValuePair::AttributeHandleValuePair(Handle handle,
const char *value,
- ULong value_length)
+ uint32_t value_length)
{
_handle = handle ;
_valueLength = value_length ;
@@ -59,7 +59,7 @@
// ----------------------------------------------------------------------------
// AttributeHandleValuePairSet
// ----------------------------------------------------------------------------
-AttributeHandleValuePairSet::AttributeHandleValuePairSet(ULong)
+AttributeHandleValuePairSet::AttributeHandleValuePairSet(uint32_t)
{
_order = RECEIVE ;
_transport = RELIABLE ;
@@ -72,7 +72,7 @@
}
// ----------------------------------------------------------------------------
-ULong
+uint32_t
AttributeHandleValuePairSet::size() const
{
return _set.size();
@@ -80,11 +80,11 @@
// ----------------------------------------------------------------------------
Handle
-AttributeHandleValuePairSet::getHandle(ULong i) const
+AttributeHandleValuePairSet::getHandle(uint32_t i) const
throw (ArrayIndexOutOfBounds)
{
list<AttributeHandleValuePair *>::const_iterator j = _set.begin();
- for (ULong k = 0 ; j != _set.end(); j++, k++) {
+ for (uint32_t k = 0 ; j != _set.end(); j++, k++) {
if (i == k)
return (*j)->_handle ;
}
@@ -93,12 +93,12 @@
}
// ----------------------------------------------------------------------------
-ULong
-AttributeHandleValuePairSet::getValueLength(ULong i) const
+uint32_t
+AttributeHandleValuePairSet::getValueLength(uint32_t i) const
throw (ArrayIndexOutOfBounds)
{
list<AttributeHandleValuePair *>::const_iterator j = _set.begin();
- for (ULong k = 0 ; j != _set.end(); j++, k++) {
+ for (uint32_t k = 0 ; j != _set.end(); j++, k++) {
if (i == k)
return (*j)->_valueLength ;
}
@@ -108,13 +108,13 @@
// ----------------------------------------------------------------------------
void
-AttributeHandleValuePairSet::getValue(ULong i,
+AttributeHandleValuePairSet::getValue(uint32_t i,
char *buff,
- ULong& value_length) const
+ uint32_t& value_length) const
throw (ArrayIndexOutOfBounds)
{
list<AttributeHandleValuePair *>::const_iterator j = _set.begin();
- for (ULong k = 0 ; j != _set.end(); j++, k++) {
+ for (uint32_t k = 0 ; j != _set.end(); j++, k++) {
if (i == k) {
value_length = (*j)->_valueLength ;
memcpy(buff, (*j)->_value, (*j)->_valueLength);
@@ -127,12 +127,12 @@
// ----------------------------------------------------------------------------
char *
-AttributeHandleValuePairSet::getValuePointer(ULong i,
- ULong& value_length) const
+AttributeHandleValuePairSet::getValuePointer(uint32_t i,
+ uint32_t& value_length) const
throw (ArrayIndexOutOfBounds)
{
list<AttributeHandleValuePair *>::const_iterator j = _set.begin();
- for (ULong k = 0 ; j != _set.end(); j++, k++) {
+ for (uint32_t k = 0 ; j != _set.end(); j++, k++) {
if (i == k) {
value_length = (*j)->_valueLength ;
return (*j)->_value ;
@@ -144,7 +144,7 @@
// ----------------------------------------------------------------------------
TransportType
-AttributeHandleValuePairSet::getTransportType(ULong) const
+AttributeHandleValuePairSet::getTransportType(uint32_t) const
throw (InvalidHandleValuePairSetContext)
{
return _transport ;
@@ -152,7 +152,7 @@
// ----------------------------------------------------------------------------
OrderType
-AttributeHandleValuePairSet::getOrderType(ULong) const
+AttributeHandleValuePairSet::getOrderType(uint32_t) const
throw (ArrayIndexOutOfBounds, InvalidHandleValuePairSetContext)
{
return _order ;
@@ -162,7 +162,7 @@
void
AttributeHandleValuePairSet::add(Handle h,
const char *buff,
- ULong value_length)
+ uint32_t value_length)
throw (ValueLengthExceeded, ValueCountExceeded)
{
AttributeHandleValuePair *ahvp ;
@@ -191,7 +191,7 @@
// ----------------------------------------------------------------------------
void
AttributeHandleValuePairSet::moveFrom(const AttributeHandleValuePairSet&,
- ULong&)
+ uint32_t&)
throw (ValueCountExceeded, ArrayIndexOutOfBounds)
{
throw RTIinternalError("Unimplemented service");
@@ -208,7 +208,7 @@
}
// ----------------------------------------------------------------------------
-ULong
+uint32_t
AttributeHandleValuePairSet::start() const
{
//not implemented
@@ -216,16 +216,16 @@
}
// ----------------------------------------------------------------------------
-ULong
-AttributeHandleValuePairSet::valid(ULong) const
+uint32_t
+AttributeHandleValuePairSet::valid(uint32_t) const
{
//not implemented
return 0 ;
}
// ----------------------------------------------------------------------------
-ULong
-AttributeHandleValuePairSet::next(ULong) const
+uint32_t
+AttributeHandleValuePairSet::next(uint32_t) const
{
//not implemented
return 0 ;
@@ -234,7 +234,7 @@
// ----------------------------------------------------------------------------
// AttributeHandleSet
// ----------------------------------------------------------------------------
-AttributeHandleSet::AttributeHandleSet(ULong size)
+AttributeHandleSet::AttributeHandleSet(uint32_t size)
{
}
@@ -244,7 +244,7 @@
}
// ----------------------------------------------------------------------------
-inline ULong
+inline uint32_t
AttributeHandleSet::size() const
{
return _set.size();
@@ -252,11 +252,11 @@
// ----------------------------------------------------------------------------
AttributeHandle
-AttributeHandleSet::getHandle(ULong i) const
+AttributeHandleSet::getHandle(uint32_t i) const
throw (ArrayIndexOutOfBounds)
{
list<AttributeHandle>::const_iterator h ;
- ULong j ;
+ uint32_t j ;
for (j = 0, h = _set.begin(); h != _set.end(); h++, j++) {
if (i == j)
return (*h);
@@ -314,7 +314,7 @@
}
// ----------------------------------------------------------------------------
-inline ULong
+inline uint32_t
FederateHandleSet::size() const
{
return _set.size();
@@ -322,11 +322,11 @@
// ----------------------------------------------------------------------------
FederateHandle
-FederateHandleSet::getHandle(ULong i) const
+FederateHandleSet::getHandle(uint32_t i) const
throw (ArrayIndexOutOfBounds)
{
list<FederateHandle>::const_iterator h ;
- ULong j ;
+ uint32_t j ;
for (j = 0, h = _set.begin(); h != _set.end(); h++, j++) {
if (i == j)
return (*h);
@@ -374,7 +374,7 @@
ParameterHandleValuePair::ParameterHandleValuePair(Handle handle,
const char *value,
- ULong value_length)
+ uint32_t value_length)
{
_handle = handle ;
_valueLength = value_length ;
@@ -392,7 +392,7 @@
// ----------------------------------------------------------------------------
// ParameterHandleValuePairSet
// ----------------------------------------------------------------------------
-ParameterHandleValuePairSet::ParameterHandleValuePairSet(ULong)
+ParameterHandleValuePairSet::ParameterHandleValuePairSet(uint32_t)
{
_order = RECEIVE ;
_transport = RELIABLE ;
@@ -404,7 +404,7 @@
}
// ----------------------------------------------------------------------------
-ULong
+uint32_t
ParameterHandleValuePairSet::size() const
{
return _set.size();
@@ -412,11 +412,11 @@
// ----------------------------------------------------------------------------
Handle
-ParameterHandleValuePairSet::getHandle(ULong i) const
+ParameterHandleValuePairSet::getHandle(uint32_t i) const
throw (ArrayIndexOutOfBounds)
{
list<ParameterHandleValuePair *>::const_iterator j = _set.begin();
- for (ULong k = 0 ; j != _set.end(); j++, k++) {
+ for (uint32_t k = 0 ; j != _set.end(); j++, k++) {
if (i == k)
return (*j)->_handle ;
}
@@ -425,12 +425,12 @@
}
// ----------------------------------------------------------------------------
-ULong
-ParameterHandleValuePairSet::getValueLength(ULong i) const
+uint32_t
+ParameterHandleValuePairSet::getValueLength(uint32_t i) const
throw (ArrayIndexOutOfBounds)
{
list<ParameterHandleValuePair *>::const_iterator j = _set.begin();
- for (ULong k = 0 ; j != _set.end(); j++, k++) {
+ for (uint32_t k = 0 ; j != _set.end(); j++, k++) {
if (i == k)
return (*j)->_valueLength ;
}
@@ -440,13 +440,13 @@
// ----------------------------------------------------------------------------
void
-ParameterHandleValuePairSet::getValue(ULong i,
+ParameterHandleValuePairSet::getValue(uint32_t i,
char *buff,
- ULong& value_length) const
+ uint32_t& value_length) const
throw (ArrayIndexOutOfBounds)
{
list<ParameterHandleValuePair *>::const_iterator j = _set.begin();
- for (ULong k = 0 ; j != _set.end(); j++, k++) {
+ for (uint32_t k = 0 ; j != _set.end(); j++, k++) {
if (i == k) {
value_length = (*j)->_valueLength ;
memcpy(buff, (*j)->_value, (*j)->_valueLength);
@@ -459,12 +459,12 @@
// ----------------------------------------------------------------------------
char *
-ParameterHandleValuePairSet::getValuePointer(ULong i,
- ULong& value_length) const
+ParameterHandleValuePairSet::getValuePointer(uint32_t i,
+ uint32_t& value_length) const
throw (ArrayIndexOutOfBounds)
{
list<ParameterHandleValuePair *>::const_iterator j = _set.begin();
- for (ULong k = 0 ; j != _set.end(); j++, k++) {
+ for (uint32_t k = 0 ; j != _set.end(); j++, k++) {
if (i == k) {
value_length = (*j)->_valueLength ;
return (*j)->_value ;
@@ -494,7 +494,7 @@
void
ParameterHandleValuePairSet::add(Handle h,
const char *buff,
- ULong value_length)
+ uint32_t value_length)
throw (ValueLengthExceeded, ValueCountExceeded)
{
ParameterHandleValuePair *phvp ;
@@ -523,7 +523,7 @@
// ----------------------------------------------------------------------------
void
ParameterHandleValuePairSet::moveFrom(const ParameterHandleValuePairSet&,
- ULong&)
+ uint32_t&)
throw (ValueCountExceeded, ArrayIndexOutOfBounds)
{
throw RTIinternalError("Unimplemented service");
@@ -540,7 +540,7 @@
}
// ----------------------------------------------------------------------------
-ULong
+uint32_t
ParameterHandleValuePairSet::start() const
{
//not implemented
@@ -548,16 +548,16 @@
}
// ----------------------------------------------------------------------------
-ULong
-ParameterHandleValuePairSet::valid(ULong) const
+uint32_t
+ParameterHandleValuePairSet::valid(uint32_t) const
{
//not implemented
return 0 ;
}
// ----------------------------------------------------------------------------
-ULong
-ParameterHandleValuePairSet::next(ULong) const
+uint32_t
+ParameterHandleValuePairSet::next(uint32_t) const
{
//not implemented
return 0 ;
@@ -565,5 +565,5 @@
} // namespace certi
-// $Id: GAV.cc,v 3.21 2009/10/21 18:56:28 erk Exp $
+// $Id: GAV.cc,v 3.22 2010/03/07 21:30:30 erk Exp $
Index: libCERTI/Dimension.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/Dimension.hh,v
retrieving revision 3.9
retrieving revision 3.10
diff -u -b -r3.9 -r3.10
--- libCERTI/Dimension.hh 31 Oct 2007 10:30:20 -0000 3.9
+++ libCERTI/Dimension.hh 7 Mar 2010 21:30:30 -0000 3.10
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Dimension.hh,v 3.9 2007/10/31 10:30:20 erk Exp $
+// $Id: Dimension.hh,v 3.10 2010/03/07 21:30:30 erk Exp $
// ----------------------------------------------------------------------------
#ifndef _CERTI_DIMENSION_HH
@@ -54,33 +54,33 @@
* Set dimension lower bound.
* @param[in] lowerBound the lower bound
*/
- static void setLowerBound(ULong lowerBound);
+ static void setLowerBound(uint32_t lowerBound);
/**
* Set dimension upper bound.
* @param[in] upperBound the upper bound
*/
- static void setUpperBound(ULong upperBound);
+ static void setUpperBound(uint32_t upperBound);
/**
* Get dimension lower bound.
* @return the lower bound
*/
- static ULong getLowerBound() { return axisLowerBound ; }
+ static uint32_t getLowerBound() { return axisLowerBound ; }
/**
* Get dimension upper bound.
* @return the upper bound
*/
- static ULong getUpperBound() { return axisUpperBound ; }
+ static uint32_t getUpperBound() { return axisUpperBound ; }
private:
- static ULong axisLowerBound ;
- static ULong axisUpperBound ;
+ static uint32_t axisLowerBound ;
+ static uint32_t axisUpperBound ;
};
} // namespace certi
#endif
-// $Id: Dimension.hh,v 3.9 2007/10/31 10:30:20 erk Exp $
+// $Id: Dimension.hh,v 3.10 2010/03/07 21:30:30 erk Exp $
Index: libCERTI/Extent.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Extent.cc,v
retrieving revision 3.13
retrieving revision 3.14
diff -u -b -r3.13 -r3.14
--- libCERTI/Extent.cc 7 Mar 2010 18:23:39 -0000 3.13
+++ libCERTI/Extent.cc 7 Mar 2010 21:30:30 -0000 3.14
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Extent.cc,v 3.13 2010/03/07 18:23:39 erk Exp $
+// $Id: Extent.cc,v 3.14 2010/03/07 21:30:30 erk Exp $
// ----------------------------------------------------------------------------
@@ -46,7 +46,7 @@
// ----------------------------------------------------------------------------
-ULong
+uint32_t
Extent::getRangeLowerBound(DimensionHandle handle) const
throw (ArrayIndexOutOfBounds)
{
@@ -56,7 +56,7 @@
return ranges[handle - 1].first ;
}
-ULong
+uint32_t
Extent::getRangeUpperBound(DimensionHandle handle) const
throw (ArrayIndexOutOfBounds)
{
@@ -67,7 +67,7 @@
}
void
-Extent::setRangeLowerBound(DimensionHandle handle, ULong val)
+Extent::setRangeLowerBound(DimensionHandle handle, uint32_t val)
throw (ArrayIndexOutOfBounds)
{
if ((handle <= 0) || (handle > ranges.size()))
@@ -77,7 +77,7 @@
}
void
-Extent::setRangeUpperBound(DimensionHandle handle, ULong val)
+Extent::setRangeUpperBound(DimensionHandle handle, uint32_t val)
throw (ArrayIndexOutOfBounds)
{
if ((handle <= 0) || (handle > ranges.size()))
@@ -108,4 +108,4 @@
} // namespace certi
-// $Id: Extent.cc,v 3.13 2010/03/07 18:23:39 erk Exp $
+// $Id: Extent.cc,v 3.14 2010/03/07 21:30:30 erk Exp $
Index: libCERTI/FedRegion.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/FedRegion.hh,v
retrieving revision 3.4
retrieving revision 3.5
diff -u -b -r3.4 -r3.5
--- libCERTI/FedRegion.hh 7 Dec 2008 20:16:13 -0000 3.4
+++ libCERTI/FedRegion.hh 7 Mar 2010 21:30:30 -0000 3.5
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: FedRegion.hh,v 3.4 2008/12/07 20:16:13 gotthardp Exp $
+// $Id: FedRegion.hh,v 3.5 2010/03/07 21:30:30 erk Exp $
// ----------------------------------------------------------------------------
#ifndef CERTI_FED_REGION_HH
@@ -38,29 +38,29 @@
FedRegion(RegionHandle, SpaceHandle, const std::vector<Extent> &);
virtual ~FedRegion();
- virtual ULong getRangeLowerBound(ExtentIndex, DimensionHandle) const
+ virtual uint32_t getRangeLowerBound(ExtentIndex, DimensionHandle) const
throw (ArrayIndexOutOfBounds);
- virtual ULong getRangeUpperBound(ExtentIndex, DimensionHandle) const
+ virtual uint32_t getRangeUpperBound(ExtentIndex, DimensionHandle) const
throw (ArrayIndexOutOfBounds);
- virtual void setRangeLowerBound(ExtentIndex, DimensionHandle, ULong)
+ virtual void setRangeLowerBound(ExtentIndex, DimensionHandle, uint32_t)
throw (ArrayIndexOutOfBounds);
- virtual void setRangeUpperBound(ExtentIndex, DimensionHandle, ULong)
+ virtual void setRangeUpperBound(ExtentIndex, DimensionHandle, uint32_t)
throw (ArrayIndexOutOfBounds);
virtual SpaceHandle getSpaceHandle() const
throw ();
- virtual ULong getNumberOfExtents() const
+ virtual uint32_t getNumberOfExtents() const
throw ();
- virtual ULong getRangeLowerBoundNotificationLimit(ExtentIndex,
+ virtual uint32_t getRangeLowerBoundNotificationLimit(ExtentIndex,
DimensionHandle) const
throw (ArrayIndexOutOfBounds);
- virtual ULong getRangeUpperBoundNotificationLimit(ExtentIndex,
+ virtual uint32_t getRangeUpperBoundNotificationLimit(ExtentIndex,
DimensionHandle) const
throw (ArrayIndexOutOfBounds);
@@ -75,4 +75,4 @@
#endif // CERTI_FED_REGION_HH
-// $Id: FedRegion.hh,v 3.4 2008/12/07 20:16:13 gotthardp Exp $
+// $Id: FedRegion.hh,v 3.5 2010/03/07 21:30:30 erk Exp $
Index: libCERTI/ObjectSet.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectSet.cc,v
retrieving revision 3.27
retrieving revision 3.28
diff -u -b -r3.27 -r3.28
--- libCERTI/ObjectSet.cc 19 Nov 2009 18:15:31 -0000 3.27
+++ libCERTI/ObjectSet.cc 7 Mar 2010 21:30:30 -0000 3.28
@@ -66,7 +66,7 @@
void
ObjectSet::changeAttributeTransportationType(ObjectHandle,
AttributeHandle *,
- UShort,
+ uint16_t,
TransportType)
throw (ObjectNotKnown,
AttributeNotDefined,
@@ -81,7 +81,7 @@
void
ObjectSet::changeAttributeOrderType(ObjectHandle,
AttributeHandle *,
- UShort,
+ uint16_t,
TransportType)
throw (ObjectNotKnown,
AttributeNotDefined,
@@ -268,7 +268,7 @@
negotiatedAttributeOwnershipDivestiture(FederateHandle,
ObjectHandle,
AttributeHandle *,
- UShort,
+ uint16_t,
const std::string&)
throw (ObjectNotKnown,
AttributeNotDefined,
@@ -284,7 +284,7 @@
attributeOwnershipAcquisitionIfAvailable(FederateHandle,
ObjectHandle,
AttributeHandle *,
- UShort)
+ uint16_t)
throw (ObjectNotKnown,
ObjectClassNotPublished,
AttributeNotDefined,
@@ -301,7 +301,7 @@
unconditionalAttributeOwnershipDivestiture(FederateHandle,
ObjectHandle,
AttributeHandle *,
- UShort)
+ uint16_t)
throw (ObjectNotKnown,
AttributeNotDefined,
AttributeNotOwned,
@@ -315,7 +315,7 @@
ObjectSet::attributeOwnershipAcquisition(FederateHandle,
ObjectHandle,
AttributeHandle *,
- UShort,
+ uint16_t,
const std::string&)
throw (ObjectNotKnown,
@@ -333,7 +333,7 @@
cancelNegotiatedAttributeOwnershipDivestiture(FederateHandle the_federate,
ObjectHandle the_object,
std::vector <AttributeHandle>
&the_attributes,
- UShort the_size)
+ uint16_t the_size)
throw (ObjectNotKnown,
AttributeNotDefined,
AttributeNotOwned,
@@ -373,7 +373,7 @@
ObjectSet::attributeOwnershipReleaseResponse(FederateHandle,
ObjectHandle,
std::vector <AttributeHandle> &,
- UShort)
+ uint16_t)
throw (ObjectNotKnown,
AttributeNotDefined,
AttributeNotOwned,
@@ -390,7 +390,7 @@
ObjectSet::cancelAttributeOwnershipAcquisition(FederateHandle,
ObjectHandle,
std::vector <AttributeHandle> &,
- UShort)
+ uint16_t)
throw (ObjectNotKnown,
AttributeNotDefined,
AttributeAlreadyOwned,
@@ -461,4 +461,4 @@
}
} // namespace certi
-// $Id: ObjectSet.cc,v 3.27 2009/11/19 18:15:31 erk Exp $
+// $Id: ObjectSet.cc,v 3.28 2010/03/07 21:30:30 erk Exp $
Index: libCERTI/ObjectSet.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectSet.hh,v
retrieving revision 3.15
retrieving revision 3.16
diff -u -b -r3.15 -r3.16
--- libCERTI/ObjectSet.hh 19 Nov 2009 18:15:31 -0000 3.15
+++ libCERTI/ObjectSet.hh 7 Mar 2010 21:30:30 -0000 3.16
@@ -59,14 +59,14 @@
void changeAttributeTransportationType(ObjectHandle the_object,
AttributeHandle *the_attributes,
- UShort the_size,
+ uint16_t the_size,
TransportType the_type)
throw (ObjectNotKnown, AttributeNotDefined, AttributeNotOwned,
RTIinternalError, InvalidObjectHandle);
void changeAttributeOrderType(ObjectHandle the_object,
AttributeHandle *the_attributes,
- UShort the_size,
+ uint16_t the_size,
TransportType the_type)
throw (ObjectNotKnown, AttributeNotDefined, AttributeNotOwned,
RTIinternalError, InvalidObjectHandle);
@@ -104,7 +104,7 @@
negotiatedAttributeOwnershipDivestiture(FederateHandle the_federate,
ObjectHandle the_object,
AttributeHandle *the_attributes,
- UShort the_size,
+ uint16_t the_size,
const std::string& the_tag)
throw (ObjectNotKnown, AttributeNotDefined, AttributeNotOwned,
AttributeAlreadyBeingDivested, RTIinternalError);
@@ -113,7 +113,7 @@
attributeOwnershipAcquisitionIfAvailable(FederateHandle the_federate,
ObjectHandle the_object,
AttributeHandle *the_attributes,
- UShort the_size)
+ uint16_t the_size)
throw (ObjectNotKnown, ObjectClassNotPublished, AttributeNotDefined,
AttributeNotPublished, FederateOwnsAttributes,
AttributeAlreadyBeingAcquired, RTIinternalError);
@@ -122,7 +122,7 @@
unconditionalAttributeOwnershipDivestiture(FederateHandle the_federate,
ObjectHandle the_object,
AttributeHandle *the_attributes,
- UShort the_size)
+ uint16_t the_size)
throw (ObjectNotKnown, AttributeNotDefined, AttributeNotOwned,
RTIinternalError);
@@ -130,7 +130,7 @@
attributeOwnershipAcquisition(FederateHandle the_federate,
ObjectHandle the_object,
AttributeHandle *the_attributes,
- UShort the_size,
+ uint16_t the_size,
const std::string& the_tag)
throw (ObjectNotKnown, ObjectClassNotPublished, AttributeNotDefined,
AttributeNotPublished, FederateOwnsAttributes,
RTIinternalError);
@@ -139,7 +139,7 @@
cancelNegotiatedAttributeOwnershipDivestiture(FederateHandle the_federate,
ObjectHandle the_object,
std::vector
<AttributeHandle> &,
- UShort the_size)
+ uint16_t the_size)
throw (ObjectNotKnown, AttributeNotDefined, AttributeNotOwned,
AttributeDivestitureWasNotRequested, RTIinternalError);
@@ -147,7 +147,7 @@
attributeOwnershipReleaseResponse(FederateHandle the_federate,
ObjectHandle the_object,
std::vector <AttributeHandle>
&the_attributes,
- UShort the_size)
+ uint16_t the_size)
throw (ObjectNotKnown, AttributeNotDefined, AttributeNotOwned,
FederateWasNotAskedToReleaseAttribute, RTIinternalError);
@@ -155,7 +155,7 @@
cancelAttributeOwnershipAcquisition(FederateHandle the_federate,
ObjectHandle the_object,
std::vector <AttributeHandle>
&the_attributes,
- UShort the_size)
+ uint16_t the_size)
throw (ObjectNotKnown, AttributeNotDefined, AttributeAlreadyOwned,
AttributeAcquisitionWasNotRequested, RTIinternalError);
Index: libCERTI/NetworkMessage.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/NetworkMessage.hh,v
retrieving revision 3.57
retrieving revision 3.58
diff -u -b -r3.57 -r3.58
--- libCERTI/NetworkMessage.hh 7 Mar 2010 18:23:40 -0000 3.57
+++ libCERTI/NetworkMessage.hh 7 Mar 2010 21:30:30 -0000 3.58
@@ -17,7 +17,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: NetworkMessage.hh,v 3.57 2010/03/07 18:23:40 erk Exp $
+// $Id: NetworkMessage.hh,v 3.58 2010/03/07 21:30:30 erk Exp $
// ----------------------------------------------------------------------------
#ifndef CERTI_NETWORK_MESSAGE_HH
@@ -183,10 +183,10 @@
//->removeParameter(1)
// ParamArraySize = 2,
// ParamArray =[1, 3], ValueArray =["Val1", "Val3"]
- void removeParameter(UShort Rank);
+ void removeParameter(uint16_t Rank);
// See RemoveParameter for explanations.
- void removeAttribute(UShort Rank);
+ void removeAttribute(uint16_t Rank);
// Value Array Management
@@ -281,4 +281,4 @@
#endif // CERTI_NETWORK_MESSAGE_HH
-// $Id: NetworkMessage.hh,v 3.57 2010/03/07 18:23:40 erk Exp $
+// $Id: NetworkMessage.hh,v 3.58 2010/03/07 21:30:30 erk Exp $
Index: libCERTI/ObjectClassBroadcastList.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectClassBroadcastList.cc,v
retrieving revision 3.27
retrieving revision 3.28
diff -u -b -r3.27 -r3.28
--- libCERTI/ObjectClassBroadcastList.cc 21 Oct 2009 18:56:28 -0000
3.27
+++ libCERTI/ObjectClassBroadcastList.cc 7 Mar 2010 21:30:30 -0000
3.28
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: ObjectClassBroadcastList.cc,v 3.27 2009/10/21 18:56:28 erk Exp $
+// $Id: ObjectClassBroadcastList.cc,v 3.28 2010/03/07 21:30:30 erk Exp $
// ----------------------------------------------------------------------------
@@ -82,12 +82,12 @@
reducedMessage->setLabel(message->getLabel());
}
// Copy attributes that are in the bsWaiting state in Line.
- UShort currentSize ;
+ uint16_t currentSize ;
AttributeHandle currentAttrib ;
reducedMessage->handleArraySize = 0 ;
- for (UShort i = 0 ; i < message->handleArraySize ; i++) {
+ for (uint16_t i = 0 ; i < message->handleArraySize ; i++) {
currentAttrib = message->handleArray[i] ;
@@ -401,4 +401,4 @@
} // namespace certi
-// $Id: ObjectClassBroadcastList.cc,v 3.27 2009/10/21 18:56:28 erk Exp $
+// $Id: ObjectClassBroadcastList.cc,v 3.28 2010/03/07 21:30:30 erk Exp $
Index: RTIA/DeclarationManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/DeclarationManagement.cc,v
retrieving revision 3.30
retrieving revision 3.31
diff -u -b -r3.30 -r3.31
--- RTIA/DeclarationManagement.cc 27 Feb 2010 16:53:36 -0000 3.30
+++ RTIA/DeclarationManagement.cc 7 Mar 2010 21:30:30 -0000 3.31
@@ -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: DeclarationManagement.cc,v 3.30 2010/02/27 16:53:36 erk Exp $
+// $Id: DeclarationManagement.cc,v 3.31 2010/03/07 21:30:30 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -109,7 +109,7 @@
{
// Variables leurres
//AttributeHandle *attribArray = NULL ;
- UShort attribArraySize = 0 ;
+ uint16_t attribArraySize = 0 ;
std::vector <AttributeHandle> attribArrayVector ;
attribArrayVector.empty();
@@ -484,4 +484,4 @@
}} // namespace certi/rtia
-// $Id: DeclarationManagement.cc,v 3.30 2010/02/27 16:53:36 erk Exp $
+// $Id: DeclarationManagement.cc,v 3.31 2010/03/07 21:30:30 erk Exp $
Index: RTIA/ObjectManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/ObjectManagement.cc,v
retrieving revision 3.65
retrieving revision 3.66
diff -u -b -r3.65 -r3.66
--- RTIA/ObjectManagement.cc 7 Mar 2010 18:23:40 -0000 3.65
+++ RTIA/ObjectManagement.cc 7 Mar 2010 21:30:30 -0000 3.66
@@ -255,7 +255,7 @@
ObjectManagement::reflectAttributeValues(ObjectHandle the_object,
std::vector <AttributeHandle>
&the_attributes,
std::vector <AttributeValue_t>
&the_values,
- UShort the_size,
+ uint16_t the_size,
FederationTime the_time,
const std::string& the_tag,
EventRetractionHandle the_event,
@@ -288,7 +288,7 @@
ObjectManagement::reflectAttributeValues(ObjectHandle the_object,
std::vector <AttributeHandle>
&the_attributes,
std::vector <AttributeValue_t>
&the_values,
- UShort the_size,
+ uint16_t the_size,
const std::string& the_tag,
TypeException &)
{
@@ -417,7 +417,7 @@
ObjectManagement::receiveInteraction(InteractionClassHandle the_interaction,
std::vector <ParameterHandle>
&the_parameters,
std::vector <ParameterValue_t>
&the_values,
- UShort the_size,
+ uint16_t the_size,
FederationTime the_time,
const std::string& the_tag,
EventRetractionHandle the_event,
@@ -446,7 +446,7 @@
ObjectManagement::receiveInteraction(InteractionClassHandle the_interaction,
std::vector <ParameterHandle>
&the_parameters,
std::vector <ParameterValue_t>
&the_values,
- UShort the_size,
+ uint16_t the_size,
const std::string& the_tag,
TypeException &)
{
@@ -704,7 +704,7 @@
void
ObjectManagement::provideAttributeValueUpdate(ObjectHandle the_object,
std::vector <AttributeHandle>
&the_attributes,
- UShort attribArraySize,
+ uint16_t attribArraySize,
TypeException &)
{
M_Provide_Attribute_Value_Update req;
@@ -945,7 +945,7 @@
ObjectManagement::
attributesInScope(ObjectHandle theObject,
const std::vector <AttributeHandle> &attribArray,
- const UShort attribArraySize,
+ const uint16_t attribArraySize,
TypeException &e) {
M_Attributes_In_Scope req;
@@ -971,7 +971,7 @@
ObjectManagement::
attributesOutOfScope(ObjectHandle theObject,
const std::vector <AttributeHandle> &attribArray,
- const UShort attribArraySize,
+ const uint16_t attribArraySize,
TypeException &e) {
M_Attributes_Out_Of_Scope req;
@@ -1021,7 +1021,7 @@
ObjectManagement::
turnUpdatesOnForObjectInstance(ObjectHandle theObject,
const std::vector <AttributeHandle> &attribArray,
- const UShort attribArraySize,
+ const uint16_t attribArraySize,
TypeException &e) {
M_Turn_Updates_On_For_Object_Instance req;
@@ -1047,7 +1047,7 @@
ObjectManagement::
turnUpdatesOffForObjectInstance(ObjectHandle theObject,
const std::vector <AttributeHandle> &attribArray,
- const UShort attribArraySize,
+ const uint16_t attribArraySize,
TypeException &e) {
M_Turn_Updates_Off_For_Object_Instance req;
Index: RTIA/RTIA_network.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/RTIA_network.cc,v
retrieving revision 3.33
retrieving revision 3.34
diff -u -b -r3.33 -r3.34
--- RTIA/RTIA_network.cc 21 Oct 2009 18:56:29 -0000 3.33
+++ RTIA/RTIA_network.cc 7 Mar 2010 21:30:30 -0000 3.34
@@ -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: RTIA_network.cc,v 3.33 2009/10/21 18:56:29 erk Exp $
+// $Id: RTIA_network.cc,v 3.34 2010/03/07 21:30:30 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -128,7 +128,7 @@
// Retrieve order type
updateOrder = TIMESTAMP;
- for (UShort i=0; i< msg->handleArraySize; ++i)
+ for (uint16_t i=0; i< msg->handleArraySize; ++i)
{
if (rootObject->ObjectClasses->getObjectFromHandle(
msg->objectClass)
->getAttribute(msg->handleArray[i])->order != TIMESTAMP)
@@ -373,4 +373,4 @@
}} // namespace certi/rtia
-// $Id: RTIA_network.cc,v 3.33 2009/10/21 18:56:29 erk Exp $
+// $Id: RTIA_network.cc,v 3.34 2010/03/07 21:30:30 erk Exp $
Index: RTIA/ObjectManagement.hh
===================================================================
RCS file: /sources/certi/certi/RTIA/ObjectManagement.hh,v
retrieving revision 3.32
retrieving revision 3.33
diff -u -b -r3.32 -r3.33
--- RTIA/ObjectManagement.hh 27 Feb 2010 16:53:36 -0000 3.32
+++ RTIA/ObjectManagement.hh 7 Mar 2010 21:30:30 -0000 3.33
@@ -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: ObjectManagement.hh,v 3.32 2010/02/27 16:53:36 erk Exp $
+// $Id: ObjectManagement.hh,v 3.33 2010/03/07 21:30:30 erk Exp $
// ----------------------------------------------------------------------------
#ifndef _CERTI_RTIA_OM
@@ -74,7 +74,7 @@
void reflectAttributeValues(ObjectHandle theObjectHandle,
std::vector <AttributeHandle> &attribArray,
std::vector <AttributeValue_t> &valueArray,
- UShort attribArraySize,
+ uint16_t attribArraySize,
FederationTime theTime,
const std::string& theTag,
EventRetractionHandle theHandle,
@@ -83,7 +83,7 @@
void reflectAttributeValues(ObjectHandle theObjectHandle,
std::vector <AttributeHandle> &attribArray,
std::vector <AttributeValue_t> &valueArray,
- UShort attribArraySize,
+ uint16_t attribArraySize,
const std::string& theTag,
TypeException &e);
@@ -109,7 +109,7 @@
void receiveInteraction(InteractionClassHandle theInteraction,
std::vector <ParameterHandle> ¶mArray,
std::vector <ParameterValue_t> &valueArray,
- UShort paramArraySize,
+ uint16_t paramArraySize,
FederationTime theTime,
const std::string& theTag,
EventRetractionHandle theHandle,
@@ -118,7 +118,7 @@
void receiveInteraction(InteractionClassHandle theInteraction,
std::vector <ParameterHandle> ¶mArray,
std::vector <ParameterValue_t> &valueArray,
- UShort paramArraySize,
+ uint16_t paramArraySize,
const std::string& theTag,
TypeException &e);
@@ -179,7 +179,7 @@
void provideAttributeValueUpdate(ObjectHandle theObject,
std::vector <AttributeHandle>
&theAttributes,
- UShort attribArraySize,
+ uint16_t attribArraySize,
TypeException &e);
void retract(EventRetractionHandle theHandle, TypeException &e);
@@ -204,14 +204,14 @@
void
attributesInScope(ObjectHandle theObject,
const std::vector <AttributeHandle> &attribArray,
- const UShort attribArraySize,
+ const uint16_t attribArraySize,
TypeException &e);
// 6.14
void
attributesOutOfScope(ObjectHandle theObject,
const std::vector <AttributeHandle> &attribArray,
- const UShort attribArraySize,
+ const uint16_t attribArraySize,
TypeException &e);
/**
@@ -231,14 +231,14 @@
void
turnUpdatesOnForObjectInstance(ObjectHandle theObject,
const std::vector <AttributeHandle> &attribArray,
- const UShort attribArraySize,
+ const uint16_t attribArraySize,
TypeException &e);
// 6.18
void
turnUpdatesOffForObjectInstance(ObjectHandle theObject,
const std::vector <AttributeHandle> &attribArray,
- const UShort attribArraySize,
+ const uint16_t attribArraySize,
TypeException &e);
// RTI Support Services
@@ -298,4 +298,4 @@
#endif // _CERTI_RTIA_OM
-// $Id: ObjectManagement.hh,v 3.32 2010/02/27 16:53:36 erk Exp $
+// $Id: ObjectManagement.hh,v 3.33 2010/03/07 21:30:30 erk Exp $
Index: include/certi.hh
===================================================================
RCS file: /sources/certi/certi/include/certi.hh,v
retrieving revision 3.44
retrieving revision 3.45
diff -u -b -r3.44 -r3.45
--- include/certi.hh 7 Mar 2010 18:23:40 -0000 3.44
+++ include/certi.hh 7 Mar 2010 21:30:31 -0000 3.45
@@ -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.44 2010/03/07 18:23:40 erk Exp $
+// $Id: certi.hh,v 3.45 2010/03/07 21:30:31 erk Exp $
// ----------------------------------------------------------------------------
#ifndef CERTI_HH_INCLUDED
@@ -107,7 +107,6 @@
#define CERTI_ENCODE_DOUBLE_TO_UINT64BE(val) (CERTI_UINT64_TO_BE
(*(uint64_t*)(val)))
#define CERTI_DECODE_DOUBLE_FROM_UINT64BE(val) (CERTI_UINT64_FROM_BE
(*(uint64_t*)(val)))
-//#include "RTI.hh"
#include <string>
/**
@@ -121,9 +120,6 @@
namespace certi {
-typedef uint16_t UShort;
-typedef uint32_t ULong;
-
typedef uint32_t Handle;
typedef Handle ObjectClassHandle;
typedef Handle InteractionClassHandle;
@@ -272,4 +268,4 @@
(uint64_t) CERTI_INT64_CONSTANT(0xff00000000000000U)) >> 56)))
#endif // CERTI_HH_INCLUDED
-// $Id: certi.hh,v 3.44 2010/03/07 18:23:40 erk Exp $
+// $Id: certi.hh,v 3.45 2010/03/07 21:30:31 erk Exp $
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [certi-cvs] certi RTIG/FederationsList.cc RTIG/Federation.c...,
certi-cvs <=