use 'modern' C pre-processor

mdaus · Jan 12, 2023 · fc3008b · fc3008b
1 parent b44709a
commit fc3008b
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 15 deletions.
diff --git a/UnitTest/UnitTest.vcxproj b/UnitTest/UnitTest.vcxproj
@@ -23,16 +23,16 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v143</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -64,10 +64,13 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <TreatWarningAsError>true</TreatWarningAsError>
       <ControlFlowGuard>Guard</ControlFlowGuard>
-      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
-      <ConformanceMode>true</ConformanceMode>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <TranslateIncludes>true</TranslateIncludes>
+      <UseStandardPreprocessor>true</UseStandardPreprocessor>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -88,6 +91,11 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <ControlFlowGuard>Guard</ControlFlowGuard>
       <TranslateIncludes>true</TranslateIncludes>
+      <UseStandardPreprocessor>true</UseStandardPreprocessor>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

diff --git a/UnitTest/pch.h b/UnitTest/pch.h
@@ -10,9 +10,12 @@
 // add headers that you want to pre-compile here
 
 #define WIN32_LEAN_AND_MEAN  // Exclude rarely-used stuff from Windows headers
+#pragma warning(push)
+#pragma warning(disable: 5105) // macro expansion producing '...' has undefined behavior
 #include <WinSock.h>
 #include <windows.h>
 #include <comdef.h>
+#pragma warning(pop)
 #undef min
 #undef max
 
@@ -108,6 +111,7 @@
 #include <logging/ExceptionLogger.h>
 #include <import/logging.h>
 #include <import/re.h>
+#include "io/StringStream.h"
 
 #include "TestCase.h"
 

diff --git a/modules/c++/CMakeLists.txt b/modules/c++/CMakeLists.txt
@@ -4,8 +4,11 @@ set(CXX_STANDARD_REQUIRED true)
 
 # turn on warnings as errors
 if (MSVC)
-    add_compile_options(/WX)
-    add_compile_options(/W4)
+    add_compile_options(/WX /W4)
+
+    # use standard (not legacy) C pre-processor
+    add_compile_options(/Zc:preprocessor)
+    add_compile_options(/wd5105) # macro expansion producing '...' has undefined behavior
 elseif (UNIX)
     add_compile_options(-Werror)
 endif()

diff --git a/modules/c++/coda-oss-lite.vcxproj b/modules/c++/coda-oss-lite.vcxproj
@@ -446,16 +446,19 @@
       <WarningLevel>EnableAllWarnings</WarningLevel>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions);CODA_OSS_EXPORTS;CODA_OSS_DLL;MT_DEFAULT_PINNING=0;RE_ENABLE_STD_REGEX=1</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
       <AdditionalIncludeDirectories>cli\include\;coda_oss\include;config\include\;except\include\;gsl\include\;io\include\;logging\include\;math\include\;math.linear\include\;math.poly\include\;mem\include\;mt\include\;plugin\include\;polygon\include\;re\include\;sio.lite\include\;std\include\;str\include\;sys\include\;tiff\include;types\include\;units\include\</AdditionalIncludeDirectories>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <ControlFlowGuard>Guard</ControlFlowGuard>
-      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <TranslateIncludes>true</TranslateIncludes>
+      <UseStandardPreprocessor>true</UseStandardPreprocessor>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>
@@ -470,15 +473,18 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions);CODA_OSS_EXPORTS;CODA_OSS_DLL;MT_DEFAULT_PINNING=0;RE_ENABLE_STD_REGEX=1</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
       <AdditionalIncludeDirectories>cli\include\;coda_oss\include;config\include\;except\include\;gsl\include\;io\include\;logging\include\;math\include\;math.linear\include\;math.poly\include\;mem\include\;mt\include\;plugin\include\;polygon\include\;re\include\;sio.lite\include\;std\include\;str\include\;sys\include\;tiff\include;types\include\;units\include\</AdditionalIncludeDirectories>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <ControlFlowGuard>Guard</ControlFlowGuard>
-      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
       <TranslateIncludes>true</TranslateIncludes>
+      <UseStandardPreprocessor>true</UseStandardPreprocessor>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>

diff --git a/modules/c++/framework.h b/modules/c++/framework.h
@@ -8,8 +8,11 @@
 
 #define WIN32_LEAN_AND_MEAN             // Exclude rarely-used stuff from Windows headers
 #define NOMINMAX // no min()/max() macros
+#pragma warning(push)
+#pragma warning(disable: 5105) // macro expansion producing '...' has undefined behavior
 #include <windows.h>
 #include <Winsock2.h>
 #include <comdef.h>
+#pragma warning(pop)
 #pragma comment(lib, "Ws2_32")
 #pragma warning(pop)
diff --git a/modules/c++/io/include/io/FileInputStreamOS.h b/modules/c++/io/include/io/FileInputStreamOS.h
@@ -23,6 +23,8 @@
 #ifndef __IO_FILE_INPUT_STREAM_OS_H__
 #define __IO_FILE_INPUT_STREAM_OS_H__
 
+#include "config/Exports.h"
+
 #if !defined(USE_IO_STREAMS)
 
 #include "except/Exception.h"
@@ -51,7 +53,7 @@ namespace io
  *  method is based on the pos in the file, and the streamTo() and read()
  *  are file operations
  */
-struct FileInputStreamOS : public SeekableInputStream
+struct CODA_OSS_API FileInputStreamOS : public SeekableInputStream
 {
 protected:
     sys::File mFile;

diff --git a/modules/c++/pch.h b/modules/c++/pch.h
@@ -10,9 +10,12 @@
 #pragma warning(disable: 4619) // #pragma warning: there is no warning number '...'
 
 #pragma warning(disable: 4820) // '...': '...' bytes padding added after data member '...'
-#pragma warning(disable: 4710) // '...': function not inlined
-#pragma warning(disable: 5045) // Compiler will insert Spectre mitigation for memory load if / Qspectre switch specified
 #pragma warning(disable: 4668) // '...' is not defined as a preprocessor macro, replacing with '...' for '...'
+#pragma warning(disable: 5045) // Compiler will insert Spectre mitigation for memory load if / Qspectre switch specified
+#pragma warning(disable: 4514) //	'...': unreferenced inline function has been removed
+
+#pragma warning(push)
+#pragma warning(disable: 4710) // '...': function not inlined
 #pragma warning(disable: 5027) // '...': move assignment operator was implicitly defined as deleted
 #pragma warning(disable: 5026) // '...': move constructor was implicitly defined as deleted
 #pragma warning(disable: 4626) // '...': assignment operator was implicitly defined as deleted
@@ -63,6 +66,8 @@
 #include <std/optional>
 #include <std/type_traits>
 
-#pragma warning(disable: 4514) //	'...': unreferenced inline function has been removed
+#pragma warning(pop)
+
+#pragma warning(disable: 4251) // '...': class '...' needs to have dll-interface to be used by clients of class '...'
 
 #endif //CODA_OSS_pch_h_INCLUDED_
diff --git a/modules/c++/sys/include/sys/File.h b/modules/c++/sys/include/sys/File.h
@@ -27,6 +27,7 @@
 #include "sys/SystemException.h"
 #include "sys/Path.h"
 #include "sys/filesystem.h"
+#include "config/Exports.h"
 
 #if defined(WIN32) || defined(_WIN32)
 #    define _SYS_SEEK_CUR FILE_CURRENT
@@ -68,7 +69,7 @@ typedef int _SYS_HANDLE_TYPE;
 
 namespace sys
 {
-struct File
+struct CODA_OSS_API File
 {
     enum
     {

diff --git a/modules/drivers/hdf5/CMakeLists.txt b/modules/drivers/hdf5/CMakeLists.txt
@@ -1,6 +1,12 @@
 set(MODULE_NAME hdf5)
 
 if(CODA_ENABLE_HDF5)
+    # set up warnings
+    if (MSVC)
+        # DO NOT use standard (not legacy) C pre-processor
+        add_compile_options(/Zc:preprocessor-)
+    endif()
+
     coda_add_module(${MODULE_NAME} VERSION 1.13.2)
 else()
     message("${MODULE_NAME} will not be built since HDF5 is not enabled")