mirror of
https://github.com/FirebirdSQL/firebird.git
synced 2025-01-23 04:43:03 +01:00
Fixed c++ dialect issues after cherry-pick
This commit is contained in:
parent
b4a85182ed
commit
c48135b83a
@ -158,9 +158,9 @@ namespace {
|
||||
PortsCleanup(p)
|
||||
{}
|
||||
|
||||
void closePort(rem_port* port) override;
|
||||
void closePort(rem_port* port);
|
||||
|
||||
void delay() override
|
||||
void delay()
|
||||
{
|
||||
Thread::sleep(50);
|
||||
}
|
||||
@ -5993,13 +5993,13 @@ static void finalize(rem_port* port)
|
||||
}
|
||||
REMOTE_free_packet(port, packet);
|
||||
delete rdb;
|
||||
port->port_context = nullptr;
|
||||
port->port_context = NULL;
|
||||
}
|
||||
|
||||
// Cleanup the queue
|
||||
|
||||
delete port->port_deferred_packets;
|
||||
port->port_deferred_packets = nullptr;
|
||||
port->port_deferred_packets = NULL;
|
||||
|
||||
port->port_flags |= PORT_detached;
|
||||
}
|
||||
|
@ -799,7 +799,7 @@ void PortsCleanup::closePorts()
|
||||
delay();
|
||||
|
||||
Firebird::MutexLockGuard guard(m_mutex, FB_FUNCTION);
|
||||
Firebird::AutoSetRestore cl(&closing, true);
|
||||
Firebird::AutoSetRestore<bool> cl(&closing, true);
|
||||
|
||||
{ // scope
|
||||
Firebird::MutexUnlockGuard g2(m_mutex, FB_FUNCTION);
|
||||
|
Loading…
Reference in New Issue
Block a user