From cdf86b37d6180f5f88393c02d8f5e19e2e645ad6 Mon Sep 17 00:00:00 2001 From: Thomas Grill Date: Fri, 3 Jan 2003 04:35:22 +0000 Subject: "" svn path=/trunk/; revision=317 --- externals/grill/vasp/source/classes.cpp | 8 ++++---- externals/grill/vasp/source/classes.h | 8 ++++---- externals/grill/vasp/source/obj_chns.cpp | 2 +- externals/grill/vasp/source/obj_frames.cpp | 4 ++-- externals/grill/vasp/source/obj_imm.cpp | 2 +- externals/grill/vasp/source/obj_offs.cpp | 2 +- externals/grill/vasp/source/obj_part.cpp | 2 +- externals/grill/vasp/source/obj_peaks.cpp | 2 +- externals/grill/vasp/source/obj_radio.cpp | 2 +- externals/grill/vasp/source/obj_size.cpp | 4 ++-- externals/grill/vasp/source/obj_split.cpp | 4 ++-- externals/grill/vasp/source/obj_sync.cpp | 2 +- externals/grill/vasp/source/obj_vasp.cpp | 2 +- externals/grill/vasp/source/obj_vecs.cpp | 2 +- externals/grill/vasp/source/ops_rearr.cpp | 2 +- externals/grill/vasp/source/ops_resmp.cpp | 2 +- externals/grill/vasp/source/ops_search.cpp | 2 +- externals/grill/vasp/vasp.cw | Bin 142172 -> 142172 bytes 18 files changed, 26 insertions(+), 26 deletions(-) (limited to 'externals/grill/vasp') diff --git a/externals/grill/vasp/source/classes.cpp b/externals/grill/vasp/source/classes.cpp index 801826dd..2c7770a4 100644 --- a/externals/grill/vasp/source/classes.cpp +++ b/externals/grill/vasp/source/classes.cpp @@ -24,7 +24,7 @@ const t_symbol *vasp_base::sym_double; const t_symbol *vasp_base::sym_complex; const t_symbol *vasp_base::sym_vector; -V vasp_base::Setup(t_class *c) +V vasp_base::Setup(t_classid c) { sym_radio = MakeSymbol("radio"); sym_vasp = MakeSymbol("vasp"); @@ -94,7 +94,7 @@ vasp_op::vasp_op(BL op) if(op) FLEXT_ADDATTR_VAR("to",m_getto,m_setto); } -V vasp_op::Setup(t_class *c) +V vasp_op::Setup(t_classid c) { FLEXT_CADDBANG(c,0,m_dobang); FLEXT_CADDMETHOD_(c,0,"vasp",m_vasp); @@ -258,7 +258,7 @@ vasp_binop::vasp_binop(I argc,const t_atom *argv,const Argument &def,BL op,UL ou AddOutlets(outcode); } -V vasp_binop::Setup(t_class *c) +V vasp_binop::Setup(t_classid c) { FLEXT_CADDMETHOD(c,1,a_list); FLEXT_CADDMETHOD_(c,1,"vasp",a_vasp); @@ -383,7 +383,7 @@ vasp_anyop::vasp_anyop(I argc,const t_atom *argv,const Argument &def,BL op,UL ou AddOutlets(outcode); } -V vasp_anyop::Setup(t_class *c) +V vasp_anyop::Setup(t_classid c) { FLEXT_CADDMETHOD(c,1,a_list); FLEXT_CADDMETHOD_(c,1,"vasp",a_list); diff --git a/externals/grill/vasp/source/classes.h b/externals/grill/vasp/source/classes.h index 1ef17a3f..d90e9beb 100644 --- a/externals/grill/vasp/source/classes.h +++ b/externals/grill/vasp/source/classes.h @@ -54,7 +54,7 @@ protected: BL ToOutVasp(I outlet,Vasp &v); private: - static V Setup(t_class *); + static V Setup(t_classid); FLEXT_CALLBACK_V(m_radio) @@ -128,7 +128,7 @@ protected: #endif private: - static V Setup(t_class *); + static V Setup(t_classid); virtual V m_bang() = 0; // do! and output current Vasp }; @@ -201,7 +201,7 @@ protected: V m_getarg(AtomList &l) { arg.MakeList(l); } private: - static V Setup(t_class *); + static V Setup(t_classid); FLEXT_CALLBACK_V(a_list) FLEXT_CALLBACK_V(a_vasp) @@ -241,7 +241,7 @@ protected: V m_getarg(AtomList &l) { arg.MakeList(l); } private: - static V Setup(t_class *); + static V Setup(t_classid); FLEXT_CALLBACK_V(a_list) FLEXT_CALLBACK_V(a_radio) diff --git a/externals/grill/vasp/source/obj_chns.cpp b/externals/grill/vasp/source/obj_chns.cpp index b8c2affc..8b38374f 100755 --- a/externals/grill/vasp/source/obj_chns.cpp +++ b/externals/grill/vasp/source/obj_chns.cpp @@ -41,7 +41,7 @@ public: AddOutAnything(); } - static V Setup(t_class *c) + static V Setup(t_classid c) { FLEXT_CADDMETHOD(c,1,m_ix); FLEXT_CADDATTR_VAR(c,"index",ix,m_ix); diff --git a/externals/grill/vasp/source/obj_frames.cpp b/externals/grill/vasp/source/obj_frames.cpp index 9f6b54a7..3ecd0af1 100644 --- a/externals/grill/vasp/source/obj_frames.cpp +++ b/externals/grill/vasp/source/obj_frames.cpp @@ -48,7 +48,7 @@ public: if(abs) FLEXT_ADDATTR_VAR("frames",frms,m_arg); } - static V Setup(t_class *c) + static V Setup(t_classid c) { FLEXT_CADDMETHOD(c,1,m_arg); } @@ -140,7 +140,7 @@ public: if(argc && CanbeFloat(argv[0])) m_arg(GetAFloat(argv[0])); } - static V Setup(t_class *c) + static V Setup(t_classid c) { FLEXT_CADDATTR_VAR(c,"factor",factor,m_arg); } diff --git a/externals/grill/vasp/source/obj_imm.cpp b/externals/grill/vasp/source/obj_imm.cpp index 4d4000d2..35ea1a92 100644 --- a/externals/grill/vasp/source/obj_imm.cpp +++ b/externals/grill/vasp/source/obj_imm.cpp @@ -50,7 +50,7 @@ public: AddOutAnything(); } - static V Setup(t_class *c) + static V Setup(t_classid c) { FLEXT_CADDMETHOD(c,1,m_frames); FLEXT_CADDATTR_VAR(c,"frames",frms,m_frames); diff --git a/externals/grill/vasp/source/obj_offs.cpp b/externals/grill/vasp/source/obj_offs.cpp index 6ecfeefd..c2682a30 100644 --- a/externals/grill/vasp/source/obj_offs.cpp +++ b/externals/grill/vasp/source/obj_offs.cpp @@ -46,7 +46,7 @@ public: AddOutAnything(); } - static V Setup(t_class *c) + static V Setup(t_classid c) { FLEXT_CADDMETHOD(c,1,m_offs); FLEXT_CADDATTR_VAR(c,"frames",offs,m_offs); diff --git a/externals/grill/vasp/source/obj_part.cpp b/externals/grill/vasp/source/obj_part.cpp index 5f0e652b..2a12536d 100644 --- a/externals/grill/vasp/source/obj_part.cpp +++ b/externals/grill/vasp/source/obj_part.cpp @@ -45,7 +45,7 @@ public: ~vasp_part() { if(part) delete[] part; } - static V Setup(t_class *c) + static V Setup(t_classid c) { FLEXT_CADDMETHOD_(c,1,"list",m_part); FLEXT_CADDATTR_VAR(c,"parts",m_getpart,m_setpart); diff --git a/externals/grill/vasp/source/obj_peaks.cpp b/externals/grill/vasp/source/obj_peaks.cpp index 003acfaa..3f708ea6 100644 --- a/externals/grill/vasp/source/obj_peaks.cpp +++ b/externals/grill/vasp/source/obj_peaks.cpp @@ -47,7 +47,7 @@ public: AddOutAnything(2); } - static V Setup(t_class *c) + static V Setup(t_classid c) { FLEXT_CADDMETHOD(c,1,m_peaks); FLEXT_CADDATTR_VAR(c,"peaks",peaks,m_peaks); diff --git a/externals/grill/vasp/source/obj_radio.cpp b/externals/grill/vasp/source/obj_radio.cpp index a3fde97c..1746db07 100644 --- a/externals/grill/vasp/source/obj_radio.cpp +++ b/externals/grill/vasp/source/obj_radio.cpp @@ -37,7 +37,7 @@ public: AddOutAnything(2); } - static V Setup(t_class *c) + static V Setup(t_classid c) { FLEXT_CADDMETHOD(c,0,m_any); } diff --git a/externals/grill/vasp/source/obj_size.cpp b/externals/grill/vasp/source/obj_size.cpp index b061824b..d8245471 100644 --- a/externals/grill/vasp/source/obj_size.cpp +++ b/externals/grill/vasp/source/obj_size.cpp @@ -48,7 +48,7 @@ public: if(abs) FLEXT_ADDATTR_VAR("frames",size,m_arg); } - static V Setup(t_class *c) + static V Setup(t_classid c) { FLEXT_CADDMETHOD(c,1,m_arg); FLEXT_CADDATTR_VAR1(c,"keep",keep); @@ -142,7 +142,7 @@ public: if(argc && CanbeFloat(argv[0])) m_arg(GetAFloat(argv[0])); } - static V Setup(t_class *c) + static V Setup(t_classid c) { FLEXT_CADDATTR_VAR(c,"factor",factor,m_arg); } diff --git a/externals/grill/vasp/source/obj_split.cpp b/externals/grill/vasp/source/obj_split.cpp index 8a3dda94..afeb3fd6 100644 --- a/externals/grill/vasp/source/obj_split.cpp +++ b/externals/grill/vasp/source/obj_split.cpp @@ -119,7 +119,7 @@ public: ~vasp_join() { if(vi) delete[] vi; } - static V Setup(t_class *c) + static V Setup(t_classid c) { FLEXT_CADDMETHOD_(c,0,"reset",m_reset); } @@ -251,7 +251,7 @@ public: AddOutAnything(); } - static V Setup(t_class *c) + static V Setup(t_classid c) { FLEXT_CADDMETHOD_(c,0,"reset",m_reset); FLEXT_CADDMETHOD_(c,1,"vasp",m_add); diff --git a/externals/grill/vasp/source/obj_sync.cpp b/externals/grill/vasp/source/obj_sync.cpp index a8726328..f91131e0 100644 --- a/externals/grill/vasp/source/obj_sync.cpp +++ b/externals/grill/vasp/source/obj_sync.cpp @@ -54,7 +54,7 @@ public: AddOutAnything(cnt); } - static V Setup(t_class *c) + static V Setup(t_classid c) { FLEXT_CADDMETHOD_(c,0,"reset",m_reset); } diff --git a/externals/grill/vasp/source/obj_vasp.cpp b/externals/grill/vasp/source/obj_vasp.cpp index 2b4319c3..802db581 100644 --- a/externals/grill/vasp/source/obj_vasp.cpp +++ b/externals/grill/vasp/source/obj_vasp.cpp @@ -44,7 +44,7 @@ public: AddOutAnything(); } - static V Setup(t_class *c) + static V Setup(t_classid c) { FLEXT_CADDMETHOD_(c,0,"list",m_vasp); diff --git a/externals/grill/vasp/source/obj_vecs.cpp b/externals/grill/vasp/source/obj_vecs.cpp index 2806a806..b55103ae 100644 --- a/externals/grill/vasp/source/obj_vecs.cpp +++ b/externals/grill/vasp/source/obj_vecs.cpp @@ -45,7 +45,7 @@ public: AddOutAnything(); } - static V Setup(t_class *c) + static V Setup(t_classid c) { FLEXT_CADDMETHOD(c,1,m_ix); FLEXT_CADDATTR_VAR(c,"index",ix,m_ix); diff --git a/externals/grill/vasp/source/ops_rearr.cpp b/externals/grill/vasp/source/ops_rearr.cpp index b7712115..683d5581 100644 --- a/externals/grill/vasp/source/ops_rearr.cpp +++ b/externals/grill/vasp/source/ops_rearr.cpp @@ -107,7 +107,7 @@ public: fill(xsf_zero) {} - static V Setup(t_class *c) + static V Setup(t_classid c) { FLEXT_CADDATTR_VAR1_E(c,"fill",fill); } diff --git a/externals/grill/vasp/source/ops_resmp.cpp b/externals/grill/vasp/source/ops_resmp.cpp index e7e33bb9..63b02c98 100644 --- a/externals/grill/vasp/source/ops_resmp.cpp +++ b/externals/grill/vasp/source/ops_resmp.cpp @@ -209,7 +209,7 @@ public: fill(xtf_zero),inter(xti_4p) {} - static V Setup(t_class *c) + static V Setup(t_classid c) { FLEXT_CADDATTR_VAR1_E(c,"fill",fill); FLEXT_CADDATTR_VAR1_E(c,"inter",inter); diff --git a/externals/grill/vasp/source/ops_search.cpp b/externals/grill/vasp/source/ops_search.cpp index 580a4d1b..7e8bbee6 100644 --- a/externals/grill/vasp/source/ops_search.cpp +++ b/externals/grill/vasp/source/ops_search.cpp @@ -136,7 +136,7 @@ public: slope(0),dir(0) {} - static V Setup(t_class *c) + static V Setup(t_classid c) { FLEXT_CADDATTR_VAR1(c,"dir",dir); FLEXT_CADDATTR_VAR1(c,"slope",slope); diff --git a/externals/grill/vasp/vasp.cw b/externals/grill/vasp/vasp.cw index 8e698cb2..34c30254 100644 Binary files a/externals/grill/vasp/vasp.cw and b/externals/grill/vasp/vasp.cw differ -- cgit v1.2.1