summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmiel Bruijntjes <emiel.bruijntjes@copernica.com>2014-04-10 11:30:36 +0200
committerEmiel Bruijntjes <emiel.bruijntjes@copernica.com>2014-04-10 11:31:41 +0200
commitec2ee67b805b3f431db4ce2f9cdfc8d74aadfe35 (patch)
treebff9b6760a01c479c62b019859f20eb4a5398241
parent2bcd097519405ef2fb3b600ddc8ec58b332fa040 (diff)
calls to strlen has been converted into calls to ::strlen, because Php::strlen() now also exists as (slow) php function, see issue #78
-rw-r--r--include/hiddenpointer.h2
-rw-r--r--include/value.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/include/hiddenpointer.h b/include/hiddenpointer.h
index 558da53..dc981c0 100644
--- a/include/hiddenpointer.h
+++ b/include/hiddenpointer.h
@@ -30,7 +30,7 @@ public:
HiddenPointer(Type *pointer, const char *text, int size=-1)
{
// calculate size of the text
- if (size < 0) size = strlen(text);
+ if (size < 0) size = ::strlen(text);
// allocate data + trailing null + size of pointer
char *buffer = new char[size + 1 + sizeof(Type *)];
diff --git a/include/value.h b/include/value.h
index d1e6c8a..d64eeed 100644
--- a/include/value.h
+++ b/include/value.h
@@ -571,7 +571,7 @@ public:
*/
bool contains(const char *key) const
{
- return contains(key, strlen(key));
+ return contains(key, ::strlen(key));
}
/**
@@ -741,7 +741,7 @@ public:
*/
void set(const char *key, const Value &value)
{
- set(key, strlen(key), value);
+ set(key, ::strlen(key), value);
}
/**
@@ -787,7 +787,7 @@ public:
*/
void unset(const char *key)
{
- unset(key, strlen(key));
+ unset(key, ::strlen(key));
}
/**