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

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 : Peter A. Buhr
-// Last Modified On : Fri Jul 21 22:19:13 2017
-// Update Count     : 33
+// Last Modified By : Andrew Beach
+// Last Modified On : Thr Aug 17 11:38:00 2017
+// Update Count     : 34
 //
 
@@ -24 +24 @@
 #include <sstream>
 #include <string>
+#include <type_traits>
 
 #include <cassert>
+
 template< typename T >
 static inline T * maybeClone( const T *orig ) {
@@ -304 +306 @@
 // 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, perfect forwarding
+// TODO: update to use variadic arguments
 
 template< typename T1, typename T2 >
@@ -313 +315 @@
 
         struct iterator {
-                typedef std::tuple<typename T1::value_type, typename T2::value_type> value_type;
-                typedef typename T1::iterator T1Iter;
-                typedef typename T2::iterator T2Iter;
+                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;
@@ -323 +327 @@
                 }
                 bool operator!=( const iterator &other ) const { return it != other.it; }
-                value_type operator*() const { return std::make_tuple( *std::get<0>(it), *std::get<1>(it) ); }
+                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() ); }
@@ -333 +337 @@
 
 template< typename... Args >
-group_iterate_t<Args...> group_iterate( const Args &... args ) {
-        return group_iterate_t<Args...>(args...);
-}
-
-struct CodeLocation {
-        int linenumber;
-        std::string filename;
-
-        /// Create a new unset CodeLocation.
-        CodeLocation()
-                : linenumber( -1 )
-                , filename("")
-        {}
-
-        /// Create a new CodeLocation with the given values.
-        CodeLocation( const char* filename, int lineno )
-                : linenumber( lineno )
-                , filename(filename ? filename : "")
-        {}
-
-        CodeLocation( const CodeLocation& rhs ) = default;
-
-        bool isSet () const {
-                return -1 != linenumber;
-        }
-
-        bool isUnset () const {
-                return !isSet();
-        }
-
-        void unset () {
-                linenumber = -1;
-                filename = "";
-        }
-
-        // Use field access for set.
-};
-
-inline std::string to_string( const CodeLocation& location ) {
-        return location.isSet() ? location.filename + ":" + std::to_string(location.linenumber) + " " : "";
+group_iterate_t<Args...> group_iterate( Args &&... args ) {
+        return group_iterate_t<Args...>(std::forward<Args>( args )...);
 }