From e7ea728ec6c80eb3a7564f9c721563c49d744c51 Mon Sep 17 00:00:00 2001
From: "J. Daniel Smith" <dan.smith@maxar.com>
Date: Mon, 21 Aug 2023 11:43:25 -0400
Subject: [PATCH] reduce differences between cpp17 and main branches (#576)

---
 UnitTest/pch.h                              |  1 +
 modules/c++/nitf/include/nitf/SubWindow.hpp | 11 -----------
 modules/c++/nitf/include/nitf/System.hpp    |  4 ----
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/UnitTest/pch.h b/UnitTest/pch.h
index c624646df..37e984a9e 100644
--- a/UnitTest/pch.h
+++ b/UnitTest/pch.h
@@ -13,6 +13,7 @@
 #define NOMINMAX
 #pragma warning(push)
 #pragma warning(disable: 5039) //	'...': pointer or reference to potentially throwing function passed to 'extern "C"' function under -EHc. Undefined behavior may occur if this function throws an exception.
+#pragma warning(disable: 5105) // macro expansion producing '...' has undefined behavior
 #include <windows.h>
 #pragma warning(pop)
 #pragma comment(lib, "ws2_32")
diff --git a/modules/c++/nitf/include/nitf/SubWindow.hpp b/modules/c++/nitf/include/nitf/SubWindow.hpp
index 241cf7513..485d952aa 100644
--- a/modules/c++/nitf/include/nitf/SubWindow.hpp
+++ b/modules/c++/nitf/include/nitf/SubWindow.hpp
@@ -119,18 +119,7 @@ DECLARE_CLASS(SubWindow)
     std::optional<std::vector<uint32_t>> bandList;
 };
 
-#if CODA_OSS_cpp14
-// This template<template> syntax allows an arbitary TContainer<uint32_t> to be passed
-// rather than requiring that it be std::vector<uint32_t>.  Note that the container
-// must support data() and size().
-template<template<typename, typename...> typename TContainer, typename ...TAlloc>
-inline void setBands(SubWindow& subWindow,
-    TContainer<uint32_t, TAlloc...>& bandList) // std::vector<T> really has another template parameter
-
-#else
-// While the above is legitimate C++11 syntax, older compilers don't like it
 inline void setBands(SubWindow& subWindow, std::vector<uint32_t>& bandList)
-#endif // CODA_OSS_cpp14
 {
     subWindow.setBandList(bandList.data());
     subWindow.setNumBands(gsl::narrow<uint32_t>(bandList.size()));
diff --git a/modules/c++/nitf/include/nitf/System.hpp b/modules/c++/nitf/include/nitf/System.hpp
index 4aba08ab7..94bd86a04 100644
--- a/modules/c++/nitf/include/nitf/System.hpp
+++ b/modules/c++/nitf/include/nitf/System.hpp
@@ -54,11 +54,7 @@ typedef nitf_Off Off;
 typedef nitf_AccessFlags AccessFlags;
 typedef nitf_CreationFlags CreationFlags;
 
-#if CODA_OSS_cpp17
-using byte = std::byte;
-#else
 using byte = sys::byte;
-#endif
 
 using Version = nitf_Version;
 using FieldType = nitf_FieldType;