no more gsl::make_span

Dan Smith · Dan Smith · commit c30ae278f01c · 2022-01-17T12:30:21.000-05:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.14)
 project(six-library)
 
 set(CMAKE_CXX_STANDARD 11)
+set(CXX_STANDARD_REQUIRED true)
 
 if (${CMAKE_PROJECT_NAME} STREQUAL six-library)
     # we are the top-level project and are responsible for configuration
diff --git a/six/modules/c++/cphd/tests/test_round_trip.cpp b/six/modules/c++/cphd/tests/test_round_trip.cpp
@@ -24,6 +24,7 @@
 #include <fstream>
 #include <memory>
 #include <thread>
+#include <std/span>
 
 #include <cphd/CPHDReader.h>
 #include <cphd/CPHDWriter.h>
@@ -39,7 +40,6 @@
 #include <cphd/Metadata.h>
 #include <cphd/PVPBlock.h>
 
-
 /*!
  * Reads in CPHD file from InputFile
  * Writes out CPHD file to OutputFile
@@ -85,7 +85,7 @@ void testRoundTrip(const std::string& inPathname, const std::string& outPathname
         for (size_t channel = 0, idx = 0; channel < metadata.data.getNumChannels(); ++channel)
         {
             const size_t bufSize = metadata.data.getCompressedSignalSize(channel);
-            wideband.read(channel, gsl::make_span(&data[idx], bufSize));
+            wideband.read(channel, std::span<std::byte>(&data[idx], bufSize));
             idx += bufSize;
         }
         writer.write(
@@ -101,7 +101,7 @@ void testRoundTrip(const std::string& inPathname, const std::string& outPathname
             const size_t bufSize = metadata.data.getSignalSize(channel);
             wideband.read(channel, 0, cphd::Wideband::ALL,
                  0, cphd::Wideband::ALL, numThreads,
-                gsl::make_span(&data[idx], bufSize));
+                std::span<std::byte>(&data[idx], bufSize));
             idx += bufSize;
         }
 
diff --git a/six/modules/c++/cphd/unittests/test_read_wideband.cpp b/six/modules/c++/cphd/unittests/test_read_wideband.cpp
@@ -43,25 +43,28 @@ namespace testing
         }
     }
 }
-#else
+#endif // GTEST_API_
 
-inline bool operator==(std::byte lhs, char rhs)
-{
-    return static_cast<char>(lhs) == rhs;
-}
-inline bool operator!=(std::byte lhs, char rhs)
+namespace
 {
-    return !(lhs == rhs);
+    inline bool operator==(std::byte lhs, char rhs)
+    {
+        return static_cast<char>(lhs) == rhs;
+    }
+    inline bool operator!=(std::byte lhs, char rhs)
+    {
+        return !(lhs == rhs);
+    }
 }
-
-inline std::ostream& operator<<(std::ostream& os, std::byte v)
+namespace str
 {
-    os << static_cast<unsigned char>(v);
-    return os;
+    inline std::ostream& operator<<(std::ostream& os, std::byte v)
+    {
+        os << static_cast<unsigned char>(v);
+        return os;
+    }
 }
 
-#endif // GTEST_API_
-
 namespace
 {
 TEST_CASE(testReadCompressedChannel)
diff --git a/six/modules/c++/cphd/unittests/test_signal_block_round.cpp b/six/modules/c++/cphd/unittests/test_signal_block_round.cpp
@@ -55,8 +55,8 @@ std::vector<std::complex<T> > generateData(size_t length)
     srand(0);
     for (size_t ii = 0; ii < data.size(); ++ii)
     {
-        float real = static_cast<T>(rand() / 100);
-        float imag = static_cast<T>(rand() / 100);
+        auto real = static_cast<T>(rand() / 100);
+        auto imag = static_cast<T>(rand() / 100);
         data[ii] = std::complex<T>(real, imag);
     }
     return data;
diff --git a/six/modules/c++/six.sicd/unittests/test_AMP8I_PHS8I.cpp b/six/modules/c++/six.sicd/unittests/test_AMP8I_PHS8I.cpp
@@ -494,11 +494,14 @@ TEST_CASE(test_create_sicd_from_mem_8i)
     test_create_sicd_from_mem("test_create_sicd_from_mem_8i_noamp.sicd", six::PixelType::AMP8I_PHS8I, false /*makeAmplitudeTable*/);
 }
 
-inline std::ostream& operator<<(std::ostream& os, const six::sicd::ImageData::AMP8I_PHS8I_t& p)
+namespace str
+{
+inline std::ostream & operator<<(std::ostream & os, const six::sicd::ImageData::AMP8I_PHS8I_t & p)
 {
     os << p.first << p.second;
     return os;
 }
+}
 template<typename TNearestNeighbor>
 static void test_near_point(const std::complex<float>& p, const six::sicd::ImageData::AMP8I_PHS8I_t& expected,
     TNearestNeighbor nearest_neighbor_f)

Original file line number	Diff line number	Diff line change
`@@ -43,25 +43,28 @@ namespace testing`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`	`}`
`46`		`-#else`
	`46`	`+#endif // GTEST_API_`
`47`	`47`
`48`		`-inline bool operator==(std::byte lhs, char rhs)`
`49`		`-{`
`50`		`- return static_cast<char>(lhs) == rhs;`
`51`		`-}`
`52`		`-inline bool operator!=(std::byte lhs, char rhs)`
	`48`	`+namespace`
`53`	`49`	`{`
`54`		`- return !(lhs == rhs);`
	`50`	`+ inline bool operator==(std::byte lhs, char rhs)`
	`51`	`+ {`
	`52`	`+ return static_cast<char>(lhs) == rhs;`
	`53`	`+ }`
	`54`	`+ inline bool operator!=(std::byte lhs, char rhs)`
	`55`	`+ {`
	`56`	`+ return !(lhs == rhs);`
	`57`	`+ }`
`55`	`58`	`}`
`56`		`-`
`57`		`-inline std::ostream& operator<<(std::ostream& os, std::byte v)`
	`59`	`+namespace str`
`58`	`60`	`{`
`59`		`- os << static_cast<unsigned char>(v);`
`60`		`- return os;`
	`61`	`+ inline std::ostream& operator<<(std::ostream& os, std::byte v)`
	`62`	`+ {`
	`63`	`+ os << static_cast<unsigned char>(v);`
	`64`	`+ return os;`
	`65`	`+ }`
`61`	`66`	`}`
`62`	`67`
`63`		`-#endif // GTEST_API_`
`64`		`-`
`65`	`68`	`namespace`
`66`	`69`	`{`
`67`	`70`	`TEST_CASE(testReadCompressedChannel)`
Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,8 @@ std::vector<std::complex<T> > generateData(size_t length)`
`55`	`55`	`srand(0);`
`56`	`56`	`for (size_t ii = 0; ii < data.size(); ++ii)`
`57`	`57`	`{`
`58`		`- float real = static_cast<T>(rand() / 100);`
`59`		`- float imag = static_cast<T>(rand() / 100);`
	`58`	`+ auto real = static_cast<T>(rand() / 100);`
	`59`	`+ auto imag = static_cast<T>(rand() / 100);`
`60`	`60`	`data[ii] = std::complex<T>(real, imag);`
`61`	`61`	`}`
`62`	`62`	`return data;`
Original file line number	Diff line number	Diff line change
`@@ -494,11 +494,14 @@ TEST_CASE(test_create_sicd_from_mem_8i)`
`494`	`494`	`test_create_sicd_from_mem("test_create_sicd_from_mem_8i_noamp.sicd", six::PixelType::AMP8I_PHS8I, false /makeAmplitudeTable/);`
`495`	`495`	`}`
`496`	`496`
`497`		`-inline std::ostream& operator<<(std::ostream& os, const six::sicd::ImageData::AMP8I_PHS8I_t& p)`
	`497`	`+namespace str`
	`498`	`+{`
	`499`	`+inline std::ostream & operator<<(std::ostream & os, const six::sicd::ImageData::AMP8I_PHS8I_t & p)`
`498`	`500`	`{`
`499`	`501`	`os << p.first << p.second;`
`500`	`502`	`return os;`
`501`	`503`	`}`
	`504`	`+}`
`502`	`505`	`template<typename TNearestNeighbor>`
`503`	`506`	`static void test_near_point(const std::complex<float>& p, const six::sicd::ImageData::AMP8I_PHS8I_t& expected,`
`504`	`507`	`TNearestNeighbor nearest_neighbor_f)`