Changeset bf4fe05 for src/GenPoly/InstantiateGeneric.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/GenPoly/InstantiateGeneric.cpp (modified) (2 diffs)

src/GenPoly/InstantiateGeneric.cpp

@@ -14 +14 @@
 //
 
-#include "InstantiateGeneric.h"
+#include "InstantiateGeneric.hpp"
 
 #include <cassert>                     // for assertf, assert
@@ -27 +27 @@
 #include "AST/TranslationUnit.hpp"     // for TranslationUnit
 #include "AST/Vector.hpp"              // for vector
-#include "CodeGen/OperatorTable.h"     // for isAssignment
-#include "Common/ScopedMap.h"          // for ScopedMap
-#include "Common/UniqueName.h"         // for UniqueName
-#include "GenPoly/GenPoly.h"           // for isPolyType, typesPolyCompatible
+#include "CodeGen/OperatorTable.hpp"   // for isAssignment
+#include "Common/ScopedMap.hpp"        // for ScopedMap
+#include "Common/UniqueName.hpp"       // for UniqueName
+#include "GenPoly/GenPoly.hpp"         // for isPolyType, typesPolyCompatible
 #include "GenPoly/ScrubTypeVars.hpp"   // for scrubAllTypeVars
 #include "ResolvExpr/AdjustExprType.hpp"  // for adjustExprType
-#include "ResolvExpr/Unify.h"          // for typesCompatible
+#include "ResolvExpr/Unify.hpp"        // for typesCompatible
 
 namespace GenPoly {