Changeset 3d5701e for src/InitTweak/FixInit.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/InitTweak/FixInit.cc (modified) (4 diffs)

src/InitTweak/FixInit.cc

@@ -10 +10 @@
 // Created On       : Wed Jan 13 16:29:30 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Feb 13 18:15:56 2019
-// Update Count     : 76
+// Last Modified On : Sun Feb 16 04:17:07 2020
+// Update Count     : 82
 //
 #include "FixInit.h"
@@ -38 +38 @@
 #include "GenPoly/GenPoly.h"           // for getFunctionType
 #include "InitTweak.h"                 // for getFunctionName, getCallArg
-#include "Parser/LinkageSpec.h"        // for C, Spec, Cforall, isBuiltin
 #include "ResolvExpr/Resolver.h"       // for findVoidExpression
 #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, isBuiltin
 #include "SynTree/Attribute.h"         // for Attribute
 #include "SynTree/Constant.h"          // for Constant
@@ -745 +745 @@
                 }
 
-                // to prevent warnings (‘_unq0’ may be used uninitialized in this function),
+                // to prevent warnings ('_unq0' may be used uninitialized in this function),
                 // insert an appropriate zero initializer for UniqueExpr temporaries.
                 Initializer * makeInit( Type * t ) {