Model::get_raw_value(...) method do not get pt::Stream& now, only Ezc::Env<>&
This commit is contained in:
parent
0fff26bf2f
commit
df1bb0e56d
11
src/model.h
11
src/model.h
|
@ -263,13 +263,8 @@ public:
|
||||||
#ifdef MORM_HAS_EZC_LIBRARY
|
#ifdef MORM_HAS_EZC_LIBRARY
|
||||||
template<typename FunInfoStreamType>
|
template<typename FunInfoStreamType>
|
||||||
bool get_raw_value(const wchar_t * db_field_name, const wchar_t * flat_field_name, ModelData * model_data,
|
bool get_raw_value(const wchar_t * db_field_name, const wchar_t * flat_field_name, ModelData * model_data,
|
||||||
Ezc::Env<FunInfoStreamType> & fun_info, pt::Stream & stream, bool clear_stream = true)
|
Ezc::Env<FunInfoStreamType> & fun_info)
|
||||||
{
|
{
|
||||||
if( clear_stream )
|
|
||||||
{
|
|
||||||
stream.clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
ModelEnv model_env_local;
|
ModelEnv model_env_local;
|
||||||
model_env = &model_env_local;
|
model_env = &model_env_local;
|
||||||
|
|
||||||
|
@ -278,7 +273,6 @@ public:
|
||||||
model_env->db_field_name = db_field_name;
|
model_env->db_field_name = db_field_name;
|
||||||
model_env->flat_field_name = flat_field_name;
|
model_env->flat_field_name = flat_field_name;
|
||||||
model_env->model_data = model_data;
|
model_env->model_data = model_data;
|
||||||
model_env->stream = &stream;
|
|
||||||
model_env->ezc_fun_info = &fun_info;
|
model_env->ezc_fun_info = &fun_info;
|
||||||
model_env->ezc_fun_info_typeinfo = &typeid(fun_info);
|
model_env->ezc_fun_info_typeinfo = &typeid(fun_info);
|
||||||
model_env->model = this;
|
model_env->model = this;
|
||||||
|
@ -930,7 +924,8 @@ protected:
|
||||||
|
|
||||||
|
|
||||||
template<typename FunInfoStreamType>
|
template<typename FunInfoStreamType>
|
||||||
void field_member_ezc_put_field_value_to_stream(const wchar_t * db_field_name, const wchar_t * flat_field_name, void (Model::*method)(Ezc::Env<FunInfoStreamType> &), const FT & field_type)
|
void field_member_ezc_put_field_value_to_stream(const wchar_t * db_field_name, const wchar_t * flat_field_name,
|
||||||
|
void (Model::*method)(Ezc::Env<FunInfoStreamType> &), const FT & field_type)
|
||||||
{
|
{
|
||||||
if( (is_empty_field(model_env->db_field_name) || is_the_same_field(db_field_name, model_env->db_field_name)) &&
|
if( (is_empty_field(model_env->db_field_name) || is_the_same_field(db_field_name, model_env->db_field_name)) &&
|
||||||
(is_empty_field(model_env->flat_field_name) || is_the_same_field(flat_field_name, model_env->flat_field_name)) )
|
(is_empty_field(model_env->flat_field_name) || is_the_same_field(flat_field_name, model_env->flat_field_name)) )
|
||||||
|
|
Loading…
Reference in New Issue