cpp/*: use std::nullopt instead of {}

XPhyro · Jan 17, 2024 · fb2e534 · fb2e534
1 parent 874d30c
commit fb2e534
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/cpp/include/pool.hpp b/src/cpp/include/pool.hpp
@@ -59,7 +59,7 @@ namespace xph {
         inline std::optional<T> pop()
         {
             if (!m_pool.size())
-                return {};
+                return std::nullopt;
 
             auto front = m_pool.front();
             m_pool.erase(m_pool.begin());

diff --git a/src/cpp/shared/obs/obs-event-sounds.cpp b/src/cpp/shared/obs/obs-event-sounds.cpp
@@ -38,7 +38,7 @@ std::optional<decltype(fork())> play_sound(const char* filename)
     errno = 0;
     if (auto pid = fork(); pid < 0 || errno) {
         perror("fork");
-        return {};
+        return std::nullopt;
     } else if (pid == 0) {
         execlp("play", "play", "-q", "--", ss.str().c_str(), NULL);
         std::exit(EXIT_SUCCESS);

diff --git a/src/cpp/util/core/blank-screens.cpp b/src/cpp/util/core/blank-screens.cpp
@@ -203,7 +203,7 @@ std::optional<int> force_single_instance(const Options& options)
     } else if (std::ofstream ofl(lock_file); ofl.is_open()) {
         pid_t pid = getpid();
         ofl << pid;
-        return {};
+        return std::nullopt;
     } else {
         return { EXIT_FAILURE };
     }