From 2010acc142834ce217308bf30f9108b0dcd88b45 Mon Sep 17 00:00:00 2001 From: wandererfan Date: Thu, 30 Nov 2023 20:22:36 -0500 Subject: [PATCH] [TD]fix errors in MS CI - apparently the "or" alternative to "||" is not supported by MS but is part of the c++ specification: https://en.cppreference.com/w/cpp/language/operator_alternative - also missing TechDrawExport --- src/Mod/TechDraw/App/LineGenerator.cpp | 2 +- src/Mod/TechDraw/App/LineGenerator.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Mod/TechDraw/App/LineGenerator.cpp b/src/Mod/TechDraw/App/LineGenerator.cpp index 1088e83411..fe98786a00 100644 --- a/src/Mod/TechDraw/App/LineGenerator.cpp +++ b/src/Mod/TechDraw/App/LineGenerator.cpp @@ -127,7 +127,7 @@ QPen LineGenerator::getLinePen(size_t lineNumber, double nominalLineWidth) // there are some lines with numbers >1 that are also continuous, and // a dash pattern is not applicable. std::string naToken{"n/a"}; - if (elements.empty() or elements.front() == naToken) { + if (elements.empty() || elements.front() == naToken) { // plain boring solid line (or possibly an invalid line number) linePen.setStyle(Qt::SolidLine); return linePen; diff --git a/src/Mod/TechDraw/App/LineGenerator.h b/src/Mod/TechDraw/App/LineGenerator.h index 8237102793..d400b3fef7 100644 --- a/src/Mod/TechDraw/App/LineGenerator.h +++ b/src/Mod/TechDraw/App/LineGenerator.h @@ -44,7 +44,7 @@ namespace TechDraw { -class LineGenerator { +class TechDrawExport LineGenerator { public: LineGenerator(); ~LineGenerator() = default;