Changeset 3d5701e for src/GenPoly/Box.cc

Timestamp:

Feb 25, 2020, 1:17:33 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

7dc2e015

Parents:

9fb8f01 (diff), dd9e1ca (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

resolve conflict

File:

• src/GenPoly/Box.cc (modified) (4 diffs)

src/GenPoly/Box.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jun 21 15:49:59 2017
-// Update Count     : 346
+// Last Modified On : Fri Dec 13 23:40:34 2019
+// Update Count     : 347
 //
 
@@ -37 +37 @@
 #include "InitTweak/InitTweak.h"         // for getFunctionName, isAssignment
 #include "Lvalue.h"                      // for generalizedLvalue
-#include "Parser/LinkageSpec.h"          // for C, Spec, Cforall, Intrinsic
 #include "ResolvExpr/TypeEnvironment.h"  // for EqvClass
 #include "ResolvExpr/typeops.h"          // for typesCompatible
@@ -44 +43 @@
 #include "SymTab/Indexer.h"              // for Indexer
 #include "SymTab/Mangler.h"              // for Mangler
+#include "SynTree/LinkageSpec.h"         // for C, Spec, Cforall, Intrinsic
 #include "SynTree/Attribute.h"           // for Attribute
 #include "SynTree/Constant.h"            // for Constant
@@ -837 +837 @@
                                         deref->args.push_back( new CastExpr( new VariableExpr( param ), new PointerType( Type::Qualifiers(), arg->get_type()->clone() ) ) );
                                         deref->result = arg->get_type()->clone();
-                                        deref->result->set_lvalue( true );
                                         return deref;
                                 } // if