lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 3.0.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-08 15:55:53 +02:00
parent e7d7193284
commit cfcb558cfe
3050 changed files with 91703 additions and 48310 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/geometry/solids/STEP/src/ExpDict.cc
+7 -7
View File
@@ -10,7 +10,7 @@
* and is not subject to copyright.
*/
/* $Id: ExpDict.cc,v 1.5 2000/06/08 17:18:11 gcosmo Exp $ */
/* $Id: ExpDict.cc,v 1.6 2000/11/20 18:14:56 gcosmo Exp $ */
#include <memory.h>
#include <math.h>
#include <stdio.h>
@@ -834,7 +834,7 @@ AttrDescriptor::ExpandedTypeName(SCLstring & s) const
const char *
AttrDescriptor::GenerateExpress (SCLstring &buf) const
{
char tmp[BUFSIZ];
// char tmp[BUFSIZ];
SCLstring sstr;
buf = AttrExprDefStr(sstr);
buf.Append(";\n");
@@ -955,7 +955,7 @@ EnumTypeDescriptor::GenerateExpress (SCLstring &buf) const
const char *desc = Description();
const char *ptr = &(desc[16]);
int count;
Where_rule_ptr wr;
// Where_rule_ptr wr;
int i;
int all_comments = 1;
@@ -1058,10 +1058,10 @@ EntityDescriptor::~EntityDescriptor ()
const char *
EntityDescriptor::GenerateExpress (SCLstring &buf) const
{
char tmp[BUFSIZ];
// char tmp[BUFSIZ];
SCLstring sstr;
int count;
Where_rule_ptr wr;
// Where_rule_ptr wr;
int i;
int all_comments = 1;
@@ -1681,7 +1681,7 @@ TypeDescriptor::GenerateExpress (SCLstring &buf) const
const char *desc = Description();
const char *ptr = desc;
int count;
Where_rule_ptr wr;
// Where_rule_ptr wr;
int i;
int all_comments = 1;
@@ -2093,7 +2093,7 @@ SelectTypeDescriptor::CanBe (const TypeDescriptor * other) const
const TypeDescriptor *
SelectTypeDescriptor::CanBe (const char * other) const
{
const TypeDescriptor * found =0;
// const TypeDescriptor * found =0;
TypeDescItr elements (GetElements()) ;
const TypeDescriptor * td =0;
source/geometry/solids/STEP/src/Registry_inline.cc
+3 -2
View File
@@ -13,7 +13,7 @@ extern int pr_obj_errors;
* and is not subject to copyright.
*/
/* $Id: Registry_inline.cc,v 1.3 2000/01/21 13:42:55 gcosmo Exp $ */
/* $Id: Registry_inline.cc,v 1.4 2000/11/20 18:14:56 gcosmo Exp $ */
#include <ExpDict.h>
#include <Registry.h>
@@ -33,7 +33,8 @@ static int uniqueNames( const char *, const SchRename * );
//#else
Registry::Registry (CF_init initFunct)
//#endif
: entity_cnt(0), all_ents_cnt(0), col(0)
// Changed order of member initialisations to match correct order - GC
: col(0), entity_cnt(0), all_ents_cnt(0)
{
//#ifdef __OSTORE__
// need to make this thing persistent in a database - DAS
source/geometry/solids/STEP/src/STEPaggregate.cc
+3 -3
View File
@@ -10,7 +10,7 @@
* and is not subject to copyright.
*/
/* $Id: STEPaggregate.cc,v 1.4 2000/01/21 13:42:56 gcosmo Exp $ */
/* $Id: STEPaggregate.cc,v 1.5 2000/11/20 18:14:57 gcosmo Exp $ */
#include <stdio.h>
@@ -25,7 +25,7 @@ const int Real_Num_Precision = REAL_NUM_PRECISION; // from STEPattribute.h
#define STRING_DELIM '\''
static char rcsid[] = "$Id: STEPaggregate.cc,v 1.4 2000/01/21 13:42:56 gcosmo Exp $";
// static char rcsid[] = "$Id: STEPaggregate.cc,v 1.5 2000/11/20 18:14:57 gcosmo Exp $";
/******************************************************************
** Functions for manipulating aggregate attributes
@@ -1980,7 +1980,7 @@ RealNode::asStr(SCLstring &s)
const char *
RealNode::STEPwrite(SCLstring &s, const char *)
{
char tmp[BUFSIZ];
// char tmp[BUFSIZ];
if(value != S_REAL_NULL)
{
// sprintf(tmp, "%.15g", value);
source/geometry/solids/STEP/src/STEPcomplex.cc
+6 -4
View File
@@ -29,7 +29,7 @@ STEPcomplex::STEPcomplex(Registry *registry, const SCLstring **names,
: SCLP23(Application_instance)(fileid, 1), sc(0), _registry(registry), visited(0)
{
char *nms[BUFSIZ];
SCLstring *name;
// SCLstring *name;
int j, k;
head = this;
@@ -168,7 +168,7 @@ STEPcomplex::~STEPcomplex()
void
STEPcomplex::AssignDerives()
{
const char *nm;
// const char *nm;
STEPattribute * a = 0;
STEPcomplex *scomp1 = head;
STEPcomplex *scomp2;
@@ -492,7 +492,7 @@ STEPcomplex::BuildAttrs(const char *s )
//////////////////////////////////////////////
// find out how many attrs there are
//////////////////////////////////////////////
int attrCount = attrList->EntryCount();
// int attrCount = attrList->EntryCount();
STEPattribute * a = 0;
@@ -573,6 +573,8 @@ STEPcomplex::BuildAttrs(const char *s )
#endif
break;
}
default: // Added default field - GC
break;
}
a -> set_null ();
@@ -673,7 +675,7 @@ STEPcomplex::WriteExtMapEntities(G4std::ostream& out, const char *currSch)
const char *
STEPcomplex::WriteExtMapEntities(SCLstring &buf, const char *currSch)
{
char instanceInfo[BUFSIZ];
// char instanceInfo[BUFSIZ];
SCLstring tmp;
// sprintf(instanceInfo, "%s(", (char *)StrToUpper( EntityName(), tmp ) );
source/geometry/solids/STEP/src/STEPfile.cc
+10 -7
View File
@@ -14,7 +14,7 @@ int pr_obj_errors = 0;
* and is not subject to copyright.
*/
/* $Id: STEPfile.cc,v 1.4 2000/01/21 13:42:57 gcosmo Exp $ */
/* $Id: STEPfile.cc,v 1.5 2000/11/20 18:14:58 gcosmo Exp $ */
/********************************************************************
TODO LIST:
@@ -272,7 +272,7 @@ STEPfile::HeaderConvertToNew(InstMgr& oldinst)
InstMgr* imtmp = new InstMgr;
SCLP23(Application_instance)* oldse;
int count = 0;
// int count = 0;
// FILE_NAME <== (N279)FILE_IDENTIFICATION
p21DIS_File_name * fn = 0;
@@ -498,7 +498,7 @@ STEPfile::HeaderMergeInstances(InstMgr* im)
{
SCLP23(Application_instance)* se = 0;
SCLP23(Application_instance)* from = 0;
SCLP23(Application_instance)* to = 0;
// SCLP23(Application_instance)* to = 0;
int idnum;
@@ -1545,7 +1545,7 @@ STEPfile::FindHeaderSection (G4std::istream& in)
{
char buf[BUFSIZ];
char *b = buf;
int rval =0;
// int rval =0;
*b = '\0';
@@ -1597,7 +1597,7 @@ STEPfile::CreateInstance(G4std::istream& in, G4std::ostream &out)
int fileid = -1;
SCLP23(Application_instance_ptr) * scopelist =0;
int n =0;
// int n =0;
SCLP23(Application_instance)* obj;
ErrorDescriptor result;
@@ -2125,7 +2125,7 @@ STEPfile::ReadInstance(G4std::istream& in, G4std::ostream& out, SCLstring &cmtSt
char c;
int fileid;
int n =0;
// int n =0;
SCLP23(Application_instance)* obj = ENTITY_NULL;
int idIncrNum = FileIdIncr();
@@ -2333,7 +2333,7 @@ BUG: doesn't check to see if the backup command works.
void
STEPfile::MakeBackupFile()
{
static int i =1;
// static int i =1;
char backup_call [2*BUFSIZ];
char backup_file [BUFSIZ];
@@ -2931,6 +2931,9 @@ STEPfile::AppendFile (G4std::istream* in, int useTechCor)
// valid_insts = ReadWorkingData2 (*in2);
valid_insts = ReadData2 (*in2, useTechCor);
break;
default: // Added default field - GC
break;
}
//check for "ENDSEC;"
source/geometry/solids/STEP/src/STEPfile_inline.cc
+6 -6
View File
@@ -11,7 +11,7 @@
* and is not subject to copyright.
*/
/* $Id: STEPfile_inline.cc,v 1.6 2000/02/14 13:44:04 gcosmo Exp $ */
/* $Id: STEPfile_inline.cc,v 1.7 2000/11/20 18:14:58 gcosmo Exp $ */
#include <STEPfile.h>
#include <s_HEADER_SCHEMA.h>
@@ -34,19 +34,19 @@ extern void HeaderSchemaInit (Registry & reg);
STEPfile::STEPfile(Registry& r, InstMgr& i, const char *filename)
// Changed order of member initialisations to match correct order - GC
#ifdef __O3DB__
: _reg(&r), _instances(&i),
: _instances(&i), _reg(&r),
#else
: _reg(r), _instances(i),
: _instances(i), _reg(r),
#endif
#ifdef __OSTORE__
db (0),
#endif
_headerId(0), _maxErrorCount(5000),
_fileIdIncr (0), _headerId(0),
_fileName (0), _entsNotCreated(0), _entsInvalid(0),
_entsIncomplete(0), _entsWarning(0),
_errorCount (0), _warningCount (0),
_fileIdIncr (0)
_errorCount (0), _warningCount (0), _maxErrorCount(5000)
{
SetFileType(VERSION_CURRENT);
source/geometry/solids/STEP/src/SdaiAll.cc
+4 -4
View File
@@ -3,7 +3,7 @@
// This file was generated by fedex_plus. You probably don't want to edit
// it since your modifications will be lost if fedex_plus is used to
// regenerate it.
/* $Id: SdaiAll.cc,v 1.2 2000/06/08 17:18:11 gcosmo Exp $ */
/* $Id: SdaiAll.cc,v 1.3 2000/11/20 18:14:59 gcosmo Exp $ */
#include <schema.h>
#ifdef WIN32
@@ -13,9 +13,9 @@
void
InitSchemasAndEnts (Registry & reg)
{
Interface_spec_ptr is;
Used_item_ptr ui;
Referenced_item_ptr ri;
// Interface_spec_ptr is;
// Used_item_ptr ui;
// Referenced_item_ptr ri;
Uniqueness_rule_ptr ur;
Where_rule_ptr wr;
Global_rule_ptr gr;
source/geometry/solids/STEP/src/collect.cc
+1 -1
View File
@@ -98,7 +98,7 @@ int ComplexCollect::supports( EntNode *ents ) const
// Changed 'and' to 'andl'. 'and' is reserved word in the standard - GC
EntNode *node = ents, *nextnode;
AndList *andl;
AndList *andl=0;
ComplexList *clist = clists, *cl = NULL, *current;
int retval;
EntList *elist, *next;
source/geometry/solids/STEP/src/complexlist.cc
+1 -1
View File
@@ -93,7 +93,7 @@ void ComplexList::addChildren( EntList *ent )
EntList *child;
char *nm;
EntNode *prev = list, *prev2 = NULL, *newnode;
int comp;
int comp=0;
if ( ent->multiple() ) {
child = ((MultList *)ent)->childList;
source/geometry/solids/STEP/src/compstructs.cc
+3 -3
View File
@@ -21,9 +21,9 @@ ComplexCollect *gencomplex()
EntList *node, *child, *next1, *next2, *next3, *next4,
*next5, *next6, *next7, *next8, *next9, *next10,
*next11, *next12, *next13, *next14, *next15,
*next16, *next17, *next18, *next19, *next20,
*next21, *next22, *next23, *next24, *next25,
*next26, *next27, *next28, *next29, *next30;
*next16, *next17, *next18; //, *next19, *next20,
// *next21, *next22, *next23, *next24, *next25,
// *next26, *next27, *next28, *next29, *next30;
cc = new ComplexCollect;
source/geometry/solids/STEP/src/dirobj.cc
+14 -2
View File
@@ -10,7 +10,7 @@
* and is not subject to copyright.
*/
/* $Id: dirobj.cc,v 1.4 2000/06/08 17:18:12 gcosmo Exp $ */
/* $Id: dirobj.cc,v 1.6 2000/11/21 07:54:50 gcosmo Exp $ */
/*
* DirObj implementation
@@ -42,6 +42,18 @@
#include <dirobj.h>
#ifndef MAXNAMLEN
# define MAXNAMLEN 255
#endif
#ifndef S_IFMT
# define S_IFMT __S_IFMT
#endif
#ifndef S_IFDIR
# define S_IFDIR __S_IFDIR
#endif
// to help ObjectCenter
#ifndef HAVE_MEMMOVE
extern "C"
@@ -112,7 +124,7 @@ const char* DirObj::RealPath (const char* path) {
boolean DirObj::LoadDirectory (const char* name) {
char buf[MAXPATHLEN+2];
const char* path = buf;
// const char* path = buf;
strcpy(buf, ValidDirectories(RealPath(name)));
return Reset(buf);
source/geometry/solids/STEP/src/entnode.cc
+1 -1
View File
@@ -22,7 +22,7 @@ EntNode::EntNode( const char **names )
* element. This ensures that `this' points to the start of the list.
*/
{
int j = 1, comp;
int j = 1, comp = 0;
EntNode *prev, *prev2 = NULL, // prev2 - the one before prev
*newnode, *firstnode;
const char *nm;
source/geometry/solids/STEP/src/gennodearray.cc
+2 -2
View File
@@ -10,7 +10,7 @@
* and is not subject to copyright.
*/
/* $Id: gennodearray.cc,v 1.3 2000/01/21 13:43:11 gcosmo Exp $ */
/* $Id: gennodearray.cc,v 1.4 2000/11/20 18:15:02 gcosmo Exp $ */
//#include "/proj/pdevel/autoc/arch.sunCC.iv/scl_cf.h"
// This is an scl configuration file generated by the configure script
@@ -99,7 +99,7 @@ GenNodeArray::Check (int index)
GenericNode** newbuf;
if (index >= _bufsize) {
int oldBufSize = _bufsize;
// int oldBufSize = _bufsize;
_bufsize = (index+1) * 2;
/*
#ifdef __OSTORE__
source/geometry/solids/STEP/src/mgrnodearray.cc
+2 -2
View File
@@ -10,7 +10,7 @@
* and is not subject to copyright.
*/
/* $Id: mgrnodearray.cc,v 1.3 2000/01/21 13:43:12 gcosmo Exp $ */
/* $Id: mgrnodearray.cc,v 1.4 2000/11/20 18:15:02 gcosmo Exp $ */
/*
* MgrNodeArray - dynamic array object of MgrNodes.
@@ -230,7 +230,7 @@ int MgrNodeArraySorted::MgrNodeIndex(int fileId) {
G4cout << "MgrNodeArraySorted::MgrNodeIndex()\n";
int low = 0;
int high = _count - 1;
int mid;
int mid = 0;
int found = 0;
int curFileId;
source/geometry/solids/STEP/src/multlist.cc
+1 -1
View File
@@ -118,7 +118,7 @@ EntList *MultList::copyList( EntList *ent )
* to the end of our list.
*/
{
EntList *newlist, *child;
EntList *newlist=0, *child;
switch ( ent->join ) {
case SIMPLE:
source/geometry/solids/STEP/src/orlist.cc
+1 -1
View File
@@ -50,7 +50,7 @@ void OrList::unmarkAll( EntNode *ents )
*/
{
EntList *child;
int j;
// int j;
if ( (child = getChild( choice )) != NULL ) {
// choice = the last selected path which we'll now undo.
source/geometry/solids/STEP/src/print.cc
+1 -1
View File
@@ -53,7 +53,7 @@ G4std::ostream & operator << ( G4std::ostream &os, MultList &mlist )
*/
{
char jointype[7];
int k, lastSimple;
int k, lastSimple=0;
// lastSimple - is the last child simple? If so, we need to print another
// line at the end. If not, the children of last child did already.
EntList *child = mlist.childList;
source/geometry/solids/STEP/src/read_func.cc
+1 -1
View File
@@ -1180,7 +1180,7 @@ ReadTokenSeparator(G4std::istream& in, SCLstring *comments)
{
char c;
SCLstring s; // used if need to read a comment
const char *cstr = 0;
// const char *cstr = 0;
if (in.eof())
{
source/geometry/solids/STEP/src/sdaiApplication_instance.cc
+3 -3
View File
@@ -10,9 +10,9 @@
* and is not subject to copyright.
*/
/* $Id: sdaiApplication_instance.cc,v 1.1 2000/01/21 13:43:15 gcosmo Exp $ */
/* $Id: sdaiApplication_instance.cc,v 1.2 2000/11/20 18:15:04 gcosmo Exp $ */
//static char rcsid[] ="$Id: sdaiApplication_instance.cc,v 1.1 2000/01/21 13:43:15 gcosmo Exp $";
//static char rcsid[] ="$Id: sdaiApplication_instance.cc,v 1.2 2000/11/20 18:15:04 gcosmo Exp $";
#include <sdai.h>
//#include <STEPentity.h>
@@ -901,7 +901,7 @@ ReadEntityRef(G4std::istream &in, ErrorDescriptor *err, char *tokenList,
case '#':
{
int id = -1;
int n = 0;
// int n = 0;
in >> id;
if (in.fail ()) // there's been an error in input
{