Changes in src/Common/utility.h [b1bead1:6b0b624]

File:

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

src/Common/utility.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Fri May 5 11:03:00 2017
-// Update Count     : 32
-//
-
-#ifndef _UTILITY_H
-#define _UTILITY_H
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Jul 21 22:19:13 2017
+// Update Count     : 33
+//
+
+#pragma once
 
 #include <cctype>
@@ -25 +24 @@
 #include <sstream>
 #include <string>
-#include <type_traits>
 
 #include <cassert>
@@ -306 +304 @@
 // for ( val : group_iterate( container1, container2, ... ) ) {}
 // syntax to have a for each that iterates multiple containers of the same length
-// TODO: update to use variadic arguments
+// TODO: update to use variadic arguments, perfect forwarding
 
 template< typename T1, typename T2 >
 struct group_iterate_t {
-        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: <%lu, %lu>.", v1.size(), v2.size());
+        group_iterate_t( const T1 & v1, const T2 & v2 ) : args(v1, v2) {
+                assertf(v1.size() == v2.size(), "group iteration requires containers of the same size.");
         };
 
         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<typename T1::value_type, typename T2::value_type> value_type;
+                typedef typename T1::iterator T1Iter;
+                typedef typename T2::iterator T2Iter;
                 typedef std::tuple<T1Iter, T2Iter> IterTuple;
                 IterTuple it;
@@ -327 +323 @@
                 }
                 bool operator!=( const iterator &other ) const { return it != other.it; }
-                value_type operator*() const { return std::tie( *std::get<0>(it), *std::get<1>(it) ); }
+                value_type operator*() const { return std::make_tuple( *std::get<0>(it), *std::get<1>(it) ); }
         };
         iterator begin() { return iterator( std::get<0>(args).begin(), std::get<1>(args).begin() ); }
@@ -336 +332 @@
 };
 
-/// performs bounds check to ensure that all arguments are of the same length.
 template< typename... Args >
-group_iterate_t<Args...> group_iterate( Args &&... args ) {
-        return group_iterate_t<Args...>(false, std::forward<Args>( args )...);
-}
-
-/// does not perform a bounds check - requires user to ensure that iteration terminates when appropriate.
-template< typename... Args >
-group_iterate_t<Args...> unsafe_group_iterate( Args &&... args ) {
-        return group_iterate_t<Args...>(true, std::forward<Args>( args )...);
+group_iterate_t<Args...> group_iterate( const Args &... args ) {
+        return group_iterate_t<Args...>(args...);
 }
 
@@ -386 +375 @@
 }
 
-#endif // _UTILITY_H
-
 // Local Variables: //
 // tab-width: 4 //