firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 07:23:04 +01:00
Code Issues

Fixed c++ dialect issues after cherry-pick

Browse Source
This commit is contained in:
AlexPeshkoff 2022-09-12 20:29:07 +03:00
parent b4a85182ed
commit c48135b83a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/remote/client/interface.cpp
View File

@ -158,9 +158,9 @@ namespace {
PortsCleanup(p) PortsCleanup(p)
{} {}
void closePort(rem_port* port) override; void closePort(rem_port* port);
void delay() override void delay()
{ {
Thread::sleep(50); Thread::sleep(50);
} }
@ -5993,13 +5993,13 @@ static void finalize(rem_port* port)
} }
REMOTE_free_packet(port, packet); REMOTE_free_packet(port, packet);
delete rdb; delete rdb;
port->port_context = nullptr; port->port_context = NULL;
} }
// Cleanup the queue // Cleanup the queue
delete port->port_deferred_packets; delete port->port_deferred_packets;
port->port_deferred_packets = nullptr; port->port_deferred_packets = NULL;
port->port_flags |= PORT_detached; port->port_flags |= PORT_detached;
} }

2
src/remote/remote.cpp
View File

@ -799,7 +799,7 @@ void PortsCleanup::closePorts()
delay(); delay();
Firebird::MutexLockGuard guard(m_mutex, FB_FUNCTION); Firebird::MutexLockGuard guard(m_mutex, FB_FUNCTION);
Firebird::AutoSetRestore cl(&closing, true); Firebird::AutoSetRestore<bool> cl(&closing, true);
{ // scope { // scope
Firebird::MutexUnlockGuard g2(m_mutex, FB_FUNCTION); Firebird::MutexUnlockGuard g2(m_mutex, FB_FUNCTION);