Merge pull request #5388 from leoetlino/optional

Add a std::optional and std::variant implementation

Source/CMakeLists.txt

@@ -1,7 +1,3 @@
-set(CMAKE_CXX_STANDARD 14)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
-
 if(CMAKE_SYSTEM_NAME MATCHES "Windows")
   add_definitions(-DNOMINMAX)
   add_definitions(-DUNICODE)
@@ -13,11 +9,29 @@ if(CMAKE_SYSTEM_NAME MATCHES "Windows")
   add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
 endif()
 
-# enable the latest C++ standard feature set,
-# and also disable MSVC specific extensions
-# to be even more standards compliant.
-check_and_add_flag(CPPLATEST /std:c++latest)
-check_and_add_flag(STANDARD_COMPLIANCE /permissive-)
+if(CMAKE_C_COMPILER_ID MATCHES "MSVC")
+  # enable the latest C++ standard feature set,
+  # and also disable MSVC specific extensions
+  # to be even more standards compliant.
+  check_and_add_flag(CPPLATEST /std:c++latest)
+  check_and_add_flag(STANDARD_COMPLIANCE /permissive-)
+else()
+  # Enable C++17, but fall back to C++14 if it isn't available.
+  # CMAKE_CXX_STANDARD cannot be used here because we require C++14 or newer, not any standard.
+  check_and_add_flag(CXX17 -std=c++17)
+  if(NOT FLAG_CXX_CXX17)
+    check_and_add_flag(CXX1Z -std=c++1z)
+    if (NOT FLAG_CXX_CXX1Z)
+      set(CMAKE_CXX_STANDARD 14)
+      set(CMAKE_CXX_STANDARD_REQUIRED ON)
+      set(CMAKE_CXX_EXTENSIONS OFF)
+    endif()
+  endif()
+
+  # These compat headers must not be in the include path when building with MSVC,
+  # because it currently does not support __has_include_next / #include_next.
+  include_directories(SYSTEM Core/Common/Compat)
+endif()
 
 # These aren't actually needed for C11/C++11
 # but some dependencies require them (LLVM, libav).

Source/Core/Common/Common.vcxproj

@@ -227,4 +227,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

Source/Core/Common/Common.vcxproj.filters

@@ -324,4 +324,4 @@
   <ItemGroup>
     <Natvis Include="BitField.natvis" />
   </ItemGroup>
-</Project>
+</Project>

Source/Core/Common/Compat/in_place.h

@@ -0,0 +1,43 @@
+// Copyright 2017 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+// MPark.Variant
+//
+// Copyright Michael Park, 2015-2017
+//
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
+
+#include <cstddef>
+
+namespace std
+{
+struct in_place_t
+{
+  explicit in_place_t() = default;
+};
+
+template <std::size_t I>
+struct in_place_index_t
+{
+  explicit in_place_index_t() = default;
+};
+
+template <typename T>
+struct in_place_type_t
+{
+  explicit in_place_type_t() = default;
+};
+
+constexpr in_place_t in_place{};
+
+template <std::size_t I>
+constexpr in_place_index_t<I> in_place_index{};
+
+template <typename T>
+constexpr in_place_type_t<T> in_place_type{};
+
+}  // namespace std

Source/Core/Core/IOS/ES/Formats.cpp

@@ -419,12 +419,13 @@ SharedContentMap::SharedContentMap(Common::FromWhichRoot root) : m_root(root)
 
 SharedContentMap::~SharedContentMap() = default;
 
-std::string SharedContentMap::GetFilenameFromSHA1(const std::array<u8, 20>& sha1) const
+std::optional<std::string>
+SharedContentMap::GetFilenameFromSHA1(const std::array<u8, 20>& sha1) const
 {
   const auto it = std::find_if(m_entries.begin(), m_entries.end(),
                                [&sha1](const auto& entry) { return entry.sha1 == sha1; });
   if (it == m_entries.end())
-    return "unk";
+    return {};
 
   const std::string id_string(it->id.begin(), it->id.end());
   return Common::RootUserPath(m_root) + StringFromFormat("/shared1/%s.app", id_string.c_str());
@@ -442,9 +443,9 @@ std::vector<std::array<u8, 20>> SharedContentMap::GetHashes() const
 
 std::string SharedContentMap::AddSharedContent(const std::array<u8, 20>& sha1)
 {
-  std::string filename = GetFilenameFromSHA1(sha1);
-  if (filename != "unk")
-    return filename;
+  auto filename = GetFilenameFromSHA1(sha1);
+  if (filename)
+    return *filename;
 
   const std::string id = StringFromFormat("%08x", m_last_id);
   Entry entry;
@@ -455,7 +456,7 @@ std::string SharedContentMap::AddSharedContent(const std::array<u8, 20>& sha1)
   WriteEntries();
   filename = Common::RootUserPath(m_root) + StringFromFormat("/shared1/%s.app", id.c_str());
   m_last_id++;
-  return filename;
+  return *filename;
 }
 
 bool SharedContentMap::DeleteSharedContent(const std::array<u8, 20>& sha1)

Source/Core/Core/IOS/ES/Formats.h

@@ -10,6 +10,7 @@
 #include <array>
 #include <cstddef>
 #include <map>
+#include <optional>
 #include <string>
 #include <vector>
 
@@ -217,7 +218,7 @@ public:
   explicit SharedContentMap(Common::FromWhichRoot root);
   ~SharedContentMap();
 
-  std::string GetFilenameFromSHA1(const std::array<u8, 20>& sha1) const;
+  std::optional<std::string> GetFilenameFromSHA1(const std::array<u8, 20>& sha1) const;
   std::string AddSharedContent(const std::array<u8, 20>& sha1);
   bool DeleteSharedContent(const std::array<u8, 20>& sha1);
   std::vector<std::array<u8, 20>> GetHashes() const;

Source/Core/Core/IOS/ES/NandUtils.cpp

@@ -152,8 +152,8 @@ std::vector<Content> GetStoredContentsFromTMD(const TMDReader& tmd)
                [&tmd, &shared](const auto& content) {
                  if (content.IsShared())
                  {
-                   const std::string path = shared.GetFilenameFromSHA1(content.sha1);
-                   return path != "unk" && File::Exists(path);
+                   const auto path = shared.GetFilenameFromSHA1(content.sha1);
+                   return path && File::Exists(*path);
                  }
                  return File::Exists(
                      Common::GetTitleContentPath(tmd.GetTitleId(), Common::FROM_SESSION_ROOT) +

Source/Core/Core/IOS/ES/TitleManagement.cpp

@@ -665,8 +665,8 @@ IPCCommandResult ES::ExportTitleDone(Context& context, const IOCtlVRequest& requ
 ReturnCode ES::DeleteSharedContent(const std::array<u8, 20>& sha1) const
 {
   IOS::ES::SharedContentMap map{Common::FromWhichRoot::FROM_SESSION_ROOT};
-  const std::string content_path = map.GetFilenameFromSHA1(sha1);
-  if (content_path == "unk")
+  const auto content_path = map.GetFilenameFromSHA1(sha1);
+  if (!content_path)
     return ES_EINVAL;
 
   // Check whether the shared content is used by a system title.
@@ -689,7 +689,7 @@ ReturnCode ES::DeleteSharedContent(const std::array<u8, 20>& sha1) const
     return ES_EINVAL;
 
   // Delete the shared content and update the content map.
-  if (!File::Delete(content_path))
+  if (!File::Delete(*content_path))
     return FS_ENOENT;
 
   if (!map.DeleteSharedContent(sha1))

Source/Core/DiscIO/NANDContentLoader.cpp

@@ -94,7 +94,8 @@ bool CNANDContentDataBuffer::GetRange(u32 start, u32 size, u8* buffer)
   return true;
 }
 
-CNANDContentLoader::CNANDContentLoader(const std::string& content_name)
+CNANDContentLoader::CNANDContentLoader(const std::string& content_name, Common::FromWhichRoot from)
+    : m_root(from)
 {
   m_Valid = Initialize(content_name);
 }
@@ -185,7 +186,7 @@ void CNANDContentLoader::InitializeContentEntries(const std::vector<u8>& data_ap
 
   u32 data_app_offset = 0;
   const std::vector<u8> title_key = m_ticket.GetTitleKey();
-  IOS::ES::SharedContentMap shared_content{Common::FromWhichRoot::FROM_SESSION_ROOT};
+  IOS::ES::SharedContentMap shared_content{m_root};
 
   for (size_t i = 0; i < contents.size(); ++i)
   {
@@ -208,7 +209,7 @@ void CNANDContentLoader::InitializeContentEntries(const std::vector<u8>& data_ap
     {
       std::string filename;
       if (content.IsShared())
-        filename = shared_content.GetFilenameFromSHA1(content.sha1);
+        filename = *shared_content.GetFilenameFromSHA1(content.sha1);
       else
         filename = StringFromFormat("%s/%08x.app", m_Path.c_str(), content.id);
 
@@ -223,14 +224,15 @@ CNANDContentManager::~CNANDContentManager()
 {
 }
 
-const CNANDContentLoader& CNANDContentManager::GetNANDLoader(const std::string& content_path)
+const CNANDContentLoader& CNANDContentManager::GetNANDLoader(const std::string& content_path,
+                                                             Common::FromWhichRoot from)
 {
   auto it = m_map.find(content_path);
   if (it != m_map.end())
     return *it->second;
   return *m_map
-              .emplace_hint(it, std::make_pair(content_path,
-                                               std::make_unique<CNANDContentLoader>(content_path)))
+              .emplace_hint(it, std::make_pair(content_path, std::make_unique<CNANDContentLoader>(
+                                                                 content_path, from)))
               ->second;
 }
 
@@ -238,7 +240,7 @@ const CNANDContentLoader& CNANDContentManager::GetNANDLoader(u64 title_id,
                                                              Common::FromWhichRoot from)
 {
   std::string path = Common::GetTitleContentPath(title_id, from);
-  return GetNANDLoader(path);
+  return GetNANDLoader(path, from);
 }
 
 void CNANDContentManager::ClearCache()

Source/Core/DiscIO/NANDContentLoader.h

@@ -75,7 +75,7 @@ struct SNANDContent
 class CNANDContentLoader final
 {
 public:
-  explicit CNANDContentLoader(const std::string& content_name);
+  explicit CNANDContentLoader(const std::string& content_name, Common::FromWhichRoot from);
   ~CNANDContentLoader();
 
   bool IsValid() const;
@@ -90,6 +90,7 @@ private:
 
   bool m_Valid = false;
   bool m_IsWAD = false;
+  Common::FromWhichRoot m_root;
   std::string m_Path;
   IOS::ES::TMDReader m_tmd;
   IOS::ES::TicketReader m_ticket;
@@ -107,8 +108,11 @@ public:
     return instance;
   }
 
-  const CNANDContentLoader& GetNANDLoader(const std::string& content_path);
-  const CNANDContentLoader& GetNANDLoader(u64 title_id, Common::FromWhichRoot from);
+  const CNANDContentLoader&
+  GetNANDLoader(const std::string& content_path,
+                Common::FromWhichRoot from = Common::FROM_CONFIGURED_ROOT);
+  const CNANDContentLoader&
+  GetNANDLoader(u64 title_id, Common::FromWhichRoot from = Common::FROM_CONFIGURED_ROOT);
   void ClearCache();
 
 private: