make utility type in Combine private and avoid collisions

msvc by default doesn't use two-phase lookup, so this caused conflicts

Author: tomjnixon

include/adm/detail/auto_base.hpp

@@ -171,21 +171,21 @@ namespace adm {
 
     template <typename A, typename... Tail>
     struct MakeCombineBase {
-      using B = typename HasParametersT<Tail...>::type;
+      using Base = typename HasParametersT<Tail...>::type;
 
       using combine_add_remove =
           std::integral_constant<bool, typename A::has_add_remove() &&
-                                           typename B::has_add_remove()>;
+                                           typename Base::has_add_remove()>;
       using combine_get_set_has =
           std::integral_constant<bool, typename A::has_get_set_has() &&
-                                           typename B::has_get_set_has()>;
+                                           typename Base::has_get_set_has()>;
       using combine_isDefault_unset =
           std::integral_constant<bool, typename A::has_isDefault_unset() &&
-                                           typename B::has_isDefault_unset()>;
+                                           typename Base::has_isDefault_unset()>;
 
       using IsDefaultUnsetCombined =
           std::conditional_t<combine_isDefault_unset::value,
-                             CombineIsDefaultUnsetB<A, B>, CombineRaw<A, B>>;
+                             CombineIsDefaultUnsetB<A, Base>, CombineRaw<A, Base>>;
 
       // - need to combine
       //   - last in chain -> use CombineB<A, B>
@@ -195,16 +195,16 @@ namespace adm {
       using GetSetHasCombined = std::conditional_t<
           combine_get_set_has::value,
           std::conditional_t<!combine_isDefault_unset::value,
-                             CombineGetSetHasB<A, B>,
-                             CombineGetSetHas<A, B, IsDefaultUnsetCombined>>,
+                             CombineGetSetHasB<A, Base>,
+                             CombineGetSetHas<A, Base, IsDefaultUnsetCombined>>,
           IsDefaultUnsetCombined>;
 
       using AddRemoveCombined = std::conditional_t<
           combine_add_remove::value,
           std::conditional_t<!(combine_isDefault_unset::value ||
                                combine_get_set_has::value),
-                             CombineAddRemoveB<A, B>,
-                             CombineAddRemove<A, B, GetSetHasCombined>>,
+                             CombineAddRemoveB<A, Base>,
+                             CombineAddRemove<A, Base, GetSetHasCombined>>,
           GetSetHasCombined>;
 
       using type = AddRemoveCombined;
@@ -213,17 +213,19 @@ namespace adm {
     /// a subclass of A and B, with methods according to their Flags
     template <typename A, typename... Tail>
     struct Combine : public MakeCombineBase<A, Tail...>::type {
-      using B = typename HasParametersT<Tail...>::type;
+    private:
+      using Base = typename HasParametersT<Tail...>::type;
 
+    public:
       using has_get_set_has =
           std::integral_constant<bool, typename A::has_get_set_has() ||
-                                           typename B::has_get_set_has()>;
+                                           typename Base::has_get_set_has()>;
       using has_isDefault_unset =
           std::integral_constant<bool, typename A::has_isDefault_unset() ||
-                                           typename B::has_isDefault_unset()>;
+                                           typename Base::has_isDefault_unset()>;
       using has_add_remove =
           std::integral_constant<bool, typename A::has_add_remove() ||
-                                           typename B::has_add_remove()>;
+                                           typename Base::has_add_remove()>;
     };
 
     template <typename... Bases>