""

svn path=/trunk/; revision=1176

9 files changed, 23 insertions, 12 deletions

diff --git a/externals/grill/vasp/changes.txt b/externals/grill/vasp/changes.txt
index c9c7a34e..5d79e4dc 100644
--- a/externals/grill/vasp/changes.txt
+++ b/externals/grill/vasp/changes.txt
@@ -20,6 +20,7 @@ Version history:
 - ADD: vasp.search (vasp.o=, vasp.f=) objects... @incl attribute (default false) to include current sample into search
 - ADD: [vasp.channels?] reports number of channels in the first vasp vector (buffer/array)
 - CHANGE: vasp.min?, vasp.max?, vasp.amin?, vasp.amax?, vasp.rmin?, vasp.rmax? no longer return the reference vasp / return a list of vector maxima/minima
+- CHANGE: inherited several classes from the flext class, so that new and delete use the RT-system functions
 
 0.1.2:
 - FIX: bug in vasp.frames* ... wrong argument
diff --git a/externals/grill/vasp/config-pd-msvc.txt b/externals/grill/vasp/config-pd-msvc.txt
index 1ae24513..d4b1d0e2 100644
--- a/externals/grill/vasp/config-pd-msvc.txt
+++ b/externals/grill/vasp/config-pd-msvc.txt
@@ -9,7 +9,8 @@ PDPATH=c:\programme\audio\pd
 FLEXTPATH=$(PDPATH)\flext
 
 # where is MS VC++?
-MSVCPATH=c:\programme\prog\microsoft visual studio\VC98
+# (only necessary if not run from within the build environment)
+# MSVCPATH=c:\programme\prog\microsoft visual studio\VC98
 
 # where should the external be built?
 OUTPATH=pd-msvc
diff --git a/externals/grill/vasp/makefile.pd-msvc b/externals/grill/vasp/makefile.pd-msvc
index 1ab086f8..f43a2b9d 100644
--- a/externals/grill/vasp/makefile.pd-msvc
+++ b/externals/grill/vasp/makefile.pd-msvc
@@ -17,7 +17,7 @@ LIBS=pd.lib pthreadVC.lib flext_t-pdwin.lib
 # compiler definitions and flags
 DEFS=/DFLEXT_SYS=2 /DFLEXT_THREADS
 
-CFLAGS=/GR /GX- /GD /G6 /Ox /MT
+CFLAGS=/GR /G6 /Ox /MT /EHsc
 
 # the rest can stay untouched
 # ----------------------------------------------
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: