adjusting warning diagnostics for ext headers removing pragma wrappers

planetchili · planetchili · commit 29fbda38b7bf · 2025-03-11T14:24:08.000+09:00
diff --git a/IntelPresentMon/AppCef/source/winmain.cpp b/IntelPresentMon/AppCef/source/winmain.cpp
@@ -13,11 +13,7 @@
 #include <PresentMonAPIWrapper/DiagnosticHandler.h>
 #include <PresentMonAPI2Loader/Loader.h>
 #include <dwmapi.h>
-
-#pragma warning(push)
-#pragma warning(disable : 4297)
 #include <boost/process.hpp>
-#pragma warning(pop)
 
 #pragma comment(lib, "Dwmapi.lib")
 
diff --git a/IntelPresentMon/CommonUtilities/CommonUtilities.vcxproj b/IntelPresentMon/CommonUtilities/CommonUtilities.vcxproj
@@ -94,7 +94,6 @@
     <ClInclude Include="win\Overlapped.h" />
     <ClInclude Include="win\Utilities.h" />
     <ClInclude Include="win\WinAPI.h" />
-    <ClInclude Include="pipe\WrapAsio.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="cli\CliFramework.cpp" />
diff --git a/IntelPresentMon/CommonUtilities/CommonUtilities.vcxproj.filters b/IntelPresentMon/CommonUtilities/CommonUtilities.vcxproj.filters
@@ -216,9 +216,6 @@
     <ClInclude Include="pipe\SecurityMode.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="pipe\WrapAsio.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="reg\Registry.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/IntelPresentMon/CommonUtilities/cli/CliFramework.h b/IntelPresentMon/CommonUtilities/cli/CliFramework.h
@@ -1,10 +1,6 @@
 #pragma once
 
-#pragma warning(push)
-#pragma warning(disable : 26827)
-#define CLI11_COMPILE 0
 #include <CLI/CLI.hpp>
-#pragma warning(pop)
 
 #include <optional>
 #include <cassert>
diff --git a/IntelPresentMon/CommonUtilities/pipe/CoroMutex.h b/IntelPresentMon/CommonUtilities/pipe/CoroMutex.h
@@ -1,6 +1,8 @@
 #pragma once
 #include "../win/WinAPI.h"
-#include "WrapAsio.h"
+#include <boost/asio.hpp>
+#include <boost/asio/windows/object_handle.hpp>
+#include <boost/asio/experimental/awaitable_operators.hpp>
 #include <deque>
 
 namespace pmon::util::pipe
diff --git a/IntelPresentMon/CommonUtilities/pipe/Pipe.h b/IntelPresentMon/CommonUtilities/pipe/Pipe.h
@@ -1,6 +1,8 @@
 #pragma once
 #include "../win/WinAPI.h"
-#include "WrapAsio.h"
+#include <boost/asio.hpp>
+#include <boost/asio/windows/object_handle.hpp>
+#include <boost/asio/experimental/awaitable_operators.hpp>
 #include <cereal/archives/binary.hpp>
 #include <cereal/types/string.hpp>
 #include <cereal/types/vector.hpp>
diff --git a/IntelPresentMon/CommonUtilities/pipe/WrapAsio.h b/IntelPresentMon/CommonUtilities/pipe/WrapAsio.h
diff --git a/IntelPresentMon/PresentMonAPI2Tests/BoostProcess.h b/IntelPresentMon/PresentMonAPI2Tests/BoostProcess.h
diff --git a/IntelPresentMon/PresentMonAPI2Tests/EtlTests.cpp b/IntelPresentMon/PresentMonAPI2Tests/EtlTests.cpp
@@ -3,7 +3,7 @@
 #include <fstream>
 #include "CppUnitTest.h"
 #include "StatusComparison.h"
-#include "BoostProcess.h"
+#include <boost/process.hpp>
 #include "CsvHelper.h"
 #include "../PresentMonAPI2Loader/Loader.h"
 #include <string>
diff --git a/IntelPresentMon/PresentMonAPI2Tests/PresentMonAPI2Tests.vcxproj b/IntelPresentMon/PresentMonAPI2Tests/PresentMonAPI2Tests.vcxproj
@@ -114,7 +114,6 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="BoostProcess.h" />
     <ClInclude Include="CsvHelper.h" />
     <ClInclude Include="StatusComparison.h" />
     <ClInclude Include="Utilities.h" />
diff --git a/IntelPresentMon/PresentMonAPI2Tests/PresentMonAPI2Tests.vcxproj.filters b/IntelPresentMon/PresentMonAPI2Tests/PresentMonAPI2Tests.vcxproj.filters
@@ -32,9 +32,6 @@
     <ClInclude Include="Utilities.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="BoostProcess.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="StatusComparison.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/IntelPresentMon/PresentMonAPI2Tests/RealtimeMetricTests.cpp b/IntelPresentMon/PresentMonAPI2Tests/RealtimeMetricTests.cpp
@@ -3,7 +3,7 @@
 #include <fstream>
 #include "CppUnitTest.h"
 #include "StatusComparison.h"
-#include "BoostProcess.h"
+#include <boost/process.hpp>
 #include <string>
 #include <iostream>
 #include <windows.h>
diff --git a/IntelPresentMon/PresentMonAPI2Tests/WrapperIntrospectionTests.cpp b/IntelPresentMon/PresentMonAPI2Tests/WrapperIntrospectionTests.cpp
@@ -1,6 +1,6 @@
 #include "CppUnitTest.h"
 #include "StatusComparison.h"
-#include "BoostProcess.h"
+#include <boost/process.hpp>
 #include "../PresentMonAPI2/Internal.h"
 #include "../PresentMonAPIWrapper/PresentMonAPIWrapper.h"
 #include "../PresentMonAPI2Loader/Loader.h"
diff --git a/IntelPresentMon/UnitTests/BoostProcess.h b/IntelPresentMon/UnitTests/BoostProcess.h
diff --git a/IntelPresentMon/UnitTests/UnitTests.vcxproj b/IntelPresentMon/UnitTests/UnitTests.vcxproj
@@ -112,9 +112,6 @@
       <Project>{808f5ea9-ea09-4d72-87b4-5397d43cba54}</Project>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="BoostProcess.h" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/IntelPresentMon/UnitTests/UnitTests.vcxproj.filters b/IntelPresentMon/UnitTests/UnitTests.vcxproj.filters
@@ -5,7 +5,4 @@
     <ClCompile Include="ExtremeQueue.cpp" />
     <ClCompile Include="Timing.cpp" />
   </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="BoostProcess.h" />
-  </ItemGroup>
 </Project>
diff --git a/PresentData/PresentMonTraceSession.cpp b/PresentData/PresentMonTraceSession.cpp
@@ -292,9 +292,6 @@ void CALLBACK EventRecordCallback(EVENT_RECORD* pEventRecord)
     auto session = (PMTraceSession*) pEventRecord->UserContext;
     auto const& hdr = pEventRecord->EventHeader;
 
-    #pragma warning(push)
-    #pragma warning(disable: 4984) // c++17 extension
-
     if constexpr (!IS_REALTIME_SESSION) {
         if (session->mStartTimestamp.QuadPart == 0) {
             session->mStartTimestamp = hdr.TimeStamp;
@@ -374,8 +371,6 @@ void CALLBACK EventRecordCallback(EVENT_RECORD* pEventRecord)
             return;
         }
     }
-
-    #pragma warning(pop)
 }
 
 template<bool... Ts>

Original file line number	Diff line number	Diff line change
`@@ -292,9 +292,6 @@ void CALLBACK EventRecordCallback(EVENT_RECORD* pEventRecord)`
`292`	`292`	`auto session = (PMTraceSession*) pEventRecord->UserContext;`
`293`	`293`	`auto const& hdr = pEventRecord->EventHeader;`
`294`	`294`
`295`		`- #pragma warning(push)`
`296`		`- #pragma warning(disable: 4984) // c++17 extension`
`297`		`-`
`298`	`295`	`if constexpr (!IS_REALTIME_SESSION) {`
`299`	`296`	`if (session->mStartTimestamp.QuadPart == 0) {`
`300`	`297`	`session->mStartTimestamp = hdr.TimeStamp;`
`@@ -374,8 +371,6 @@ void CALLBACK EventRecordCallback(EVENT_RECORD* pEventRecord)`
`374`	`371`	`return;`
`375`	`372`	`}`
`376`	`373`	`}`
`377`		`-`
`378`		`- #pragma warning(pop)`
`379`	`374`	`}`
`380`	`375`
`381`	`376`	`template<bool... Ts>`