diff options
| author | Thomas Grill <xovo@users.sourceforge.net> | 2003-06-13 02:45:16 +0000 |
|---|---|---|
| committer | Thomas Grill <xovo@users.sourceforge.net> | 2003-06-13 02:45:16 +0000 |
| commit | c0c7359304c7bb54d794c74b260d9b0bd18f02ae (patch) | |
| tree | c16ff1091eb663e4483e6fffe8f2db1abc152d28 /externals/grill/vasp/source/opdefs.h | |
| parent | d1f912c93aef58acb6b69b16576792bbcd608399 (diff) | |
""
svn path=/trunk/; revision=701
Diffstat (limited to 'externals/grill/vasp/source/opdefs.h')
| -rw-r--r-- | externals/grill/vasp/source/opdefs.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/externals/grill/vasp/source/opdefs.h b/externals/grill/vasp/source/opdefs.h index 71774db6..833163dc 100644 --- a/externals/grill/vasp/source/opdefs.h +++ b/externals/grill/vasp/source/opdefs.h @@ -443,20 +443,20 @@ template<class T,class CL> inline BL _D__cop(OpParam &p) { return V__cop<T,OpPar // MSVC 6 can't handle optimization here!! (silently produces wrong code!!!) -#define _D__run(T,CL,p) V__run<T,CL>(p.rsdt,p.rss,p.rddt,p.rds,p.frames) -#define _D__cun(T,CL,p) V__cun<T,CL>(p.rsdt,p.isdt,p.rss,p.iss,p.rddt,p.iddt,p.rds,p.ids,p.frames) -#define _D__rbin(T,CL,p) _F__rbin<T,CL>(p) -#define _D__cbin(T,CL,p) _F__cbin<T,CL>(p) -#define _D__rop(T,CL,p) V__rop<T,OpParam &,CL>(p,p.rsdt,p.rss,p.rddt,p.rds,p.frames) -#define _D__cop(T,CL,p) V__cop<T,OpParam &,CL>(p,p.rsdt,p.isdt,p.rss,p.iss,p.rddt,p.iddt,p.rds,p.ids,p.frames) - -#if defined(VASP_COMPACT) || (defined(_MSC_VER) && _MSC_VER <= 1200) - #define D__run(T,CL,p) _d__run<T>(CL::run,p) - #define D__cun(T,CL,p) _d__cun<T>(CL::cun,p) - #define D__rbin(T,CL,p) _d__rbin<T>(CL::rbin,p) - #define D__cbin(T,CL,p) _d__cbin<T>(CL::cbin,p) - #define D__rop(T,CL,p) _d__rop<T>(CL::rop,p) - #define D__cop(T,CL,p) _d__cop<T>(CL::cop,p) +#define _D__run(T,CL,p) V__run< T,CL >(p.rsdt,p.rss,p.rddt,p.rds,p.frames) +#define _D__cun(T,CL,p) V__cun< T,CL >(p.rsdt,p.isdt,p.rss,p.iss,p.rddt,p.iddt,p.rds,p.ids,p.frames) +#define _D__rbin(T,CL,p) _F__rbin< T,CL >(p) +#define _D__cbin(T,CL,p) _F__cbin< T,CL >(p) +#define _D__rop(T,CL,p) V__rop< T,OpParam &,CL >(p,p.rsdt,p.rss,p.rddt,p.rds,p.frames) +#define _D__cop(T,CL,p) V__cop< T,OpParam &,CL >(p,p.rsdt,p.isdt,p.rss,p.iss,p.rddt,p.iddt,p.rds,p.ids,p.frames) + +#if defined(VASP_COMPACT) || (defined(_MSC_VER) && _MSC_VER < 1300) + #define D__run(T,CL,p) _d__run< T >(CL::run,p) + #define D__cun(T,CL,p) _d__cun< T >(CL::cun,p) + #define D__rbin(T,CL,p) _d__rbin< T >(CL::rbin,p) + #define D__cbin(T,CL,p) _d__cbin< T >(CL::cbin,p) + #define D__rop(T,CL,p) _d__rop< T >(CL::rop,p) + #define D__cop(T,CL,p) _d__cop< T >(CL::cop,p) #else #define D__run(T,CL,p) ( CL::run_opt()?_D__run(T,CL,p):_d__run<T>(CL::run,p) ) #define D__cun(T,CL,p) ( CL::cun_opt()?_D__cun(T,CL,p):_d__cun<T>(CL::cun,p) ) |