Changes in src/Common/utility.h [50377a4:4639b0d]

File:

• src/Common/utility.h (modified) (5 diffs)

src/Common/utility.h

@@ -28 +28 @@
 #include <cassert>
 
-#include "Common/Indenter.h"
-
 template< typename T >
 static inline T * maybeClone( const T *orig ) {
@@ -77 +75 @@
 
 template< typename Container >
-void printAll( const Container &container, std::ostream &os, Indenter indent = {} ) {
+void printAll( const Container &container, std::ostream &os, int indent = 0 ) {
         for ( typename Container::const_iterator i = container.begin(); i != container.end(); ++i ) {
                 if ( *i ) {
-                        os << indent;
-                        (*i)->print( os, indent );
+                        os << std::string( indent,  ' ' );
+                        (*i)->print( os, indent + 2 );
                         // need an endl after each element because it's not easy to know when each individual item should end
                         os << std::endl;
@@ -280 +278 @@
 };
 
-template< typename aT >
-struct FuncGuard {
-        aT m_after;
-
-        template< typename bT >
-        FuncGuard( bT before, aT after ) : m_after( after ) {
-                before();
-        }
-
-        ~FuncGuard() {
-                m_after();
-        }
-};
-
-template< typename bT, typename aT >
-FuncGuard<aT> makeFuncGuard( bT && before, aT && after ) {
-        return FuncGuard<aT>( std::forward<bT>(before), std::forward<aT>(after) );
-}
-
 template< typename T >
 struct ValueGuardPtr< std::list< T > > {
@@ -353 +332 @@
 template< typename T1, typename T2 >
 struct group_iterate_t {
-private:
-        std::tuple<T1, T2> args;
-public:
         group_iterate_t( bool skipBoundsCheck, const T1 & v1, const T2 & v2 ) : args(v1, v2) {
                 assertf(skipBoundsCheck || v1.size() == v2.size(), "group iteration requires containers of the same size: <%zd, %zd>.", v1.size(), v2.size());
         };
 
-        typedef std::tuple<decltype(*std::get<0>(args).begin()), decltype(*std::get<1>(args).begin())> value_type;
-        typedef decltype(std::get<0>(args).begin()) T1Iter;
-        typedef decltype(std::get<1>(args).begin()) T2Iter;
-
         struct iterator {
+                typedef typename std::remove_reference<T1>::type T1val;
+                typedef typename std::remove_reference<T2>::type T2val;
+                typedef std::tuple<typename T1val::value_type &, typename T2val::value_type &> value_type;
+                typedef typename T1val::iterator T1Iter;
+                typedef typename T2val::iterator T2Iter;
                 typedef std::tuple<T1Iter, T2Iter> IterTuple;
                 IterTuple it;
@@ -374 +351 @@
                 value_type operator*() const { return std::tie( *std::get<0>(it), *std::get<1>(it) ); }
         };
-
         iterator begin() { return iterator( std::get<0>(args).begin(), std::get<1>(args).begin() ); }
         iterator end() { return iterator( std::get<0>(args).end(), std::get<1>(args).end() ); }
+
+private:
+        std::tuple<T1, T2> args;
 };