Squashed 'externals/nitro/' changes from 3822f6ef3..d74a68191

d74a68191 Merge branch 'main' into cpp17 b12caf2fc latest from CODA-OSS (#556) 0cd432624 use sys::make_span (#555) f5223165c Merge commit '63bc647787ac53602074aeeedd3565522ea7b170' into cpp17 63bc64778 Squashed 'externals/coda-oss/' changes from d95aa8dd3b..113db4a49d 1ab864800 latest from coda-oss fc16938bc merge develop/sync_externals e4b454976 Merge branch 'main' into cpp17 05dae18a3 patch to build other projects git-subtree-dir: externals/nitro git-subtree-split: d74a6819149f37d8bbbbfc9f040197e3bcc94e88
ngageoint · Jun 13, 2023 · 08481bf · 08481bf
1 parent 64a32e4
commit 08481bf
Show file tree

Hide file tree

Showing 38 changed files with 278 additions and 184 deletions.
diff --git a/externals/coda-oss/UnitTest/UnitTest.vcxproj b/externals/coda-oss/UnitTest/UnitTest.vcxproj
@@ -71,6 +71,7 @@
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <ConformanceMode>true</ConformanceMode>
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -96,6 +97,7 @@
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <ConformanceMode>true</ConformanceMode>
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -321,6 +323,10 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\modules\c++\types\unittests\test_complex.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\modules\c++\types\unittests\test_page_row_col.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>

diff --git a/externals/coda-oss/UnitTest/UnitTest.vcxproj.filters b/externals/coda-oss/UnitTest/UnitTest.vcxproj.filters
@@ -222,6 +222,9 @@
     <ClCompile Include="..\modules\c++\mt\unittests\test_mt_byte_swap.cpp">
       <Filter>mt</Filter>
     </ClCompile>
+    <ClCompile Include="..\modules\c++\types\unittests\test_complex.cpp">
+      <Filter>types</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="pch.h" />

diff --git a/externals/coda-oss/UnitTest/pch.h b/externals/coda-oss/UnitTest/pch.h
@@ -53,6 +53,7 @@
 #include <types/PageRowCol.h>
 #include <types/RangeList.h>
 #include <types/Range.h>
+#include <types/complex.h>
 #include <sys/Conf.h>
 #include <sys/Path.h>
 #include <except/Exception.h>

diff --git a/externals/coda-oss/UnitTest/types.cpp b/externals/coda-oss/UnitTest/types.cpp
@@ -15,4 +15,8 @@ TEST_CLASS(test_range_list){ public:
 #include "types/unittests/test_range_list.cpp"
 };
 
+TEST_CLASS(test_complex){ public:
+#include "types/unittests/test_complex.cpp"
+};
+
 }
diff --git a/externals/coda-oss/modules/c++/coda-oss-lite.vcxproj b/externals/coda-oss/modules/c++/coda-oss-lite.vcxproj
@@ -19,10 +19,8 @@
     <ClInclude Include="coda_oss\include\coda_oss\bit.h" />
     <ClInclude Include="coda_oss\include\coda_oss\CPlusPlus.h" />
     <ClInclude Include="coda_oss\include\coda_oss\cstddef.h" />
-    <ClInclude Include="coda_oss\include\coda_oss\memory.h" />
     <ClInclude Include="coda_oss\include\coda_oss\namespace_.h" />
     <ClInclude Include="coda_oss\include\coda_oss\optional.h" />
-    <ClInclude Include="coda_oss\include\coda_oss\optional_.h" />
     <ClInclude Include="coda_oss\include\coda_oss\span.h" />
     <ClInclude Include="coda_oss\include\coda_oss\span_.h" />
     <ClInclude Include="coda_oss\include\coda_oss\string.h" />
@@ -257,6 +255,7 @@
     <ClInclude Include="tiff\include\tiff\KnownTags.h" />
     <ClInclude Include="tiff\include\tiff\TypeFactory.h" />
     <ClInclude Include="tiff\include\tiff\Utils.h" />
+    <ClInclude Include="types\include\types\complex.h" />
     <ClInclude Include="types\include\types\PageRowCol.h" />
     <ClInclude Include="types\include\types\Range.h" />
     <ClInclude Include="types\include\types\RangeList.h" />
@@ -472,6 +471,7 @@
       <ConformanceMode>true</ConformanceMode>
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
       <EnablePREfast>true</EnablePREfast>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>
@@ -498,6 +498,7 @@
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <ConformanceMode>true</ConformanceMode>
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>

diff --git a/externals/coda-oss/modules/c++/coda-oss-lite.vcxproj.filters b/externals/coda-oss/modules/c++/coda-oss-lite.vcxproj.filters
@@ -30,18 +30,12 @@
     <ClInclude Include="coda_oss\include\coda_oss\cstddef.h">
       <Filter>coda_oss</Filter>
     </ClInclude>
-    <ClInclude Include="coda_oss\include\coda_oss\memory.h">
-      <Filter>coda_oss</Filter>
-    </ClInclude>
     <ClInclude Include="coda_oss\include\coda_oss\namespace_.h">
       <Filter>coda_oss</Filter>
     </ClInclude>
     <ClInclude Include="coda_oss\include\coda_oss\optional.h">
       <Filter>coda_oss</Filter>
     </ClInclude>
-    <ClInclude Include="coda_oss\include\coda_oss\optional_.h">
-      <Filter>coda_oss</Filter>
-    </ClInclude>
     <ClInclude Include="coda_oss\include\coda_oss\span.h">
       <Filter>coda_oss</Filter>
     </ClInclude>
@@ -750,6 +744,9 @@
     <ClInclude Include="sys\include\sys\SysInt.h">
       <Filter>sys</Filter>
     </ClInclude>
+    <ClInclude Include="types\include\types\complex.h">
+      <Filter>types</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="pch.cpp" />

diff --git a/externals/coda-oss/modules/c++/coda_oss/include/coda_oss/cstddef.h b/externals/coda-oss/modules/c++/coda_oss/include/coda_oss/cstddef.h
@@ -18,23 +18,15 @@
  * License along with this program; If not, http://www.gnu.org/licenses/.
  *
  */
+#pragma once
 #ifndef CODA_OSS_coda_oss_cstddef_h_INCLUDED_
 #define CODA_OSS_coda_oss_cstddef_h_INCLUDED_
-#pragma once
-
-#include <stdint.h>
 
 #include <cstddef>
-#include <type_traits>
-
-// Need a fairly decent C++ compiler to use the real GSL.  This brings in more than 
-// we really need for span (e.g., gsl::narrow()), but it keeps things simple.
-#include "gsl/gsl.h"  // not gsl/byte; need #pragma here to turn off warnings
 
 namespace coda_oss
 {
 	using byte = std::byte;
 }
-static_assert(!std::is_same<coda_oss::byte, uint8_t>::value, "'coda_oss::byte' should be a unique type.");
 
 #endif  // CODA_OSS_coda_oss_cstddef_h_INCLUDED_
diff --git a/externals/coda-oss/modules/c++/coda_oss/include/coda_oss/memory.h b/externals/coda-oss/modules/c++/coda_oss/include/coda_oss/memory.h
diff --git a/externals/coda-oss/modules/c++/coda_oss/include/coda_oss/type_traits.h b/externals/coda-oss/modules/c++/coda_oss/include/coda_oss/type_traits.h
@@ -24,8 +24,6 @@
 
 #include <type_traits>
 
-#include "CPlusPlus.h"
-
 #include "coda_oss/namespace_.h"
 namespace coda_oss
 {

diff --git a/externals/coda-oss/modules/c++/mem/include/mem/AutoPtr.h b/externals/coda-oss/modules/c++/mem/include/mem/AutoPtr.h
@@ -27,7 +27,6 @@
 
 #include <std/memory>
 
-#include "coda_oss/memory.h"
 #include "mem/SharedPtr.h"
 
 namespace mem

diff --git a/externals/coda-oss/modules/c++/mem/include/mem/ScopedPtr.h b/externals/coda-oss/modules/c++/mem/include/mem/ScopedPtr.h
@@ -21,9 +21,11 @@
  *
  */
 
+#pragma once 
 #ifndef CODA_OSS_mem_ScopedPtr_h_INCLUDED_
 #define CODA_OSS_mem_ScopedPtr_h_INCLUDED_
-#pragma once
+
+#include <assert.h>
 
 #include <cstddef>
 #include <std/memory>
@@ -110,15 +112,13 @@ class ScopedPtr
         auto rhs_ptr = rhs.get();
         if (ptr == nullptr && rhs_ptr == nullptr)
         {
-            return true;
+            return true; // both NULL: equal
         }
-
         if (ptr == nullptr || rhs_ptr == nullptr)
         {
-            return false;
+            return false; // either NULL, but not both (above): not equal
         }
-
-        return *ptr == *rhs_ptr;
+        return *ptr == *rhs_ptr; // compare the (non-NULL) objects
     }
 
     bool operator!=(const ScopedPtr& rhs) const noexcept
@@ -138,12 +138,16 @@ class ScopedPtr
 
     T& operator*() const
     {
-        return *get();
+        auto ptr = get();
+        assert(ptr != nullptr);
+        return *ptr;
     }
 
     T* operator->() const noexcept
     {
-        return get();
+        auto ptr = get();
+        assert(ptr != nullptr);
+        return ptr;
     }
 
     void reset(T* ptr = nullptr)

diff --git a/externals/coda-oss/modules/c++/mem/include/mem/SharedPtrCpp11.h b/externals/coda-oss/modules/c++/mem/include/mem/SharedPtrCpp11.h
@@ -20,14 +20,13 @@
  *
  */
 
+#pragma once 
 #ifndef CODA_OSS_mem_SharedPtrCpp11_h_INCLUDED_
 #define CODA_OSS_mem_SharedPtrCpp11_h_INCLUDED_
-#pragma once
 
 #include <memory>
 #include <type_traits>
 
-#include "coda_oss/memory.h"
 #include "sys/CPlusPlus.h"
 
 namespace mem

diff --git a/externals/coda-oss/modules/c++/std/include/import/cpp14.h b/externals/coda-oss/modules/c++/std/include/import/cpp14.h
@@ -21,10 +21,9 @@
  *
  */
 
-
+#pragma once 
 #ifndef CODA_OSS_import_cpp14_h_INCLUDED_
 #define CODA_OSS_import_cpp14_h_INCLUDED_
-#pragma once
 
 // Common C++14 headers
 #include <limits>

diff --git a/externals/coda-oss/modules/c++/std/include/std/cstddef b/externals/coda-oss/modules/c++/std/include/std/cstddef
@@ -18,11 +18,10 @@
  * License along with this program; If not, http://www.gnu.org/licenses/.
  *
  */
+#pragma once
 #ifndef CODA_OSS_std_cstddef_INCLUDED_
 #define CODA_OSS_std_cstddef_INCLUDED_
-#pragma once
 
-#include "coda_oss/CPlusPlus.h"
-#include "coda_oss/cstddef.h"
+#include <cstddef>
 
 #endif  // CODA_OSS_std_cstddef_INCLUDED_
diff --git a/externals/coda-oss/modules/c++/std/include/std/memory b/externals/coda-oss/modules/c++/std/include/std/memory
@@ -18,28 +18,10 @@
  * License along with this program; If not, http://www.gnu.org/licenses/.
  *
  */
+#pragma once
 #ifndef CODA_OSS_std_memory_INCLUDED_
 #define CODA_OSS_std_memory_INCLUDED_
-#pragma once
 
 #include <memory>
-#include "coda_oss/memory.h"
-#include "coda_oss/CPlusPlus.h"
-
-// Make it (too?) easy for clients to get our various std:: implementations
-#ifndef CODA_OSS_NO_std_make_unique
-    #if CODA_OSS_cpp14
-        #define CODA_OSS_NO_std_make_unique 1  // part of C++14
-    #else
-        #define CODA_OSS_NO_std_make_unique 0  // use our own
-    #endif
-#endif
-
-#if !CODA_OSS_NO_std_make_unique
-namespace std // This is slightly uncouth: we're not supposed to augment "std".
-{
-    using coda_oss::make_unique;
-}
-#endif  // !CODA_OSS_NO_std_make_unique
 
 #endif  // CODA_OSS_std_memory_INCLUDED_
diff --git a/externals/coda-oss/modules/c++/std/include/std/optional b/externals/coda-oss/modules/c++/std/include/std/optional
@@ -18,11 +18,10 @@
  * License along with this program; If not, http://www.gnu.org/licenses/.
  *
  */
+#pragma once
 #ifndef CODA_OSS_std_optional_INCLUDED_
 #define CODA_OSS_std_optional_INCLUDED_
-#pragma once
 
-#include "coda_oss/CPlusPlus.h"
-#include "coda_oss/optional.h"
+#include <optional>
 
 #endif  // CODA_OSS_std_optional_INCLUDED_