Changeset 14890


Ignore:
Timestamp:
05/04/13 16:56:02 (12 years ago)
Author:
Eric.Larour
Message:

CHG: cosmetics

Location:
issm/trunk-jpl/src/c/shared/Alloc
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/shared/Alloc/alloc.h

    r13251 r14890  
    1313void xdelete(Matrix<IssmDouble>** pvptr);
    1414void xdelete(Vector<IssmDouble>** pvptr);
     15
    1516#endif

  • issm/trunk-jpl/src/c/shared/Alloc/xNewDelete.h

    r13623 r14890  
    88#include <cassert>
    99
    10 // memory management of types
    11 // T with non-trivial constructors require
    12 // C++ style memory management
     10/* memory management of types T with non-trivial constructors require C++ style memory management*/
    1311#define USE_CXX_MEMORY_MANAGMENT_FOR_NON_POD_TYPES
    14 // but for speed on may alternatively use C memory management
    15 // but can do so safely only for T that are at most
    16 // plain old data structures (POD)
     12/* but for speed one may alternatively use C memory management but can do so safely only for T that are at most
     13 * plain old data structures (POD)*/
    1714#ifndef USE_CXX_MEMORY_MANAGMENT_FOR_NON_POD_TYPES
    1815#include <cstdlib>
    1916#endif
    2017
    21 template <class T>
    22 T* xNew(unsigned int size) {
     18template <class T> T* xNew(unsigned int size) { /*{{{*/
    2319#ifdef USE_CXX_MEMORY_MANAGMENT_FOR_NON_POD_TYPES
    2420  T* aT_p=new T[size];
    … …  
    3026  return aT_p;
    3127#endif 
    32 }
    33 
    34 template <class T>
    35 T** xNew(unsigned int dim1, unsigned int dim2) {
     28}/*}}}*/
     29template <class T> T** xNew(unsigned int dim1, unsigned int dim2) { /*{{{*/
    3630#ifdef USE_CXX_MEMORY_MANAGMENT_FOR_NON_POD_TYPES
    3731  T* buf=new T[dim1*dim2];
    … …  
    5549  return aT_pp ;
    5650#endif
    57 }
    58 
    59 template <class T>
    60 T* xNewZeroInit(unsigned int size) {
     51}/*}}}*/
     52template <class T> T* xNewZeroInit(unsigned int size) {/*{{{*/
    6153#ifdef USE_CXX_MEMORY_MANAGMENT_FOR_NON_POD_TYPES
    6254  T* aT_p=xNew<T>(size);
    … …  
    6961  return aT_p;
    7062#endif
    71 }
    72 
    73 template <class T>
    74 T** xNewZeroInit(unsigned int dim1, unsigned int dim2) {
     63}/*}}}*/
     64template <class T> T** xNewZeroInit(unsigned int dim1, unsigned int dim2) {/*{{{*/
    7565#ifdef USE_CXX_MEMORY_MANAGMENT_FOR_NON_POD_TYPES
    7666  T** aT_pp=xNew<T>(dim1,dim2);
    … …  
    8979  return aT_pp ;
    9080#endif
    91 }
    92 
    93 template <class T>
    94 void xDelete(T**& aT_pp) {
     81}/*}}}*/
     82template <class T> void xDelete(T**& aT_pp) {/*{{{*/
    9583  if (aT_pp) {
    9684#ifdef USE_CXX_MEMORY_MANAGMENT_FOR_NON_POD_TYPES
    … …  
    10391  }
    10492  aT_pp=0;
    105 }
    106 
    107 template <class T>
    108 void xDelete(T*& aT_p) {
     93}/*}}}*/
     94template <class T> void xDelete(T*& aT_p) {/*{{{*/
    10995  if (aT_p)
    11096#ifdef USE_CXX_MEMORY_MANAGMENT_FOR_NON_POD_TYPES
    … …  
    114100#endif
    115101  aT_p=0;
    116 }
    117 
    118 template <class T>
    119 T* xReNew(T* old, unsigned int old_size, unsigned int size) {
     102}/*}}}*/
     103template <class T> T* xReNew(T* old, unsigned int old_size, unsigned int size) {/*{{{*/
    120104#ifdef USE_CXX_MEMORY_MANAGMENT_FOR_NON_POD_TYPES
    121105        T* aT_p=0;
    … …  
    150134        return aT_p;
    151135#endif
    152 }
     136}/*}}}*/
    153137
    154138#endif
Note: See TracChangeset for help on using the changeset viewer.