ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

windows portability bugfix

Browse Source
This commit is contained in:
Axel Kohlmeyer
2018-05-11 18:03:49 -04:00
parent 075598b405
commit 233f03ea8e
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/atc/Function.cpp
View File

@ -1,4 +1,6 @@
#ifndef _WIN32
#include <alloca.h> #include <alloca.h>
#endif
#include "Function.h" #include "Function.h"
#include "ATC_Error.h" #include "ATC_Error.h"
#include "LammpsInterface.h" #include "LammpsInterface.h"
@ -59,7 +61,11 @@ namespace ATC {
{ {
string type = args[0]; string type = args[0];
int narg = nargs -1; int narg = nargs -1;
#ifdef _WIN32
double *dargs = (double *) _alloca(sizeof(double) * narg);
#endif
double *dargs = (double *) alloca(sizeof(double) * narg); double *dargs = (double *) alloca(sizeof(double) * narg);
#endif
for (int i = 0; i < narg; ++i) dargs[i] = atof(args[i+1]); for (int i = 0; i < narg; ++i) dargs[i] = atof(args[i+1]);
return function(type, narg, dargs); return function(type, narg, dargs);
@ -193,7 +199,11 @@ XT_Function_Mgr * XT_Function_Mgr::myInstance_ = NULL;
{ {
string type = args[0]; string type = args[0];
int narg = nargs -1; int narg = nargs -1;
#ifdef _WIN32
double *dargs = (double *) _alloca(sizeof(double) * narg);
#else
double *dargs = (double *) alloca(sizeof(double) * narg); double *dargs = (double *) alloca(sizeof(double) * narg);
#endif
for (int i = 0; i < narg; ++i) dargs[i] = atof(args[i+1]); for (int i = 0; i < narg; ++i) dargs[i] = atof(args[i+1]);
return function(type, narg, dargs); return function(type, narg, dargs);