From 18eccccede09d71210706340599b0628211ec75a Mon Sep 17 00:00:00 2001 From: alexpeshkoff Date: Thu, 28 May 2009 07:55:13 +0000 Subject: [PATCH] AIX port - fixed warnings --- src/dsql/user_dsql.cpp | 4 ++++ src/jrd/evl_string.h | 15 ++++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/dsql/user_dsql.cpp b/src/dsql/user_dsql.cpp index 22fc516638..3fe715ed7e 100644 --- a/src/dsql/user_dsql.cpp +++ b/src/dsql/user_dsql.cpp @@ -1138,6 +1138,8 @@ static ISC_STATUS error(const Firebird::Exception& ex) gds__print_status(UDSQL_error->dsql_status); exit(UDSQL_error->dsql_status[1]); + + return 0; // suppress compiler warning } @@ -1150,6 +1152,8 @@ static ISC_STATUS error() gds__print_status(UDSQL_error->dsql_status); exit(UDSQL_error->dsql_status[1]); + + return 0; // suppress compiler warning } //____________________________________________________________ diff --git a/src/jrd/evl_string.h b/src/jrd/evl_string.h index d06ef5685d..0a27370d79 100644 --- a/src/jrd/evl_string.h +++ b/src/jrd/evl_string.h @@ -267,14 +267,15 @@ private: struct PatternItem { PatternItemType type; - union + struct str_struct { - struct - { - SLONG length; - CharType* data; - SLONG* kmpNext; // Jump table for Knuth-Morris-Pratt algorithm - } str; + SLONG length; + CharType* data; + SLONG* kmpNext; // Jump table for Knuth-Morris-Pratt algorithm + }; + union // anonymous union + { + str_struct str; SLONG skipCount; }; bool match_any;