8
0
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 18:03:04 +01:00
This commit is contained in:
Adriano dos Santos Fernandes 2016-05-08 23:05:39 -03:00
parent 41d8b9ec55
commit 82b18b30f2
6 changed files with 6 additions and 3 deletions

View File

@ -341,6 +341,7 @@ inline void operator delete[](void* mem, std::size_t s ALLOC_PARAMS) throw()
MemoryPool::globalFree(mem); MemoryPool::globalFree(mem);
} }
#endif #endif
#ifdef DEBUG_GDS_ALLOC #ifdef DEBUG_GDS_ALLOC
#ifdef __clang__ #ifdef __clang__

View File

@ -1721,6 +1721,7 @@ static gpre_ctx* par_alias_list( gpre_req* request, gpre_nod* alias_list)
// a base table having a matching table name or alias // a base table having a matching table name or alias
if (!context) if (!context)
{
for (context = request->req_contexts; context; context = context->ctx_next) for (context = request->req_contexts; context; context = context->ctx_next)
{ {
if (context->ctx_scope_level != request->req_scope_level) if (context->ctx_scope_level != request->req_scope_level)
@ -1732,6 +1733,7 @@ static gpre_ctx* par_alias_list( gpre_req* request, gpre_nod* alias_list)
break; break;
} }
} }
}
if (!context) if (!context)
{ {

View File

@ -352,4 +352,3 @@ namespace Jrd
} // namespace } // namespace
#endif // JRD_SAVEPOINT_H #endif // JRD_SAVEPOINT_H

View File

@ -142,7 +142,7 @@ public:
{ {
#ifdef WORDS_BIGENDIAN #ifdef WORDS_BIGENDIAN
if (lck_length <= 8) if (lck_length <= 8)
return &lck_key.lck_string[8-lck_length]; return &lck_key.lck_string[8 - lck_length];
#endif #endif
return &lck_key.lck_string[0]; return &lck_key.lck_string[0];
} }

View File

@ -3087,7 +3087,7 @@ void Service::get_action_svc_string_pos(const ClumpletReader& spb, string& switc
void Service::get_action_svc_data(const ClumpletReader& spb, string& switches, bool bigint) void Service::get_action_svc_data(const ClumpletReader& spb, string& switches, bool bigint)
{ {
string s; string s;
s.printf("%" SQUADFORMAT" ", bigint ? spb.getBigInt() : (SINT64) spb.getInt()); s.printf("%" SQUADFORMAT" ", (bigint ? spb.getBigInt() : (SINT64) spb.getInt()));
switches += s; switches += s;
} }

View File

@ -5450,6 +5450,7 @@ static rem_port* analyze(ClntAuthBlock& cBlock, PathName& attach_name, unsigned
inet_af = AF_INET; inet_af = AF_INET;
else if (ISC_analyze_protocol(PROTOCOL_INET6, attach_name, node_name, INET_SEPARATOR)) else if (ISC_analyze_protocol(PROTOCOL_INET6, attach_name, node_name, INET_SEPARATOR))
inet_af = AF_INET6; inet_af = AF_INET6;
if (inet_af != AF_UNSPEC || if (inet_af != AF_UNSPEC ||
ISC_analyze_protocol(PROTOCOL_INET, attach_name, node_name, INET_SEPARATOR) || ISC_analyze_protocol(PROTOCOL_INET, attach_name, node_name, INET_SEPARATOR) ||
ISC_analyze_tcp(attach_name, node_name)) ISC_analyze_tcp(attach_name, node_name))