Import Geant4 9.6.0 source tree
This commit is contained in:
+22
-22
@@ -1,22 +1,22 @@
|
||||
#ifndef HEP_DEFS_H
|
||||
#define HEP_DEFS_H
|
||||
|
||||
#ifdef WIN32
|
||||
//
|
||||
// Define DLL export macro for WIN32 systems for
|
||||
// importing/exporting external symbols to DLLs
|
||||
//
|
||||
#if defined G4LIB_BUILD_DLL
|
||||
#if defined CLHEP_EXPORT
|
||||
#define DLL_API __declspec( dllexport )
|
||||
#else
|
||||
#define DLL_API __declspec( dllimport )
|
||||
#endif
|
||||
#else
|
||||
#define DLL_API
|
||||
#endif
|
||||
#else
|
||||
#define DLL_API
|
||||
#endif
|
||||
|
||||
#endif /* HEP_DEFS_H */
|
||||
#ifndef HEP_DEFS_H
|
||||
#define HEP_DEFS_H
|
||||
|
||||
#ifdef WIN32
|
||||
//
|
||||
// Define DLL export macro for WIN32 systems for
|
||||
// importing/exporting external symbols to DLLs
|
||||
//
|
||||
#if defined G4LIB_BUILD_DLL
|
||||
#if defined CLHEP_EXPORT
|
||||
#define DLL_API __declspec( dllexport )
|
||||
#else
|
||||
#define DLL_API __declspec( dllimport )
|
||||
#endif
|
||||
#else
|
||||
#define DLL_API
|
||||
#endif
|
||||
#else
|
||||
#define DLL_API
|
||||
#endif
|
||||
|
||||
#endif /* HEP_DEFS_H */
|
||||
|
||||
@@ -30,6 +30,17 @@
|
||||
//
|
||||
// ======================================================================
|
||||
|
||||
// don't generate unnecessary warnings
|
||||
#if defined __GNUC__
|
||||
#if __GNUC__ > 3 && __GNUC_MINOR__ > 6
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor"
|
||||
#endif
|
||||
#endif
|
||||
#ifdef __clang__
|
||||
#pragma clang diagnostic push
|
||||
#pragma clang diagnostic ignored "-Wdelete-non-virtual-dtor"
|
||||
#endif
|
||||
|
||||
#include "CLHEP/Utility/defs.h"
|
||||
#include "CLHEP/Utility/noncopyable.h"
|
||||
|
||||
Reference in New Issue
Block a user