Kaydet (Commit) efd34115 authored tarafından Lionel Elie Mamane's avatar Lionel Elie Mamane

MacOS X fixup to bogus WaE: 'bValue' may be used uninitialized

Change-Id: I1485e7f6b9147d4cec94833c0a2b35e730c397cf
üst 9d5e05ed
......@@ -211,6 +211,10 @@ bool OCheckBoxModel::DbUseBool()
}
//------------------------------------------------------------------------------
#if defined __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#endif
Any OCheckBoxModel::translateDbColumnToControlValue()
{
Any aValue;
......@@ -244,18 +248,16 @@ Any OCheckBoxModel::translateDbColumnToControlValue()
// Since above either bValue is initialised, either aValue.hasValue(),
// bValue cannot be used uninitialised here.
// But GCC does not see/understand that, which breaks -Werror builds.
#if defined __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#endif
// Since the MacOS X compiler does not support #pragma GCC diagnostic
// within a function, moved them to outside the function.
aValue <<= (sal_Int16)( bValue ? STATE_CHECK : STATE_NOCHECK );
#if defined __GNUC__
#pragma GCC diagnostic pop
#endif
}
return aValue;
}
#if defined __GNUC__
#pragma GCC diagnostic pop
#endif
//-----------------------------------------------------------------------------
sal_Bool OCheckBoxModel::commitControlValueToDbColumn( bool /*_bPostReset*/ )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment