Changeset 4639b0d for src/Common/utility.h

Timestamp:

Sep 12, 2017, 7:01:34 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

7aa257ae, 7dc09294

Parents:

b3c7963

Message:

Fix memory error in lazy_map

File:

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

src/Common/utility.h

@@ -376 +376 @@
 template< typename T, typename Func >
 struct lambda_iterate_t {
-        T & ref;
-        Func f;
+        const T & ref;
+        std::function<Func> f;
 
         struct iterator {
                 typedef decltype(begin(ref)) Iter;
                 Iter it;
-                Func f;
-                iterator( Iter it, Func f ) : it(it), f(f) {}
+                std::function<Func> f;
+                iterator( Iter it, std::function<Func> f ) : it(it), f(f) {}
                 iterator & operator++() {
                         ++it; return *this;
@@ -391 +391 @@
         };
 
-        lambda_iterate_t( T & ref, Func f ) : ref(ref), f(f) {}
+        lambda_iterate_t( const T & ref, std::function<Func> f ) : ref(ref), f(f) {}
 
         auto begin() const -> decltype(iterator(std::begin(ref), f)) { return iterator(std::begin(ref), f); }
@@ -398 +398 @@
 
 template< typename... Args >
-lambda_iterate_t<Args...> lazy_map( Args &&... args ) {
-        return lambda_iterate_t<Args...>(std::forward<Args>( args )...);
+lambda_iterate_t<Args...> lazy_map( const Args &... args ) {
+        return lambda_iterate_t<Args...>( args...);
 }