Import Geant4 3.2.0 source tree
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
$Id: History,v 1.4 2000/11/20 18:14:53 gcosmo Exp $
|
||||
$Id: History,v 1.6 2001/06/18 08:41:12 gcosmo Exp $
|
||||
-------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
@@ -19,6 +19,14 @@ committal in the CVS repository !
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
June 18, 2001 Gabriele Cosmo (STEP-V03-01-00)
|
||||
- dirobj.cc: removed usage of strdup() to allow porting on Linux-g++ -ansi
|
||||
setup. Replaced with existing solution for __O3DB__.
|
||||
|
||||
April 20, 2001 Gabriele Cosmo
|
||||
- Minor fixes for removing some pedantic warnings from Linux-g++,
|
||||
modified files: scl_hash.cc, scl_string.cc.
|
||||
|
||||
November 20, 2000 Gabriele Cosmo (STEP-V02-00-00)
|
||||
- Fixes to remove warnings from "-Wall -ansi -pedantic" g++ compiler options:
|
||||
o commented out variables declared and not used.
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
//
|
||||
// $Id: classes.h,v 1.3 2000/01/21 13:42:37 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
// GEANT4 tag $Name: $
|
||||
//
|
||||
/*
|
||||
** Fed-x parser output module for generating C++ class definitions
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
* and is not subject to copyright.
|
||||
*/
|
||||
|
||||
/* $Id: dirobj.cc,v 1.6 2000/11/21 07:54:50 gcosmo Exp $ */
|
||||
/* $Id: dirobj.cc,v 1.7 2001/06/18 08:19:40 gcosmo Exp $ */
|
||||
|
||||
/*
|
||||
* DirObj implementation
|
||||
@@ -500,12 +500,12 @@ void DirObj::InsertFile (const char* f, int index) {
|
||||
CheckIndex(index);
|
||||
spot = &fileList[index];
|
||||
}
|
||||
#ifdef __O3DB__
|
||||
//#ifdef __O3DB__ // Removed strdup() for ANSI porting - GC
|
||||
char* string = new char [strlen (f)];
|
||||
strcpy (string, f);
|
||||
#else
|
||||
char* string = strdup(f);
|
||||
#endif
|
||||
//#else
|
||||
// char* string = strdup(f);
|
||||
//#endif
|
||||
*spot = string;
|
||||
++fileCount;
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/* "$Id: scl_hash.cc,v 1.3 2000/01/21 13:43:15 gcosmo Exp $"; */
|
||||
/* "$Id: scl_hash.cc,v 1.4 2001/04/20 19:07:14 gcosmo Exp $"; */
|
||||
|
||||
/*
|
||||
* Dynamic hashing, after CACM April 1988 pp 446-457, by Per-Ake Larson.
|
||||
@@ -109,7 +109,7 @@ HASHcreate(unsigned count)
|
||||
** minimum SEGMENT_SIZE, then convert into segments.
|
||||
*/
|
||||
i = SEGMENT_SIZE;
|
||||
while (i < count)
|
||||
while (i < int(count))
|
||||
i <<= 1;
|
||||
count = DIV(i, SEGMENT_SIZE);
|
||||
|
||||
@@ -124,7 +124,7 @@ HASHcreate(unsigned count)
|
||||
/*
|
||||
** Allocate initial 'i' segments of buckets
|
||||
*/
|
||||
for (i = 0; i < count; i++)
|
||||
for (i = 0; i < int(count); i++)
|
||||
/* table->Directory[i] = (struct Element **) calloc(SEGMENT_SIZE,sizeof(struct Element));*/
|
||||
{
|
||||
table->Directory[i] = new struct Element * [SEGMENT_SIZE];
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
* and is not subject to copyright.
|
||||
*/
|
||||
|
||||
/* $Id: scl_string.cc,v 1.3 2000/01/21 13:43:15 gcosmo Exp $ */
|
||||
/* $Id: scl_string.cc,v 1.4 2001/04/20 19:07:14 gcosmo Exp $ */
|
||||
|
||||
#include <scl_string.h>
|
||||
#include <stdio.h>
|
||||
@@ -46,7 +46,7 @@ SCLstring::SCLstring (const char * str, int lim)
|
||||
|
||||
// check the length
|
||||
int l;
|
||||
if (lim && (strlen (str) > lim)) l = lim;
|
||||
if (lim && (int(strlen (str)) > lim)) l = lim;
|
||||
else l = strlen (str);
|
||||
|
||||
_strBufSize = newBufSize (l);
|
||||
|
||||
Reference in New Issue
Block a user