Changeset 3362

Timestamp:

Nov 25, 2014, 11:41:57 AM (8 years ago)

Author:

Peter

Message:

avoid temp variable. refs #794

File:

• trunk/yat/omic/BamReadIterator.cc (modified) (2 diffs)

trunk/yat/omic/BamReadIterator.cc

@@ -112 +112 @@
     : Actor(&bf)
   {
+    using boost::shared_ptr;
 #if YAT_HAVE_HTSLIB
-    hts_itr_t* it = sam_itr_queryi(bf.index(), tid, begin, end);
+    iter_ = shared_ptr<hts_itr_t>(sam_itr_queryi(bf.index(), tid, begin, end),
+                                  IndexDestroyer());
 #else
-    bam_iter_t it = bam_iter_query(bf.index(), tid, begin, end);
+    iter_ =
+      shared_ptr<__bam_iter_t>(bam_iter_query(bf.index(), tid, begin, end),
+                               IndexDestroyer());
 #endif
-    if (!it) {
+    if (!iter_.get()) {
       std::stringstream ss;
       ss << "BamReadIterator constructor: invalid region: ( tid=" << tid
@@ -123 +127 @@
       throw utility::runtime_error(ss.str());
     }
-    // iter_ takes ownership
-#if YAT_HAVE_HTSLIB
-    iter_ = boost::shared_ptr<hts_itr_t>(it, IndexDestroyer());
-#else
-    iter_ = boost::shared_ptr<__bam_iter_t>(it, IndexDestroyer());
-#endif
-    assert(iter_.get());
   }