Changeset bf4fe05 for src/GenPoly/GenPoly.cpp

Timestamp:

May 13, 2024, 7:07:06 AM (5 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/GenPoly.cpp (moved) (moved from src/GenPoly/GenPoly.cc) (3 diffs)

src/GenPoly/GenPoly.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// GenPoly.cc -- General GenPoly utilities.
+// GenPoly.cpp -- General GenPoly utilities.
 //
 // Author           : Richard C. Bilson
@@ -14 +14 @@
 //
 
-#include "GenPoly.h"
-
-#include <cassert>                      // for assertf, assert
-#include <iostream>                     // for operator<<, ostream, basic_os...
-#include <iterator>                     // for back_insert_iterator, back_in...
-#include <list>                         // for list, _List_iterator, list<>:...
-#include <typeindex>                    // for type_index
-#include <utility>                      // for pair
-#include <vector>                       // for vector
+#include "GenPoly.hpp"
+
+#include <cassert>                        // for assertf, assert
+#include <iostream>                       // for operator<<, ostream, basic_...
+#include <iterator>                       // for back_insert_iterator, back_...
+#include <list>                           // for list, _List_iterator, list<...
+#include <typeindex>                      // for type_index
+#include <utility>                        // for pair
+#include <vector>                         // for vector
 
 #include "AST/Expr.hpp"
 #include "AST/Type.hpp"
 #include "AST/TypeSubstitution.hpp"
-#include "GenPoly/ErasableScopedMap.h"  // for ErasableScopedMap<>::const_it...
-#include "ResolvExpr/typeops.h"         // for flatten
+#include "GenPoly/ErasableScopedMap.hpp"  // for ErasableScopedMap<>::const_...
+#include "ResolvExpr/Typeops.hpp"         // for flatten
 
 using namespace std;
@@ -256 +256 @@
 
         // So remaining types can be examined case by case.
-        // Recurse through type structure (conditions borrowed from Unify.cc).
+        // Recurse through type structure (conditions borrowed from Unify.cpp).
 
         if ( type_index(typeid(ast::BasicType)) == lid ) {