Added include guard and allow array access operator on a const Value object

2 files changed, 37 insertions, 0 deletions

diff --git a/include/value.h b/include/value.h
index 09392ad..6b764a2 100644
--- a/include/value.h
+++ b/include/value.h
@@ -514,6 +514,17 @@ public:
     
     /**
      *  Array access operator
+     *  This can be used for accessing arrays
+     *  @param  index
+     *  @return Value
+     */
+    Value operator[](int index) const
+    {
+        return get(index);
+    }
+    
+    /**
+     *  Array access operator
      *  This can be used for accessing associative arrays
      *  @param  key
      *  @return Member
@@ -524,11 +535,33 @@ public:
      *  Array access operator
      *  This can be used for accessing associative arrays
      *  @param  key
+     *  @return Value
+     */
+    Value operator[](const std::string &key) const
+    {
+        return get(key);
+    }
+
+    /**
+     *  Array access operator
+     *  This can be used for accessing associative arrays
+     *  @param  key
      *  @return HashMember
      */
     HashMember<std::string> operator[](const char *key);
 
     /**
+     *  Array access operator
+     *  This can be used for accessing associative arrays
+     *  @param  key
+     *  @return Value
+     */
+    Value operator[](const char *key) const
+    {
+        return get(key);
+    }
+
+    /**
      *  Call the function in PHP
      *  We have ten variants of this function, depending on the number of parameters
      *  This call operator is only useful when the variable represents a callable
diff --git a/phpcpp.h b/phpcpp.h
index 236a93a..9fd97b9 100644
--- a/phpcpp.h
+++ b/phpcpp.h
@@ -7,6 +7,9 @@
  *  @author Emiel Bruijntjes <emiel.bruijntjes@copernica.com>
  */
 
+#ifndef PHPCPP_H
+#define PHPCPP_H
+
 /**
  *  Other C and C++ libraries that PhpCpp depends on
  */
@@ -55,3 +58,4 @@
 #   define PHPCPP_EXPORT
 #endif
 
+#endif /* phpcpp.h */