Merge branch 'main' of github.com:mdaus/coda-oss

mdaus · Jan 25, 2024 · 3add739 · 3add739
2 parents bfdc4b1 + 3ea6e19
commit 3add739
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 868 deletions.
diff --git a/UnitTest/UnitTest.vcxproj b/UnitTest/UnitTest.vcxproj
@@ -325,10 +325,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\modules\c++\sys\unittests\test_ximd.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_complex.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>

diff --git a/UnitTest/UnitTest.vcxproj.filters b/UnitTest/UnitTest.vcxproj.filters
@@ -258,9 +258,6 @@
     <ClCompile Include="..\modules\drivers\highfive\unittests\tests_high_five_base.cpp">
       <Filter>hdf5.lite</Filter>
     </ClCompile>
-    <ClCompile Include="..\modules\c++\sys\unittests\test_ximd.cpp">
-      <Filter>sys</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="pch.h" />

diff --git a/UnitTest/sys.cpp b/UnitTest/sys.cpp
@@ -23,7 +23,6 @@
 #include <sys/DateTime.h>
 #include <sys/Conf.h>
 #include <sys/Path.h>
-#include <sys/Ximd.h>
 
 namespace sys
 {
@@ -59,8 +58,4 @@ TEST_CLASS(test_path){ public:
 #include "sys/unittests/test_path.cpp"
 };
 
-TEST_CLASS(test_ximd){ public:
-#include "sys/unittests/test_ximd.cpp"
-};
-
 }
diff --git a/modules/c++/coda-oss.vcxproj b/modules/c++/coda-oss.vcxproj
@@ -285,7 +285,6 @@
     <ClInclude Include="sys\include\sys\ThreadWin32.h" />
     <ClInclude Include="sys\include\sys\TimeStamp.h" />
     <ClInclude Include="sys\include\sys\UTCDateTime.h" />
-    <ClInclude Include="sys\include\sys\Ximd.h" />
     <ClInclude Include="tiff\include\tiff\Common.h" />
     <ClInclude Include="tiff\include\tiff\FileReader.h" />
     <ClInclude Include="tiff\include\tiff\FileWriter.h" />

diff --git a/modules/c++/coda-oss.vcxproj.filters b/modules/c++/coda-oss.vcxproj.filters
@@ -957,9 +957,6 @@
     <ClInclude Include="coda_oss\include\coda_oss\mdspan_.h">
       <Filter>coda_oss</Filter>
     </ClInclude>
-    <ClInclude Include="sys\include\sys\Ximd.h">
-      <Filter>sys</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="pch.cpp" />
@@ -1445,9 +1442,6 @@
     <Filter Include="math.poly">
       <UniqueIdentifier>{15f9b62f-d17e-4d84-bc34-de6fd5fbcb33}</UniqueIdentifier>
     </Filter>
-    <Filter Include="polygon">
-      <UniqueIdentifier>{f2544ccb-0933-44c7-af39-cd986982af3d}</UniqueIdentifier>
-    </Filter>
     <Filter Include="include">
       <UniqueIdentifier>{9050a469-23a5-4da0-92b1-a07a8e52e9fc}</UniqueIdentifier>
     </Filter>
@@ -1502,6 +1496,9 @@
     <Filter Include="coda_oss">
       <UniqueIdentifier>{59f3d9a1-06d3-4779-aef2-cc55223c3017}</UniqueIdentifier>
     </Filter>
+    <Filter Include="polygon">
+      <UniqueIdentifier>{f2544ccb-0933-44c7-af39-cd986982af3d}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <None Include="gsl\include\gsl\algorithm">

diff --git a/modules/c++/sys/include/sys/Ximd.h b/modules/c++/sys/include/sys/Ximd.h