Import Geant4 10.3.0 source tree
This commit is contained in:
@@ -23,7 +23,7 @@ inline void cmem_free(T*& a_p){
|
||||
}
|
||||
|
||||
template <class T>
|
||||
inline T* cmem_alloc(unsigned int a_num){
|
||||
inline T* cmem_alloc(size_t a_num){
|
||||
if(a_num<=0) return 0;
|
||||
T* p = (T*)::malloc(a_num*sizeof(T));
|
||||
if(!p) return 0;
|
||||
@@ -34,7 +34,7 @@ inline T* cmem_alloc(unsigned int a_num){
|
||||
}
|
||||
|
||||
template <class T>
|
||||
inline T* cmem_alloc_copy(const T* a_from,unsigned int a_num){
|
||||
inline T* cmem_alloc_copy(const T* a_from,size_t a_num){
|
||||
if(a_num<=0) return 0;
|
||||
T* p = (T*)::malloc(a_num*sizeof(T));
|
||||
if(!p) return 0;
|
||||
@@ -42,7 +42,7 @@ inline T* cmem_alloc_copy(const T* a_from,unsigned int a_num){
|
||||
mem::increment("cmem");
|
||||
#endif
|
||||
//::memcpy(p,a_from,a_num*sizeof(T));
|
||||
for(unsigned int i=0;i<a_num;i++) p[i] = a_from[i];
|
||||
for(size_t i=0;i<a_num;i++) p[i] = a_from[i];
|
||||
return p;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user