Changeset 1febef62 for src/Common

Timestamp:

Mar 21, 2019, 2:21:59 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

ca59826

Parents:

b5cff2b

Message:

Fix gcc-7 errors in persistent map

File:

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

src/Common/PersistentMap.h ¶

@@ -146 +146 @@
 
                 // remove map from base
-                Base base_map = base->take_as<Base>();
+                Base base_map = base->template take_as<Base>();
                 base->reset_as_base();
 
@@ -155 +155 @@
                                 auto it = base_map.find( self.key );
 
-                                base->init<Ins>( 
+                                base->template init<Ins>( 
                                                 mut_this->shared_from_this(), std::move(self.key), std::move(it->second) );
                                 base->mode = INS;
@@ -165 +165 @@
                                 Ins& self = mut_this->as<Ins>();
 
-                                base->init<Rem>( mut_this->shared_from_this(), self.key );
+                                base->template init<Rem>( mut_this->shared_from_this(), self.key );
                                 base->mode = REM;
 
@@ -175 +175 @@
                                 auto it = base_map.find( self.key );
 
-                                base->init<Ins>( 
+                                base->template init<Ins>( 
                                                 mut_this->shared_from_this(), std::move(self.key), std::move(it->second) );
                                 base->mode = UPD;
@@ -243 +243 @@
                 Ptr ret = std::make_shared<Self>( take_as<Base>() );
                 reset_as_base();
-                Base& base_map = ret->as<Base>();
+                Base& base_map = ret->template as<Base>();
 
                 // check if this is update or insert
@@ -274 +274 @@
                 Ptr ret = std::make_shared<Self>( take_as<Base>() );
                 reset_as_base();
-                Base& base_map = ret->as<Base>();
+                Base& base_map = ret->template as<Base>();
 
                 // set self to INS node and remove from base