Changeset bf4fe05 for src/ResolvExpr/CurrentObject.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/CurrentObject.cpp (moved) (moved from src/ResolvExpr/CurrentObject.cc ) (3 diffs)

src/ResolvExpr/CurrentObject.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// CurrentObject.h --
+// CurrentObject.cpp --
 //
 // Author           : Rob Schluntz
@@ -14 +14 @@
 //
 
+#include "CurrentObject.hpp"
+
 #include <stddef.h>                    // for size_t
 #include <cassert>                     // for assertf, assert, safe_dynamic_...
@@ -28 +30 @@
 #include "AST/Print.hpp"               // for readonly
 #include "AST/Type.hpp"
-#include "Common/Eval.h"               // for eval
-#include "Common/Indenter.h"           // for Indenter, operator<<
-#include "Common/SemanticError.h"      // for SemanticError
-#include "Common/utility.h"            // for toString
-#include "CurrentObject.h"
+#include "Common/Eval.hpp"             // for eval
+#include "Common/Indenter.hpp"         // for Indenter, operator<<
+#include "Common/SemanticError.hpp"    // for SemanticError
+#include "Common/Utility.hpp"          // for toString
 
 #if 0