X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FSafeIterator.hh;h=b0ff4bfbcaab3ddc828596d0ea39051619181a5f;hb=412024ed31a4ab4eaea7a4165a434f8efebee325;hp=44982a71991e38b616ec2b215549e2ea7d1121a0;hpb=64a21c02b81501982ba4406ea69a388825c23057;p=senf.git

diff --git a/Packets/SafeIterator.hh b/Packets/SafeIterator.hh
index 44982a7..b0ff4bf 100644
--- a/Packets/SafeIterator.hh
+++ b/Packets/SafeIterator.hh
@@ -23,10 +23,10 @@
 /** \file
     \brief SafeIterator public header */
 
-#ifndef HH_SafeIterator_
-#define HH_SafeIterator_ 1
+#ifndef HH_SENF_Packets_SafeIterator_
+#define HH_SENF_Packets_SafeIterator_ 1
 
-#ifndef HH_Packets_
+#ifndef HH_SENF_Packets_Packets_
 #error "Don't include 'SafeIterator.hh' directly, include 'Packets.hh'"
 #endif
 
@@ -142,10 +142,10 @@ namespace senf {
         ///@}
         ///////////////////////////////////////////////////////////////////////////
 
-        Parser operator*() const;       ///< Access the stored parser
+        Parser & operator*() const;       ///< Access the stored parser
                                         /**< On every access, the stored parsers iterator will be
                                              updated / re-validated. */
-        Parser const * operator->() const; ///< Access the stored parser
+        Parser * operator->() const; ///< Access the stored parser
                                         /**< On every access, the stored parsers iterator will be
                                              updated / re-validated. */
         bool boolean_test() const;      ///< Check validity
@@ -161,8 +161,8 @@ namespace senf {
 
 ///////////////////////////////hh.e////////////////////////////////////////
 #endif
-#if !defined(HH_Packets__decls_) && !defined(HH_SafeIterator_i_)
-#define HH_SafeIterator_i_
+#if !defined(HH_SENF_Packets_Packets__decls_) && !defined(HH_SENF_Packets_SafeIterator_i_)
+#define HH_SENF_Packets_SafeIterator_i_
 #include "SafeIterator.cci"
 //#include "SafeIterator.ct"
 #include "SafeIterator.cti"