summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartijn Otto <martijn.otto@copernica.com>2015-08-10 08:53:49 +0200
committerMartijn Otto <martijn.otto@copernica.com>2015-08-10 08:53:49 +0200
commit66063dba8280f2e0a1d1591b804467bf712f99c6 (patch)
tree8d669f1aff42d9c74eaed8739be437dd96770b03
parent8aa6e9bbb497d494dbcf86203acaf136da2a50c8 (diff)
parent6d4d44249dc12cad3a179dd7277e1072c7a5b958 (diff)
Merge pull request #212 from RicoAntonioFelix/master
Minor fixes
-rw-r--r--README.md6
-rw-r--r--documentation/lambda-functions.html2
2 files changed, 4 insertions, 4 deletions
diff --git a/README.md b/README.md
index ec6254e..2fdcdc4 100644
--- a/README.md
+++ b/README.md
@@ -56,8 +56,8 @@ The method call to export the above C++ function:
```c
extension.add("my_plus", my_plus, {
- Php::ByVal("a", Php::numericType),
- Php::ByVal("b", Php::numericType)
+ Php::ByVal("a", Php::numericType),
+ Php::ByVal("b", Php::numericType)
});
```
@@ -71,7 +71,7 @@ features from the C++11 language. It does not matter if your functions accept st
integers, booleans or other native parameters: PHP-CPP takes care of the conversion.
The return value of your function is also transformed by PHP-CPP into PHP.
-More complicated structured can be handled by PHP-CPP as well. If you would like to return
+More complicated structures can be handled by PHP-CPP as well. If you would like to return
a nested associative array from your function, you can do so too:
```c
diff --git a/documentation/lambda-functions.html b/documentation/lambda-functions.html
index 9278234..288c97b 100644
--- a/documentation/lambda-functions.html
+++ b/documentation/lambda-functions.html
@@ -57,7 +57,7 @@ other_function(function() {
void other_function(Php::Parameters &amp;params)
{
// make sure the function was really called with at least one parameter
- if (params.size() == 0) return nullptr;
+ if (params.size() == 0) return;
// this function is called from PHP user space, and it is called
// with a anonymous function as its first parameter