diff options
author | Emiel Bruijntjes <emiel.bruijntjes@copernica.com> | 2014-03-13 16:24:01 +0100 |
---|---|---|
committer | Emiel Bruijntjes <emiel.bruijntjes@copernica.com> | 2014-03-13 16:24:01 +0100 |
commit | 0c244b567d251a0bb0069c24090ce3a578f7c886 (patch) | |
tree | 21b0917b075dce332cb67e6b5fc00e11059dcdaa | |
parent | 40287b042fc252dbf348ae386cf3c9e3cab95d63 (diff) |
ensure that to __to*() functions always return a Value object, fixed compile errors in example
-rw-r--r-- | documentation/special-features.html | 2 | ||||
-rw-r--r-- | include/class.h | 30 |
2 files changed, 16 insertions, 16 deletions
diff --git a/documentation/special-features.html b/documentation/special-features.html index 1569e5f..763f30d 100644 --- a/documentation/special-features.html +++ b/documentation/special-features.html @@ -192,7 +192,7 @@ public: * Cast the object to a string * @return std::string */ - std::string Php::Value __toString() + std::string __toString() { return std::to_string(_value); } diff --git a/include/class.h b/include/class.h index 7e748cf..ca09a66 100644 --- a/include/class.h +++ b/include/class.h @@ -242,7 +242,7 @@ private: * @param params * @return Value */ - virtual Value call(Base *base, const char *name, Parameters ¶ms) const override + virtual Value callCall(Base *base, const char *name, Parameters ¶ms) const override { // cast to the user object T *object = (T *)base; @@ -308,7 +308,7 @@ private: * @param params Parameters passed to the function * @return Value */ - virtual Value callStatic(const char *name, Parameters ¶ms) const override + virtual Value callCallStatic(const char *name, Parameters ¶ms) const override { return maybeCallStatic<T>(name, params); } @@ -319,7 +319,7 @@ private: * @param params Parameters to pass * @return Value */ - virtual Value invoke(Base *object, Parameters ¶ms) const override + virtual Value callInvoke(Base *object, Parameters ¶ms) const override { // cast to actual object T *obj = (T *)object; @@ -333,13 +333,13 @@ private: * @param base * @return Value */ - virtual Value toString(Base *base) const override + virtual Value callToString(Base *base) const override { // cast to actual object T *obj = (T *)base; // pass on - return obj->__toString().setType(Type::String); + return Value(obj->__toString()).setType(Type::String); } /** @@ -347,13 +347,13 @@ private: * @param base * @return Value */ - virtual Value toInteger(Base *base) const override + virtual Value callToInteger(Base *base) const override { // cast to actual object T *obj = (T *)base; // pass on - return obj->__toInteger().setType(Type::Numeric); + return Value(obj->__toInteger()).setType(Type::Numeric); } /** @@ -361,13 +361,13 @@ private: * @param base * @return Value */ - virtual Value toFloat(Base *base) const override + virtual Value callToFloat(Base *base) const override { // cast to actual object T *obj = (T *)base; // pass on - return obj->__toFloat().setType(Type::Float); + return Value(obj->__toFloat()).setType(Type::Float); } /** @@ -375,13 +375,13 @@ private: * @param base * @return Value */ - virtual Value toBool(Base *base) const override + virtual Value callToBool(Base *base) const override { // cast to actual object T *obj = (T *)base; // pass on - return obj->__toBool().setType(Type::Bool); + return Value(obj->__toBool()).setType(Type::Bool); } /** @@ -391,7 +391,7 @@ private: * @param value * @return Value */ - virtual Value get(Base *base, const Value &name) const override + virtual Value callGet(Base *base, const Value &name) const override { // cast to actual object T *obj = (T *)base; @@ -406,7 +406,7 @@ private: * @param name * @param value */ - virtual void set(Base *base, const Value &name, const Value &value) const override + virtual void callSet(Base *base, const Value &name, const Value &value) const override { // cast to actual object T *obj = (T *)base; @@ -420,7 +420,7 @@ private: * @param base * @param name */ - virtual void unset(Base *base, const Value &name) const override + virtual void callUnset(Base *base, const Value &name) const override { // cast to actual object T *obj = (T *)base; @@ -450,7 +450,7 @@ private: * @param object2 * @return int */ - virtual int compare(Base *object1, Base *object2) const override + virtual int callCompare(Base *object1, Base *object2) const override { // cast to the actual implementation type T *t1 = (T *)object1; |