diff options
author | Rémi Verschelde <remi@verschelde.fr> | 2021-05-06 08:36:30 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-06 08:36:30 +0200 |
commit | 42b07f713fcbf9228dbc9145a07f706285a17a5f (patch) | |
tree | d43c43f71d524839293dc58a756c3f561ee2646b /core/variant/variant.h | |
parent | 4fee363d7df235d2b9275240a87474d9bd0de541 (diff) | |
parent | 3f078c99f6be160641b1c4782d2653b9d76a5ca8 (diff) |
Merge pull request #37700 from Calinou/rename-ip-unix-tcp-server
Rename `IP_Unix`, `IP_Address` and `TCP_Server` to remove underscores
Diffstat (limited to 'core/variant/variant.h')
-rw-r--r-- | core/variant/variant.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/variant/variant.h b/core/variant/variant.h index 0acafc64fa..7f3c3477fc 100644 --- a/core/variant/variant.h +++ b/core/variant/variant.h @@ -359,7 +359,7 @@ public: operator Side() const; operator Orientation() const; - operator IP_Address() const; + operator IPAddress() const; Object *get_validated_object() const; Object *get_validated_object_with_check(bool &r_previously_freed) const; @@ -421,7 +421,7 @@ public: Variant(const Vector<::RID> &p_array); // helper Variant(const Vector<Vector2> &p_array); // helper - Variant(const IP_Address &p_address); + Variant(const IPAddress &p_address); // If this changes the table in variant_op must be updated enum Operator { |