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

Import Geant4 4.0.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-08 16:18:25 +02:00
parent 36c080dca6
commit 921d3b1cda
3990 changed files with 185376 additions and 82884 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/geometry/solids/STEP/GNUmakefile
+19 -4
View File
@@ -1,4 +1,4 @@
# $Id: GNUmakefile,v 1.3 2000/02/14 13:44:01 gcosmo Exp $
# $Id: GNUmakefile,v 1.5 2001/11/29 16:46:51 gcosmo Exp $
# -------------------------------------------------------------
# GNUmakefile for STEP library. Gabriele Cosmo, 15/11/96.
# -------------------------------------------------------------
@@ -20,6 +20,17 @@ CPPFLAGS += \
-I$(G4BASE)/global/HEPRandom/include \
-I$(G4BASE)/global/HEPGeometry/include
# To avoid incompatibilities with ANSI standard treatment of strings, the
# NIST STEP reader on gcc-2.95.X and later must be compiled in non-ANSI mode.
#
ifneq (,$(findstring Linux-g++,$(G4SYSTEM)))
ansi_options = -Wall -ansi -pedantic
NCXX = $(filter-out $(ansi_options),$(CXXFLAGS))
NCPP = $(CPPFLAGS)
CXXFLAGS := $(NCXX)
CPPFLAGS := $(NCPP) -w
endif
include $(G4INSTALL)/config/common.gmk
# Fix for ISO AP203 geometry standard files to be always compiled without optimization.
@@ -29,14 +40,18 @@ CXXFLAGS_WITHOUT_O := $(filter-out -O% , $(CXXFLAGS))
CXXFLAGS_WITHOUT_O := $(filter-out +O% , $(CXXFLAGS_WITHOUT_O))
$(G4TMP)/$(G4SYSTEM)/$(name)/SdaiCONFIG_CONTROL_DESIGN.o: src/SdaiCONFIG_CONTROL_DESIGN.cc
$(CXX) $(CXXFLAGS_WITHOUT_O) $(CPPFLAGS) -c $(OUT_OBJ)$@ src/SdaiCONFIG_CONTROL_DESIGN.cc
@$(ECHO) Compiling SdaiCONFIG_CONTROL_DESIGN.cc ...
@$(CXX) $(CXXFLAGS_WITHOUT_O) $(CPPFLAGS) -c $(OUT_OBJ)$@ src/SdaiCONFIG_CONTROL_DESIGN.cc
$(G4TMP)/$(G4SYSTEM)/$(name)/SdaiCONFIG_CONTROL_DESIGN_init.o: src/SdaiCONFIG_CONTROL_DESIGN_init.cc
$(CXX) $(CXXFLAGS_WITHOUT_O) $(CPPFLAGS) -c $(OUT_OBJ)$@ src/SdaiCONFIG_CONTROL_DESIGN_init.cc
@$(ECHO) Compiling SdaiCONFIG_CONTROL_DESIGN_init.cc ...
@$(CXX) $(CXXFLAGS_WITHOUT_O) $(CPPFLAGS) -c $(OUT_OBJ)$@ src/SdaiCONFIG_CONTROL_DESIGN_init.cc
ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
CXXFLAGS_WITH_ZM = $(filter-out -Zm%,$(CXXFLAGS)) -Zm500
$(G4TMPDIR)/SdaiCONFIG_CONTROL_DESIGN.o: src/SdaiCONFIG_CONTROL_DESIGN.cc
$(CXX) $(CXXFLAGS_WITH_ZM) $(CPPFLAGS) -c $(OUT_OBJ)$@ \
@$(ECHO) Compiling SdaiCONFIG_CONTROL_DESIGN.cc ...
@$(CXX) $(CXXFLAGS_WITH_ZM) $(CPPFLAGS) -c $(OUT_OBJ)$@ \
src/SdaiCONFIG_CONTROL_DESIGN.cc
endif
source/geometry/solids/STEP/History
+11 -1
View File
@@ -1,4 +1,4 @@
$Id: History,v 1.6 2001/06/18 08:41:12 gcosmo Exp $
$Id: History,v 1.9 2001/11/29 16:50:01 gcosmo Exp $
-------------------------------------------------------------------
=========================================================
@@ -19,6 +19,16 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
November 29, 2001 Gabriele Cosmo (STEP-V03-02-01)
- Fixes for compilation on gcc-2.96.98 and gcc-3.0.2 compilers to overcome warnings
produced and fix std namespace problems in sdaiString.cc.
September 19, 2001 Gabriele Cosmo (STEP-V03-02-00)
- SdaiCONFIG_CONTROL_DESIGN.cc: cleaned up warnings on SUN-CC.
- dirobj.cc: restored usage of strdup() and force non-ansi compilation in GNUmakefile
for Linux-g++, to avoid incompatibilities on the usage of C strings operations
when "-ansi -pedantic" is adopted.
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__.
source/geometry/solids/STEP/include/classes.h
+1 -1
View File
@@ -6,7 +6,7 @@
//
// $Id: classes.h,v 1.3 2000/01/21 13:42:37 gcosmo Exp $
// GEANT4 tag $Name: $
// GEANT4 tag $Name: geant4-04-00 $
//
/*
** Fed-x parser output module for generating C++ class definitions
source/geometry/solids/STEP/src/SdaiCONFIG_CONTROL_DESIGN.cc
+501 -501
View File
File diff suppressed because it is too large Load Diff
source/geometry/solids/STEP/src/dirobj.cc
+5 -5
View File
@@ -10,7 +10,7 @@
* and is not subject to copyright.
*/
/* $Id: dirobj.cc,v 1.7 2001/06/18 08:19:40 gcosmo Exp $ */
/* $Id: dirobj.cc,v 1.8 2001/09/19 09:52:46 gcosmo Exp $ */
/*
* DirObj implementation
@@ -500,12 +500,12 @@ void DirObj::InsertFile (const char* f, int index) {
CheckIndex(index);
spot = &fileList[index];
}
//#ifdef __O3DB__ // Removed strdup() for ANSI porting - GC
#ifdef __O3DB__ // strdup() should be removed 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;
}
source/geometry/solids/STEP/src/sdaiString.cc
+5 -1
View File
@@ -9,7 +9,7 @@
* and is not subject to copyright.
*/
/* $Id: sdaiString.cc,v 1.1 2000/01/21 13:43:19 gcosmo Exp $ */
/* $Id: sdaiString.cc,v 1.2 2001/11/29 16:46:51 gcosmo Exp $ */
#include <sdai.h>
#include "g4std/strstream"
@@ -92,7 +92,11 @@ SCLP23(String)::STEPread (G4std::istream& in, ErrorDescriptor *err)
in >> c;
// remember the current format state to restore the previous settings
#ifdef G4USE_STD_NAMESPACE
std::ios::fmtflags flags = in.flags();
#else
long int flags = in.flags();
#endif
in.unsetf(G4std::ios::skipws);
if (c == STRING_DELIM)