Merge branch 'ezc_types' of ssh://gitea.ttmath.org:2299/tomasz.sowa/morm into ezc_types

This commit is contained in:
Tomasz Sowa 2021-11-05 09:44:14 +01:00
commit 318d9d447f
1 changed files with 4 additions and 6 deletions

View File

@ -253,7 +253,7 @@ public:
#ifdef MORM_HAS_EZC_LIBRARY
template<typename FunInfoStreamType>
bool get_raw_value(const wchar_t * db_field_name, const wchar_t * flat_field_name, ModelData * model_data,
Ezc::Env<FunInfoStreamType> & fun_info)
Ezc::Env<FunInfoStreamType> & env)
{
ModelEnv model_env_local;
model_env = &model_env_local;
@ -263,11 +263,9 @@ public:
model_env->db_field_name = db_field_name;
model_env->flat_field_name = flat_field_name;
model_env->model_data = model_data;
model_env->ezc_fun_info = &fun_info;
model_env->ezc_fun_info_typeinfo = &typeid(fun_info);
model_env->ezc_var_space_local = &fun_info.res.space_local;
model_env->ezc_fun_info = &env;
model_env->ezc_fun_info_typeinfo = &typeid(env);
model_env->ezc_var_space_local = &env.res.space_local;
model_env->model = this;
try