summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@outlook.com>2020-09-29 00:37:49 +0200
committerTiger Wang <ziwei.tiger@outlook.com>2020-09-30 23:05:17 +0200
commitf9ac6543ab29bf87ee8c2ff2d91cf41747a43e04 (patch)
tree9464624310bc244c2e5b3704eb4b90dd66c44e38 /src
parentDoors: check power & toggle correctly (diff)
downloadcuberite-f9ac6543ab29bf87ee8c2ff2d91cf41747a43e04.tar
cuberite-f9ac6543ab29bf87ee8c2ff2d91cf41747a43e04.tar.gz
cuberite-f9ac6543ab29bf87ee8c2ff2d91cf41747a43e04.tar.bz2
cuberite-f9ac6543ab29bf87ee8c2ff2d91cf41747a43e04.tar.lz
cuberite-f9ac6543ab29bf87ee8c2ff2d91cf41747a43e04.tar.xz
cuberite-f9ac6543ab29bf87ee8c2ff2d91cf41747a43e04.tar.zst
cuberite-f9ac6543ab29bf87ee8c2ff2d91cf41747a43e04.zip
Diffstat (limited to 'src')
-rw-r--r--src/Bindings/LuaState.cpp2
-rw-r--r--src/Bindings/LuaState.h2
-rw-r--r--src/Vector3.h7
3 files changed, 2 insertions, 9 deletions
diff --git a/src/Bindings/LuaState.cpp b/src/Bindings/LuaState.cpp
index 31493d4fe..c6042ac62 100644
--- a/src/Bindings/LuaState.cpp
+++ b/src/Bindings/LuaState.cpp
@@ -2107,7 +2107,7 @@ void cLuaState::LogStackTrace(lua_State * a_LuaState, int a_StartingDepth)
-int cLuaState::ApiParamError(fmt::string_view a_Msg)
+int cLuaState::ApiParamError(std::string_view a_Msg)
{
// Retrieve current function name
lua_Debug entry;
diff --git a/src/Bindings/LuaState.h b/src/Bindings/LuaState.h
index f17bd0485..2c45377c7 100644
--- a/src/Bindings/LuaState.h
+++ b/src/Bindings/LuaState.h
@@ -838,7 +838,7 @@ public:
/** Prints the message, prefixed with the current function name, then logs the stack contents and raises a Lua error.
To be used for bindings when they detect bad parameters.
Doesn't return, but a dummy return type is provided so that Lua API functions may do "return ApiParamError(...)". */
- int ApiParamError(fmt::string_view a_Msg);
+ int ApiParamError(std::string_view a_Msg);
/** Formats and prints the message using printf-style format specifiers, but prefixed with the current function name, then logs the stack contents and raises a Lua error.
To be used for bindings when they detect bad parameters.
diff --git a/src/Vector3.h b/src/Vector3.h
index 0c7008763..0e275e9b3 100644
--- a/src/Vector3.h
+++ b/src/Vector3.h
@@ -426,7 +426,6 @@ public:
template <typename FormatContext>
auto format(const Vector3<What> & a_Vec, FormatContext & a_Ctx)
- -> typename FormatContext::iterator
{
Write(a_Ctx, "{");
Write(a_Ctx, a_Vec.x);
@@ -493,9 +492,3 @@ typedef Vector3<int> Vector3i;
typedef std::vector<Vector3i> cVector3iArray;
-
-
-
-
-
-