Skip to content

Commit c7c0d1d

Browse files
committed
Fix -Wabsolute-value in fun
+ misc improvements
1 parent 7455578 commit c7c0d1d

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/jrd/fun.epp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ public:
226226
{}
227227
~OwnedBlobStack();
228228
void close();
229-
void setBlobCreated(blb* b)
229+
void setBlobCreated(blb* b) noexcept
230230
{
231231
m_blob_created = b;
232232
}
@@ -1144,7 +1144,7 @@ static void invoke(thread_db* tdbb,
11441144
// convert it to the declared return type of the UDF.
11451145
dsc* return_dsc = 0;
11461146
result_is_null = false;
1147-
if ((FUN_T) abs(return_ptr->prm_fun_mechanism) == FUN_descriptor)
1147+
if (return_ptr->prm_fun_mechanism == FUN_descriptor)
11481148
{
11491149
// The formal param's type is contained in value->vlu_desc.dsc_dtype
11501150
// but I want to know if the UDF changed it to a compatible type
@@ -1264,7 +1264,7 @@ static bool private_move(Jrd::thread_db* tdbb, dsc* from, dsc* to)
12641264
MOV_move(tdbb, from, to);
12651265
return true;
12661266
}
1267-
catch (Firebird::status_exception& e)
1267+
catch (const Firebird::status_exception& e)
12681268
{
12691269
e.stuffException(tdbb->tdbb_status_vector);
12701270
return false;

0 commit comments

Comments
 (0)