Do not disable C4668 globally

Author: ala-ableton

cmake_include/ConfigureCompileFlags.cmake

@@ -100,7 +100,6 @@ elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC)
     "/wd4626" # 'Derived class' : assignment operator was implicitly defined as deleted because a base class assignment operator is inaccessible or deleted
     "/wd4628" # digraphs not supported with -Ze. Character sequence 'digraph' not interpreted as alternate token for 'char'
     "/wd4640" # 'Instance': construction of local static object is not thread-safe
-    "/wd4668" # 'Symbol' is not defined as a preprocessor macro, replacing with '0' for 'directives'
     "/wd4710" # 'Function': function not inlined
     "/wd4711" # Function 'function' selected for inline expansion
     "/wd4738" # Storing 32-bit float result in memory, possible loss of performance

examples/CMakeLists.txt

@@ -143,6 +143,7 @@ if(WIN32)
   # When building LinkHut, additional warnings are generated from third-party frameworks
   set(extra_ignored_warnings_LIST
     "/wd4127" # conditional expression is constant
+    "/wd4668" # 'symbol' is not defined as a preprocessor macro, replacing with '0' for 'directives'
     "/wd4702" # unreachable code
   )
   if(LINK_BUILD_ASIO)

examples/linkaudio/AudioPlatform.hpp

@@ -19,26 +19,26 @@
 
 #pragma once
 
-#if LINKHUT_AUDIO_PLATFORM_ASIO
+#if defined(LINKHUT_AUDIO_PLATFORM_ASIO)
 #include "AudioPlatform_Asio.hpp"
 #endif
 
-#if LINKHUT_AUDIO_PLATFORM_COREAUDIO
+#if defined(LINKHUT_AUDIO_PLATFORM_COREAUDIO)
 #include "AudioPlatform_CoreAudio.hpp"
 #endif
 
-#if LINKHUT_AUDIO_PLATFORM_DUMMY
+#if defined(LINKHUT_AUDIO_PLATFORM_DUMMY)
 #include "AudioPlatform_Dummy.hpp"
 #endif
 
-#if LINKHUT_AUDIO_PLATFORM_JACK
+#if defined(LINKHUT_AUDIO_PLATFORM_JACK)
 #include "AudioPlatform_Jack.hpp"
 #endif
 
-#if LINKHUT_AUDIO_PLATFORM_PORTAUDIO
+#if defined(LINKHUT_AUDIO_PLATFORM_PORTAUDIO)
 #include "AudioPlatform_Portaudio.hpp"
 #endif
 
-#if LINKHUT_AUDIO_PLATFORM_WASAPI
+#if defined(LINKHUT_AUDIO_PLATFORM_WASAPI)
 #include "AudioPlatform_Wasapi.hpp"
 #endif

examples/linkhut/main.cpp

@@ -24,7 +24,7 @@
 #include <chrono>
 #include <iostream>
 #include <thread>
-#if LINK_PLATFORM_UNIX
+#if defined(LINK_PLATFORM_UNIX)
 #include <termios.h>
 #endif
 
@@ -45,7 +45,7 @@ struct State
 
 void disableBufferedInput()
 {
-#if LINK_PLATFORM_UNIX
+#if defined(LINK_PLATFORM_UNIX)
   termios t;
   tcgetattr(STDIN_FILENO, &t);
   t.c_lflag &= ~ICANON;
@@ -55,7 +55,7 @@ void disableBufferedInput()
 
 void enableBufferedInput()
 {
-#if LINK_PLATFORM_UNIX
+#if defined(LINK_PLATFORM_UNIX)
   termios t;
   tcgetattr(STDIN_FILENO, &t);
   t.c_lflag |= ICANON;
@@ -108,7 +108,7 @@ void input(State& state)
 {
   char in;
 
-#if LINK_PLATFORM_WINDOWS
+#if defined(LINK_PLATFORM_WINDOWS)
   HANDLE stdinHandle = GetStdHandle(STD_INPUT_HANDLE);
   DWORD numCharsRead;
   INPUT_RECORD inputRecord;
@@ -117,7 +117,7 @@ void input(State& state)
     ReadConsoleInput(stdinHandle, &inputRecord, 1, &numCharsRead);
   } while ((inputRecord.EventType != KEY_EVENT) || inputRecord.Event.KeyEvent.bKeyDown);
   in = inputRecord.Event.KeyEvent.uChar.AsciiChar;
-#elif LINK_PLATFORM_UNIX
+#elif defined(LINK_PLATFORM_UNIX)
   in = std::cin.get();
 #endif
 

include/ableton/discovery/NetworkByteStreamSerializable.hpp

@@ -20,9 +20,9 @@
 #pragma once
 
 #include <ableton/platforms/asio/AsioWrapper.hpp>
-#if LINK_PLATFORM_MACOSX
+#if defined(LINK_PLATFORM_MACOSX)
 #include <ableton/platforms/darwin/Darwin.hpp>
-#elif LINK_PLATFORM_LINUX
+#elif defined(LINK_PLATFORM_LINUX)
 #include <ableton/platforms/linux/Linux.hpp>
 #endif
 
@@ -32,7 +32,7 @@
 #include <utility>
 #include <vector>
 
-#if LINK_PLATFORM_WINDOWS
+#if defined(LINK_PLATFORM_WINDOWS)
 #include <WS2tcpip.h>
 #include <WinSock2.h>
 #include <Windows.h>

include/ableton/platforms/Config.hpp

@@ -22,15 +22,15 @@
 #include <ableton/link/Controller.hpp>
 #include <ableton/util/Log.hpp>
 
-#if LINK_PLATFORM_WINDOWS
+#if defined(LINK_PLATFORM_WINDOWS)
 #include <ableton/platforms/asio/Context.hpp>
 #include <ableton/platforms/windows/Clock.hpp>
 #include <ableton/platforms/windows/ScanIpIfAddrs.hpp>
-#elif LINK_PLATFORM_MACOSX
+#elif defined(LINK_PLATFORM_MACOSX)
 #include <ableton/platforms/asio/Context.hpp>
 #include <ableton/platforms/darwin/Clock.hpp>
 #include <ableton/platforms/posix/ScanIpIfAddrs.hpp>
-#elif LINK_PLATFORM_LINUX
+#elif defined(LINK_PLATFORM_LINUX)
 #include <ableton/platforms/asio/Context.hpp>
 #include <ableton/platforms/linux/Clock.hpp>
 #include <ableton/platforms/posix/ScanIpIfAddrs.hpp>
@@ -43,17 +43,17 @@ namespace link
 namespace platform
 {
 
-#if LINK_PLATFORM_WINDOWS
+#if defined(LINK_PLATFORM_WINDOWS)
 using Clock = platforms::windows::Clock;
 using IoContext =
   platforms::asio::Context<platforms::windows::ScanIpIfAddrs, util::NullLog>;
 
-#elif LINK_PLATFORM_MACOSX
+#elif defined(LINK_PLATFORM_MACOSX)
 using Clock = platforms::darwin::Clock;
 using IoContext =
   platforms::asio::Context<platforms::posix::ScanIpIfAddrs, util::NullLog>;
 
-#elif LINK_PLATFORM_LINUX
+#elif defined(LINK_PLATFORM_LINUX)
 using Clock = platforms::linux::ClockMonotonic;
 using IoContext =
   platforms::asio::Context<platforms::posix::ScanIpIfAddrs, util::NullLog>;

include/ableton/platforms/asio/AsioWrapper.hpp

@@ -32,7 +32,7 @@
 #pragma push_macro("ASIO_NO_TYPEID")
 #define ASIO_NO_TYPEID 1
 
-#if LINK_PLATFORM_WINDOWS
+#if defined(LINK_PLATFORM_WINDOWS)
 #pragma push_macro("INCL_EXTRA_HTON_FUNCTIONS")
 #define INCL_EXTRA_HTON_FUNCTIONS 1
 #endif
@@ -53,14 +53,17 @@
 #pragma warning(disable : 4548)
 // C4619: #pragma warning : there is no warning number 'number'
 #pragma warning(disable : 4619)
+// C4668: 'symbol' is not defined as a preprocessor macro, replacing with '0' for
+// 'directives'
+#pragma warning(disable : 4668)
 // C4675: 'function' : resolved overload was found by argument-dependent lookup
 #pragma warning(disable : 4675)
 #endif
 
 #include <asio.hpp>
 #include <asio/system_timer.hpp>
 
-#if LINK_PLATFORM_WINDOWS
+#if defined(LINK_PLATFORM_WINDOWS)
 #pragma pop_macro("INCL_EXTRA_HTON_FUNCTIONS")
 #endif
 

include/ableton/test/CatchWrapper.hpp

@@ -31,6 +31,9 @@
 #pragma warning(push)
 // C4388: signed/unsigned mismatch
 #pragma warning(disable : 4388)
+// C4668: 'symbol' is not defined as a preprocessor macro, replacing with '0' for
+// 'directives'
+#pragma warning(disable : 4668)
 // C4702: unreachable code
 #pragma warning(disable : 4702)
 #endif

src/ableton/test/catch/CatchMain.cpp

@@ -22,7 +22,7 @@
 #include <ableton/test/CatchWrapper.hpp>
 #include <string>
 
-#if LINK_PLATFORM_WINDOWS && LINK_BUILD_VLD
+#if defined(LINK_PLATFORM_WINDOWS) && LINK_BUILD_VLD
 #include <vld.h>
 #endif