diff options
author | Thomas Grill <xovo@users.sourceforge.net> | 2003-11-10 03:42:03 +0000 |
---|---|---|
committer | Thomas Grill <xovo@users.sourceforge.net> | 2003-11-10 03:42:03 +0000 |
commit | 8a2c6d3d86df5076510e02315b354b3194e243e1 (patch) | |
tree | 3dcd8a5d977932f65982851c0f24d989787f4b9a /externals/grill/vasp/source | |
parent | d60f7df8256c9326c08ce207efe4b5609bc64571 (diff) |
""
svn path=/trunk/; revision=1176
Diffstat (limited to 'externals/grill/vasp/source')
-rw-r--r-- | externals/grill/vasp/source/arg.h | 3 | ||||
-rw-r--r-- | externals/grill/vasp/source/buflib.cpp | 11 | ||||
-rw-r--r-- | externals/grill/vasp/source/env.h | 3 | ||||
-rw-r--r-- | externals/grill/vasp/source/main.cpp | 2 | ||||
-rw-r--r-- | externals/grill/vasp/source/vasp.h | 7 | ||||
-rw-r--r-- | externals/grill/vasp/source/vecblk.h | 3 |
6 files changed, 19 insertions, 10 deletions
diff --git a/externals/grill/vasp/source/arg.h b/externals/grill/vasp/source/arg.h index bda3ef01..cd0f70a1 100644 --- a/externals/grill/vasp/source/arg.h +++ b/externals/grill/vasp/source/arg.h @@ -19,7 +19,8 @@ WARRANTIES, see the file, "license.txt," in this distribution. #define VASP_ARG_R(VAL) Argument().SetR(VAL) #define VASP_ARG_CX(RV,IV) Argument().SetCX(RV,IV) -class Argument +class Argument: + public flext { public: Argument(); diff --git a/externals/grill/vasp/source/buflib.cpp b/externals/grill/vasp/source/buflib.cpp index b3595158..41754a20 100644 --- a/externals/grill/vasp/source/buflib.cpp +++ b/externals/grill/vasp/source/buflib.cpp @@ -26,7 +26,8 @@ WARRANTIES, see the file, "license.txt," in this distribution. #endif -class FreeEntry +class FreeEntry: + public flext { public: FreeEntry(const t_symbol *s): sym(s),nxt(NULL) {} @@ -35,7 +36,8 @@ public: FreeEntry *nxt; }; -class BufEntry +class BufEntry: + public flext { public: BufEntry(const t_symbol *s,I fr,BL zero = true); @@ -68,16 +70,17 @@ static V FreeLibSym(const t_symbol *s); BufEntry::BufEntry(const t_symbol *s,I fr,BL zero): sym(s), - alloc(fr),len(fr),data(new S[fr]), + alloc(fr),len(fr), refcnt(0),nxt(NULL) { + data = (S *)NewAligned(fr*sizeof(S)); if(zero) flext::ZeroMem(data,len*sizeof(*data)); } BufEntry::~BufEntry() { if(sym) FreeLibSym(sym); - if(data) delete[] data; + if(data) FreeAligned(data); } V BufEntry::IncRef() { ++refcnt; } diff --git a/externals/grill/vasp/source/env.h b/externals/grill/vasp/source/env.h index 5b00ffae..11ad68ab 100644 --- a/externals/grill/vasp/source/env.h +++ b/externals/grill/vasp/source/env.h @@ -13,7 +13,8 @@ WARRANTIES, see the file, "license.txt," in this distribution. #include "vasp.h" -class Env +class Env: + public flext { public: Env(): cnt(0),pos(NULL),val(NULL) {} diff --git a/externals/grill/vasp/source/main.cpp b/externals/grill/vasp/source/main.cpp index 67d151ac..60352bda 100644 --- a/externals/grill/vasp/source/main.cpp +++ b/externals/grill/vasp/source/main.cpp @@ -12,7 +12,7 @@ WARRANTIES, see the file, "license.txt," in this distribution. #include "classes.h" -const C *VASP_VERSION = "0.1.3pre10"; +const C *VASP_VERSION = "0.1.3pre11"; #include "opfuns.h" diff --git a/externals/grill/vasp/source/vasp.h b/externals/grill/vasp/source/vasp.h index ed63846f..0cc80be8 100644 --- a/externals/grill/vasp/source/vasp.h +++ b/externals/grill/vasp/source/vasp.h @@ -13,10 +13,13 @@ WARRANTIES, see the file, "license.txt," in this distribution. #include "vbuffer.h" -class Vasp +class Vasp: + public flext { public: - class Ref { + class Ref: + public flext + { public: Ref(): sym(NULL) {} Ref(VBuffer &b); diff --git a/externals/grill/vasp/source/vecblk.h b/externals/grill/vasp/source/vecblk.h index a938558e..7ca4ca94 100644 --- a/externals/grill/vasp/source/vecblk.h +++ b/externals/grill/vasp/source/vecblk.h @@ -13,7 +13,8 @@ WARRANTIES, see the file, "license.txt," in this distribution. #include "vasp.h" -class VecBlock +class VecBlock: + public flext { public: |