Skip to content

Commit ef0abf9

Browse files
committed
Move CppInterOp.h into its own location; issue a warning to help users.
Currently we have the `CppInterOp.h` in `clang/Interpreter/` which makes people think that it is a clang header file. This patch moves the header into its own folder to avoid confusion.
1 parent 2d2a2cb commit ef0abf9

28 files changed

+6547
-6563
lines changed

include/CppInterOp/CppInterOp.h

Lines changed: 810 additions & 0 deletions
Large diffs are not rendered by default.

include/clang/Interpreter/CppInterOp.h

Lines changed: 6 additions & 807 deletions
Large diffs are not rendered by default.

lib/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
add_subdirectory(Interpreter)
1+
add_subdirectory(CppInterOp)

lib/Interpreter/CMakeLists.txt renamed to lib/CppInterOp/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ if(EMSCRIPTEN)
118118
# unit tests main_module you get errors due to undefined symbols. The reading of the file
119119
# below into a SYMBOLS_LIST variable is a temporary workaround that exports the undefined
120120
# symbols from the shared library, until it can be determined why they are not being exported already.
121-
file(READ "${CMAKE_SOURCE_DIR}/lib/Interpreter/exports.ld" SYMBOLS_LIST)
121+
file(READ "${CMAKE_CURRENT_SOURCE_DIR}/exports.ld" SYMBOLS_LIST)
122122

123123
# Replace newlines with spaces
124124
string(REPLACE "\n" " " SYMBOLS_LIST "${SYMBOLS_LIST}")

lib/Interpreter/CXCppInterOp.cpp renamed to lib/CppInterOp/CXCppInterOp.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#include "clang-c/CXCppInterOp.h"
2+
#include "CppInterOp/CppInterOp.h"
3+
24
#include "Compatibility.h"
35
#include "clang/AST/CXXInheritance.h"
46
#include "clang/AST/Decl.h"
@@ -7,7 +9,6 @@
79
#include "clang/AST/RecordLayout.h"
810
#include "clang/AST/Type.h"
911
#include "clang/Frontend/CompilerInstance.h"
10-
#include "clang/Interpreter/CppInterOp.h"
1112
#include "clang/Sema/Lookup.h"
1213
#include "clang/Sema/Sema.h"
1314
#include "llvm/ADT/STLExtras.h"
@@ -619,4 +620,4 @@ void Destruct(compat::Interpreter& interp, TCppObject_t This,
619620

620621
void clang_destruct(CXObject This, CXScope S, bool withFree) {
621622
Cpp::Destruct(*getInterpreter(S), This, getDecl(S), withFree);
622-
}
623+
}
File renamed without changes.

0 commit comments

Comments
 (0)