fix[merge conflicts]: renamed iFunctions -> runtimeFunctions

discopop-project · Jul 3, 2024 · 3fea67e · 3fea67e
1 parent dfbbea9
commit 3fea67e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/rtlib/calltree/DependencyMetadata.hpp b/rtlib/calltree/DependencyMetadata.hpp
@@ -13,7 +13,7 @@
 #pragma once
 
 #include "../DPUtils.hpp"
-#include "../iFunctionsTypes.hpp"
+#include "../runtimeFunctionsTypes.hpp"
 #include "MetaDataQueueElement.hpp"
 
 namespace __dp

diff --git a/rtlib/calltree/MetaDataQueue.cpp b/rtlib/calltree/MetaDataQueue.cpp
@@ -13,7 +13,7 @@
 #include "MetaDataQueue.hpp"
 
 #include "../../share/include/timer.hpp"
-#include "../iFunctionsGlobals.hpp"
+#include "../runtimeFunctionsGlobals.hpp"
 
 namespace __dp
 {

diff --git a/rtlib/calltree/MetaDataQueueElement.hpp b/rtlib/calltree/MetaDataQueueElement.hpp
@@ -16,7 +16,7 @@
 #include "CallTreeNode.hpp"
 #include <memory>
 #include <boost/functional/hash.hpp>
-#include "../iFunctionsTypes.hpp"
+#include "../runtimeFunctionsTypes.hpp"
 
 namespace __dp
 {

diff --git a/rtlib/calltree/utils.cpp b/rtlib/calltree/utils.cpp
@@ -12,7 +12,7 @@
 
 #include "utils.hpp"
 #include "../../share/include/timer.hpp"
-#include "../iFunctionsGlobals.hpp"
+#include "../runtimeFunctionsGlobals.hpp"
 #include <iostream>
 
 namespace __dp{