Merge tag 'v1.6' into debian/sid

Added tag v1.6 for changeset 746517263955

1 files changed, 9 insertions, 2 deletions

diff --git a/include/phat/representations/full_pivot_column.h b/include/phat/representations/full_pivot_column.h
index c2e9e3c..a6a09d1 100644
--- a/include/phat/representations/full_pivot_column.h
+++ b/include/phat/representations/full_pivot_column.h
@@ -19,7 +19,6 @@
 #pragma once

 

 #include <phat/helpers/misc.h>

-#include <phat/representations/abstract_pivot_column.h>

 

 namespace phat {

     class full_column {

@@ -35,6 +34,15 @@ namespace phat {
             is_in_history.resize( total_size, false );

         }

 

+	

+	template<typename InputIterator>

+	  void add_col(InputIterator begin, InputIterator end) {

+	  for(InputIterator it=begin;it!=end;it++) {

+	    add_index(*it);

+	  }

+	}

+	

+

         void add_col( const column& col ) {

             for( index idx = 0; idx < (index) col.size(); idx++ ) {

                 add_index( col[ idx ] );

@@ -96,5 +104,4 @@ namespace phat {
         }

     };

 

-    typedef abstract_pivot_column< full_column > full_pivot_column;

 }