X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fsymbol.h;h=00d4b9034f665fb1d986beb9270ec88640ada0a1;hp=3caa24e45c500c2943a6d8b6be7a57586483ac3f;hb=12fefbca9b424cb8e9ae05d83883b96e17c7b96e;hpb=b573b0146341709649f373e0fc5c0d440877ebaf diff --git a/ginac/symbol.h b/ginac/symbol.h index 3caa24e4..00d4b903 100644 --- a/ginac/symbol.h +++ b/ginac/symbol.h @@ -47,8 +47,8 @@ public: explicit symbol(const std::string & initname, unsigned domain = domain::complex); symbol(const std::string & initname, const std::string & texname, unsigned domain = domain::complex); symbol(const std::string & initname, const std::string & texname, unsigned rt, unsigned domain); - symbol(const std::string & initname, unsigned rt, tinfo_t rtt, unsigned domain = domain::complex); - symbol(const std::string & initname, const std::string & texname, unsigned rt, tinfo_t rtt, unsigned domain = domain::complex); + symbol(const std::string & initname, unsigned rt, const return_type_t& rtt, unsigned domain = domain::complex); + symbol(const std::string & initname, const std::string & texname, unsigned rt, const return_type_t& rtt, unsigned domain = domain::complex); // functions overriding virtual functions from base classes public: @@ -61,7 +61,7 @@ public: ex to_rational(exmap & repl) const; ex to_polynomial(exmap & repl) const; unsigned return_type() const { return ret_type; } - tinfo_t return_type_tinfo() const { return ret_type_tinfo; } + return_type_t return_type_tinfo() const { return ret_type_tinfo; } ex conjugate() const; ex real_part() const; ex imag_part() const; @@ -93,7 +93,7 @@ protected: std::string TeX_name; ///< LaTeX name of this symbol unsigned domain; ///< domain of symbol, complex (default) or real unsigned ret_type; ///< value returned by return_type() - tinfo_t ret_type_tinfo; ///< value returned by return_type_tinfo() + return_type_t ret_type_tinfo; ///< value returned by return_type_tinfo() private: static unsigned next_serial; }; @@ -107,8 +107,8 @@ public: realsymbol(); explicit realsymbol(const std::string & initname, unsigned domain = domain::real); realsymbol(const std::string & initname, const std::string & texname, unsigned domain = domain::real); - realsymbol(const std::string & initname, unsigned rt, tinfo_t rtt, unsigned domain = domain::real); - realsymbol(const std::string & initname, const std::string & texname, unsigned rt, tinfo_t rtt, unsigned domain = domain::real); + realsymbol(const std::string & initname, unsigned rt, const return_type_t& rtt, unsigned domain = domain::real); + realsymbol(const std::string & initname, const std::string & texname, unsigned rt, const return_type_t& rtt, unsigned domain = domain::real); }; @@ -120,8 +120,8 @@ public: possymbol(); explicit possymbol(const std::string & initname, unsigned domain = domain::positive); possymbol(const std::string & initname, const std::string & texname, unsigned domain = domain::positive); - possymbol(const std::string & initname, unsigned rt, tinfo_t rtt, unsigned domain = domain::positive); - possymbol(const std::string & initname, const std::string & texname, unsigned rt, tinfo_t rtt, unsigned domain = domain::positive); + possymbol(const std::string & initname, unsigned rt, const return_type_t& rtt, unsigned domain = domain::positive); + possymbol(const std::string & initname, const std::string & texname, unsigned rt, const return_type_t& rtt, unsigned domain = domain::positive); };