Fix -Wodr in GCC LTO builds

I've tested GCC 10 and 11, which exhibit the problem, and 8, which
doesn't.
This commit is contained in:
Flössie 2021-07-05 13:06:33 +02:00
parent 33ea50e2dd
commit 64382928c1
3 changed files with 13 additions and 3 deletions

View File

@ -28,6 +28,9 @@
using namespace rtengine; using namespace rtengine;
namespace
{
enum GeometryIndex { enum GeometryIndex {
MO_CANVAS, MO_CANVAS,
MO_OBJECT_COUNT, MO_OBJECT_COUNT,
@ -46,9 +49,6 @@ enum GeometryOffset {
OFFSET_END = (MO_OBJECT_COUNT + ::ControlLine::END) % ::ControlLine::OBJECT_COUNT, OFFSET_END = (MO_OBJECT_COUNT + ::ControlLine::END) % ::ControlLine::OBJECT_COUNT,
}; };
namespace
{
/** /**
* Returns true if the object matches the offset. * Returns true if the object matches the offset.
*/ */

View File

@ -12,6 +12,9 @@
using namespace rtengine; using namespace rtengine;
using namespace rtengine::procparams; using namespace rtengine::procparams;
namespace
{
enum GeometryIndex { enum GeometryIndex {
H_LINE, H_LINE,
V_LINE, V_LINE,
@ -20,6 +23,8 @@ enum GeometryIndex {
CENTER_CIRCLE, CENTER_CIRCLE,
}; };
}
Gradient::Gradient () : FoldableToolPanel(this, "gradient", M("TP_GRADIENT_LABEL"), false, true), EditSubscriber(ET_OBJECTS), lastObject(-1), draggedPointOldAngle(-1000.) Gradient::Gradient () : FoldableToolPanel(this, "gradient", M("TP_GRADIENT_LABEL"), false, true), EditSubscriber(ET_OBJECTS), lastObject(-1), draggedPointOldAngle(-1000.)
{ {

View File

@ -29,6 +29,9 @@
using namespace rtengine; using namespace rtengine;
using namespace rtengine::procparams; using namespace rtengine::procparams;
namespace
{
enum GeometryIndex { enum GeometryIndex {
MO_TARGET_DISK, MO_TARGET_DISK,
MO_SOURCE_DISC, MO_SOURCE_DISC,
@ -47,6 +50,8 @@ enum GeometryIndex {
VISIBLE_OBJECT_COUNT VISIBLE_OBJECT_COUNT
}; };
}
Spot::Spot() : Spot::Spot() :
FoldableToolPanel(this, "spot", M ("TP_SPOT_LABEL"), true, true), FoldableToolPanel(this, "spot", M ("TP_SPOT_LABEL"), true, true),
EditSubscriber(ET_OBJECTS), EditSubscriber(ET_OBJECTS),