comparison DEPENDENCIES/generic/include/boost/icl/interval_base_map.hpp @ 101:c530137014c0

Update Boost headers (1.58.0)

         BOOST_CONCEPT_ASSERT((LessThanComparableConcept<DomainT>));
         BOOST_CONCEPT_ASSERT((DefaultConstructibleConcept<CodomainT>));
         BOOST_CONCEPT_ASSERT((EqualComparableConcept<CodomainT>));
     }
 
+#   ifndef BOOST_ICL_NO_CXX11_RVALUE_REFERENCES
+    //==========================================================================
+    //= Move semantics
+    //==========================================================================
+
+    /** Move constructor */
+    interval_base_map(interval_base_map&& src): _map(boost::move(src._map))
+    {
+        BOOST_CONCEPT_ASSERT((DefaultConstructibleConcept<DomainT>));
+        BOOST_CONCEPT_ASSERT((LessThanComparableConcept<DomainT>));
+        BOOST_CONCEPT_ASSERT((DefaultConstructibleConcept<CodomainT>));
+        BOOST_CONCEPT_ASSERT((EqualComparableConcept<CodomainT>));
+    }
+
+    /** Move assignment operator */
+    interval_base_map& operator = (interval_base_map src) 
+    {                           //call by value sice 'src' is a "sink value" 
+        this->_map = boost::move(src._map);
+        return *this; 
+    }
+
+    //==========================================================================
+#   else 
+
     /** Copy assignment operator */
     interval_base_map& operator = (const interval_base_map& src) 
     { 
         this->_map = src._map;
         return *this; 
     }
 
-#   ifndef BOOST_ICL_NO_CXX11_RVALUE_REFERENCES
-    //==========================================================================
-    //= Move semantics
-    //==========================================================================
-
-    /** Move constructor */
-    interval_base_map(interval_base_map&& src): _map(boost::move(src._map))
-    {
-        BOOST_CONCEPT_ASSERT((DefaultConstructibleConcept<DomainT>));
-        BOOST_CONCEPT_ASSERT((LessThanComparableConcept<DomainT>));
-        BOOST_CONCEPT_ASSERT((DefaultConstructibleConcept<CodomainT>));
-        BOOST_CONCEPT_ASSERT((EqualComparableConcept<CodomainT>));
-    }
-
-    /** Move assignment operator */
-    interval_base_map& operator = (interval_base_map&& src) 
-    { 
-        this->_map = boost::move(src._map);
-        return *this; 
-    }
-
-    //==========================================================================
 #   endif // BOOST_ICL_NO_CXX11_RVALUE_REFERENCES
 
     /** swap the content of containers */
     void swap(interval_base_map& object) { _map.swap(object._map); }
 

     interval_type lead_gap = right_subtract(inter_val, (*it_).first);
     if(!icl::is_empty(lead_gap))
     {
         // [lead_gap--- . . .
         //          [-- it_ ...
-        iterator prior_ = prior(it_); 
+        iterator prior_ = it_==this->_map.begin()? it_ : prior(it_); 
         iterator inserted_ = this->template gap_insert<Combiner>(prior_, lead_gap, co_val);
         that()->handle_inserted(prior_, inserted_);
     }
 
     // . . . --------- . . . addend interval

         return that()->handle_inserted(insertion.first);
     else
     {
         // Detect the first and the end iterator of the collision sequence
         iterator first_ = this->_map.lower_bound(inter_val),
-                 last_  = insertion.first;
+                 last_  = prior(this->_map.upper_bound(inter_val));
         //assert(end_ == this->_map.upper_bound(inter_val));
         iterator it_ = first_;
         interval_type rest_interval = inter_val;
 
         add_front         (rest_interval,         it_       );

 inline void interval_base_map<SubType,DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc>
     ::insert_main(const interval_type& inter_val, const CodomainT& co_val, 
                   iterator& it_, const iterator& last_)
 {
     iterator end_   = boost::next(last_);
-    iterator prior_ = it_, inserted_;
-    if(prior_ != this->_map.end())
-        --prior_;
+    iterator prior_ = cyclic_prior(*this,it_), inserted_;
     interval_type rest_interval = inter_val, left_gap, cur_itv;
     interval_type last_interval = last_ ->first;
 
     while(it_ != end_  )
     {

         return that()->handle_inserted(insertion.first);
     else
     {
         // Detect the first and the end iterator of the collision sequence
         iterator first_ = this->_map.lower_bound(inter_val),
-                 last_  = insertion.first;
+                 last_  = prior(this->_map.upper_bound(inter_val));
         //assert((++last_) == this->_map.upper_bound(inter_val));
         iterator it_ = first_;
         insert_main(inter_val, co_val, it_, last_);
         return it_;
     }