diff options
author | Emiel Bruijntjes <emiel.bruijntjes@copernica.com> | 2014-04-09 10:25:47 +0200 |
---|---|---|
committer | Emiel Bruijntjes <emiel.bruijntjes@copernica.com> | 2014-04-09 10:25:47 +0200 |
commit | 2bea50a1f65e0e041ed48f7f8a34e62598859564 (patch) | |
tree | decd314a58852e817a6661e34518d15b3f052dae | |
parent | 13c7af5724e60f465f65fda615e87baaa9d0163f (diff) | |
parent | 33760c3efba4207eac826ff080b5f9b9672fc60e (diff) |
Merge branch 'master' of https://github.com/CopernicaMarketingSoftware/PHP-CPP
-rw-r--r-- | documentation/ten-reasons-for-using-php-cpp.html | 2 | ||||
-rw-r--r-- | include/array.h | 4 | ||||
-rw-r--r-- | include/object.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/documentation/ten-reasons-for-using-php-cpp.html b/documentation/ten-reasons-for-using-php-cpp.html index 16a1881..d4a202b 100644 --- a/documentation/ten-reasons-for-using-php-cpp.html +++ b/documentation/ten-reasons-for-using-php-cpp.html @@ -1,6 +1,6 @@ <h1>Ten reasons for using PHP-CPP</h1> <p> - There are many reasons for using PHP-CPP. Let's name a view. + There are many reasons for using PHP-CPP. Let's name a few. </p> <h4>1. It's fast</h4> <p> diff --git a/include/array.h b/include/array.h index 26fec24..0b6ceb9 100644 --- a/include/array.h +++ b/include/array.h @@ -31,7 +31,7 @@ public: Array(const Value &value) : Value(value) { // type must be valid - if (value.type() != Type::Array) throw Php::Exception("Assiging a non-array to an array variable"); + if (value.type() != Type::Array) throw Php::Exception("Assigning a non-array to an array variable"); } /** @@ -93,7 +93,7 @@ public: if (this == &value) return *this; // type must be valid - if (value.type() != Type::Array) throw Php::Exception("Assiging a non-array to a fixed array variable"); + if (value.type() != Type::Array) throw Php::Exception("Assigning a non-array to a fixed array variable"); // call base Value::operator=(value); diff --git a/include/object.h b/include/object.h index 1445943..97c9482 100644 --- a/include/object.h +++ b/include/object.h @@ -140,7 +140,7 @@ public: if (this == &value) return *this; // type must be valid - if (value.type() != Type::Object) throw Php::Exception("Assiging a non-object to an object variable"); + if (value.type() != Type::Object) throw Php::Exception("Assigning a non-object to an object variable"); // call base Value::operator=(value); |