Skip to content

Commit

Permalink
Sketcher: for Linux systems put definition of GeoElementId members ba…
Browse files Browse the repository at this point in the history
…ck to header file to fix possible linker errors
  • Loading branch information
wwmayer committed Feb 15, 2022
1 parent a5e561b commit 6e01252
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/Mod/Sketcher/App/GeoEnum.cpp
Expand Up @@ -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
6 changes: 6 additions & 0 deletions src/Mod/Sketcher/App/GeoEnum.h
Expand Up @@ -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
Expand Down

0 comments on commit 6e01252

Please sign in to comment.