Get rid of GSL.

6 files changed, 12 insertions, 17 deletions

diff --git a/src/platform/Color.cpp b/src/platform/Color.cpp
index a35ef535..bbb78628 100644
--- a/src/platform/Color.cpp
+++ b/src/platform/Color.cpp
@@ -1,7 +1,5 @@
 #include "cru/platform/Color.h"
 
-#include <gsl/gsl>
-
 #include <cmath>
 #include <cstdint>
 #include <optional>
@@ -61,9 +59,8 @@ std::optional<Color> Color::Parse(StringView string,
     if (!g) return std::nullopt;
     auto b = get_num_for_two_digit(string.substr(5, 2));
     if (!b) return std::nullopt;
-    return Color(gsl::narrow_cast<std::uint8_t>(*r),
-                 gsl::narrow_cast<std::uint8_t>(*g),
-                 gsl::narrow_cast<std::uint8_t>(*b));
+    return Color(static_cast<std::uint8_t>(*r), static_cast<std::uint8_t>(*g),
+                 static_cast<std::uint8_t>(*b));
   } else if (string_size == 9) {
     if (string[0] != u'#') return std::nullopt;
     auto r = get_num_for_two_digit(string.substr(1, 2));
@@ -74,9 +71,8 @@ std::optional<Color> Color::Parse(StringView string,
     if (!b) return std::nullopt;
     auto a = get_num_for_two_digit(string.substr(7, 2));
     if (!a) return std::nullopt;
-    return Color(
-        gsl::narrow_cast<std::uint8_t>(*r), gsl::narrow_cast<std::uint8_t>(*g),
-        gsl::narrow_cast<std::uint8_t>(*b), gsl::narrow_cast<std::uint8_t>(*a));
+    return Color(static_cast<std::uint8_t>(*r), static_cast<std::uint8_t>(*g),
+                 static_cast<std::uint8_t>(*b), static_cast<std::uint8_t>(*a));
   } else {
     return std::nullopt;
   }
diff --git a/src/platform/graphics/direct2d/WindowRenderTarget.cpp b/src/platform/graphics/direct2d/WindowRenderTarget.cpp
index 0227f084..a8d988f4 100644
--- a/src/platform/graphics/direct2d/WindowRenderTarget.cpp
+++ b/src/platform/graphics/direct2d/WindowRenderTarget.cpp
@@ -4,8 +4,8 @@
 #include "cru/platform/graphics/direct2d/Factory.h"
 
 namespace cru::platform::graphics::direct2d {
-D2DWindowRenderTarget::D2DWindowRenderTarget(
-    gsl::not_null<DirectGraphicsFactory*> factory, HWND hwnd)
+D2DWindowRenderTarget::D2DWindowRenderTarget(DirectGraphicsFactory* factory,
+                                             HWND hwnd)
     : factory_(factory), hwnd_(hwnd) {
   const auto d3d11_device = factory->GetD3D11Device();
   const auto dxgi_factory = factory->GetDxgiFactory();
diff --git a/src/platform/gui/osx/Window.mm b/src/platform/gui/osx/Window.mm
index 8773678d..d6bee564 100644
--- a/src/platform/gui/osx/Window.mm
+++ b/src/platform/gui/osx/Window.mm
@@ -471,7 +471,7 @@ cru::platform::gui::KeyModifier GetKeyModifier(NSEvent* event) {
 - (void)drawRect:(NSRect)dirtyRect {
   auto cg_context = [[NSGraphicsContext currentContext] CGContext];
   auto layer = _p->GetDrawLayer();
-  Ensures(layer);
+  cru::Ensures(layer);
   CGContextDrawLayerAtPoint(cg_context, CGPointMake(0, 0), layer);
 }
 
diff --git a/src/platform/gui/win/InputMethod.cpp b/src/platform/gui/win/InputMethod.cpp
index d9c179ad..4c5b3b8c 100644
--- a/src/platform/gui/win/InputMethod.cpp
+++ b/src/platform/gui/win/InputMethod.cpp
@@ -144,8 +144,7 @@ CompositionText GetCompositionInfo(HIMC imm_context) {
 
 }  // namespace
 
-WinInputMethodContext::WinInputMethodContext(
-    gsl::not_null<WinNativeWindow*> window)
+WinInputMethodContext::WinInputMethodContext(WinNativeWindow* window)
     : native_window_(window) {
   event_guard_ += window->NativeMessageEvent()->AddHandler(
       std::bind(&WinInputMethodContext::OnWindowNativeMessage, this,
diff --git a/src/platform/gui/win/TimerManager.cpp b/src/platform/gui/win/TimerManager.cpp
index 1bc32b51..c6128b85 100644
--- a/src/platform/gui/win/TimerManager.cpp
+++ b/src/platform/gui/win/TimerManager.cpp
@@ -22,7 +22,7 @@ long long TimerManager::SetTimer(TimerType type, int period,
                        std::move(action)};
   if (type == TimerType::Immediate) {
     if (!::PostMessageW(god_window_->GetHandle(), kSetImmediateWindowMessageId,
-                        gsl::narrow<UINT_PTR>(id), 0)) {
+                        static_cast<UINT_PTR>(id), 0)) {
       throw Win32Error(
           ::GetLastError(),
           u"Failed to post window message to god window for set immediate.");
@@ -46,7 +46,7 @@ void TimerManager::CancelTimer(long long id) {
 }
 
 void TimerManager::CreateNativeTimer(TimerInfo* info) {
-  info->native_timer_id = gsl::narrow<UINT_PTR>(info->id);
+  info->native_timer_id = static_cast<UINT_PTR>(info->id);
   ::SetTimer(god_window_->GetHandle(), info->native_timer_id, info->period,
              nullptr);
 }
diff --git a/src/platform/gui/win/UiApplication.cpp b/src/platform/gui/win/UiApplication.cpp
index 90eb20ca..94d6b9c5 100644
--- a/src/platform/gui/win/UiApplication.cpp
+++ b/src/platform/gui/win/UiApplication.cpp
@@ -71,14 +71,14 @@ long long WinUiApplication::SetImmediate(std::function<void()> action) {
 long long WinUiApplication::SetTimeout(std::chrono::milliseconds milliseconds,
                                        std::function<void()> action) {
   return this->timer_manager_->SetTimer(TimerType::Timeout,
-                                        gsl::narrow<int>(milliseconds.count()),
+                                        static_cast<int>(milliseconds.count()),
                                         std::move(action));
 }
 
 long long WinUiApplication::SetInterval(std::chrono::milliseconds milliseconds,
                                         std::function<void()> action) {
   return this->timer_manager_->SetTimer(TimerType::Interval,
-                                        gsl::narrow<int>(milliseconds.count()),
+                                        static_cast<int>(milliseconds.count()),
                                         std::move(action));
 }