diff options
| -rw-r--r-- | src/flags.h | 4 | ||||
| -rw-r--r-- | src/op.h | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/flags.h b/src/flags.h index 03f47ff9..09b7eec4 100644 --- a/src/flags.h +++ b/src/flags.h @@ -112,11 +112,11 @@ public: } basic_flags_t(const T& bits) { TRACE_CTOR(basic_flags_t, "const T&"); - set_flags(bits); + supports_flags<T, U>::set_flags(bits); } basic_flags_t(const U& bits) { TRACE_CTOR(basic_flags_t, "const U&"); - set_flags(static_cast<T>(bits)); + supports_flags<T, U>::set_flags(static_cast<T>(bits)); } ~basic_flags_t() throw() { TRACE_DTOR(basic_flags_t); @@ -267,8 +267,10 @@ public: ostream_pos_type * end_pos; bool relaxed; - context_t(const ptr_op_t& _expr_op = NULL, - const ptr_op_t& _op_to_find = NULL, + context_t() : start_pos(NULL), end_pos(NULL), relaxed(false) {} + + context_t(const ptr_op_t& _expr_op, + const ptr_op_t& _op_to_find, ostream_pos_type * const _start_pos = NULL, ostream_pos_type * const _end_pos = NULL, const bool _relaxed = true) @@ -281,7 +283,7 @@ public: void dump(std::ostream& out, const int depth = 0) const; static ptr_op_t wrap_value(const value_t& val); - static ptr_op_t wrap_functor(const expr_t::func_t& fobj); + static ptr_op_t wrap_functor(expr_t::func_t fobj); #if defined(HAVE_BOOST_SERIALIZATION) private: @@ -327,7 +329,7 @@ inline expr_t::ptr_op_t expr_t::op_t::wrap_value(const value_t& val) { } inline expr_t::ptr_op_t -expr_t::op_t::wrap_functor(const expr_t::func_t& fobj) { +expr_t::op_t::wrap_functor(expr_t::func_t fobj) { ptr_op_t temp(new op_t(op_t::FUNCTION)); temp->set_function(fobj); return temp; |