azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix string.h/String.h mismatch.

Browse Source
This commit is contained in:
Nikolay Igotti
2017-02-22 13:53:41 +03:00
parent c5fe02f537
commit 234e704226
5 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/src/launcher/cpp/launcher.cpp
+1 -3
View File
@@ -1,9 +1,7 @@
#include <string.h>
#include "Memory.h" #include "Memory.h"
#include "Natives.h" #include "Natives.h"
#include "Runtime.h" #include "Runtime.h"
#include "String.h" #include "KString.h"
#include "Types.h" #include "Types.h"
//--- Setup args --------------------------------------------------------------// //--- Setup args --------------------------------------------------------------//
runtime/src/main/cpp/Exceptions.cpp
+1 -1
View File
@@ -6,7 +6,7 @@
#include "Exceptions.h" #include "Exceptions.h"
#include "Memory.h" #include "Memory.h"
#include "Natives.h" #include "Natives.h"
#include "String.h" #include "KString.h"
#include "Types.h" #include "Types.h"
class KotlinException { class KotlinException {
runtime/src/main/cpp/String.cpp → runtime/src/main/cpp/KString.cpp
+1 -1
View File
@@ -14,7 +14,7 @@
#include "Exceptions.h" #include "Exceptions.h"
#include "Memory.h" #include "Memory.h"
#include "Natives.h" #include "Natives.h"
#include "String.h" #include "KString.h"
#include "Types.h" #include "Types.h"
#include "utf8.h" #include "utf8.h"
runtime/src/main/cpp/String.h → runtime/src/main/cpp/KString.h
View File
runtime/src/main/cpp/ToString.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
#include "Exceptions.h" #include "Exceptions.h"
#include "Memory.h" #include "Memory.h"
#include "Natives.h" #include "Natives.h"
#include "String.h" #include "KString.h"
#include "Types.h" #include "Types.h"
extern "C" { extern "C" {