Changeset bf4fe05 for src/ResolvExpr/Resolver.cpp

Timestamp:

May 13, 2024, 7:07:06 AM (6 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

ca4f2b2

Parents:

ec20ab9 (diff), 5f225f5 (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:

fix merge

File:

• src/ResolvExpr/Resolver.cpp (moved) (moved from src/ResolvExpr/Resolver.cc) (3 diffs)

src/ResolvExpr/Resolver.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Resolver.cc --
+// Resolver.cpp --
 //
 // Author           : Aaron B. Moss
@@ -21 +21 @@
 #include "Candidate.hpp"
 #include "CandidateFinder.hpp"
-#include "CurrentObject.h"               // for CurrentObject
-#include "RenameVars.h"                  // for RenameVars, global_renamer
-#include "Resolver.h"
-#include "ResolveTypeof.h"
+#include "CurrentObject.hpp"             // for CurrentObject
+#include "RenameVars.hpp"                // for RenameVars, global_renamer
+#include "Resolver.hpp"
+#include "ResolveTypeof.hpp"
 #include "ResolveMode.hpp"               // for ResolveMode
-#include "typeops.h"                     // for extractResultType
-#include "Unify.h"                       // for unify
+#include "Typeops.hpp"                   // for extractResultType
+#include "Unify.hpp"                     // for unify
 #include "CompilationState.hpp"
 #include "AST/Decl.hpp"
@@ -35 +35 @@
 #include "AST/SymbolTable.hpp"
 #include "AST/Type.hpp"
-#include "Common/Eval.h"                 // for eval
+#include "Common/Eval.hpp"               // for eval
 #include "Common/Iterate.hpp"            // for group_iterate
-#include "Common/SemanticError.h"        // for SemanticError
-#include "Common/Stats/ResolveTime.h"    // for ResolveTime::start(), ResolveTime::stop()
+#include "Common/SemanticError.hpp"      // for SemanticError
+#include "Common/Stats/ResolveTime.hpp"  // for ResolveTime::start(), ResolveTime::stop()
 #include "Common/ToString.hpp"           // for toCString
-#include "Common/UniqueName.h"           // for UniqueName
-#include "InitTweak/GenInit.h"
-#include "InitTweak/InitTweak.h"         // for isIntrinsicSingleArgCallStmt
-#include "SymTab/Mangler.h"              // for Mangler
-#include "Tuples/Tuples.h"
-#include "Validate/FindSpecialDecls.h"   // for SizeType
+#include "Common/UniqueName.hpp"         // for UniqueName
+#include "InitTweak/GenInit.hpp"
+#include "InitTweak/InitTweak.hpp"       // for isIntrinsicSingleArgCallStmt
+#include "SymTab/Mangler.hpp"            // for Mangler
+#include "Tuples/Tuples.hpp"
+#include "Validate/FindSpecialDecls.hpp" // for SizeType
 
 using namespace std;