diff --git a/exprtk.hpp b/exprtk.hpp index 851d622..c853e54 100644 --- a/exprtk.hpp +++ b/exprtk.hpp @@ -923,11 +923,11 @@ namespace exprtk //3x -> 3*x ((token_t::symbol == curr_token.type) && (token_t::number == prev_token.type) && curr_token_not_reserved) || //3(x+1) -> 3*(x+1) - (is_left_bracket(curr_token.type) && (token_t::number == prev_token.type)) || + (is_left_bracket (static_cast(curr_token.type)) && (token_t::number == prev_token.type)) || //(x+1)3 -> (x+1)*3 - (is_right_bracket(prev_token.type) && (token_t::number == curr_token.type)) || + (is_right_bracket(static_cast(prev_token.type)) && (token_t::number == curr_token.type)) || //(x+1)y -> (x+1)*y - (is_right_bracket(prev_token.type) && (token_t::symbol == curr_token.type) && curr_token_not_reserved) + (is_right_bracket(static_cast(prev_token.type)) && (token_t::symbol == curr_token.type) && curr_token_not_reserved) ) { prev_itr = itr = token_list_.insert(itr,token_t(token_t::mul)); @@ -1714,6 +1714,9 @@ namespace exprtk private: + string_literal_node(const string_literal_node&); + string_literal_node& operator=(const string_literal_node&); + const std::string value_; }; @@ -2271,7 +2274,6 @@ namespace exprtk private: std::string* value_; - }; template @@ -2720,6 +2722,11 @@ namespace exprtk T& v0_; T& v1_; + + private: + + vov_node(vov_node&); + vov_node& operator=(vov_node&); }; template @@ -2810,6 +2817,11 @@ namespace exprtk T c_; T& v_; + + private: + + cov_node(const cov_node&); + cov_node& operator=(const cov_node&); }; template @@ -2840,6 +2852,11 @@ namespace exprtk T& v_; T c_; + + private: + + voc_node(const voc_node&); + voc_node& operator=(const voc_node&); }; template @@ -2882,6 +2899,11 @@ namespace exprtk T& v0_; T& v1_; T& v2_; + + private: + + vovov1_node(const vovov1_node&); + vovov1_node& operator=(const vovov1_node&); }; template @@ -2924,6 +2946,11 @@ namespace exprtk T& v0_; T& v1_; T& v2_; + + private: + + vovov2_node(const vovov2_node&); + vovov2_node& operator=(const vovov2_node&); }; template @@ -2966,6 +2993,11 @@ namespace exprtk T c_; T& v0_; T& v1_; + + private: + + covov1_node(const covov1_node&); + covov1_node& operator=(const covov1_node&); }; template @@ -2978,7 +3010,7 @@ namespace exprtk //(constant op1 variable0) op2 variable1 node explicit covov2_node(cov_node& cvn, T& v1) - : c_ (cvn.c()), + : c_(cvn.c()), v0_(cvn.v()), v1_(v1) {} @@ -3008,6 +3040,11 @@ namespace exprtk T c_; T& v0_; T& v1_; + + private: + + covov2_node(covov2_node&); + covov2_node& operator=(covov2_node&); }; template @@ -3052,6 +3089,11 @@ namespace exprtk T& v1_; T& v2_; T& v3_; + + private: + + vovovov_node(vovovov_node&); + vovovov_node& operator=(const vovovov_node&); }; template @@ -3097,6 +3139,11 @@ namespace exprtk SType0 s0_; SType1 s1_; + + private: + + sos_node(sos_node&); + sos_node& operator=(sos_node&); }; template @@ -6085,7 +6132,6 @@ namespace exprtk private: details::node_allocator* node_allocator_; - }; inline bool check0(const char c0, const char c1, @@ -6521,7 +6567,7 @@ namespace exprtk namespace information { static const char* library = "Mathematical Expression Toolkit"; - static const char* version = "2.718281828459045235"; + static const char* version = "2.71828182845904523536"; static const char* date = "20111111"; static inline std::string data()