Changeset bf4fe05 for src/ResolvExpr/SatisfyAssertions.cpp

Timestamp:

May 13, 2024, 7:07:06 AM (17 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/SatisfyAssertions.cpp (modified) (2 diffs)

src/ResolvExpr/SatisfyAssertions.cpp

@@ -28 +28 @@
 #include "CandidateFinder.hpp"
 #include "CommonType.hpp"
-#include "Cost.h"
-#include "RenameVars.h"
+#include "Cost.hpp"
+#include "RenameVars.hpp"
 #include "SpecCost.hpp"
-#include "typeops.h"
-#include "Unify.h"
+#include "Typeops.hpp"
+#include "Unify.hpp"
 #include "AST/Decl.hpp"
 #include "AST/Expr.hpp"
@@ -40 +40 @@
 #include "AST/SymbolTable.hpp"
 #include "AST/TypeEnvironment.hpp"
-#include "FindOpenVars.h"
-#include "Common/FilterCombos.h"
-#include "Common/Indenter.h"
-#include "GenPoly/GenPoly.h"
-#include "SymTab/Mangler.h"
+#include "FindOpenVars.hpp"
+#include "Common/FilterCombos.hpp"
+#include "Common/Indenter.hpp"
+#include "GenPoly/GenPoly.hpp"
+#include "SymTab/Mangler.hpp"
 
 namespace ResolvExpr {