Please our MSVC overlords

mamba-org · Sep 13, 2023 · 5db324c · 5db324c
1 parent b64739f
commit 5db324c
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 20 deletions.
diff --git a/libmamba/include/mamba/specs/conda_url.hpp b/libmamba/include/mamba/specs/conda_url.hpp
@@ -20,13 +20,11 @@ namespace mamba::specs
 
     public:
 
-        using Base::StripScheme;
-        using Base::HideConfidential;
-        using Base::Encode;
-        using Base::Decode;
+        using StripScheme = util::detail::StripScheme;
+        using HideConfidential = util::detail::HideConfidential;
+        using Encode = util::detail::Encode;
+        using Decode = util::detail::Decode;
 
-        using Base::https;
-        using Base::localhost;
         inline static constexpr std::string_view token_prefix = "/t/";
 
         [[nodiscard]] static auto parse(std::string_view url) -> CondaURL;

diff --git a/libmamba/include/mamba/util/url.hpp b/libmamba/include/mamba/util/url.hpp
@@ -12,6 +12,43 @@
 
 namespace mamba::util
 {
+    namespace detail
+    {
+        // Working around MSVC limitation on private inheritance + using directive
+
+        enum class StripScheme : bool
+        {
+            no,
+            yes
+        };
+
+        enum class HideConfidential : bool
+        {
+            no,
+            yes
+        };
+
+        struct Encode
+        {
+            inline static constexpr struct yes_type
+            {
+            } yes = {};
+            inline static constexpr struct no_type
+            {
+            } no = {};
+        };
+
+        struct Decode
+        {
+            inline static constexpr struct yes_type
+            {
+            } yes = {};
+            inline static constexpr struct no_type
+            {
+            } no = {};
+        };
+    }
+
     /**
      * Class representing a URL.
      *
@@ -21,20 +58,10 @@ namespace mamba::util
     {
     public:
 
-        // clang-format off
-        enum class StripScheme : bool { no, yes };
-        enum class HideConfidential : bool { no, yes };
-        struct Encode
-        {
-            inline static constexpr struct yes_type {} yes = {};
-            inline static constexpr struct no_type {} no = {};
-        };
-        struct Decode
-        {
-            inline static constexpr struct yes_type {} yes = {};
-            inline static constexpr struct no_type {} no = {};
-        };
-        // clang-format on
+        using StripScheme = detail::StripScheme;
+        using HideConfidential = detail::HideConfidential;
+        using Encode = detail::Encode;
+        using Decode = detail::Decode;
 
         inline static constexpr std::string_view https = "https";
         inline static constexpr std::string_view localhost = "localhost";