mirror of
https://github.com/OpenTTD/OpenTTD.git
synced 2025-08-03 01:38:09 +01:00
Fix: inconsistent definition of copy constructor and assignment
This commit is contained in:
parent
6dfd2cad69
commit
20a9e13272
1
src/3rdparty/fmt/core.h
vendored
1
src/3rdparty/fmt/core.h
vendored
@ -529,7 +529,6 @@ void check_format_string(S);
|
|||||||
|
|
||||||
struct error_handler {
|
struct error_handler {
|
||||||
constexpr error_handler() = default;
|
constexpr error_handler() = default;
|
||||||
constexpr error_handler(const error_handler&) = default;
|
|
||||||
|
|
||||||
// This function is intentionally not constexpr to give a compile-time error.
|
// This function is intentionally not constexpr to give a compile-time error.
|
||||||
FMT_NORETURN FMT_API void on_error(const char* message);
|
FMT_NORETURN FMT_API void on_error(const char* message);
|
||||||
|
1
src/3rdparty/squirrel/squirrel/sqclass.h
vendored
1
src/3rdparty/squirrel/squirrel/sqclass.h
vendored
@ -10,6 +10,7 @@ struct SQClassMember {
|
|||||||
val = o.val;
|
val = o.val;
|
||||||
attrs = o.attrs;
|
attrs = o.attrs;
|
||||||
}
|
}
|
||||||
|
SQClassMember& operator=(SQClassMember &o) = delete;
|
||||||
SQObjectPtr val;
|
SQObjectPtr val;
|
||||||
SQObjectPtr attrs;
|
SQObjectPtr attrs;
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user