diff options
Diffstat (limited to 'drivers/unix')
| -rw-r--r-- | drivers/unix/file_access_unix.cpp | 2 | ||||
| -rw-r--r-- | drivers/unix/net_socket_posix.cpp | 6 | ||||
| -rw-r--r-- | drivers/unix/os_unix.cpp | 4 | ||||
| -rw-r--r-- | drivers/unix/os_unix.h | 1 | 
4 files changed, 4 insertions, 9 deletions
diff --git a/drivers/unix/file_access_unix.cpp b/drivers/unix/file_access_unix.cpp index 6ea55219bb..f07c654bd6 100644 --- a/drivers/unix/file_access_unix.cpp +++ b/drivers/unix/file_access_unix.cpp @@ -111,7 +111,7 @@ Error FileAccessUnix::_open(const String &p_path, int p_mode_flags) {  		}  	} -	if (is_backup_save_enabled() && (p_mode_flags & WRITE) && !(p_mode_flags & READ)) { +	if (is_backup_save_enabled() && (p_mode_flags == WRITE)) {  		save_path = path;  		path = path + ".tmp";  	} diff --git a/drivers/unix/net_socket_posix.cpp b/drivers/unix/net_socket_posix.cpp index efeaf32ff7..e01c6a0e0f 100644 --- a/drivers/unix/net_socket_posix.cpp +++ b/drivers/unix/net_socket_posix.cpp @@ -269,11 +269,11 @@ _FORCE_INLINE_ Error NetSocketPosix::_change_multicast_group(IPAddress p_ip, Str  			break; // IPv6 uses index.  		} -		for (List<IPAddress>::Element *F = c.ip_addresses.front(); F; F = F->next()) { -			if (!F->get().is_ipv4()) { +		for (const IPAddress &F : c.ip_addresses) { +			if (!F.is_ipv4()) {  				continue; // Wrong IP type  			} -			if_ip = F->get(); +			if_ip = F;  			break;  		}  		break; diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp index a5c61bbea5..f6a3e93b55 100644 --- a/drivers/unix/os_unix.cpp +++ b/drivers/unix/os_unix.cpp @@ -139,10 +139,6 @@ void OS_Unix::finalize_core() {  	NetSocketPosix::cleanup();  } -void OS_Unix::alert(const String &p_alert, const String &p_title) { -	fprintf(stderr, "ERROR: %s\n", p_alert.utf8().get_data()); -} -  String OS_Unix::get_stdin_string(bool p_block) {  	if (p_block) {  		char buff[1024]; diff --git a/drivers/unix/os_unix.h b/drivers/unix/os_unix.h index 6c79d984e9..bf82019d38 100644 --- a/drivers/unix/os_unix.h +++ b/drivers/unix/os_unix.h @@ -52,7 +52,6 @@ protected:  public:  	OS_Unix(); -	virtual void alert(const String &p_alert, const String &p_title = "ALERT!");  	virtual String get_stdin_string(bool p_block) override;  	//virtual void set_mouse_show(bool p_show);  |