From 39261d2c6b6a6b90487e5d6d9d9d38458e8e70c4 Mon Sep 17 00:00:00 2001 From: wmayer Date: Tue, 15 Feb 2022 22:01:51 +0100 Subject: [PATCH] Sketcher: for Linux systems put definition of GeoElementId members back to header file to fix possible linker errors --- src/Mod/Sketcher/App/GeoEnum.cpp | 2 ++ src/Mod/Sketcher/App/GeoEnum.h | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/src/Mod/Sketcher/App/GeoEnum.cpp b/src/Mod/Sketcher/App/GeoEnum.cpp index 8ea033fcc7..429f96dd24 100644 --- a/src/Mod/Sketcher/App/GeoEnum.cpp +++ b/src/Mod/Sketcher/App/GeoEnum.cpp @@ -36,6 +36,8 @@ bool GeoElementId::operator!=(const GeoElementId& obj) const return this->GeoId != obj.GeoId || this->Pos != obj.Pos; } +#ifdef FC_OS_WIN32 constexpr const GeoElementId GeoElementId::RtPnt = GeoElementId(GeoEnum::RtPnt, PointPos::start); constexpr const GeoElementId GeoElementId::HAxis = GeoElementId(GeoEnum::HAxis, PointPos::none); constexpr const GeoElementId GeoElementId::VAxis = GeoElementId(GeoEnum::VAxis, PointPos::end); +#endif diff --git a/src/Mod/Sketcher/App/GeoEnum.h b/src/Mod/Sketcher/App/GeoEnum.h index af205e754d..ce1ca437bb 100644 --- a/src/Mod/Sketcher/App/GeoEnum.h +++ b/src/Mod/Sketcher/App/GeoEnum.h @@ -135,6 +135,12 @@ inline constexpr GeoElementId::GeoElementId(int geoId, PointPos pos): GeoId(geoI { } +#ifndef FC_OS_WIN32 +constexpr const GeoElementId GeoElementId::RtPnt = GeoElementId(GeoEnum::RtPnt, PointPos::start); +constexpr const GeoElementId GeoElementId::HAxis = GeoElementId(GeoEnum::HAxis, PointPos::none); +constexpr const GeoElementId GeoElementId::VAxis = GeoElementId(GeoEnum::VAxis, PointPos::end); +#endif + } // namespace Sketcher namespace std