Merge branch 'master' into ini-master

Conflicts:
	include/namespace.h
	zend/extensionimpl.cpp

1 files changed, 40 insertions, 0 deletions

diff --git a/zend/hashmember.cpp b/zend/hashmember.cpp
new file mode 100644
index 0000000..f6f8483
--- /dev/null
+++ b/zend/hashmember.cpp
@@ -0,0 +1,40 @@
+/**
+ *  HashMember.cpp
+ *
+ *  @author Emiel Bruijntjes <emiel.bruijntjes@copernica.com>
+ *  @copyright 2013 Copernica BV
+ */
+#include "includes.h" 
+ 
+/**
+ *  Set up namespace
+ */
+namespace Php {
+ 
+/**
+ *  Custom output stream operator
+ *  @param  stream
+ *  @param  value
+ *  @return ostream
+ */
+std::ostream &operator<<(std::ostream &stream, const HashMember<int> &value)
+{
+    return stream << value.value();
+}
+
+/**
+ *  Custom output stream operator
+ *  @param  stream
+ *  @param  value
+ *  @return ostream
+ */
+std::ostream &operator<<(std::ostream &stream, const HashMember<std::string> &value)
+{
+    return stream << value.value();
+}
+
+/**
+ *  End of namespace
+ */
+}
+