[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] certi libCERTI/ObjectClassBroadcastList.cc libC...
|
From: |
CERTI CVS commits |
|
Subject: |
[certi-cvs] certi libCERTI/ObjectClassBroadcastList.cc libC... |
|
Date: |
Tue, 24 Sep 2013 14:27:59 +0000 |
CVSROOT: /sources/certi
Module name: certi
Changes by: Eric NOULARD <erk> 13/09/24 14:27:59
Modified files:
libCERTI : ObjectClassBroadcastList.cc ObjectClass.cc
ObjectAttribute.cc AuditLine.cc fed.hh LBTS.cc
ObjectClassAttribute.cc GAV.cc tokens.ll
FederateLevelList.hh PrettyDebug.cc
NetworkMessage.hh AuditFile.hh BasicMessage.cc
FedTime.cc Exception.cc Interaction.cc
ObjectClassBroadcastList.hh SocketTCP.cc
InteractionSet.cc LBTS.hh FederateLevelList.cc
Named.cc ObjectClassAttribute.hh BaseRegion.cc
Object.cc ObjectAttribute.hh Extent.cc
InteractionBroadcastList.hh helper.hh
GSSAPIHandler.hh NetworkMessage_RW.cc
FedRegion.cc InteractionSet.hh FedTimeD.hh
Extent.hh GSSAPIHandler.cc NetworkMessage.cc
AuditFile.cc AuditLine.hh Named.hh
ObjectClassSet.cc Dimension.cc
ObjectClassSet.hh Message_RW.cc
InteractionBroadcastList.cc PrettyDebug.hh
Exception.hh BasicMessage.hh Dimension.hh
Interaction.hh fed.cc FedRegion.hh
ObjectClass.hh Handled.hh
RTIG : Federation.hh Federation.cc RTIG_processing.cc
RTIG.cc RTIG.hh
test/libgraphc : graph_c.cc
Added files:
test/Billard : Billard_cmdline.h Billard_cmdline.c
Removed files:
libCERTI : BaseRegion.hh HandleManager.hh Message.cc
NameReservation.hh
Log message:
Merge patch #7791 : Remove $Id$ CVS keywords
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectClassBroadcastList.cc?cvsroot=certi&r1=3.32&r2=3.33
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectClass.cc?cvsroot=certi&r1=3.90&r2=3.91
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectAttribute.cc?cvsroot=certi&r1=3.19&r2=3.20
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/AuditLine.cc?cvsroot=certi&r1=3.12&r2=3.13
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/fed.hh?cvsroot=certi&r1=3.8&r2=3.9
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/LBTS.cc?cvsroot=certi&r1=3.20&r2=3.21
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectClassAttribute.cc?cvsroot=certi&r1=3.39&r2=3.40
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/GAV.cc?cvsroot=certi&r1=3.23&r2=3.24
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/tokens.ll?cvsroot=certi&r1=3.11&r2=3.12
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/FederateLevelList.hh?cvsroot=certi&r1=3.11&r2=3.12
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/PrettyDebug.cc?cvsroot=certi&r1=4.12&r2=4.13
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NetworkMessage.hh?cvsroot=certi&r1=3.66&r2=3.67
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/AuditFile.hh?cvsroot=certi&r1=3.11&r2=3.12
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/BasicMessage.cc?cvsroot=certi&r1=3.18&r2=3.19
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/FedTime.cc?cvsroot=certi&r1=3.16&r2=3.17
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Exception.cc?cvsroot=certi&r1=3.21&r2=3.22
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Interaction.cc?cvsroot=certi&r1=3.64&r2=3.65
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectClassBroadcastList.hh?cvsroot=certi&r1=3.11&r2=3.12
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SocketTCP.cc?cvsroot=certi&r1=3.35&r2=3.36
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/InteractionSet.cc?cvsroot=certi&r1=3.34&r2=3.35
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/LBTS.hh?cvsroot=certi&r1=3.13&r2=3.14
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/FederateLevelList.cc?cvsroot=certi&r1=3.11&r2=3.12
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Named.cc?cvsroot=certi&r1=3.10&r2=3.11
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectClassAttribute.hh?cvsroot=certi&r1=3.29&r2=3.30
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/BaseRegion.cc?cvsroot=certi&r1=3.6&r2=3.7
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Object.cc?cvsroot=certi&r1=3.28&r2=3.29
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectAttribute.hh?cvsroot=certi&r1=3.19&r2=3.20
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Extent.cc?cvsroot=certi&r1=3.14&r2=3.15
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/InteractionBroadcastList.hh?cvsroot=certi&r1=3.10&r2=3.11
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/helper.hh?cvsroot=certi&r1=3.2&r2=3.3
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/GSSAPIHandler.hh?cvsroot=certi&r1=3.4&r2=3.5
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NetworkMessage_RW.cc?cvsroot=certi&r1=3.58&r2=3.59
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/FedRegion.cc?cvsroot=certi&r1=3.6&r2=3.7
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/InteractionSet.hh?cvsroot=certi&r1=3.28&r2=3.29
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/FedTimeD.hh?cvsroot=certi&r1=4.1&r2=4.2
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Extent.hh?cvsroot=certi&r1=3.12&r2=3.13
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/GSSAPIHandler.cc?cvsroot=certi&r1=3.8&r2=3.9
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NetworkMessage.cc?cvsroot=certi&r1=3.51&r2=3.52
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/AuditFile.cc?cvsroot=certi&r1=3.12&r2=3.13
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/AuditLine.hh?cvsroot=certi&r1=3.11&r2=3.12
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Named.hh?cvsroot=certi&r1=3.11&r2=3.12
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectClassSet.cc?cvsroot=certi&r1=3.58&r2=3.59
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Dimension.cc?cvsroot=certi&r1=3.9&r2=3.10
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectClassSet.hh?cvsroot=certi&r1=3.42&r2=3.43
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Message_RW.cc?cvsroot=certi&r1=3.42&r2=3.43
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/InteractionBroadcastList.cc?cvsroot=certi&r1=3.16&r2=3.17
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/PrettyDebug.hh?cvsroot=certi&r1=4.10&r2=4.11
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Exception.hh?cvsroot=certi&r1=3.12&r2=3.13
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/BasicMessage.hh?cvsroot=certi&r1=3.17&r2=3.18
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Dimension.hh?cvsroot=certi&r1=3.10&r2=3.11
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Interaction.hh?cvsroot=certi&r1=3.45&r2=3.46
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/fed.cc?cvsroot=certi&r1=3.24&r2=3.25
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/FedRegion.hh?cvsroot=certi&r1=3.5&r2=3.6
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectClass.hh?cvsroot=certi&r1=3.59&r2=3.60
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Handled.hh?cvsroot=certi&r1=3.2&r2=3.3
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/BaseRegion.hh?cvsroot=certi&r1=3.3&r2=0
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/HandleManager.hh?cvsroot=certi&r1=3.8&r2=0
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Message.cc?cvsroot=certi&r1=3.68&r2=0
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NameReservation.hh?cvsroot=certi&r1=3.2&r2=0
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/Federation.hh?cvsroot=certi&r1=3.74&r2=3.75
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/Federation.cc?cvsroot=certi&r1=3.151&r2=3.152
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/RTIG_processing.cc?cvsroot=certi&r1=3.115&r2=3.116
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/RTIG.cc?cvsroot=certi&r1=3.70&r2=3.71
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/RTIG.hh?cvsroot=certi&r1=3.38&r2=3.39
http://cvs.savannah.gnu.org/viewcvs/certi/test/Billard/Billard_cmdline.h?cvsroot=certi&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/certi/test/Billard/Billard_cmdline.c?cvsroot=certi&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/certi/test/libgraphc/graph_c.cc?cvsroot=certi&r1=3.7&r2=3.8
Patches:
Index: libCERTI/ObjectClassBroadcastList.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectClassBroadcastList.cc,v
retrieving revision 3.32
retrieving revision 3.33
diff -u -b -r3.32 -r3.33
--- libCERTI/ObjectClassBroadcastList.cc 29 Mar 2010 17:52:19 -0000
3.32
+++ libCERTI/ObjectClassBroadcastList.cc 24 Sep 2013 14:27:48 -0000
3.33
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: ObjectClassBroadcastList.cc,v 3.32 2010/03/29 17:52:19 erk Exp $
// ----------------------------------------------------------------------------
@@ -500,5 +499,3 @@
}
} // namespace certi
-
-// $Id: ObjectClassBroadcastList.cc,v 3.32 2010/03/29 17:52:19 erk Exp $
Index: libCERTI/ObjectClass.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectClass.cc,v
retrieving revision 3.90
retrieving revision 3.91
diff -u -b -r3.90 -r3.91
--- libCERTI/ObjectClass.cc 9 Sep 2011 14:35:35 -0000 3.90
+++ libCERTI/ObjectClass.cc 24 Sep 2013 14:27:48 -0000 3.91
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: ObjectClass.cc,v 3.90 2011/09/09 14:35:35 erk Exp $
// ----------------------------------------------------------------------------
#include "Object.hh"
@@ -1675,5 +1674,3 @@
// }
} // namespace certi
-
-// $Id: ObjectClass.cc,v 3.90 2011/09/09 14:35:35 erk Exp $
Index: libCERTI/ObjectAttribute.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectAttribute.cc,v
retrieving revision 3.19
retrieving revision 3.20
diff -u -b -r3.19 -r3.20
--- libCERTI/ObjectAttribute.cc 20 Nov 2009 17:33:57 -0000 3.19
+++ libCERTI/ObjectAttribute.cc 24 Sep 2013 14:27:48 -0000 3.20
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: ObjectAttribute.cc,v 3.19 2009/11/20 17:33:57 erk Exp $
// ----------------------------------------------------------------------------
@@ -186,5 +185,3 @@
}
} //namespace certi
-
-// $Id: ObjectAttribute.cc,v 3.19 2009/11/20 17:33:57 erk Exp $
Index: libCERTI/AuditLine.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/AuditLine.cc,v
retrieving revision 3.12
retrieving revision 3.13
diff -u -b -r3.12 -r3.13
--- libCERTI/AuditLine.cc 19 Nov 2009 18:15:32 -0000 3.12
+++ libCERTI/AuditLine.cc 24 Sep 2013 14:27:48 -0000 3.13
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: AuditLine.cc,v 3.12 2009/11/19 18:15:32 erk Exp $
// ----------------------------------------------------------------------------
@@ -124,6 +123,3 @@
}
} // namespace certi
-
-// $Id: AuditLine.cc,v 3.12 2009/11/19 18:15:32 erk Exp $
-
Index: libCERTI/fed.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/fed.hh,v
retrieving revision 3.8
retrieving revision 3.9
diff -u -b -r3.8 -r3.9
--- libCERTI/fed.hh 9 Nov 2010 12:43:30 -0000 3.8
+++ libCERTI/fed.hh 24 Sep 2013 14:27:48 -0000 3.9
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: fed.hh,v 3.8 2010/11/09 12:43:30 erk Exp $
// ----------------------------------------------------------------------------
#ifndef _FED_HH
@@ -75,4 +74,3 @@
}
#endif // _FED_HH
-// $Id: fed.hh,v 3.8 2010/11/09 12:43:30 erk Exp $
Index: libCERTI/LBTS.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/LBTS.cc,v
retrieving revision 3.20
retrieving revision 3.21
diff -u -b -r3.20 -r3.21
--- libCERTI/LBTS.cc 19 Aug 2010 10:50:22 -0000 3.20
+++ libCERTI/LBTS.cc 24 Sep 2013 14:27:49 -0000 3.21
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: LBTS.cc,v 3.20 2010/08/19 10:50:22 erk Exp $
// ----------------------------------------------------------------------------
@@ -158,5 +157,3 @@
}
} // namespace certi
-
-// $Id: LBTS.cc,v 3.20 2010/08/19 10:50:22 erk Exp $
Index: libCERTI/ObjectClassAttribute.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectClassAttribute.cc,v
retrieving revision 3.39
retrieving revision 3.40
diff -u -b -r3.39 -r3.40
--- libCERTI/ObjectClassAttribute.cc 2 Sep 2011 21:42:23 -0000 3.39
+++ libCERTI/ObjectClassAttribute.cc 24 Sep 2013 14:27:49 -0000 3.40
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: ObjectClassAttribute.cc,v 3.39 2011/09/02 21:42:23 erk Exp $
// ----------------------------------------------------------------------------
#include "ObjectClassAttribute.hh"
@@ -194,5 +193,3 @@
}
} // namespace
-
-// $Id: ObjectClassAttribute.cc,v 3.39 2011/09/02 21:42:23 erk Exp $
Index: libCERTI/GAV.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/GAV.cc,v
retrieving revision 3.23
retrieving revision 3.24
diff -u -b -r3.23 -r3.24
--- libCERTI/GAV.cc 19 Mar 2010 13:54:03 -0000 3.23
+++ libCERTI/GAV.cc 24 Sep 2013 14:27:49 -0000 3.24
@@ -16,7 +16,6 @@
// 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.23 2010/03/19 13:54:03 erk Exp $
// ----------------------------------------------------------------------------
#include "GAV.hh"
@@ -564,6 +563,3 @@
}
} // namespace certi
-
-// $Id: GAV.cc,v 3.23 2010/03/19 13:54:03 erk Exp $
-
Index: libCERTI/tokens.ll
===================================================================
RCS file: /sources/certi/certi/libCERTI/tokens.ll,v
retrieving revision 3.11
retrieving revision 3.12
diff -u -b -r3.11 -r3.12
--- libCERTI/tokens.ll 22 Jul 2012 12:39:53 -0000 3.11
+++ libCERTI/tokens.ll 24 Sep 2013 14:27:49 -0000 3.12
@@ -20,7 +20,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: tokens.ll,v 3.11 2012/07/22 12:39:53 erk Exp $
// ----------------------------------------------------------------------------
#include "config.h"
Index: libCERTI/FederateLevelList.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/FederateLevelList.hh,v
retrieving revision 3.11
retrieving revision 3.12
diff -u -b -r3.11 -r3.12
--- libCERTI/FederateLevelList.hh 20 Mar 2010 20:43:55 -0000 3.11
+++ libCERTI/FederateLevelList.hh 24 Sep 2013 14:27:49 -0000 3.12
@@ -17,7 +17,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: FederateLevelList.hh,v 3.11 2010/03/20 20:43:55 gotthardp Exp $
// ----------------------------------------------------------------------------
#ifndef CERTI_FEDERATE_LEVEL_LIST_HH
@@ -50,5 +49,3 @@
} // namespace certi
#endif // CERTI_FEDERATE_LEVEL_LIST_HH
-
-// $Id: FederateLevelList.hh,v 3.11 2010/03/20 20:43:55 gotthardp Exp $
Index: libCERTI/PrettyDebug.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/PrettyDebug.cc,v
retrieving revision 4.12
retrieving revision 4.13
diff -u -b -r4.12 -r4.13
--- libCERTI/PrettyDebug.cc 21 Jun 2012 12:16:17 -0000 4.12
+++ libCERTI/PrettyDebug.cc 24 Sep 2013 14:27:50 -0000 4.13
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: PrettyDebug.cc,v 4.12 2012/06/21 12:16:17 erk Exp $
// ----------------------------------------------------------------------------
#include "PrettyDebug.hh"
@@ -207,4 +206,4 @@
return stream;
}
-// $Id: PrettyDebug.cc,v 4.12 2012/06/21 12:16:17 erk Exp $
+// $Id: PrettyDebug.cc,v 4.13 2013/09/24 14:27:50 erk Exp $
Index: libCERTI/NetworkMessage.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/NetworkMessage.hh,v
retrieving revision 3.66
retrieving revision 3.67
diff -u -b -r3.66 -r3.67
--- libCERTI/NetworkMessage.hh 9 Aug 2010 18:24:07 -0000 3.66
+++ libCERTI/NetworkMessage.hh 24 Sep 2013 14:27:50 -0000 3.67
@@ -17,7 +17,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: NetworkMessage.hh,v 3.66 2010/08/09 18:24:07 erk Exp $
// ----------------------------------------------------------------------------
#ifndef CERTI_NETWORK_MESSAGE_HH
@@ -260,5 +259,3 @@
} // namespace certi
#endif // CERTI_NETWORK_MESSAGE_HH
-
-// $Id: NetworkMessage.hh,v 3.66 2010/08/09 18:24:07 erk Exp $
Index: libCERTI/AuditFile.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/AuditFile.hh,v
retrieving revision 3.11
retrieving revision 3.12
diff -u -b -r3.11 -r3.12
--- libCERTI/AuditFile.hh 19 Nov 2009 18:15:32 -0000 3.11
+++ libCERTI/AuditFile.hh 24 Sep 2013 14:27:50 -0000 3.12
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: AuditFile.hh,v 3.11 2009/11/19 18:15:32 erk Exp $
// ----------------------------------------------------------------------------
#ifndef _CERTI_AUDIT_FILE_HH
@@ -84,5 +83,3 @@
} // namespace certi
#endif // _CERTI_AUDIT_FILE_HH
-
-// $Id: AuditFile.hh,v 3.11 2009/11/19 18:15:32 erk Exp $
Index: libCERTI/BasicMessage.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/BasicMessage.cc,v
retrieving revision 3.18
retrieving revision 3.19
diff -u -b -r3.18 -r3.19
--- libCERTI/BasicMessage.cc 18 Jan 2011 13:26:21 -0000 3.18
+++ libCERTI/BasicMessage.cc 24 Sep 2013 14:27:50 -0000 3.19
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: BasicMessage.cc,v 3.18 2011/01/18 13:26:21 erk Exp $
// ----------------------------------------------------------------------------
@@ -297,5 +296,3 @@
}
} // namespace certi
-
-// $Id: BasicMessage.cc,v 3.18 2011/01/18 13:26:21 erk Exp $
Index: libCERTI/FedTime.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/FedTime.cc,v
retrieving revision 3.16
retrieving revision 3.17
diff -u -b -r3.16 -r3.17
--- libCERTI/FedTime.cc 2 Apr 2009 19:58:09 -0000 3.16
+++ libCERTI/FedTime.cc 24 Sep 2013 14:27:51 -0000 3.17
@@ -18,7 +18,6 @@
// 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: FedTime.cc,v 3.16 2009/04/02 19:58:09 erk Exp $
// ----------------------------------------------------------------------------
#include <math.h>
@@ -420,6 +419,3 @@
FedTime fedtime = d / time.getTime();
return fedtime ;
}
-
-// $Id: FedTime.cc,v 3.16 2009/04/02 19:58:09 erk Exp $
-
Index: libCERTI/Exception.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Exception.cc,v
retrieving revision 3.21
retrieving revision 3.22
diff -u -b -r3.21 -r3.22
--- libCERTI/Exception.cc 31 May 2010 09:33:26 -0000 3.21
+++ libCERTI/Exception.cc 24 Sep 2013 14:27:51 -0000 3.22
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Exception.cc,v 3.21 2010/05/31 09:33:26 erk Exp $
// ----------------------------------------------------------------------------
#include "Exception.hh"
@@ -174,4 +173,3 @@
Debug(PD_Exception, pdExcept) << msg.str();
return msg.str();
}
-// $Id: Exception.cc,v 3.21 2010/05/31 09:33:26 erk Exp $
Index: libCERTI/Interaction.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Interaction.cc,v
retrieving revision 3.64
retrieving revision 3.65
diff -u -b -r3.64 -r3.65
--- libCERTI/Interaction.cc 31 Dec 2011 15:49:23 -0000 3.64
+++ libCERTI/Interaction.cc 24 Sep 2013 14:27:51 -0000 3.65
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Interaction.cc,v 3.64 2011/12/31 15:49:23 erk Exp $
// ----------------------------------------------------------------------------
#include "Interaction.hh"
@@ -529,5 +528,3 @@
}
} // namespace certi
-
-// $Id: Interaction.cc,v 3.64 2011/12/31 15:49:23 erk Exp $
Index: libCERTI/ObjectClassBroadcastList.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectClassBroadcastList.hh,v
retrieving revision 3.11
retrieving revision 3.12
diff -u -b -r3.11 -r3.12
--- libCERTI/ObjectClassBroadcastList.hh 19 Mar 2010 13:54:03 -0000
3.11
+++ libCERTI/ObjectClassBroadcastList.hh 24 Sep 2013 14:27:51 -0000
3.12
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: ObjectClassBroadcastList.hh,v 3.11 2010/03/19 13:54:03 erk Exp $
// ----------------------------------------------------------------------------
#ifndef CERTI_OBJECT_CLASS_BROADCAST_LIST_HH
@@ -173,5 +172,3 @@
} // namespace certi
#endif // CERTI_OBJECT_CLASS_BROADCAST_LIST_HH
-
-// $Id: ObjectClassBroadcastList.hh,v 3.11 2010/03/19 13:54:03 erk Exp $
Index: libCERTI/SocketTCP.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/SocketTCP.cc,v
retrieving revision 3.35
retrieving revision 3.36
diff -u -b -r3.35 -r3.36
--- libCERTI/SocketTCP.cc 4 Sep 2013 12:53:03 -0000 3.35
+++ libCERTI/SocketTCP.cc 24 Sep 2013 14:27:51 -0000 3.36
@@ -17,7 +17,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: SocketTCP.cc,v 3.35 2013/09/04 12:53:03 erk Exp $
// ----------------------------------------------------------------------------
#include "SocketTCP.hh"
@@ -581,4 +580,4 @@
} // namespace
-// $Id: SocketTCP.cc,v 3.35 2013/09/04 12:53:03 erk Exp $
+// $Id: SocketTCP.cc,v 3.36 2013/09/24 14:27:51 erk Exp $
Index: libCERTI/InteractionSet.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/InteractionSet.cc,v
retrieving revision 3.34
retrieving revision 3.35
diff -u -b -r3.34 -r3.35
--- libCERTI/InteractionSet.cc 31 Dec 2011 13:25:58 -0000 3.34
+++ libCERTI/InteractionSet.cc 24 Sep 2013 14:27:52 -0000 3.35
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: InteractionSet.cc,v 3.34 2011/12/31 13:25:58 erk Exp $
// ----------------------------------------------------------------------------
#include "Interaction.hh"
@@ -265,5 +264,3 @@
}
} // namespace certi
-
-// $Id: InteractionSet.cc,v 3.34 2011/12/31 13:25:58 erk Exp $
Index: libCERTI/LBTS.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/LBTS.hh,v
retrieving revision 3.13
retrieving revision 3.14
diff -u -b -r3.13 -r3.14
--- libCERTI/LBTS.hh 19 Aug 2010 10:50:19 -0000 3.13
+++ libCERTI/LBTS.hh 24 Sep 2013 14:27:52 -0000 3.14
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: LBTS.hh,v 3.13 2010/08/19 10:50:19 erk Exp $
// ----------------------------------------------------------------------------
#ifndef LIBCERTI_LBTS_HH
@@ -107,5 +106,3 @@
}
#endif // LIBCERTI_LBTS_HH
-
-// $Id: LBTS.hh,v 3.13 2010/08/19 10:50:19 erk Exp $
Index: libCERTI/FederateLevelList.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/FederateLevelList.cc,v
retrieving revision 3.11
retrieving revision 3.12
diff -u -b -r3.11 -r3.12
--- libCERTI/FederateLevelList.cc 6 Jul 2007 09:25:18 -0000 3.11
+++ libCERTI/FederateLevelList.cc 24 Sep 2013 14:27:52 -0000 3.12
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: FederateLevelList.cc,v 3.11 2007/07/06 09:25:18 erk Exp $
// ----------------------------------------------------------------------------
@@ -59,5 +58,3 @@
}
}
-
-// $Id: FederateLevelList.cc,v 3.11 2007/07/06 09:25:18 erk Exp $
Index: libCERTI/Named.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Named.cc,v
retrieving revision 3.10
retrieving revision 3.11
diff -u -b -r3.10 -r3.11
--- libCERTI/Named.cc 19 Nov 2009 18:15:32 -0000 3.10
+++ libCERTI/Named.cc 24 Sep 2013 14:27:52 -0000 3.11
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Named.cc,v 3.10 2009/11/19 18:15:32 erk Exp $
// ----------------------------------------------------------------------------
#include "Named.hh"
@@ -91,5 +90,3 @@
} /* end of getLeafClassName */
} // certi
-
-// $Id: Named.cc,v 3.10 2009/11/19 18:15:32 erk Exp $
Index: libCERTI/ObjectClassAttribute.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectClassAttribute.hh,v
retrieving revision 3.29
retrieving revision 3.30
diff -u -b -r3.29 -r3.30
--- libCERTI/ObjectClassAttribute.hh 2 Sep 2011 21:42:23 -0000 3.29
+++ libCERTI/ObjectClassAttribute.hh 24 Sep 2013 14:27:52 -0000 3.30
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: ObjectClassAttribute.hh,v 3.29 2011/09/02 21:42:23 erk Exp $
// ----------------------------------------------------------------------------
#ifndef CERTI_OBJECT_CLASS_ATTRIBUTE_HH
@@ -121,5 +120,3 @@
} // namespace
#endif // CERTI_OBJECT_CLASS_ATTRIBUTE_HH
-
-// $Id: ObjectClassAttribute.hh,v 3.29 2011/09/02 21:42:23 erk Exp $
Index: libCERTI/BaseRegion.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/BaseRegion.cc,v
retrieving revision 3.6
retrieving revision 3.7
diff -u -b -r3.6 -r3.7
--- libCERTI/BaseRegion.cc 7 Mar 2010 21:30:30 -0000 3.6
+++ libCERTI/BaseRegion.cc 24 Sep 2013 14:27:52 -0000 3.7
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: BaseRegion.cc,v 3.6 2010/03/07 21:30:30 erk Exp $
// ----------------------------------------------------------------------------
@@ -155,5 +154,3 @@
}
} // namespace certi
-
-// $Id: BaseRegion.cc,v 3.6 2010/03/07 21:30:30 erk Exp $
Index: libCERTI/Object.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Object.cc,v
retrieving revision 3.28
retrieving revision 3.29
diff -u -b -r3.28 -r3.29
--- libCERTI/Object.cc 19 Mar 2010 13:54:03 -0000 3.28
+++ libCERTI/Object.cc 24 Sep 2013 14:27:53 -0000 3.29
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Object.cc,v 3.28 2010/03/19 13:54:03 erk Exp $
// ----------------------------------------------------------------------------
@@ -127,5 +126,3 @@
}
} // namespace certi
-
-// $Id: Object.cc,v 3.28 2010/03/19 13:54:03 erk Exp $
Index: libCERTI/ObjectAttribute.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectAttribute.hh,v
retrieving revision 3.19
retrieving revision 3.20
diff -u -b -r3.19 -r3.20
--- libCERTI/ObjectAttribute.hh 20 Nov 2009 17:33:57 -0000 3.19
+++ libCERTI/ObjectAttribute.hh 24 Sep 2013 14:27:53 -0000 3.20
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: ObjectAttribute.hh,v 3.19 2009/11/20 17:33:57 erk Exp $
// ----------------------------------------------------------------------------
#ifndef CERTI_OBJECT_ATTRIBUTE_HH
@@ -95,5 +94,3 @@
}
#endif // CERTI_OBJECT_ATTRIBUTE_HH
-
-// $Id: ObjectAttribute.hh,v 3.19 2009/11/20 17:33:57 erk Exp $
Index: libCERTI/Extent.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Extent.cc,v
retrieving revision 3.14
retrieving revision 3.15
diff -u -b -r3.14 -r3.15
--- libCERTI/Extent.cc 7 Mar 2010 21:30:30 -0000 3.14
+++ libCERTI/Extent.cc 24 Sep 2013 14:27:53 -0000 3.15
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Extent.cc,v 3.14 2010/03/07 21:30:30 erk Exp $
// ----------------------------------------------------------------------------
@@ -107,5 +106,3 @@
}
} // namespace certi
-
-// $Id: Extent.cc,v 3.14 2010/03/07 21:30:30 erk Exp $
Index: libCERTI/InteractionBroadcastList.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/InteractionBroadcastList.hh,v
retrieving revision 3.10
retrieving revision 3.11
diff -u -b -r3.10 -r3.11
--- libCERTI/InteractionBroadcastList.hh 19 Mar 2010 13:54:03 -0000
3.10
+++ libCERTI/InteractionBroadcastList.hh 24 Sep 2013 14:27:54 -0000
3.11
@@ -17,7 +17,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: InteractionBroadcastList.hh,v 3.10 2010/03/19 13:54:03 erk Exp $
// ----------------------------------------------------------------------------
#ifndef CERTI_INTERACTION_BROADCAST_LIST_HH
@@ -72,5 +71,3 @@
}
#endif // CERTI_INTERACTION_BROADCAST_LIST_HH
-
-// $Id: InteractionBroadcastList.hh,v 3.10 2010/03/19 13:54:03 erk Exp $
Index: libCERTI/helper.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/helper.hh,v
retrieving revision 3.2
retrieving revision 3.3
diff -u -b -r3.2 -r3.3
--- libCERTI/helper.hh 19 Nov 2009 18:15:30 -0000 3.2
+++ libCERTI/helper.hh 24 Sep 2013 14:27:54 -0000 3.3
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: helper.hh,v 3.2 2009/11/19 18:15:30 erk Exp $
// ----------------------------------------------------------------------------
#ifndef LIBCERTI_HELPER_HH
@@ -60,5 +59,3 @@
} // certi
#endif // LIBCERTI_HELPER_HH
-
-// $Id: helper.hh,v 3.2 2009/11/19 18:15:30 erk Exp $
Index: libCERTI/GSSAPIHandler.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/GSSAPIHandler.hh,v
retrieving revision 3.4
retrieving revision 3.5
diff -u -b -r3.4 -r3.5
--- libCERTI/GSSAPIHandler.hh 27 Jun 2003 17:26:28 -0000 3.4
+++ libCERTI/GSSAPIHandler.hh 24 Sep 2013 14:27:54 -0000 3.5
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: GSSAPIHandler.hh,v 3.4 2003/06/27 17:26:28 breholee Exp $
// ----------------------------------------------------------------------------
#ifndef _CERTI_GSSAPI_HANDLER_HH
@@ -103,5 +102,3 @@
#endif // WITH_GSSAPI
#endif // _CERTI_GSSAPI_HANDLER_HH
-
-// $Id: GSSAPIHandler.hh,v 3.4 2003/06/27 17:26:28 breholee Exp $
Index: libCERTI/NetworkMessage_RW.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/NetworkMessage_RW.cc,v
retrieving revision 3.58
retrieving revision 3.59
diff -u -b -r3.58 -r3.59
--- libCERTI/NetworkMessage_RW.cc 30 May 2010 17:41:06 -0000 3.58
+++ libCERTI/NetworkMessage_RW.cc 24 Sep 2013 14:27:54 -0000 3.59
@@ -16,7 +16,6 @@
// 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_RW.cc,v 3.58 2010/05/30 17:41:06 erk Exp $
// ----------------------------------------------------------------------------
#include "NetworkMessage.hh"
@@ -122,5 +121,3 @@
} /* end of receive */
} // namespace certi
-
-// $Id: NetworkMessage_RW.cc,v 3.58 2010/05/30 17:41:06 erk Exp $
Index: libCERTI/FedRegion.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/FedRegion.cc,v
retrieving revision 3.6
retrieving revision 3.7
diff -u -b -r3.6 -r3.7
--- libCERTI/FedRegion.cc 7 Mar 2010 21:30:30 -0000 3.6
+++ libCERTI/FedRegion.cc 24 Sep 2013 14:27:55 -0000 3.7
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: FedRegion.cc,v 3.6 2010/03/07 21:30:30 erk Exp $
// ----------------------------------------------------------------------------
@@ -139,5 +138,3 @@
}
} // namespace certi
-
-// $Id: FedRegion.cc,v 3.6 2010/03/07 21:30:30 erk Exp $
Index: libCERTI/InteractionSet.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/InteractionSet.hh,v
retrieving revision 3.28
retrieving revision 3.29
diff -u -b -r3.28 -r3.29
--- libCERTI/InteractionSet.hh 19 Mar 2010 13:54:03 -0000 3.28
+++ libCERTI/InteractionSet.hh 24 Sep 2013 14:27:55 -0000 3.29
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: InteractionSet.hh,v 3.28 2010/03/19 13:54:03 erk Exp $
// ----------------------------------------------------------------------------
#ifndef _CERTI_INTERACTION_SET_HH
@@ -156,5 +155,3 @@
} // namespace certi
#endif // _CERTI_INTERACTION_SET_HH
-
-// $Id: InteractionSet.hh,v 3.28 2010/03/19 13:54:03 erk Exp $
Index: libCERTI/FedTimeD.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/FedTimeD.hh,v
retrieving revision 4.1
retrieving revision 4.2
diff -u -b -r4.1 -r4.2
--- libCERTI/FedTimeD.hh 2 Apr 2009 19:58:09 -0000 4.1
+++ libCERTI/FedTimeD.hh 24 Sep 2013 14:27:55 -0000 4.2
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: FedTimeD.hh,v 4.1 2009/04/02 19:58:09 erk Exp $
// ----------------------------------------------------------------------------
#ifndef CERTI_FEDTIMED_HH
@@ -183,5 +182,3 @@
} // namespace certi
#endif // CERTI_FEDTIMED_HH
-
-// $Id: FedTimeD.hh,v 4.1 2009/04/02 19:58:09 erk Exp $
Index: libCERTI/Extent.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/Extent.hh,v
retrieving revision 3.12
retrieving revision 3.13
diff -u -b -r3.12 -r3.13
--- libCERTI/Extent.hh 7 Mar 2010 21:30:30 -0000 3.12
+++ libCERTI/Extent.hh 24 Sep 2013 14:27:56 -0000 3.13
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Extent.hh,v 3.12 2010/03/07 21:30:30 erk Exp $
// ----------------------------------------------------------------------------
#ifndef CERTI_EXTENT_HH
@@ -82,5 +81,3 @@
} // namespace certi
#endif // CERTI_EXTENT_HH
-
-// $Id: Extent.hh,v 3.12 2010/03/07 21:30:30 erk Exp $
Index: libCERTI/GSSAPIHandler.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/GSSAPIHandler.cc,v
retrieving revision 3.8
retrieving revision 3.9
diff -u -b -r3.8 -r3.9
--- libCERTI/GSSAPIHandler.cc 21 Oct 2009 18:56:28 -0000 3.8
+++ libCERTI/GSSAPIHandler.cc 24 Sep 2013 14:27:56 -0000 3.9
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: GSSAPIHandler.cc,v 3.8 2009/10/21 18:56:28 erk Exp $
// ----------------------------------------------------------------------------
#ifdef WITH_GSSAPI
@@ -687,5 +686,3 @@
}
#endif // WITH_GSSAPI
-
-// $Id: GSSAPIHandler.cc,v 3.8 2009/10/21 18:56:28 erk Exp $
Index: libCERTI/NetworkMessage.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/NetworkMessage.cc,v
retrieving revision 3.51
retrieving revision 3.52
diff -u -b -r3.51 -r3.52
--- libCERTI/NetworkMessage.cc 11 Aug 2010 16:45:14 -0000 3.51
+++ libCERTI/NetworkMessage.cc 24 Sep 2013 14:27:56 -0000 3.52
@@ -16,7 +16,6 @@
// 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.51 2010/08/11 16:45:14 erk Exp $
// ----------------------------------------------------------------------------
@@ -61,5 +60,3 @@
} /* end of show */
} // namespace certi
-
-// $Id: NetworkMessage.cc,v 3.51 2010/08/11 16:45:14 erk Exp $
Index: libCERTI/AuditFile.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/AuditFile.cc,v
retrieving revision 3.12
retrieving revision 3.13
diff -u -b -r3.12 -r3.13
--- libCERTI/AuditFile.cc 19 Nov 2009 18:15:31 -0000 3.12
+++ libCERTI/AuditFile.cc 24 Sep 2013 14:27:56 -0000 3.13
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: AuditFile.cc,v 3.12 2009/11/19 18:15:31 erk Exp $
// ----------------------------------------------------------------------------
@@ -220,5 +219,3 @@
}
}
-
-// $Id: AuditFile.cc,v 3.12 2009/11/19 18:15:31 erk Exp $
Index: libCERTI/AuditLine.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/AuditLine.hh,v
retrieving revision 3.11
retrieving revision 3.12
diff -u -b -r3.11 -r3.12
--- libCERTI/AuditLine.hh 20 Mar 2010 17:30:37 -0000 3.11
+++ libCERTI/AuditLine.hh 24 Sep 2013 14:27:56 -0000 3.12
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: AuditLine.hh,v 3.11 2010/03/20 17:30:37 gotthardp Exp $
// ----------------------------------------------------------------------------
#ifndef _CERTI_AUDIT_LINE_HH
@@ -66,5 +65,3 @@
}
#endif // _CERTI_AUDIT_LINE_HH
-
-// $Id: AuditLine.hh,v 3.11 2010/03/20 17:30:37 gotthardp Exp $
Index: libCERTI/Named.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/Named.hh,v
retrieving revision 3.11
retrieving revision 3.12
diff -u -b -r3.11 -r3.12
--- libCERTI/Named.hh 20 Mar 2010 17:30:37 -0000 3.11
+++ libCERTI/Named.hh 24 Sep 2013 14:27:57 -0000 3.12
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Named.hh,v 3.11 2010/03/20 17:30:37 gotthardp Exp $
// ----------------------------------------------------------------------------
#ifndef LIBCERTI_NAMED_HH
@@ -131,5 +130,3 @@
} // certi
#endif // LIBCERTI_NAMED_HH
-
-// $Id: Named.hh,v 3.11 2010/03/20 17:30:37 gotthardp Exp $
Index: libCERTI/ObjectClassSet.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectClassSet.cc,v
retrieving revision 3.58
retrieving revision 3.59
diff -u -b -r3.58 -r3.59
--- libCERTI/ObjectClassSet.cc 4 Sep 2013 08:15:34 -0000 3.58
+++ libCERTI/ObjectClassSet.cc 24 Sep 2013 14:27:57 -0000 3.59
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: ObjectClassSet.cc,v 3.58 2013/09/04 08:15:34 erk Exp $
// ----------------------------------------------------------------------------
// Project
@@ -625,4 +624,4 @@
} // namespace certi
-// $Id: ObjectClassSet.cc,v 3.58 2013/09/04 08:15:34 erk Exp $
+// $Id: ObjectClassSet.cc,v 3.59 2013/09/24 14:27:57 erk Exp $
Index: libCERTI/Dimension.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Dimension.cc,v
retrieving revision 3.9
retrieving revision 3.10
diff -u -b -r3.9 -r3.10
--- libCERTI/Dimension.cc 7 Mar 2010 21:30:30 -0000 3.9
+++ libCERTI/Dimension.cc 24 Sep 2013 14:27:57 -0000 3.10
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Dimension.cc,v 3.9 2010/03/07 21:30:30 erk Exp $
// ----------------------------------------------------------------------------
#include "Dimension.hh"
@@ -51,7 +50,3 @@
}
} // namespace certi
-
-// $Id: Dimension.cc,v 3.9 2010/03/07 21:30:30 erk Exp $
-
-
Index: libCERTI/ObjectClassSet.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectClassSet.hh,v
retrieving revision 3.42
retrieving revision 3.43
diff -u -b -r3.42 -r3.43
--- libCERTI/ObjectClassSet.hh 2 Sep 2011 21:42:22 -0000 3.42
+++ libCERTI/ObjectClassSet.hh 24 Sep 2013 14:27:57 -0000 3.43
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: ObjectClassSet.hh,v 3.42 2011/09/02 21:42:22 erk Exp $
// ----------------------------------------------------------------------------
#ifndef _CERTI_OBJECT_CLASS_SET_HH
@@ -196,4 +195,4 @@
#endif // _CERTI_OBJECT_CLASS_SET_HH
-// $Id: ObjectClassSet.hh,v 3.42 2011/09/02 21:42:22 erk Exp $
+// $Id: ObjectClassSet.hh,v 3.43 2013/09/24 14:27:57 erk Exp $
Index: libCERTI/Message_RW.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Message_RW.cc,v
retrieving revision 3.42
retrieving revision 3.43
diff -u -b -r3.42 -r3.43
--- libCERTI/Message_RW.cc 10 Jun 2010 08:31:52 -0000 3.42
+++ libCERTI/Message_RW.cc 24 Sep 2013 14:27:57 -0000 3.43
@@ -17,7 +17,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Message_RW.cc,v 3.42 2010/06/10 08:31:52 erk Exp $
// ----------------------------------------------------------------------------
#include "Message.hh"
@@ -145,5 +144,3 @@
*/
} // namespace certi
-
-// $Id: Message_RW.cc,v 3.42 2010/06/10 08:31:52 erk Exp $
Index: libCERTI/InteractionBroadcastList.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/InteractionBroadcastList.cc,v
retrieving revision 3.16
retrieving revision 3.17
diff -u -b -r3.16 -r3.17
--- libCERTI/InteractionBroadcastList.cc 23 Mar 2010 13:13:27 -0000
3.16
+++ libCERTI/InteractionBroadcastList.cc 24 Sep 2013 14:27:57 -0000
3.17
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: InteractionBroadcastList.cc,v 3.16 2010/03/23 13:13:27 erk Exp $
// ----------------------------------------------------------------------------
@@ -176,5 +175,3 @@
}
} // namespace certi
-
-// $Id: InteractionBroadcastList.cc,v 3.16 2010/03/23 13:13:27 erk Exp $
Index: libCERTI/PrettyDebug.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/PrettyDebug.hh,v
retrieving revision 4.10
retrieving revision 4.11
diff -u -b -r4.10 -r4.11
--- libCERTI/PrettyDebug.hh 21 Jun 2012 12:16:17 -0000 4.10
+++ libCERTI/PrettyDebug.hh 24 Sep 2013 14:27:57 -0000 4.11
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: PrettyDebug.hh,v 4.10 2012/06/21 12:16:17 erk Exp $
// ----------------------------------------------------------------------------
#ifndef PRETTYDEBUG_HH
@@ -131,4 +130,4 @@
#endif // PRETTYDEBUG_HH
-// $Id: PrettyDebug.hh,v 4.10 2012/06/21 12:16:17 erk Exp $
+// $Id: PrettyDebug.hh,v 4.11 2013/09/24 14:27:57 erk Exp $
Index: libCERTI/Exception.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/Exception.hh,v
retrieving revision 3.12
retrieving revision 3.13
diff -u -b -r3.12 -r3.13
--- libCERTI/Exception.hh 16 Sep 2013 13:23:04 -0000 3.12
+++ libCERTI/Exception.hh 24 Sep 2013 14:27:57 -0000 3.13
@@ -20,7 +20,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Exception.hh,v 3.12 2013/09/16 13:23:04 erk Exp $
// ----------------------------------------------------------------------------
#ifndef _CERTI_EXCEPTION_HH
@@ -303,4 +302,4 @@
#endif // _CERTI_EXCEPTION_HH
-// $Id: Exception.hh,v 3.12 2013/09/16 13:23:04 erk Exp $
+// $Id: Exception.hh,v 3.13 2013/09/24 14:27:57 erk Exp $
Index: libCERTI/BasicMessage.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/BasicMessage.hh,v
retrieving revision 3.17
retrieving revision 3.18
diff -u -b -r3.17 -r3.18
--- libCERTI/BasicMessage.hh 10 Jun 2010 08:31:52 -0000 3.17
+++ libCERTI/BasicMessage.hh 24 Sep 2013 14:27:57 -0000 3.18
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: BasicMessage.hh,v 3.17 2010/06/10 08:31:52 erk Exp $
// ----------------------------------------------------------------------------
#ifndef LIBCERTI_BASIC_MESSAGE
@@ -176,5 +175,3 @@
} // namespace certi
#endif // LIBCERTI_BASIC_MESSAGE
-
-// $Id: BasicMessage.hh,v 3.17 2010/06/10 08:31:52 erk Exp $
Index: libCERTI/Dimension.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/Dimension.hh,v
retrieving revision 3.10
retrieving revision 3.11
diff -u -b -r3.10 -r3.11
--- libCERTI/Dimension.hh 7 Mar 2010 21:30:30 -0000 3.10
+++ libCERTI/Dimension.hh 24 Sep 2013 14:27:57 -0000 3.11
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Dimension.hh,v 3.10 2010/03/07 21:30:30 erk Exp $
// ----------------------------------------------------------------------------
#ifndef _CERTI_DIMENSION_HH
@@ -82,5 +81,3 @@
} // namespace certi
#endif
-
-// $Id: Dimension.hh,v 3.10 2010/03/07 21:30:30 erk Exp $
Index: libCERTI/Interaction.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/Interaction.hh,v
retrieving revision 3.45
retrieving revision 3.46
diff -u -b -r3.45 -r3.46
--- libCERTI/Interaction.hh 31 Dec 2011 15:49:23 -0000 3.45
+++ libCERTI/Interaction.hh 24 Sep 2013 14:27:57 -0000 3.46
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Interaction.hh,v 3.45 2011/12/31 15:49:23 erk Exp $
// ----------------------------------------------------------------------------
#ifndef _CERTI_INTERACTION_HH
@@ -262,5 +261,3 @@
} // namespace
#endif // _CERTI_INTERACTION.HH
-
-// $Id: Interaction.hh,v 3.45 2011/12/31 15:49:23 erk Exp $
Index: libCERTI/fed.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/fed.cc,v
retrieving revision 3.24
retrieving revision 3.25
diff -u -b -r3.24 -r3.25
--- libCERTI/fed.cc 31 Dec 2011 13:24:27 -0000 3.24
+++ libCERTI/fed.cc 24 Sep 2013 14:27:57 -0000 3.25
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: fed.cc,v 3.24 2011/12/31 13:24:27 erk Exp $
// ----------------------------------------------------------------------------
// CERTI header
@@ -473,5 +472,3 @@
}
}} // namespaces
-
-// $Id: fed.cc,v 3.24 2011/12/31 13:24:27 erk Exp $
Index: libCERTI/FedRegion.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/FedRegion.hh,v
retrieving revision 3.5
retrieving revision 3.6
diff -u -b -r3.5 -r3.6
--- libCERTI/FedRegion.hh 7 Mar 2010 21:30:30 -0000 3.5
+++ libCERTI/FedRegion.hh 24 Sep 2013 14:27:57 -0000 3.6
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: FedRegion.hh,v 3.5 2010/03/07 21:30:30 erk Exp $
// ----------------------------------------------------------------------------
#ifndef CERTI_FED_REGION_HH
@@ -74,5 +73,3 @@
}
#endif // CERTI_FED_REGION_HH
-
-// $Id: FedRegion.hh,v 3.5 2010/03/07 21:30:30 erk Exp $
Index: libCERTI/ObjectClass.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectClass.hh,v
retrieving revision 3.59
retrieving revision 3.60
diff -u -b -r3.59 -r3.60
--- libCERTI/ObjectClass.hh 2 Sep 2011 21:42:23 -0000 3.59
+++ libCERTI/ObjectClass.hh 24 Sep 2013 14:27:57 -0000 3.60
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: ObjectClass.hh,v 3.59 2011/09/02 21:42:23 erk Exp $
// ----------------------------------------------------------------------------
#ifndef _CERTI_OBJECT_CLASS_HH
@@ -363,5 +362,3 @@
} // namespace certi
#endif // _CERTI_OBJECT_CLASS_HH
-
-// $Id: ObjectClass.hh,v 3.59 2011/09/02 21:42:23 erk Exp $
Index: libCERTI/Handled.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/Handled.hh,v
retrieving revision 3.2
retrieving revision 3.3
diff -u -b -r3.2 -r3.3
--- libCERTI/Handled.hh 3 Sep 2007 13:26:05 -0000 3.2
+++ libCERTI/Handled.hh 24 Sep 2013 14:27:58 -0000 3.3
@@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Handled.hh,v 3.2 2007/09/03 13:26:05 erk Exp $
// ----------------------------------------------------------------------------
#ifndef LIBCERTI_HANDLED_HH
@@ -97,5 +96,3 @@
} // certi
#endif // LIBCERTI_HANDLED_HH
-
-// $Id: Handled.hh,v 3.2 2007/09/03 13:26:05 erk Exp $
Index: RTIG/Federation.hh
===================================================================
RCS file: /sources/certi/certi/RTIG/Federation.hh,v
retrieving revision 3.74
retrieving revision 3.75
diff -u -b -r3.74 -r3.75
--- RTIG/Federation.hh 16 Sep 2013 14:09:43 -0000 3.74
+++ RTIG/Federation.hh 24 Sep 2013 14:27:58 -0000 3.75
@@ -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: Federation.hh,v 3.74 2013/09/16 14:09:43 erk Exp $
// ----------------------------------------------------------------------------
#ifndef _CERTI_RTIG_FEDERATION_HH
@@ -709,4 +708,4 @@
#endif // _CERTI_RTIG_FEDERATION_HH
-// $Id: Federation.hh,v 3.74 2013/09/16 14:09:43 erk Exp $
+// $Id: Federation.hh,v 3.75 2013/09/24 14:27:58 erk Exp $
Index: RTIG/Federation.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/Federation.cc,v
retrieving revision 3.151
retrieving revision 3.152
diff -u -b -r3.151 -r3.152
--- RTIG/Federation.cc 20 Sep 2013 12:04:09 -0000 3.151
+++ RTIG/Federation.cc 24 Sep 2013 14:27:58 -0000 3.152
@@ -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: Federation.cc,v 3.151 2013/09/20 12:04:09 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -2798,5 +2797,5 @@
}} // namespace certi/rtig
-// $Id: Federation.cc,v 3.151 2013/09/20 12:04:09 erk Exp $
+// $Id: Federation.cc,v 3.152 2013/09/24 14:27:58 erk Exp $
Index: RTIG/RTIG_processing.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/RTIG_processing.cc,v
retrieving revision 3.115
retrieving revision 3.116
diff -u -b -r3.115 -r3.116
--- RTIG/RTIG_processing.cc 16 Sep 2013 13:24:09 -0000 3.115
+++ RTIG/RTIG_processing.cc 24 Sep 2013 14:27:58 -0000 3.116
@@ -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: RTIG_processing.cc,v 3.115 2013/09/16 13:24:09 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -1563,4 +1562,4 @@
}} // namespace certi/rtig
-// $Id: RTIG_processing.cc,v 3.115 2013/09/16 13:24:09 erk Exp $
+// $Id: RTIG_processing.cc,v 3.116 2013/09/24 14:27:58 erk Exp $
Index: RTIG/RTIG.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/RTIG.cc,v
retrieving revision 3.70
retrieving revision 3.71
diff -u -b -r3.70 -r3.71
--- RTIG/RTIG.cc 4 Sep 2013 07:56:32 -0000 3.70
+++ RTIG/RTIG.cc 24 Sep 2013 14:27:58 -0000 3.71
@@ -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: RTIG.cc,v 3.70 2013/09/04 07:56:32 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -1073,4 +1072,4 @@
}} // namespace certi/rtig
-// $Id: RTIG.cc,v 3.70 2013/09/04 07:56:32 erk Exp $
+// $Id: RTIG.cc,v 3.71 2013/09/24 14:27:58 erk Exp $
Index: RTIG/RTIG.hh
===================================================================
RCS file: /sources/certi/certi/RTIG/RTIG.hh,v
retrieving revision 3.38
retrieving revision 3.39
diff -u -b -r3.38 -r3.39
--- RTIG/RTIG.hh 4 Sep 2013 07:56:43 -0000 3.38
+++ RTIG/RTIG.hh 24 Sep 2013 14:27:58 -0000 3.39
@@ -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: RTIG.hh,v 3.38 2013/09/04 07:56:43 erk Exp $
// ----------------------------------------------------------------------------
#ifndef CERTI_RTIG_HH
@@ -148,4 +147,4 @@
#endif // CERTI_RTIG_HH
-// $Id: RTIG.hh,v 3.38 2013/09/04 07:56:43 erk Exp $
+// $Id: RTIG.hh,v 3.39 2013/09/24 14:27:58 erk Exp $
Index: test/libgraphc/graph_c.cc
===================================================================
RCS file: /sources/certi/certi/test/libgraphc/graph_c.cc,v
retrieving revision 3.7
retrieving revision 3.8
diff -u -b -r3.7 -r3.8
--- test/libgraphc/graph_c.cc 11 Apr 2013 20:16:19 -0000 3.7
+++ test/libgraphc/graph_c.cc 24 Sep 2013 14:27:59 -0000 3.8
@@ -17,7 +17,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: graph_c.cc,v 3.7 2013/04/11 20:16:19 erk Exp $
// ---------------------------------------------------------------------------
@@ -2210,4 +2209,4 @@
#endif // X_DISPLAY_MISSING
-// $Id: graph_c.cc,v 3.7 2013/04/11 20:16:19 erk Exp $
+// $Id: graph_c.cc,v 3.8 2013/09/24 14:27:59 erk Exp $
Index: test/Billard/Billard_cmdline.h
===================================================================
RCS file: test/Billard/Billard_cmdline.h
diff -N test/Billard/Billard_cmdline.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/Billard/Billard_cmdline.h 24 Sep 2013 14:27:59 -0000 1.1
@@ -0,0 +1,230 @@
+/** @file Billard_cmdline.h
+ * @brief The header file for the command line option parser
+ * generated by GNU Gengetopt version 2.22.6
+ * http://www.gnu.org/software/gengetopt.
+ * DO NOT modify this file, since it can be overwritten
+ * @author GNU Gengetopt by Lorenzo Bettini */
+
+#ifndef BILLARD_CMDLINE_H
+#define BILLARD_CMDLINE_H
+
+/* If we use autoconf. */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h> /* for FILE */
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#ifndef CMDLINE_PARSER_PACKAGE
+/** @brief the program name (used for printing errors) */
+#define CMDLINE_PARSER_PACKAGE "billard"
+#endif
+
+#ifndef CMDLINE_PARSER_PACKAGE_NAME
+/** @brief the complete program name (used for help and version) */
+#define CMDLINE_PARSER_PACKAGE_NAME "billard"
+#endif
+
+#ifndef CMDLINE_PARSER_VERSION
+/** @brief the program version */
+#define CMDLINE_PARSER_VERSION VERSION
+#endif
+
+/** @brief Where the command line options are stored */
+struct gengetopt_args_info
+{
+ const char *help_help; /**< @brief Print help and exit help description. */
+ const char *version_help; /**< @brief Print version and exit help
description. */
+ int auto_arg; /**< @brief auto start. */
+ char * auto_orig; /**< @brief auto start original value given at command
line. */
+ const char *auto_help; /**< @brief auto start help description. */
+ int coordinated_flag; /**< @brief coordinated time (default=on). */
+ const char *coordinated_help; /**< @brief coordinated time help description.
*/
+ int delay_arg; /**< @brief delay before 1st step. */
+ char * delay_orig; /**< @brief delay before 1st step original value given
at command line. */
+ const char *delay_help; /**< @brief delay before 1st step help description.
*/
+ int notimestamp_flag; /**< @brief no timestamp (default=off). */
+ const char *notimestamp_help; /**< @brief no timestamp help description. */
+ char * federation_arg; /**< @brief federation name. */
+ char * federation_orig; /**< @brief federation name original value
given at command line. */
+ const char *federation_help; /**< @brief federation name help description.
*/
+ char * logfile_arg; /**< @brief file to log events. */
+ char * logfile_orig; /**< @brief file to log events original value given at
command line. */
+ const char *logfile_help; /**< @brief file to log events help description.
*/
+ char * name_arg; /**< @brief federate name. */
+ char * name_orig; /**< @brief federate name original value given at
command line. */
+ const char *name_help; /**< @brief federate name help description. */
+ char * demo_arg; /**< @brief select demo (static-ddm, dynamic-ddm). */
+ char * demo_orig; /**< @brief select demo (static-ddm, dynamic-ddm)
original value given at command line. */
+ const char *demo_help; /**< @brief select demo (static-ddm, dynamic-ddm)
help description. */
+ int timer_arg; /**< @brief timer. */
+ char * timer_orig; /**< @brief timer original value given at command line.
*/
+ const char *timer_help; /**< @brief timer help description. */
+ int verbose_flag; /**< @brief verbose mode (default=off). */
+ const char *verbose_help; /**< @brief verbose mode help description. */
+ int xoffset_arg; /**< @brief X offset (X11). */
+ char * xoffset_orig; /**< @brief X offset (X11) original value given at
command line. */
+ const char *xoffset_help; /**< @brief X offset (X11) help description. */
+ int yoffset_arg; /**< @brief Y offset (X11). */
+ char * yoffset_orig; /**< @brief Y offset (X11) original value given at
command line. */
+ const char *yoffset_help; /**< @brief Y offset (X11) help description. */
+ int initx_arg; /**< @brief ball initial X value. */
+ char * initx_orig; /**< @brief ball initial X value original value given
at command line. */
+ const char *initx_help; /**< @brief ball initial X value help description.
*/
+ int inity_arg; /**< @brief ball initial Y value. */
+ char * inity_orig; /**< @brief ball initial Y value original value given
at command line. */
+ const char *inity_help; /**< @brief ball initial Y value help description.
*/
+ char * filename_arg; /**< @brief FED filename. */
+ char * filename_orig; /**< @brief FED filename original value given
at command line. */
+ const char *filename_help; /**< @brief FED filename help description. */
+
+ unsigned int help_given ; /**< @brief Whether help was given. */
+ unsigned int version_given ; /**< @brief Whether version was given. */
+ unsigned int auto_given ; /**< @brief Whether auto was given. */
+ unsigned int coordinated_given ; /**< @brief Whether coordinated was
given. */
+ unsigned int delay_given ; /**< @brief Whether delay was given. */
+ unsigned int notimestamp_given ; /**< @brief Whether notimestamp was
given. */
+ unsigned int federation_given ; /**< @brief Whether federation was
given. */
+ unsigned int logfile_given ; /**< @brief Whether logfile was given. */
+ unsigned int name_given ; /**< @brief Whether name was given. */
+ unsigned int demo_given ; /**< @brief Whether demo was given. */
+ unsigned int timer_given ; /**< @brief Whether timer was given. */
+ unsigned int verbose_given ; /**< @brief Whether verbose was given. */
+ unsigned int xoffset_given ; /**< @brief Whether xoffset was given. */
+ unsigned int yoffset_given ; /**< @brief Whether yoffset was given. */
+ unsigned int initx_given ; /**< @brief Whether initx was given. */
+ unsigned int inity_given ; /**< @brief Whether inity was given. */
+ unsigned int filename_given ; /**< @brief Whether filename was given.
*/
+
+} ;
+
+/** @brief The additional parameters to pass to parser functions */
+struct cmdline_parser_params
+{
+ int override; /**< @brief whether to override possibly already present
options (default 0) */
+ int initialize; /**< @brief whether to initialize the option structure
gengetopt_args_info (default 1) */
+ int check_required; /**< @brief whether to check that all required options
were provided (default 1) */
+ int check_ambiguity; /**< @brief whether to check for options already
specified in the option structure gengetopt_args_info (default 0) */
+ int print_errors; /**< @brief whether getopt_long should print an error
message for a bad option (default 1) */
+} ;
+
+/** @brief the purpose string of the program */
+extern const char *gengetopt_args_info_purpose;
+/** @brief the usage string of the program */
+extern const char *gengetopt_args_info_usage;
+/** @brief the description string of the program */
+extern const char *gengetopt_args_info_description;
+/** @brief all the lines making the help output */
+extern const char *gengetopt_args_info_help[];
+
+/**
+ * The command line parser
+ * @param argc the number of command line options
+ * @param argv the command line options
+ * @param args_info the structure where option information will be stored
+ * @return 0 if everything went fine, NON 0 if an error took place
+ */
+int cmdline_parser (int argc, char **argv,
+ struct gengetopt_args_info *args_info);
+
+/**
+ * The command line parser (version with additional parameters - deprecated)
+ * @param argc the number of command line options
+ * @param argv the command line options
+ * @param args_info the structure where option information will be stored
+ * @param override whether to override possibly already present options
+ * @param initialize whether to initialize the option structure my_args_info
+ * @param check_required whether to check that all required options were
provided
+ * @return 0 if everything went fine, NON 0 if an error took place
+ * @deprecated use cmdline_parser_ext() instead
+ */
+int cmdline_parser2 (int argc, char **argv,
+ struct gengetopt_args_info *args_info,
+ int override, int initialize, int check_required);
+
+/**
+ * The command line parser (version with additional parameters)
+ * @param argc the number of command line options
+ * @param argv the command line options
+ * @param args_info the structure where option information will be stored
+ * @param params additional parameters for the parser
+ * @return 0 if everything went fine, NON 0 if an error took place
+ */
+int cmdline_parser_ext (int argc, char **argv,
+ struct gengetopt_args_info *args_info,
+ struct cmdline_parser_params *params);
+
+/**
+ * Save the contents of the option struct into an already open FILE stream.
+ * @param outfile the stream where to dump options
+ * @param args_info the option struct to dump
+ * @return 0 if everything went fine, NON 0 if an error took place
+ */
+int cmdline_parser_dump(FILE *outfile,
+ struct gengetopt_args_info *args_info);
+
+/**
+ * Save the contents of the option struct into a (text) file.
+ * This file can be read by the config file parser (if generated by gengetopt)
+ * @param filename the file where to save
+ * @param args_info the option struct to save
+ * @return 0 if everything went fine, NON 0 if an error took place
+ */
+int cmdline_parser_file_save(const char *filename,
+ struct gengetopt_args_info *args_info);
+
+/**
+ * Print the help
+ */
+void cmdline_parser_print_help(void);
+/**
+ * Print the version
+ */
+void cmdline_parser_print_version(void);
+
+/**
+ * Initializes all the fields a cmdline_parser_params structure
+ * to their default values
+ * @param params the structure to initialize
+ */
+void cmdline_parser_params_init(struct cmdline_parser_params *params);
+
+/**
+ * Allocates dynamically a cmdline_parser_params structure and initializes
+ * all its fields to their default values
+ * @return the created and initialized cmdline_parser_params structure
+ */
+struct cmdline_parser_params *cmdline_parser_params_create(void);
+
+/**
+ * Initializes the passed gengetopt_args_info structure's fields
+ * (also set default values for options that have a default)
+ * @param args_info the structure to initialize
+ */
+void cmdline_parser_init (struct gengetopt_args_info *args_info);
+/**
+ * Deallocates the string fields of the gengetopt_args_info structure
+ * (but does not deallocate the structure itself)
+ * @param args_info the structure to deallocate
+ */
+void cmdline_parser_free (struct gengetopt_args_info *args_info);
+
+/**
+ * Checks that all the required options were specified
+ * @param args_info the structure to check
+ * @param prog_name the name of the program that will be used to print
+ * possible errors
+ * @return
+ */
+int cmdline_parser_required (struct gengetopt_args_info *args_info,
+ const char *prog_name);
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+#endif /* BILLARD_CMDLINE_H */
Index: test/Billard/Billard_cmdline.c
===================================================================
RCS file: test/Billard/Billard_cmdline.c
diff -N test/Billard/Billard_cmdline.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/Billard/Billard_cmdline.c 24 Sep 2013 14:27:59 -0000 1.1
@@ -0,0 +1,1435 @@
+/*
+ File autogenerated by gengetopt version 2.22.6
+ generated with the following command:
+ gengetopt --no-handle-error --show-required -i CommandLine.ggo -F
Billard_cmdline -G
+
+ The developers of gengetopt consider the fixed text that goes in all
+ gengetopt output files to be in the public domain:
+ we make no copyright claims on it.
+*/
+
+/* If we use autoconf. */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifndef FIX_UNUSED
+#define FIX_UNUSED(X) (void) (X) /* avoid warnings for unused params */
+#endif
+
+
+#include "Billard_cmdline.h"
+
+const char *gengetopt_args_info_purpose = "CERTI Billard test application";
+
+const char *gengetopt_args_info_usage = "Usage: billard [OPTIONS]...";
+
+const char *gengetopt_args_info_versiontext = "";
+
+const char *gengetopt_args_info_description = "";
+
+const char *gengetopt_args_info_help[] = {
+ " -h, --help Print help and exit",
+ " -V, --version Print version and exit",
+ " -a, --auto=INT auto start",
+ " -c, --coordinated coordinated time (default=on)",
+ " -d, --delay=INT delay before 1st step",
+ " -e, --notimestamp no timestamp (default=off)",
+ " -f, --federation=STRING federation name (mandatory)",
+ " -l, --logfile=STRING file to log events",
+ " -n, --name=STRING federate name (mandatory)",
+ " -o, --demo=STRING select demo (static-ddm, dynamic-ddm)",
+ " -t, --timer=INT timer",
+ " -v, --verbose verbose mode (default=off)",
+ " -x, --xoffset=INT X offset (X11)",
+ " -y, --yoffset=INT Y offset (X11)",
+ " -X, --initx=INT ball initial X value",
+ " -Y, --inity=INT ball initial Y value",
+ " -F, --filename=STRING FED filename (mandatory)",
+ 0
+};
+
+typedef enum {ARG_NO
+ , ARG_FLAG
+ , ARG_STRING
+ , ARG_INT
+} cmdline_parser_arg_type;
+
+static
+void clear_given (struct gengetopt_args_info *args_info);
+static
+void clear_args (struct gengetopt_args_info *args_info);
+
+static int
+cmdline_parser_internal (int argc, char **argv, struct gengetopt_args_info
*args_info,
+ struct cmdline_parser_params *params, const char
*additional_error);
+
+static int
+cmdline_parser_required2 (struct gengetopt_args_info *args_info, const char
*prog_name, const char *additional_error);
+
+static char *
+gengetopt_strdup (const char *s);
+
+static
+void clear_given (struct gengetopt_args_info *args_info)
+{
+ args_info->help_given = 0 ;
+ args_info->version_given = 0 ;
+ args_info->auto_given = 0 ;
+ args_info->coordinated_given = 0 ;
+ args_info->delay_given = 0 ;
+ args_info->notimestamp_given = 0 ;
+ args_info->federation_given = 0 ;
+ args_info->logfile_given = 0 ;
+ args_info->name_given = 0 ;
+ args_info->demo_given = 0 ;
+ args_info->timer_given = 0 ;
+ args_info->verbose_given = 0 ;
+ args_info->xoffset_given = 0 ;
+ args_info->yoffset_given = 0 ;
+ args_info->initx_given = 0 ;
+ args_info->inity_given = 0 ;
+ args_info->filename_given = 0 ;
+}
+
+static
+void clear_args (struct gengetopt_args_info *args_info)
+{
+ FIX_UNUSED (args_info);
+ args_info->auto_orig = NULL;
+ args_info->coordinated_flag = 1;
+ args_info->delay_orig = NULL;
+ args_info->notimestamp_flag = 0;
+ args_info->federation_arg = NULL;
+ args_info->federation_orig = NULL;
+ args_info->logfile_arg = NULL;
+ args_info->logfile_orig = NULL;
+ args_info->name_arg = NULL;
+ args_info->name_orig = NULL;
+ args_info->demo_arg = NULL;
+ args_info->demo_orig = NULL;
+ args_info->timer_orig = NULL;
+ args_info->verbose_flag = 0;
+ args_info->xoffset_orig = NULL;
+ args_info->yoffset_orig = NULL;
+ args_info->initx_orig = NULL;
+ args_info->inity_orig = NULL;
+ args_info->filename_arg = NULL;
+ args_info->filename_orig = NULL;
+
+}
+
+static
+void init_args_info(struct gengetopt_args_info *args_info)
+{
+
+
+ args_info->help_help = gengetopt_args_info_help[0] ;
+ args_info->version_help = gengetopt_args_info_help[1] ;
+ args_info->auto_help = gengetopt_args_info_help[2] ;
+ args_info->coordinated_help = gengetopt_args_info_help[3] ;
+ args_info->delay_help = gengetopt_args_info_help[4] ;
+ args_info->notimestamp_help = gengetopt_args_info_help[5] ;
+ args_info->federation_help = gengetopt_args_info_help[6] ;
+ args_info->logfile_help = gengetopt_args_info_help[7] ;
+ args_info->name_help = gengetopt_args_info_help[8] ;
+ args_info->demo_help = gengetopt_args_info_help[9] ;
+ args_info->timer_help = gengetopt_args_info_help[10] ;
+ args_info->verbose_help = gengetopt_args_info_help[11] ;
+ args_info->xoffset_help = gengetopt_args_info_help[12] ;
+ args_info->yoffset_help = gengetopt_args_info_help[13] ;
+ args_info->initx_help = gengetopt_args_info_help[14] ;
+ args_info->inity_help = gengetopt_args_info_help[15] ;
+ args_info->filename_help = gengetopt_args_info_help[16] ;
+
+}
+
+void
+cmdline_parser_print_version (void)
+{
+ printf ("%s %s\n",
+ (strlen(CMDLINE_PARSER_PACKAGE_NAME) ? CMDLINE_PARSER_PACKAGE_NAME :
CMDLINE_PARSER_PACKAGE),
+ CMDLINE_PARSER_VERSION);
+
+ if (strlen(gengetopt_args_info_versiontext) > 0)
+ printf("\n%s\n", gengetopt_args_info_versiontext);
+}
+
+static void print_help_common(void) {
+ cmdline_parser_print_version ();
+
+ if (strlen(gengetopt_args_info_purpose) > 0)
+ printf("\n%s\n", gengetopt_args_info_purpose);
+
+ if (strlen(gengetopt_args_info_usage) > 0)
+ printf("\n%s\n", gengetopt_args_info_usage);
+
+ printf("\n");
+
+ if (strlen(gengetopt_args_info_description) > 0)
+ printf("%s\n\n", gengetopt_args_info_description);
+}
+
+void
+cmdline_parser_print_help (void)
+{
+ int i = 0;
+ print_help_common();
+ while (gengetopt_args_info_help[i])
+ printf("%s\n", gengetopt_args_info_help[i++]);
+}
+
+void
+cmdline_parser_init (struct gengetopt_args_info *args_info)
+{
+ clear_given (args_info);
+ clear_args (args_info);
+ init_args_info (args_info);
+}
+
+void
+cmdline_parser_params_init(struct cmdline_parser_params *params)
+{
+ if (params)
+ {
+ params->override = 0;
+ params->initialize = 1;
+ params->check_required = 1;
+ params->check_ambiguity = 0;
+ params->print_errors = 1;
+ }
+}
+
+struct cmdline_parser_params *
+cmdline_parser_params_create(void)
+{
+ struct cmdline_parser_params *params =
+ (struct cmdline_parser_params *)malloc(sizeof(struct
cmdline_parser_params));
+ cmdline_parser_params_init(params);
+ return params;
+}
+
+static void
+free_string_field (char **s)
+{
+ if (*s)
+ {
+ free (*s);
+ *s = 0;
+ }
+}
+
+
+static void
+cmdline_parser_release (struct gengetopt_args_info *args_info)
+{
+
+ free_string_field (&(args_info->auto_orig));
+ free_string_field (&(args_info->delay_orig));
+ free_string_field (&(args_info->federation_arg));
+ free_string_field (&(args_info->federation_orig));
+ free_string_field (&(args_info->logfile_arg));
+ free_string_field (&(args_info->logfile_orig));
+ free_string_field (&(args_info->name_arg));
+ free_string_field (&(args_info->name_orig));
+ free_string_field (&(args_info->demo_arg));
+ free_string_field (&(args_info->demo_orig));
+ free_string_field (&(args_info->timer_orig));
+ free_string_field (&(args_info->xoffset_orig));
+ free_string_field (&(args_info->yoffset_orig));
+ free_string_field (&(args_info->initx_orig));
+ free_string_field (&(args_info->inity_orig));
+ free_string_field (&(args_info->filename_arg));
+ free_string_field (&(args_info->filename_orig));
+
+
+
+ clear_given (args_info);
+}
+
+
+static void
+write_into_file(FILE *outfile, const char *opt, const char *arg, const char
*values[])
+{
+ FIX_UNUSED (values);
+ if (arg) {
+ fprintf(outfile, "%s=\"%s\"\n", opt, arg);
+ } else {
+ fprintf(outfile, "%s\n", opt);
+ }
+}
+
+
+int
+cmdline_parser_dump(FILE *outfile, struct gengetopt_args_info *args_info)
+{
+ int i = 0;
+
+ if (!outfile)
+ {
+ fprintf (stderr, "%s: cannot dump options to stream\n",
CMDLINE_PARSER_PACKAGE);
+ return EXIT_FAILURE;
+ }
+
+ if (args_info->help_given)
+ write_into_file(outfile, "help", 0, 0 );
+ if (args_info->version_given)
+ write_into_file(outfile, "version", 0, 0 );
+ if (args_info->auto_given)
+ write_into_file(outfile, "auto", args_info->auto_orig, 0);
+ if (args_info->coordinated_given)
+ write_into_file(outfile, "coordinated", 0, 0 );
+ if (args_info->delay_given)
+ write_into_file(outfile, "delay", args_info->delay_orig, 0);
+ if (args_info->notimestamp_given)
+ write_into_file(outfile, "notimestamp", 0, 0 );
+ if (args_info->federation_given)
+ write_into_file(outfile, "federation", args_info->federation_orig, 0);
+ if (args_info->logfile_given)
+ write_into_file(outfile, "logfile", args_info->logfile_orig, 0);
+ if (args_info->name_given)
+ write_into_file(outfile, "name", args_info->name_orig, 0);
+ if (args_info->demo_given)
+ write_into_file(outfile, "demo", args_info->demo_orig, 0);
+ if (args_info->timer_given)
+ write_into_file(outfile, "timer", args_info->timer_orig, 0);
+ if (args_info->verbose_given)
+ write_into_file(outfile, "verbose", 0, 0 );
+ if (args_info->xoffset_given)
+ write_into_file(outfile, "xoffset", args_info->xoffset_orig, 0);
+ if (args_info->yoffset_given)
+ write_into_file(outfile, "yoffset", args_info->yoffset_orig, 0);
+ if (args_info->initx_given)
+ write_into_file(outfile, "initx", args_info->initx_orig, 0);
+ if (args_info->inity_given)
+ write_into_file(outfile, "inity", args_info->inity_orig, 0);
+ if (args_info->filename_given)
+ write_into_file(outfile, "filename", args_info->filename_orig, 0);
+
+
+ i = EXIT_SUCCESS;
+ return i;
+}
+
+int
+cmdline_parser_file_save(const char *filename, struct gengetopt_args_info
*args_info)
+{
+ FILE *outfile;
+ int i = 0;
+
+ outfile = fopen(filename, "w");
+
+ if (!outfile)
+ {
+ fprintf (stderr, "%s: cannot open file for writing: %s\n",
CMDLINE_PARSER_PACKAGE, filename);
+ return EXIT_FAILURE;
+ }
+
+ i = cmdline_parser_dump(outfile, args_info);
+ fclose (outfile);
+
+ return i;
+}
+
+void
+cmdline_parser_free (struct gengetopt_args_info *args_info)
+{
+ cmdline_parser_release (args_info);
+}
+
+/** @brief replacement of strdup, which is not standard */
+char *
+gengetopt_strdup (const char *s)
+{
+ char *result = 0;
+ if (!s)
+ return result;
+
+ result = (char*)malloc(strlen(s) + 1);
+ if (result == (char*)0)
+ return (char*)0;
+ strcpy(result, s);
+ return result;
+}
+
+int
+cmdline_parser (int argc, char **argv, struct gengetopt_args_info *args_info)
+{
+ return cmdline_parser2 (argc, argv, args_info, 0, 1, 1);
+}
+
+int
+cmdline_parser_ext (int argc, char **argv, struct gengetopt_args_info
*args_info,
+ struct cmdline_parser_params *params)
+{
+ int result;
+ result = cmdline_parser_internal (argc, argv, args_info, params, 0);
+
+ return result;
+}
+
+int
+cmdline_parser2 (int argc, char **argv, struct gengetopt_args_info *args_info,
int override, int initialize, int check_required)
+{
+ int result;
+ struct cmdline_parser_params params;
+
+ params.override = override;
+ params.initialize = initialize;
+ params.check_required = check_required;
+ params.check_ambiguity = 0;
+ params.print_errors = 1;
+
+ result = cmdline_parser_internal (argc, argv, args_info, ¶ms, 0);
+
+ return result;
+}
+
+int
+cmdline_parser_required (struct gengetopt_args_info *args_info, const char
*prog_name)
+{
+ int result = EXIT_SUCCESS;
+
+ if (cmdline_parser_required2(args_info, prog_name, 0) > 0)
+ result = EXIT_FAILURE;
+
+ return result;
+}
+
+int
+cmdline_parser_required2 (struct gengetopt_args_info *args_info, const char
*prog_name, const char *additional_error)
+{
+ int error_occurred = 0;
+ FIX_UNUSED (additional_error);
+
+ /* checks for required options */
+ if (! args_info->federation_given)
+ {
+ fprintf (stderr, "%s: '--federation' ('-f') option required%s\n",
prog_name, (additional_error ? additional_error : ""));
+ error_occurred = 1;
+ }
+
+ if (! args_info->name_given)
+ {
+ fprintf (stderr, "%s: '--name' ('-n') option required%s\n", prog_name,
(additional_error ? additional_error : ""));
+ error_occurred = 1;
+ }
+
+ if (! args_info->filename_given)
+ {
+ fprintf (stderr, "%s: '--filename' ('-F') option required%s\n",
prog_name, (additional_error ? additional_error : ""));
+ error_occurred = 1;
+ }
+
+
+ /* checks for dependences among options */
+
+ return error_occurred;
+}
+
+/*
+ * Extracted from the glibc source tree, version 2.3.6
+ *
+ * Licensed under the GPL as per the whole glibc source tree.
+ *
+ * This file was modified so that getopt_long can be called
+ * many times without risking previous memory to be spoiled.
+ *
+ * Modified by Andre Noll and Lorenzo Bettini for use in
+ * GNU gengetopt generated files.
+ *
+ */
+
+/*
+ * we must include anything we need since this file is not thought to be
+ * inserted in a file already using getopt.h
+ *
+ * Lorenzo
+ */
+
+struct option
+{
+ const char *name;
+ /* has_arg can't be an enum because some compilers complain about
+ type mismatches in all the code that assumes it is an int. */
+ int has_arg;
+ int *flag;
+ int val;
+};
+
+/* This version of `getopt' appears to the caller like standard Unix `getopt'
+ but it behaves differently for the user, since it allows the user
+ to intersperse the options with the other arguments.
+
+ As `getopt' works, it permutes the elements of ARGV so that,
+ when it is done, all the options precede everything else. Thus
+ all application programs are extended to handle flexible argument order.
+*/
+/*
+ If the field `flag' is not NULL, it points to a variable that is set
+ to the value given in the field `val' when the option is found, but
+ left unchanged if the option is not found.
+
+ To have a long-named option do something other than set an `int' to
+ a compiled-in constant, such as set a value from `custom_optarg', set the
+ option's `flag' field to zero and its `val' field to a nonzero
+ value (the equivalent single-letter option character, if there is
+ one). For long options that have a zero `flag' field, `getopt'
+ returns the contents of the `val' field. */
+
+/* Names for the values of the `has_arg' field of `struct option'. */
+#ifndef no_argument
+#define no_argument 0
+#endif
+
+#ifndef required_argument
+#define required_argument 1
+#endif
+
+#ifndef optional_argument
+#define optional_argument 2
+#endif
+
+struct custom_getopt_data {
+ /*
+ * These have exactly the same meaning as the corresponding global
variables,
+ * except that they are used for the reentrant versions of getopt.
+ */
+ int custom_optind;
+ int custom_opterr;
+ int custom_optopt;
+ char *custom_optarg;
+
+ /* True if the internal members have been initialized. */
+ int initialized;
+
+ /*
+ * The next char to be scanned in the option-element in which the last
option
+ * character we returned was found. This allows us to pick up the scan
where
+ * we left off. If this is zero, or a null string, it means resume the
scan by
+ * advancing to the next ARGV-element.
+ */
+ char *nextchar;
+
+ /*
+ * Describe the part of ARGV that contains non-options that have been
skipped.
+ * `first_nonopt' is the index in ARGV of the first of them;
`last_nonopt' is
+ * the index after the last of them.
+ */
+ int first_nonopt;
+ int last_nonopt;
+};
+
+/*
+ * the variables optarg, optind, opterr and optopt are renamed with
+ * the custom_ prefix so that they don't interfere with getopt ones.
+ *
+ * Moreover they're static so they are visible only from within the
+ * file where this very file will be included.
+ */
+
+/*
+ * For communication from `custom_getopt' to the caller. When `custom_getopt'
finds an
+ * option that takes an argument, the argument value is returned here.
+ */
+static char *custom_optarg;
+
+/*
+ * Index in ARGV of the next element to be scanned. This is used for
+ * communication to and from the caller and for communication between
+ * successive calls to `custom_getopt'.
+ *
+ * On entry to `custom_getopt', 1 means this is the first call; initialize.
+ *
+ * When `custom_getopt' returns -1, this is the index of the first of the
non-option
+ * elements that the caller should itself scan.
+ *
+ * Otherwise, `custom_optind' communicates from one call to the next how much
of ARGV
+ * has been scanned so far.
+ *
+ * 1003.2 says this must be 1 before any call.
+ */
+static int custom_optind = 1;
+
+/*
+ * Callers store zero here to inhibit the error message for unrecognized
+ * options.
+ */
+static int custom_opterr = 1;
+
+/*
+ * Set to an option character which was unrecognized. This must be initialized
+ * on some systems to avoid linking in the system's own getopt implementation.
+ */
+static int custom_optopt = '?';
+
+/*
+ * Exchange two adjacent subsequences of ARGV. One subsequence is elements
+ * [first_nonopt,last_nonopt) which contains all the non-options that have been
+ * skipped so far. The other is elements [last_nonopt,custom_optind), which
contains
+ * all the options processed since those non-options were skipped.
+ * `first_nonopt' and `last_nonopt' are relocated so that they describe the new
+ * indices of the non-options in ARGV after they are moved.
+ */
+static void exchange(char **argv, struct custom_getopt_data *d)
+{
+ int bottom = d->first_nonopt;
+ int middle = d->last_nonopt;
+ int top = d->custom_optind;
+ char *tem;
+
+ /*
+ * Exchange the shorter segment with the far end of the longer segment.
+ * That puts the shorter segment into the right place. It leaves the
+ * longer segment in the right place overall, but it consists of two
+ * parts that need to be swapped next.
+ */
+ while (top > middle && middle > bottom) {
+ if (top - middle > middle - bottom) {
+ /* Bottom segment is the short one. */
+ int len = middle - bottom;
+ int i;
+
+ /* Swap it with the top part of the top segment. */
+ for (i = 0; i < len; i++) {
+ tem = argv[bottom + i];
+ argv[bottom + i] =
+ argv[top - (middle - bottom) + i];
+ argv[top - (middle - bottom) + i] = tem;
+ }
+ /* Exclude the moved bottom segment from further
swapping. */
+ top -= len;
+ } else {
+ /* Top segment is the short one. */
+ int len = top - middle;
+ int i;
+
+ /* Swap it with the bottom part of the bottom segment.
*/
+ for (i = 0; i < len; i++) {
+ tem = argv[bottom + i];
+ argv[bottom + i] = argv[middle + i];
+ argv[middle + i] = tem;
+ }
+ /* Exclude the moved top segment from further swapping.
*/
+ bottom += len;
+ }
+ }
+ /* Update records for the slots the non-options now occupy. */
+ d->first_nonopt += (d->custom_optind - d->last_nonopt);
+ d->last_nonopt = d->custom_optind;
+}
+
+/* Initialize the internal data when the first call is made. */
+static void custom_getopt_initialize(struct custom_getopt_data *d)
+{
+ /*
+ * Start processing options with ARGV-element 1 (since ARGV-element 0
+ * is the program name); the sequence of previously skipped non-option
+ * ARGV-elements is empty.
+ */
+ d->first_nonopt = d->last_nonopt = d->custom_optind;
+ d->nextchar = NULL;
+ d->initialized = 1;
+}
+
+#define NONOPTION_P (argv[d->custom_optind][0] != '-' ||
argv[d->custom_optind][1] == '\0')
+
+/* return: zero: continue, nonzero: return given value to user */
+static int shuffle_argv(int argc, char *const *argv,const struct option
*longopts,
+ struct custom_getopt_data *d)
+{
+ /*
+ * Give FIRST_NONOPT & LAST_NONOPT rational values if CUSTOM_OPTIND has
been
+ * moved back by the user (who may also have changed the arguments).
+ */
+ if (d->last_nonopt > d->custom_optind)
+ d->last_nonopt = d->custom_optind;
+ if (d->first_nonopt > d->custom_optind)
+ d->first_nonopt = d->custom_optind;
+ /*
+ * If we have just processed some options following some
+ * non-options, exchange them so that the options come first.
+ */
+ if (d->first_nonopt != d->last_nonopt &&
+ d->last_nonopt != d->custom_optind)
+ exchange((char **) argv, d);
+ else if (d->last_nonopt != d->custom_optind)
+ d->first_nonopt = d->custom_optind;
+ /*
+ * Skip any additional non-options and extend the range of
+ * non-options previously skipped.
+ */
+ while (d->custom_optind < argc && NONOPTION_P)
+ d->custom_optind++;
+ d->last_nonopt = d->custom_optind;
+ /*
+ * The special ARGV-element `--' means premature end of options. Skip
+ * it like a null option, then exchange with previous non-options as if
+ * it were an option, then skip everything else like a non-option.
+ */
+ if (d->custom_optind != argc && !strcmp(argv[d->custom_optind], "--")) {
+ d->custom_optind++;
+ if (d->first_nonopt != d->last_nonopt
+ && d->last_nonopt != d->custom_optind)
+ exchange((char **) argv, d);
+ else if (d->first_nonopt == d->last_nonopt)
+ d->first_nonopt = d->custom_optind;
+ d->last_nonopt = argc;
+ d->custom_optind = argc;
+ }
+ /*
+ * If we have done all the ARGV-elements, stop the scan and back over
+ * any non-options that we skipped and permuted.
+ */
+ if (d->custom_optind == argc) {
+ /*
+ * Set the next-arg-index to point at the non-options that we
+ * previously skipped, so the caller will digest them.
+ */
+ if (d->first_nonopt != d->last_nonopt)
+ d->custom_optind = d->first_nonopt;
+ return -1;
+ }
+ /*
+ * If we have come to a non-option and did not permute it, either stop
+ * the scan or describe it to the caller and pass it by.
+ */
+ if (NONOPTION_P) {
+ d->custom_optarg = argv[d->custom_optind++];
+ return 1;
+ }
+ /*
+ * We have found another option-ARGV-element. Skip the initial
+ * punctuation.
+ */
+ d->nextchar = (argv[d->custom_optind] + 1 + (longopts != NULL &&
argv[d->custom_optind][1] == '-'));
+ return 0;
+}
+
+/*
+ * Check whether the ARGV-element is a long option.
+ *
+ * If there's a long option "fubar" and the ARGV-element is "-fu", consider
+ * that an abbreviation of the long option, just like "--fu", and not "-f" with
+ * arg "u".
+ *
+ * This distinction seems to be the most useful approach.
+ *
+ */
+static int check_long_opt(int argc, char *const *argv, const char *optstring,
+ const struct option *longopts, int *longind,
+ int print_errors, struct custom_getopt_data *d)
+{
+ char *nameend;
+ const struct option *p;
+ const struct option *pfound = NULL;
+ int exact = 0;
+ int ambig = 0;
+ int indfound = -1;
+ int option_index;
+
+ for (nameend = d->nextchar; *nameend && *nameend != '='; nameend++)
+ /* Do nothing. */ ;
+
+ /* Test all long options for either exact match or abbreviated matches
*/
+ for (p = longopts, option_index = 0; p->name; p++, option_index++)
+ if (!strncmp(p->name, d->nextchar, nameend - d->nextchar)) {
+ if ((unsigned int) (nameend - d->nextchar)
+ == (unsigned int) strlen(p->name)) {
+ /* Exact match found. */
+ pfound = p;
+ indfound = option_index;
+ exact = 1;
+ break;
+ } else if (pfound == NULL) {
+ /* First nonexact match found. */
+ pfound = p;
+ indfound = option_index;
+ } else if (pfound->has_arg != p->has_arg
+ || pfound->flag != p->flag
+ || pfound->val != p->val)
+ /* Second or later nonexact match found. */
+ ambig = 1;
+ }
+ if (ambig && !exact) {
+ if (print_errors) {
+ fprintf(stderr,
+ "%s: option `%s' is ambiguous\n",
+ argv[0], argv[d->custom_optind]);
+ }
+ d->nextchar += strlen(d->nextchar);
+ d->custom_optind++;
+ d->custom_optopt = 0;
+ return '?';
+ }
+ if (pfound) {
+ option_index = indfound;
+ d->custom_optind++;
+ if (*nameend) {
+ if (pfound->has_arg != no_argument)
+ d->custom_optarg = nameend + 1;
+ else {
+ if (print_errors) {
+ if (argv[d->custom_optind - 1][1] ==
'-') {
+ /* --option */
+ fprintf(stderr, "%s: option
`--%s' doesn't allow an argument\n",
+ argv[0], pfound->name);
+ } else {
+ /* +option or -option */
+ fprintf(stderr, "%s: option
`%c%s' doesn't allow an argument\n",
+ argv[0],
argv[d->custom_optind - 1][0], pfound->name);
+ }
+
+ }
+ d->nextchar += strlen(d->nextchar);
+ d->custom_optopt = pfound->val;
+ return '?';
+ }
+ } else if (pfound->has_arg == required_argument) {
+ if (d->custom_optind < argc)
+ d->custom_optarg = argv[d->custom_optind++];
+ else {
+ if (print_errors) {
+ fprintf(stderr,
+ "%s: option `%s' requires an
argument\n",
+ argv[0],
+ argv[d->custom_optind - 1]);
+ }
+ d->nextchar += strlen(d->nextchar);
+ d->custom_optopt = pfound->val;
+ return optstring[0] == ':' ? ':' : '?';
+ }
+ }
+ d->nextchar += strlen(d->nextchar);
+ if (longind != NULL)
+ *longind = option_index;
+ if (pfound->flag) {
+ *(pfound->flag) = pfound->val;
+ return 0;
+ }
+ return pfound->val;
+ }
+ /*
+ * Can't find it as a long option. If this is not getopt_long_only, or
+ * the option starts with '--' or is not a valid short option, then
+ * it's an error. Otherwise interpret it as a short option.
+ */
+ if (print_errors) {
+ if (argv[d->custom_optind][1] == '-') {
+ /* --option */
+ fprintf(stderr,
+ "%s: unrecognized option `--%s'\n",
+ argv[0], d->nextchar);
+ } else {
+ /* +option or -option */
+ fprintf(stderr,
+ "%s: unrecognized option `%c%s'\n",
+ argv[0], argv[d->custom_optind][0],
+ d->nextchar);
+ }
+ }
+ d->nextchar = (char *) "";
+ d->custom_optind++;
+ d->custom_optopt = 0;
+ return '?';
+}
+
+static int check_short_opt(int argc, char *const *argv, const char *optstring,
+ int print_errors, struct custom_getopt_data *d)
+{
+ char c = *d->nextchar++;
+ const char *temp = strchr(optstring, c);
+
+ /* Increment `custom_optind' when we start to process its last
character. */
+ if (*d->nextchar == '\0')
+ ++d->custom_optind;
+ if (!temp || c == ':') {
+ if (print_errors)
+ fprintf(stderr, "%s: invalid option -- %c\n", argv[0],
c);
+
+ d->custom_optopt = c;
+ return '?';
+ }
+ if (temp[1] == ':') {
+ if (temp[2] == ':') {
+ /* This is an option that accepts an argument
optionally. */
+ if (*d->nextchar != '\0') {
+ d->custom_optarg = d->nextchar;
+ d->custom_optind++;
+ } else
+ d->custom_optarg = NULL;
+ d->nextchar = NULL;
+ } else {
+ /* This is an option that requires an argument. */
+ if (*d->nextchar != '\0') {
+ d->custom_optarg = d->nextchar;
+ /*
+ * If we end this ARGV-element by taking the
+ * rest as an arg, we must advance to the next
+ * element now.
+ */
+ d->custom_optind++;
+ } else if (d->custom_optind == argc) {
+ if (print_errors) {
+ fprintf(stderr,
+ "%s: option requires an
argument -- %c\n",
+ argv[0], c);
+ }
+ d->custom_optopt = c;
+ if (optstring[0] == ':')
+ c = ':';
+ else
+ c = '?';
+ } else
+ /*
+ * We already incremented `custom_optind' once;
+ * increment it again when taking next ARGV-elt
+ * as argument.
+ */
+ d->custom_optarg = argv[d->custom_optind++];
+ d->nextchar = NULL;
+ }
+ }
+ return c;
+}
+
+/*
+ * Scan elements of ARGV for option characters given in OPTSTRING.
+ *
+ * If an element of ARGV starts with '-', and is not exactly "-" or "--",
+ * then it is an option element. The characters of this element
+ * (aside from the initial '-') are option characters. If `getopt'
+ * is called repeatedly, it returns successively each of the option characters
+ * from each of the option elements.
+ *
+ * If `getopt' finds another option character, it returns that character,
+ * updating `custom_optind' and `nextchar' so that the next call to `getopt'
can
+ * resume the scan with the following option character or ARGV-element.
+ *
+ * If there are no more option characters, `getopt' returns -1.
+ * Then `custom_optind' is the index in ARGV of the first ARGV-element
+ * that is not an option. (The ARGV-elements have been permuted
+ * so that those that are not options now come last.)
+ *
+ * OPTSTRING is a string containing the legitimate option characters.
+ * If an option character is seen that is not listed in OPTSTRING,
+ * return '?' after printing an error message. If you set `custom_opterr' to
+ * zero, the error message is suppressed but we still return '?'.
+ *
+ * If a char in OPTSTRING is followed by a colon, that means it wants an arg,
+ * so the following text in the same ARGV-element, or the text of the following
+ * ARGV-element, is returned in `custom_optarg'. Two colons mean an option
that
+ * wants an optional arg; if there is text in the current ARGV-element,
+ * it is returned in `custom_optarg', otherwise `custom_optarg' is set to zero.
+ *
+ * If OPTSTRING starts with `-' or `+', it requests different methods of
+ * handling the non-option ARGV-elements.
+ * See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above.
+ *
+ * Long-named options begin with `--' instead of `-'.
+ * Their names may be abbreviated as long as the abbreviation is unique
+ * or is an exact match for some defined option. If they have an
+ * argument, it follows the option name in the same ARGV-element, separated
+ * from the option name by a `=', or else the in next ARGV-element.
+ * When `getopt' finds a long-named option, it returns 0 if that option's
+ * `flag' field is nonzero, the value of the option's `val' field
+ * if the `flag' field is zero.
+ *
+ * The elements of ARGV aren't really const, because we permute them.
+ * But we pretend they're const in the prototype to be compatible
+ * with other systems.
+ *
+ * LONGOPTS is a vector of `struct option' terminated by an
+ * element containing a name which is zero.
+ *
+ * LONGIND returns the index in LONGOPT of the long-named option found.
+ * It is only valid when a long-named option has been found by the most
+ * recent call.
+ *
+ * Return the option character from OPTS just read. Return -1 when there are
+ * no more options. For unrecognized options, or options missing arguments,
+ * `custom_optopt' is set to the option letter, and '?' is returned.
+ *
+ * The OPTS string is a list of characters which are recognized option letters,
+ * optionally followed by colons, specifying that that letter takes an
+ * argument, to be placed in `custom_optarg'.
+ *
+ * If a letter in OPTS is followed by two colons, its argument is optional.
+ * This behavior is specific to the GNU `getopt'.
+ *
+ * The argument `--' causes premature termination of argument scanning,
+ * explicitly telling `getopt' that there are no more options. If OPTS begins
+ * with `--', then non-option arguments are treated as arguments to the option
+ * '\0'. This behavior is specific to the GNU `getopt'.
+ */
+
+static int getopt_internal_r(int argc, char *const *argv, const char
*optstring,
+ const struct option *longopts, int *longind,
+ struct custom_getopt_data *d)
+{
+ int ret, print_errors = d->custom_opterr;
+
+ if (optstring[0] == ':')
+ print_errors = 0;
+ if (argc < 1)
+ return -1;
+ d->custom_optarg = NULL;
+
+ /*
+ * This is a big difference with GNU getopt, since optind == 0
+ * means initialization while here 1 means first call.
+ */
+ if (d->custom_optind == 0 || !d->initialized) {
+ if (d->custom_optind == 0)
+ d->custom_optind = 1; /* Don't scan ARGV[0], the
program name. */
+ custom_getopt_initialize(d);
+ }
+ if (d->nextchar == NULL || *d->nextchar == '\0') {
+ ret = shuffle_argv(argc, argv, longopts, d);
+ if (ret)
+ return ret;
+ }
+ if (longopts && (argv[d->custom_optind][1] == '-' ))
+ return check_long_opt(argc, argv, optstring, longopts,
+ longind, print_errors, d);
+ return check_short_opt(argc, argv, optstring, print_errors, d);
+}
+
+static int custom_getopt_internal(int argc, char *const *argv, const char
*optstring,
+ const struct option *longopts, int *longind)
+{
+ int result;
+ /* Keep a global copy of all internal members of d */
+ static struct custom_getopt_data d;
+
+ d.custom_optind = custom_optind;
+ d.custom_opterr = custom_opterr;
+ result = getopt_internal_r(argc, argv, optstring, longopts,
+ longind, &d);
+ custom_optind = d.custom_optind;
+ custom_optarg = d.custom_optarg;
+ custom_optopt = d.custom_optopt;
+ return result;
+}
+
+static int custom_getopt_long (int argc, char *const *argv, const char
*options,
+ const struct option *long_options, int *opt_index)
+{
+ return custom_getopt_internal(argc, argv, options, long_options,
+ opt_index);
+}
+
+
+static char *package_name = 0;
+
+/**
+ * @brief updates an option
+ * @param field the generic pointer to the field to update
+ * @param orig_field the pointer to the orig field
+ * @param field_given the pointer to the number of occurrence of this option
+ * @param prev_given the pointer to the number of occurrence already seen
+ * @param value the argument for this option (if null no arg was specified)
+ * @param possible_values the possible values for this option (if specified)
+ * @param default_value the default value (in case the option only accepts
fixed values)
+ * @param arg_type the type of this option
+ * @param check_ambiguity @see cmdline_parser_params.check_ambiguity
+ * @param override @see cmdline_parser_params.override
+ * @param no_free whether to free a possible previous value
+ * @param multiple_option whether this is a multiple option
+ * @param long_opt the corresponding long option
+ * @param short_opt the corresponding short option (or '-' if none)
+ * @param additional_error possible further error specification
+ */
+static
+int update_arg(void *field, char **orig_field,
+ unsigned int *field_given, unsigned int *prev_given,
+ char *value, const char *possible_values[],
+ const char *default_value,
+ cmdline_parser_arg_type arg_type,
+ int check_ambiguity, int override,
+ int no_free, int multiple_option,
+ const char *long_opt, char short_opt,
+ const char *additional_error)
+{
+ char *stop_char = 0;
+ const char *val = value;
+ int found;
+ char **string_field;
+ FIX_UNUSED (field);
+
+ stop_char = 0;
+ found = 0;
+
+ if (!multiple_option && prev_given && (*prev_given || (check_ambiguity &&
*field_given)))
+ {
+ if (short_opt != '-')
+ fprintf (stderr, "%s: `--%s' (`-%c') option given more than once%s\n",
+ package_name, long_opt, short_opt,
+ (additional_error ? additional_error : ""));
+ else
+ fprintf (stderr, "%s: `--%s' option given more than once%s\n",
+ package_name, long_opt,
+ (additional_error ? additional_error : ""));
+ return 1; /* failure */
+ }
+
+ FIX_UNUSED (default_value);
+
+ if (field_given && *field_given && ! override)
+ return 0;
+ if (prev_given)
+ (*prev_given)++;
+ if (field_given)
+ (*field_given)++;
+ if (possible_values)
+ val = possible_values[found];
+
+ switch(arg_type) {
+ case ARG_FLAG:
+ *((int *)field) = !*((int *)field);
+ break;
+ case ARG_INT:
+ if (val) *((int *)field) = strtol (val, &stop_char, 0);
+ break;
+ case ARG_STRING:
+ if (val) {
+ string_field = (char **)field;
+ if (!no_free && *string_field)
+ free (*string_field); /* free previous string */
+ *string_field = gengetopt_strdup (val);
+ }
+ break;
+ default:
+ break;
+ };
+
+ /* check numeric conversion */
+ switch(arg_type) {
+ case ARG_INT:
+ if (val && !(stop_char && *stop_char == '\0')) {
+ fprintf(stderr, "%s: invalid numeric value: %s\n", package_name, val);
+ return 1; /* failure */
+ }
+ break;
+ default:
+ ;
+ };
+
+ /* store the original value */
+ switch(arg_type) {
+ case ARG_NO:
+ case ARG_FLAG:
+ break;
+ default:
+ if (value && orig_field) {
+ if (no_free) {
+ *orig_field = value;
+ } else {
+ if (*orig_field)
+ free (*orig_field); /* free previous string */
+ *orig_field = gengetopt_strdup (value);
+ }
+ }
+ };
+
+ return 0; /* OK */
+}
+
+
+int
+cmdline_parser_internal (
+ int argc, char **argv, struct gengetopt_args_info *args_info,
+ struct cmdline_parser_params *params, const char
*additional_error)
+{
+ int c; /* Character of the parsed option. */
+
+ int error_occurred = 0;
+ struct gengetopt_args_info local_args_info;
+
+ int override;
+ int initialize;
+ int check_required;
+ int check_ambiguity;
+
+ char *optarg;
+ int optind;
+ int opterr;
+ int optopt;
+
+ package_name = argv[0];
+
+ override = params->override;
+ initialize = params->initialize;
+ check_required = params->check_required;
+ check_ambiguity = params->check_ambiguity;
+
+ if (initialize)
+ cmdline_parser_init (args_info);
+
+ cmdline_parser_init (&local_args_info);
+
+ optarg = 0;
+ optind = 0;
+ opterr = params->print_errors;
+ optopt = '?';
+
+ while (1)
+ {
+ int option_index = 0;
+
+ static struct option long_options[] = {
+ { "help", 0, NULL, 'h' },
+ { "version", 0, NULL, 'V' },
+ { "auto", 1, NULL, 'a' },
+ { "coordinated", 0, NULL, 'c' },
+ { "delay", 1, NULL, 'd' },
+ { "notimestamp", 0, NULL, 'e' },
+ { "federation", 1, NULL, 'f' },
+ { "logfile", 1, NULL, 'l' },
+ { "name", 1, NULL, 'n' },
+ { "demo", 1, NULL, 'o' },
+ { "timer", 1, NULL, 't' },
+ { "verbose", 0, NULL, 'v' },
+ { "xoffset", 1, NULL, 'x' },
+ { "yoffset", 1, NULL, 'y' },
+ { "initx", 1, NULL, 'X' },
+ { "inity", 1, NULL, 'Y' },
+ { "filename", 1, NULL, 'F' },
+ { 0, 0, 0, 0 }
+ };
+
+ custom_optarg = optarg;
+ custom_optind = optind;
+ custom_opterr = opterr;
+ custom_optopt = optopt;
+
+ c = custom_getopt_long (argc, argv, "hVa:cd:ef:l:n:o:t:vx:y:X:Y:F:",
long_options, &option_index);
+
+ optarg = custom_optarg;
+ optind = custom_optind;
+ opterr = custom_opterr;
+ optopt = custom_optopt;
+
+ if (c == -1) break; /* Exit from `while (1)' loop. */
+
+ switch (c)
+ {
+ case 'h': /* Print help and exit. */
+ cmdline_parser_print_help ();
+ cmdline_parser_free (&local_args_info);
+ exit (EXIT_SUCCESS);
+
+ case 'V': /* Print version and exit. */
+ cmdline_parser_print_version ();
+ cmdline_parser_free (&local_args_info);
+ exit (EXIT_SUCCESS);
+
+ case 'a': /* auto start. */
+
+
+ if (update_arg( (void *)&(args_info->auto_arg),
+ &(args_info->auto_orig), &(args_info->auto_given),
+ &(local_args_info.auto_given), optarg, 0, 0, ARG_INT,
+ check_ambiguity, override, 0, 0,
+ "auto", 'a',
+ additional_error))
+ goto failure;
+
+ break;
+ case 'c': /* coordinated time. */
+
+
+ if (update_arg((void *)&(args_info->coordinated_flag), 0,
&(args_info->coordinated_given),
+ &(local_args_info.coordinated_given), optarg, 0, 0, ARG_FLAG,
+ check_ambiguity, override, 1, 0, "coordinated", 'c',
+ additional_error))
+ goto failure;
+
+ break;
+ case 'd': /* delay before 1st step. */
+
+
+ if (update_arg( (void *)&(args_info->delay_arg),
+ &(args_info->delay_orig), &(args_info->delay_given),
+ &(local_args_info.delay_given), optarg, 0, 0, ARG_INT,
+ check_ambiguity, override, 0, 0,
+ "delay", 'd',
+ additional_error))
+ goto failure;
+
+ break;
+ case 'e': /* no timestamp. */
+
+
+ if (update_arg((void *)&(args_info->notimestamp_flag), 0,
&(args_info->notimestamp_given),
+ &(local_args_info.notimestamp_given), optarg, 0, 0, ARG_FLAG,
+ check_ambiguity, override, 1, 0, "notimestamp", 'e',
+ additional_error))
+ goto failure;
+
+ break;
+ case 'f': /* federation name. */
+
+
+ if (update_arg( (void *)&(args_info->federation_arg),
+ &(args_info->federation_orig), &(args_info->federation_given),
+ &(local_args_info.federation_given), optarg, 0, 0, ARG_STRING,
+ check_ambiguity, override, 0, 0,
+ "federation", 'f',
+ additional_error))
+ goto failure;
+
+ break;
+ case 'l': /* file to log events. */
+
+
+ if (update_arg( (void *)&(args_info->logfile_arg),
+ &(args_info->logfile_orig), &(args_info->logfile_given),
+ &(local_args_info.logfile_given), optarg, 0, 0, ARG_STRING,
+ check_ambiguity, override, 0, 0,
+ "logfile", 'l',
+ additional_error))
+ goto failure;
+
+ break;
+ case 'n': /* federate name. */
+
+
+ if (update_arg( (void *)&(args_info->name_arg),
+ &(args_info->name_orig), &(args_info->name_given),
+ &(local_args_info.name_given), optarg, 0, 0, ARG_STRING,
+ check_ambiguity, override, 0, 0,
+ "name", 'n',
+ additional_error))
+ goto failure;
+
+ break;
+ case 'o': /* select demo (static-ddm, dynamic-ddm). */
+
+
+ if (update_arg( (void *)&(args_info->demo_arg),
+ &(args_info->demo_orig), &(args_info->demo_given),
+ &(local_args_info.demo_given), optarg, 0, 0, ARG_STRING,
+ check_ambiguity, override, 0, 0,
+ "demo", 'o',
+ additional_error))
+ goto failure;
+
+ break;
+ case 't': /* timer. */
+
+
+ if (update_arg( (void *)&(args_info->timer_arg),
+ &(args_info->timer_orig), &(args_info->timer_given),
+ &(local_args_info.timer_given), optarg, 0, 0, ARG_INT,
+ check_ambiguity, override, 0, 0,
+ "timer", 't',
+ additional_error))
+ goto failure;
+
+ break;
+ case 'v': /* verbose mode. */
+
+
+ if (update_arg((void *)&(args_info->verbose_flag), 0,
&(args_info->verbose_given),
+ &(local_args_info.verbose_given), optarg, 0, 0, ARG_FLAG,
+ check_ambiguity, override, 1, 0, "verbose", 'v',
+ additional_error))
+ goto failure;
+
+ break;
+ case 'x': /* X offset (X11). */
+
+
+ if (update_arg( (void *)&(args_info->xoffset_arg),
+ &(args_info->xoffset_orig), &(args_info->xoffset_given),
+ &(local_args_info.xoffset_given), optarg, 0, 0, ARG_INT,
+ check_ambiguity, override, 0, 0,
+ "xoffset", 'x',
+ additional_error))
+ goto failure;
+
+ break;
+ case 'y': /* Y offset (X11). */
+
+
+ if (update_arg( (void *)&(args_info->yoffset_arg),
+ &(args_info->yoffset_orig), &(args_info->yoffset_given),
+ &(local_args_info.yoffset_given), optarg, 0, 0, ARG_INT,
+ check_ambiguity, override, 0, 0,
+ "yoffset", 'y',
+ additional_error))
+ goto failure;
+
+ break;
+ case 'X': /* ball initial X value. */
+
+
+ if (update_arg( (void *)&(args_info->initx_arg),
+ &(args_info->initx_orig), &(args_info->initx_given),
+ &(local_args_info.initx_given), optarg, 0, 0, ARG_INT,
+ check_ambiguity, override, 0, 0,
+ "initx", 'X',
+ additional_error))
+ goto failure;
+
+ break;
+ case 'Y': /* ball initial Y value. */
+
+
+ if (update_arg( (void *)&(args_info->inity_arg),
+ &(args_info->inity_orig), &(args_info->inity_given),
+ &(local_args_info.inity_given), optarg, 0, 0, ARG_INT,
+ check_ambiguity, override, 0, 0,
+ "inity", 'Y',
+ additional_error))
+ goto failure;
+
+ break;
+ case 'F': /* FED filename. */
+
+
+ if (update_arg( (void *)&(args_info->filename_arg),
+ &(args_info->filename_orig), &(args_info->filename_given),
+ &(local_args_info.filename_given), optarg, 0, 0, ARG_STRING,
+ check_ambiguity, override, 0, 0,
+ "filename", 'F',
+ additional_error))
+ goto failure;
+
+ break;
+
+ case 0: /* Long option with no short option */
+ case '?': /* Invalid option. */
+ /* `getopt_long' already printed an error message. */
+ goto failure;
+
+ default: /* bug: option not considered. */
+ fprintf (stderr, "%s: option unknown: %c%s\n",
CMDLINE_PARSER_PACKAGE, c, (additional_error ? additional_error : ""));
+ abort ();
+ } /* switch */
+ } /* while */
+
+
+
+ if (check_required)
+ {
+ error_occurred += cmdline_parser_required2 (args_info, argv[0],
additional_error);
+ }
+
+ cmdline_parser_release (&local_args_info);
+
+ if ( error_occurred )
+ return (EXIT_FAILURE);
+
+ return 0;
+
+failure:
+
+ cmdline_parser_release (&local_args_info);
+ return (EXIT_FAILURE);
+}
Index: libCERTI/BaseRegion.hh
===================================================================
RCS file: libCERTI/BaseRegion.hh
diff -N libCERTI/BaseRegion.hh
--- libCERTI/BaseRegion.hh 7 Mar 2010 21:30:30 -0000 3.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,73 +0,0 @@
-// ----------------------------------------------------------------------------
-// CERTI - HLA RunTime Infrastructure
-// Copyright (C) 2002-2005 ONERA
-//
-// This file is part of CERTI-libRTI
-//
-// CERTI-libRTI 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-libRTI 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: BaseRegion.hh,v 3.3 2010/03/07 21:30:30 erk Exp $
-// ----------------------------------------------------------------------------
-
-#ifndef CERTI_BASE_REGION_HH
-#define CERTI_BASE_REGION_HH
-
-#include "Extent.hh"
-#include "Handled.hh"
-
-#include <vector>
-
-namespace certi {
-
-typedef Handle RegionHandle ;
-
-class CERTI_EXPORT BaseRegion : public Handled<RegionHandle>
-{
-public:
- BaseRegion(RegionHandle);
- virtual ~BaseRegion();
-
- virtual uint32_t getRangeLowerBound(ExtentIndex, DimensionHandle) const
- throw (ArrayIndexOutOfBounds);
-
- virtual uint32_t getRangeUpperBound(ExtentIndex, DimensionHandle) const
- throw (ArrayIndexOutOfBounds);
-
- virtual void setRangeLowerBound(ExtentIndex, DimensionHandle, uint32_t)
- throw (ArrayIndexOutOfBounds);
-
- virtual void setRangeUpperBound(ExtentIndex, DimensionHandle, uint32_t)
- throw (ArrayIndexOutOfBounds);
-
- virtual uint32_t getNumberOfExtents() const
- throw ();
-
- virtual SpaceHandle getSpaceHandle() const
- throw () = 0 ;
-
- const std::vector<Extent> &getExtents() const ;
- void replaceExtents(const std::vector<Extent> &) throw (InvalidExtents);
- bool overlaps(const BaseRegion ®ion) const ;
-
-protected:
- void setExtents(const std::vector<Extent> &);
-
- std::vector<Extent> extents ;
-};
-
-} // namespace certi
-
-#endif // CERTI_BASE_REGION_HH
Index: libCERTI/HandleManager.hh
===================================================================
RCS file: libCERTI/HandleManager.hh
diff -N libCERTI/HandleManager.hh
--- libCERTI/HandleManager.hh 24 Nov 2009 21:44:47 -0000 3.8
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,118 +0,0 @@
-// ----------------------------------------------------------------------------
-// CERTI - HLA RunTime Infrastructure
-// Copyright (C) 2002-2005 ONERA
-//
-// This program 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.
-//
-// This program 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: HandleManager.hh,v 3.8 2009/11/24 21:44:47 erk Exp $
-// ----------------------------------------------------------------------------
-
-#ifndef LIBCERTI_HANDLE_MANAGER
-#define LIBCERTI_HANDLE_MANAGER
-
-#include "certi.hh"
-
-#include <limits>
-
-namespace certi {
-
-/**
- * Manage a set of handles ('provide' and 'free' services). Freed
- * handles may be provided again in a future request.
- */
-template<typename T>
-class HandleManager
-{
-public:
- /**
- * Constructor with init value.
- * The default maximal value will be based on the type max given
- * by numeric_limits traits.
- * @param[in] init Initial handle value (use for first requested handle)
- */
- HandleManager(T);
- /**
- * Constructor with init value and max.
- * @param[in] init Initial handle value (use for first requested handle)
- * @param[in] hmax Maximal handle value
- */
- HandleManager(T init, size_t hmax);
- /**
- * Provide a new unique federation execution-wide handle.
- * IEEE-1516.1-2000 - 10.1.1 Names says:
- * "Each name in an FDD (object classes, interactions, attributes,
- * parameters, dimensions, transportation types, order types)
- * shall have a unique, and unpredictable, federation execution-wide
handle."
- *
- * @return the new handle
- * @throw RTIinternalError if all handles between first and maximal are
used
- */
- T provide() throw (RTIinternalError);
-
- /**
- * Free a handle.
- * @pre handle is a previously-provided handle
- * @param handle Handle to free
- * @todo CHECK how this could be handled, currently free does nothing!
- */
- void free(T handle);
-
-private:
- size_t maximum ;
- T highest ;
- std::list<T> available ;
-};
-
-
-template<typename T>
-HandleManager<T>::HandleManager(T init)
-: maximum(std::numeric_limits<T>::max()), highest(init) { }
-
-template<typename T>
-HandleManager<T>::HandleManager(T init, size_t hmax)
-: highest(init), maximum(hmax) { }
-
-template<typename T> T
-HandleManager<T>::provide() throw (RTIinternalError)
-{
- T handle = 0 ;
-
- if (available.size() > 0) {
- handle = available.front();
- available.pop_front();
- }
- else {
- if (highest < maximum)
- handle = highest++ ;
- else
- throw RTIinternalError("Maximum handle reached");
- }
-
- return handle ;
-} /* end of provide */
-
-template<typename T> void
-HandleManager<T>::free(T handle)
-{
- //if (handle + 1 == highest)
- //--highest ;
- //else
- //available.push_back(handle);
-}
-
-} // certi
-
-#endif // LIBCERTI_HANDLE_MANAGER
Index: libCERTI/Message.cc
===================================================================
RCS file: libCERTI/Message.cc
diff -N libCERTI/Message.cc
--- libCERTI/Message.cc 7 Mar 2010 18:23:39 -0000 3.68
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,60 +0,0 @@
-// ----------------------------------------------------------------------------
-// CERTI - HLA RunTime Infrastructure
-// Copyright (C) 2002-2005 ONERA
-//
-// This program 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.
-//
-// This program 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
-
-#include "Message.hh"
-#include "certi.hh"
-#include "PrettyDebug.hh"
-
-#include <stdlib.h>
-#include <cstdio>
-#include <cstring>
-#include <assert.h>
-
-using std::vector ;
-
-namespace certi {
-
-static PrettyDebug G("GENDOC",__FILE__) ;
-
-Message::Message()
-{
- exception = e_NO_EXCEPTION ;
- exceptionReason = "" ;
- messageName = "Message (generic)";
- type = NOT_USED ;
- resignAction = certi::NO_ACTION ;
- space = 0 ;
- dimension = 0 ;
-} /* end of Message default constructor */
-
-// ----------------------------------------------------------------------------
-/** Store exception into message
- @param the_exception : exception type (enum)
- @param the_reason : exception reason
-*/
-void
-Message::setException(TypeException the_exception,
- const std::string& the_reason)
-{
- exception = the_exception ;
- exceptionReason = the_reason;
-}
-
-} // namespace certi
Index: libCERTI/NameReservation.hh
===================================================================
RCS file: libCERTI/NameReservation.hh
diff -N libCERTI/NameReservation.hh
--- libCERTI/NameReservation.hh 31 May 2010 13:14:18 -0000 3.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,55 +0,0 @@
-// ----------------------------------------------------------------------------
-// CERTI - HLA RunTime Infrastructure
-// Copyright (C) 2004 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: NameReservation.hh,v 3.2 2010/05/31 13:14:18 erk Exp $
-// ----------------------------------------------------------------------------
-
-#ifndef LIBCERTI_NAME_RESERVATION_HH
-#define LIBCERTI_NAME_RESERVATION_HH
-
-#include <map>
-#include "certi.hh"
-#include "Named.hh"
-#include "Handled.hh"
-
-namespace certi {
-
-class NameReservation;
-
-typedef std::map<std::string, NameReservation *> NameReservationSet;
-
-class CERTI_EXPORT NameReservation : public Named, public
Handled<FederateHandle>
-{
-public:
- NameReservation(FederateHandle the_owner, std::string the_name)
- : Named(the_name)
- , Handled<FederateHandle>(the_owner)
- {
- }
-
- virtual ~NameReservation()
- {
- }
-
-};
-
-} // namespace certi
-#endif // LIBCERTI_NAME_RESERVATION_HH
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [certi-cvs] certi libCERTI/ObjectClassBroadcastList.cc libC...,
CERTI CVS commits <=