expose STL iterator interface for FairMQParts

fairmq/FairMQParts.h

@@ -9,16 +9,19 @@
 #ifndef FAIRMQPARTS_H_
 #define FAIRMQPARTS_H_
 
-#include <vector>
-#include <memory> // unique_ptr
-
 #include "FairMQTransportFactory.h"
 #include "FairMQMessage.h"
 
+#include <vector>
+#include <memory> // unique_ptr
+
 /// FairMQParts is a lightweight convenience wrapper around a vector of unique pointers to FairMQMessage, used for sending multi-part messages
 
 class FairMQParts
 {
+  private:
+    using container = std::vector<std::unique_ptr<FairMQMessage>>;
+
   public:
     /// Default constructor
     FairMQParts() : fParts() {};
@@ -33,7 +36,7 @@ class FairMQParts
 
     /// Adds part (FairMQMessage) to the container
     /// @param msg message pointer (for example created with NewMessage() method of FairMQDevice)
-    inline void AddPart(FairMQMessage* msg)
+    void AddPart(FairMQMessage* msg)
     {
         fParts.push_back(std::unique_ptr<FairMQMessage>(msg));
     }
@@ -49,27 +52,35 @@ class FairMQParts
     /// Adds part (std::unique_ptr<FairMQMessage>&) to the container (move)
     /// @param msg unique pointer to FairMQMessage
     /// rvalue ref (move required when passing argument)
-    inline void AddPart(std::unique_ptr<FairMQMessage>&& msg)
+    void AddPart(std::unique_ptr<FairMQMessage>&& msg)
     {
         fParts.push_back(std::move(msg));
     }
 
     /// Get reference to part in the container at index (without bounds check)
     /// @param index container index
-    inline FairMQMessage& operator[](const int index) { return *(fParts[index]); }
+    FairMQMessage& operator[](const int index) { return *(fParts[index]); }
 
     /// Get reference to unique pointer to part in the container at index (with bounds check)
     /// @param index container index
-    inline std::unique_ptr<FairMQMessage>& At(const int index) { return fParts.at(index); }
+    std::unique_ptr<FairMQMessage>& At(const int index) { return fParts.at(index); }
 
     // ref version
-    inline FairMQMessage& AtRef(const int index) { return *(fParts.at(index)); }
+    FairMQMessage& AtRef(const int index) { return *(fParts.at(index)); }
 
     /// Get number of parts in the container
     /// @return number of parts in the container
-    inline int Size() const { return fParts.size(); }
+    int Size() const { return fParts.size(); }
 
-    std::vector<std::unique_ptr<FairMQMessage>> fParts;
+    container fParts;
+
+    // forward container iterators
+    using iterator = container::iterator;
+    using const_iterator = container::const_iterator;
+    auto begin() -> decltype(fParts.begin()) { return fParts.begin(); }
+    auto end() -> decltype(fParts.end()) { return fParts.end(); }
+    auto cbegin() -> decltype(fParts.cbegin()) { return fParts.cbegin(); }
+    auto cend() -> decltype(fParts.cend()) { return fParts.cend(); }
 };
 
 #endif /* FAIRMQPARTS_H_ */