Revision: 76186
http://sourceforge.net/p/brlcad/code/76186
Author: starseeker
Date: 2020-06-23 16:51:07 +0000 (Tue, 23 Jun 2020)
Log Message:
-----------
Test to see if we can avoid argument between corecrt_math_defines.h and qmath.h
on MSVC
Modified Paths:
--------------
brlcad/branches/qtged/src/qged/cadtreemodel.h
Modified: brlcad/branches/qtged/src/qged/cadtreemodel.h
===================================================================
--- brlcad/branches/qtged/src/qged/cadtreemodel.h 2020-06-23 16:44:16 UTC
(rev 76185)
+++ brlcad/branches/qtged/src/qged/cadtreemodel.h 2020-06-23 16:51:07 UTC
(rev 76186)
@@ -41,6 +41,11 @@
#if defined(__clang__)
# pragma clang diagnostic ignored "-Wfloat-equal"
#endif
+
+// Getting reports of conflict between MSVC math defines and qmath.h - try
idea from
+// https://bugreports.qt.io/browse/QTBUG-45935
+#undef _USE_MATH_DEFINES
+
#undef Success
#include <QtCore>
#undef Success
@@ -49,6 +54,7 @@
#include <QObject>
#undef Success
#include <QHash>
+
#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >=
6)) && !defined(__clang__)
# pragma GCC diagnostic pop
#endif
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
