View Issue Details
| ID | Project | Category | View Status | Date Submitted | Last Update |
|---|---|---|---|---|---|
| 0004529 | File formats | Merge request | public | 2021-01-04 21:19 | 2021-01-28 17:00 |
| Reporter | StefanBruens | Assigned To | wmayer | ||
| Priority | normal | Severity | minor | Reproducibility | always |
| Status | closed | Resolution | fixed | ||
| Summary | 0004529: Fix for ODR issue in Mod/Sketcher/GUI/TaskSketcherGeneral | ||||
| Description | Ui_TaskSketcherGeneral is declared in the wrong namespace. Same type of issue as fixed in https://github.com/FreeCAD/FreeCAD/commit/6bd39e8a90e65d81733e06d73bc627387808c772 | ||||
| Tags | No tags attached. | ||||
| FreeCAD Information | OS: openSUSE Tumbleweed Word size of OS: 64-bit Word size of FreeCAD: 64-bit Version: 0.18.Unknown Build type: Release Python version: 3.8.6 Qt version: 5.15.2 Coin version: 3.1.3 OCC version: 7.3.0 Locale: English/United States (en_US) | ||||
|
|
0001-Fix-ODR-violation-correct-Ui_TaskSketcherGeneral-nam.patch (1,030 bytes)
From 47be1f5e46acd7f438672b238f1e8354a494decf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Sat, 28 Nov 2020 13:35:59 +0100
Subject: [PATCH] Fix ODR violation, correct Ui_TaskSketcherGeneral namespace
The generated ui_TaskSketcherGeneral.h defines the class in the
SketcherGui namespace.
---
src/Mod/Sketcher/Gui/TaskSketcherGeneral.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.h b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.h
index eb3276ec7..c08489eeb 100644
--- a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.h
+++ b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.h
@@ -28,8 +28,6 @@
#include <Gui/Selection.h>
#include <boost/signals2.hpp>
-class Ui_TaskSketcherGeneral;
-
namespace App {
class Property;
}
@@ -40,6 +38,7 @@ class ViewProvider;
namespace SketcherGui {
+class Ui_TaskSketcherGeneral;
class ViewProviderSketch;
class SketcherGeneralWidget : public QWidget
--
2.29.2
|
|
|
Pull request: pːFreeCADː4327ː |
|
|
Merged. |
|
|
Fix committed to master branch. |
|
FreeCAD: master 569817d8 2021-01-28 16:16:05 Committer: wwmayer Details Diff |
Fix ODR violation, correct Ui_TaskSketcherGeneral namespace The generated ui_TaskSketcherGeneral.h defines the class in the SketcherGui namespace. Fixes 0004529 |
Affected Issues 0004529 |
|
| mod - src/Mod/Sketcher/Gui/TaskSketcherGeneral.h | Diff File | ||
| Date Modified | Username | Field | Change |
|---|---|---|---|
| 2021-01-04 21:19 | StefanBruens | New Issue | |
| 2021-01-04 21:19 | StefanBruens | File Added: 0001-Fix-ODR-violation-correct-Ui_TaskSketcherGeneral-nam.patch | |
| 2021-01-28 16:25 | StefanBruens | Note Added: 0015224 | |
| 2021-01-28 16:43 | wmayer | Assigned To | => wmayer |
| 2021-01-28 16:43 | wmayer | Status | new => closed |
| 2021-01-28 16:43 | wmayer | Resolution | open => fixed |
| 2021-01-28 16:43 | wmayer | Fixed in Version | => 0.19 |
| 2021-01-28 16:43 | wmayer | Note Added: 0015225 | |
| 2021-01-28 17:00 | StefanBruens | Changeset attached | => FreeCAD master 569817d8 |
| 2021-01-28 17:00 | guest | Note Added: 0015226 |
FreeCAD