cruft

opentrack · Dec 26, 2018 · 51250d6 · 51250d6
1 parent 66685c8
commit 51250d6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/cmake/opentrack-platform.cmake b/cmake/opentrack-platform.cmake
@@ -108,13 +108,18 @@ if(MINGW)
 endif()
 
 if(MSVC)
-    add_definitions(-DNOMINMAX -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -D_NO_DEBUG_HEAP)
+    add_definitions(-DNOMINMAX)
+    add_definitions(-DWIN32_LEAN_AND_MEAN)
+    add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+    add_definitions(-D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1)
+    add_definitions(-D_SCL_SECURE_NO_WARNINGS)
+
     add_definitions(-D_ITERATOR_DEBUG_LEVEL=0)
     add_definitions(-D_HAS_EXCEPTIONS=0)
+
     add_definitions(-D_ENABLE_EXTENDED_ALIGNED_STORAGE)
     add_definitions(-D_SILENCE_CXX17_NEGATORS_DEPRECATION_WARNING)
     add_definitions(-D_SILENCE_CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING)
-    add_definitions(-DWIN32_LEAN_AND_MEAN)
 
     set(__stuff "-permissive- -diagnostics:caret")
     set(CMAKE_CXX_FLAGS "${__stuff} ${CMAKE_CXX_FLAGS}")

diff --git a/sdk-paths-sthalik@Clang-windows.cmake b/sdk-paths-sthalik@Clang-windows.cmake
@@ -101,7 +101,7 @@ set(_cxxflags
     -Wpragmas
     -Wreorder
     -Wreturn-std-move
-    -Wself-assign-field
+    -Wself-assign
     -Wself-move
     -Wshadow-field-in-constructor-modified
     -Wsometimes-uninitialized
@@ -123,6 +123,7 @@ set(_cxxflags
     -Wno-exit-time-destructors
     -Wno-deprecated
     -Wno-comma
+    -Wno-self-assign-overloaded
 )
 set(base-cxxflags "")
 foreach(k ${_cxxflags})

diff --git a/tracker-hydra/ftnoir_tracker_hydra.h b/tracker-hydra/ftnoir_tracker_hydra.h
@@ -5,7 +5,8 @@
 #include "options/options.hpp"
 using namespace options;
 
-struct settings : opts {
+struct settings : opts
+{
     settings() :
         opts("tracker-hydra")
     {}
@@ -15,7 +16,7 @@ class Hydra_Tracker : public ITracker
 {
 public:
     Hydra_Tracker();
-    ~Hydra_Tracker();
+    ~Hydra_Tracker() override;
     module_status start_tracker(QFrame *) override;
     void data(double *data) override;
 
@@ -29,8 +30,8 @@ class dialog_hydra: public ITrackerDialog
     Q_OBJECT
 public:
     dialog_hydra();
-    void register_tracker(ITracker *) {}
-    void unregister_tracker() {}
+    void register_tracker(ITracker *) override {}
+    void unregister_tracker() override {}
 private:
     settings s;
     Ui::UIHydraControls ui;
@@ -43,7 +44,7 @@ class hydraDll : public Metadata
 {
     Q_OBJECT
 
-    QString name() { return QString("Razer Hydra -- inertial device"); }
-    QIcon icon() { return QIcon(":/images/opentrack.png"); }
+    QString name() override { return QString("Razer Hydra -- inertial device"); }
+    QIcon icon() override { return QIcon(":/images/opentrack.png"); }
 };