summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBastiaan Olij <mux213@gmail.com>2019-04-07 17:05:48 +1000
committerGitHub <noreply@github.com>2019-04-07 17:05:48 +1000
commitdf04c4097fe09204e1906ae76996b80376d84d34 (patch)
treeb97be4daa825844e5b6e29575b88a695023dbabc
parentc714f99376ddf32c01b76491d9340ad92e998a0f (diff)
parent459d3d28e44515dbb6d3c79b683c5efcd9a910fe (diff)
downloadredot-cpp-df04c4097fe09204e1906ae76996b80376d84d34.tar.gz
Merge pull request #259 from BastiaanOlij/update_3.1_stable
Synced with Godot 3.1 stable
-rw-r--r--LICENSE.md2
m---------godot_headers0
-rw-r--r--src/core/String.cpp2
3 files changed, 2 insertions, 2 deletions
diff --git a/LICENSE.md b/LICENSE.md
index e91703e..91df97e 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,6 +1,6 @@
# MIT License
-Copyright (c) 2017 GodotNativeTools
+Copyright (c) 2017-2019 GodotNativeTools
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/godot_headers b/godot_headers
-Subproject b98ac387a1407c16536fdde79466f932433adb0
+Subproject 489db2761c8aa0f49efbbc729dfa728f850f975
diff --git a/src/core/String.cpp b/src/core/String.cpp
index 3535322..1f4be2a 100644
--- a/src/core/String.cpp
+++ b/src/core/String.cpp
@@ -99,7 +99,7 @@ String::~String() {
}
wchar_t &String::operator[](const int idx) {
- return *godot::api->godot_string_operator_index(&_godot_string, idx);
+ return *const_cast<wchar_t *>(godot::api->godot_string_operator_index(&_godot_string, idx));
}
wchar_t String::operator[](const int idx) const {