Changeset 3197

Timestamp:

Apr 29, 2014, 3:40:53 AM (9 years ago)

Author:

Peter

Message:

refs #790. workaround for old boost

Location:

trunk

Files:

• test/bam_pair_iterator.cc (modified) (3 diffs)
• yat/omic/BamPairIterator.h (modified) (2 diffs)

trunk/test/bam_pair_iterator.cc

@@ -27 +27 @@
 #include "yat/omic/BamWriteIterator.h"
 #endif
-
-#include <boost/version.hpp>
 
 #include <algorithm>
@@ -76 +74 @@
   for (; piter!=pend; ++piter) {
     result.push_back(*piter);
+    result.back() = *piter;
     // This code doesn't work with boost 1.48 (or older). See
     // https://svn.boost.org/trac/boost/ticket/5697 for details. It's
@@ -81 +80 @@
     // and if it wasn't modify this test accordingly and update the
     // docs in 'yat/omic/BamPairIterator.h'.
-#if BOOST_VERSION > 104800
     result.back().first() = piter->first();
     result.back().second() = piter->second();
-#endif
   }
   // not really doing anything since we've already iterated through

trunk/yat/omic/BamPairIterator.h

@@ -27 +27 @@
 #include "BamPair.h"
 #include "BamRead.h"
+
+#include <yat/utility/yat_assert.h>
 
 #include <boost/concept/assert.hpp>
@@ -84 +86 @@
      */
     explicit BamPairIterator(Base begin, Base end);
+
+#if BOOST_VERSION < 104900
+    /**
+       This is workaround implementation of operator-> when
+       implementation in base class (boost) does not compile. This
+       implementation may be slow, so when using old boost it often
+       prefereble to use operator*.
+     */
+    typename BamPairIterator::pointer operator->(void) const
+    {
+      // older versions of boost mandates pointer to be
+      // value_type*. To accomplish that we implement this slow thing
+      // which keeps a copy of a value_type as member.
+      // See https://svn.boost.org/trac/boost/ticket/5697 for discussion.
+
+      // Possibly stupid to assign each time, but why bother optimize
+      // for old bugs in boost. Users who are eager for speed, should
+      // either upgrade their boost or use (*iterator).function()
+      // rather than iterator->function().
+      YAT_ASSERT(mate_);
+      YAT_ASSERT(iter_ != end_);
+      dummie_.first() = *mate_;
+      dummie_.second() = *iter_;
+      return &dummie_;
+    }
+  private:
+    mutable BamPair dummie_;
+#endif
+
   private:
     Base iter_;