[FIX] Remove name clashes with seqan3{,align_cfg}::detail

Signed-off-by: Lydia Buntrock <[email protected]>
seqan · Aug 14, 2020 · 5b4726a · 5b4726a
1 parent e328f6e
commit 5b4726a
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 25 deletions.
diff --git a/include/seqan3/alignment/configuration/align_config_aligned_ends.hpp b/include/seqan3/alignment/configuration/align_config_aligned_ends.hpp
@@ -543,13 +543,13 @@ namespace seqan3::align_cfg
  */
 template <typename end_gaps_t>
 //!\cond
-    requires detail::is_type_specialisation_of_v<end_gaps_t, end_gaps>
+    requires seqan3::detail::is_type_specialisation_of_v<end_gaps_t, end_gaps>
 //!\endcond
 struct aligned_ends : public pipeable_config_element<aligned_ends<end_gaps_t>, end_gaps_t>
 {
     //!\privatesection
     //!\brief Internal id to check for consistent configuration settings.
-    static constexpr detail::align_config_id id{detail::align_config_id::aligned_ends};
+    static constexpr seqan3::detail::align_config_id id{seqan3::detail::align_config_id::aligned_ends};
 };
 
 /*!\name Type deduction guides

diff --git a/include/seqan3/alignment/configuration/align_config_alignment_result_capture.hpp b/include/seqan3/alignment/configuration/align_config_alignment_result_capture.hpp
@@ -71,8 +71,7 @@ namespace seqan3::align_cfg
  */
 template <typename alignment_result_t>
 //!\cond
-    requires detail::is_type_specialisation_of_v<alignment_result_t, alignment_result>
+    requires seqan3::detail::is_type_specialisation_of_v<alignment_result_t, alignment_result>
 //!\endcond
-inline constexpr detail::alignment_result_capture_element<alignment_result_t> alignment_result_capture{};
+inline constexpr seqan3::detail::alignment_result_capture_element<alignment_result_t> alignment_result_capture{};
 }  // namespace seqan3::align_cfg
-
diff --git a/include/seqan3/alignment/configuration/align_config_band.hpp b/include/seqan3/alignment/configuration/align_config_band.hpp
@@ -111,7 +111,7 @@ class band_fixed_size : public pipeable_config_element<band_fixed_size>
 
     //!\privatesection
     //!\brief Internal id to check for consistent configuration settings.
-    static constexpr detail::align_config_id id{detail::align_config_id::band};
+    static constexpr seqan3::detail::align_config_id id{seqan3::detail::align_config_id::band};
 };
 
 } // namespace seqan3::align_cfg
diff --git a/include/seqan3/alignment/configuration/align_config_debug.hpp b/include/seqan3/alignment/configuration/align_config_debug.hpp
@@ -32,7 +32,7 @@ namespace seqan3::align_cfg
  * \note This configuration is only useful for debugging purposes as it can have a significant impact on the
  *       performance.
  */
-inline constexpr detail::debug_mode<std::integral_constant<detail::align_config_id,
-                                                           detail::align_config_id::debug>> debug{};
+inline constexpr seqan3::detail::debug_mode<std::integral_constant<seqan3::detail::align_config_id,
+                                                                   seqan3::detail::align_config_id::debug>> debug{};
 //!\endcond
 }  // namespace seqan3::align_cfg
diff --git a/include/seqan3/alignment/configuration/align_config_gap.hpp b/include/seqan3/alignment/configuration/align_config_gap.hpp
@@ -41,11 +41,11 @@ namespace seqan3::align_cfg
 template <typename gap_scheme_t>
 struct gap : public pipeable_config_element<gap<gap_scheme_t>, gap_scheme_t>
 {
-    static_assert(detail::is_type_specialisation_of_v<gap_scheme_t, gap_scheme>,
+    static_assert(seqan3::detail::is_type_specialisation_of_v<gap_scheme_t, gap_scheme>,
                   "Expects seqan3::gap_scheme class.");
     //!\privatesection
     //!\brief Internal id to check for consistent configuration settings.
-    static constexpr detail::align_config_id id{detail::align_config_id::gap};
+    static constexpr seqan3::detail::align_config_id id{seqan3::detail::align_config_id::gap};
 };
 
 /*!\name Type deduction guides

diff --git a/include/seqan3/alignment/configuration/align_config_max_error.hpp b/include/seqan3/alignment/configuration/align_config_max_error.hpp
@@ -37,7 +37,7 @@ struct max_error : public pipeable_config_element<max_error, uint32_t>
 {
     //!\privatesection
     //!\brief Internal id to check for consistent configuration settings.
-    static constexpr detail::align_config_id id{detail::align_config_id::max_error};
+    static constexpr seqan3::detail::align_config_id id{seqan3::detail::align_config_id::max_error};
 };
 
 } // namespace seqan3::align_cfg
diff --git a/include/seqan3/alignment/configuration/align_config_method.hpp b/include/seqan3/alignment/configuration/align_config_method.hpp
@@ -143,7 +143,7 @@ struct method_global : public pipeable_config_element<method_global>
 
     //!\privatesection
     //!\brief An internal id used to check for a valid alignment configuration.
-    static constexpr detail::align_config_id id{detail::align_config_id::global};
+    static constexpr seqan3::detail::align_config_id id{seqan3::detail::align_config_id::global};
 };
 
 } // namespace seqan3::align_cfg
diff --git a/include/seqan3/alignment/configuration/align_config_on_result.hpp b/include/seqan3/alignment/configuration/align_config_on_result.hpp
@@ -75,7 +75,7 @@ struct on_result : public seqan3::pipeable_config_element<on_result<callback_t>>
 
     //!\privatesection
     //!\brief Internal id to check for consistent configuration settings.
-    static constexpr detail::align_config_id id{detail::align_config_id::on_result};
+    static constexpr seqan3::detail::align_config_id id{seqan3::detail::align_config_id::on_result};
 };
 
 /*!\name Type deduction guides

diff --git a/include/seqan3/alignment/configuration/align_config_parallel.hpp b/include/seqan3/alignment/configuration/align_config_parallel.hpp
@@ -36,7 +36,7 @@ namespace seqan3::align_cfg
  *
  * \include test/snippet/alignment/configuration/align_cfg_parallel_example.cpp
  */
-using parallel = seqan3::detail::parallel_mode<std::integral_constant<detail::align_config_id,
-                                                                      detail::align_config_id::parallel>>;
+using parallel = seqan3::detail::parallel_mode<std::integral_constant<seqan3::detail::align_config_id,
+                                                                      seqan3::detail::align_config_id::parallel>>;
 
 } // namespace seqan3::align_cfg
diff --git a/include/seqan3/alignment/configuration/align_config_result.hpp b/include/seqan3/alignment/configuration/align_config_result.hpp
@@ -126,12 +126,12 @@ namespace seqan3::align_cfg
  *
  * \include test/snippet/alignment/configuration/align_cfg_result_example.cpp
  */
-template <typename alignment_result_tag_t = detail::with_score_type, typename score_t = int32_t>
+template <typename alignment_result_tag_t = seqan3::detail::with_score_type, typename score_t = int32_t>
 //!\cond
-    requires std::same_as<alignment_result_tag_t, detail::with_score_type> ||
-             std::same_as<alignment_result_tag_t, detail::with_end_positions_type> ||
-             std::same_as<alignment_result_tag_t, detail::with_begin_positions_type> ||
-             std::same_as<alignment_result_tag_t, detail::with_alignment_type>
+    requires std::same_as<alignment_result_tag_t, seqan3::detail::with_score_type> ||
+             std::same_as<alignment_result_tag_t, seqan3::detail::with_end_positions_type> ||
+             std::same_as<alignment_result_tag_t, seqan3::detail::with_begin_positions_type> ||
+             std::same_as<alignment_result_tag_t, seqan3::detail::with_alignment_type>
 //!\endcond
 class result : public pipeable_config_element<result<alignment_result_tag_t, score_t>, alignment_result_tag_t>
 {
@@ -164,12 +164,14 @@ class result : public pipeable_config_element<result<alignment_result_tag_t, sco
      * \param[in] score_type_tag The score type to use (e.g. seqan3::using_score_type<int>).
      */
     constexpr result(alignment_result_tag_t result_tag,
-                     detail::score_type<score_t> SEQAN3_DOXYGEN_ONLY(score_type_tag)) noexcept : base_t{result_tag} {}
+                     seqan3::detail::score_type<score_t> SEQAN3_DOXYGEN_ONLY(score_type_tag)) noexcept
+        : base_t{result_tag}
+    {}
     //!\}
 
     //!\privatesection
     //!\brief Internal id to check for consistent configuration settings.
-    static constexpr detail::align_config_id id{detail::align_config_id::result};
+    static constexpr seqan3::detail::align_config_id id{seqan3::detail::align_config_id::result};
 };
 
 /*!\name Type deduction guides
@@ -182,6 +184,6 @@ result(alignment_result_tag_t) -> result<alignment_result_tag_t>;
 
 //!\brief Deduces the alignment result from the given constructor arguments.
 template <typename alignment_result_tag_t, arithmetic score_t>
-result(alignment_result_tag_t, detail::score_type<score_t>) -> result<alignment_result_tag_t, score_t>;
+result(alignment_result_tag_t, seqan3::detail::score_type<score_t>) -> result<alignment_result_tag_t, score_t>;
 //!\}
 } // namespace seqan3::align_cfg
diff --git a/include/seqan3/alignment/configuration/align_config_scoring.hpp b/include/seqan3/alignment/configuration/align_config_scoring.hpp
@@ -42,7 +42,7 @@ struct scoring : public pipeable_config_element<scoring<scoring_scheme_t>, scori
 {
     //!\privatesection
     //!\brief Internal id to check for consistent configuration settings.
-    static constexpr detail::align_config_id id{detail::align_config_id::scoring};
+    static constexpr seqan3::detail::align_config_id id{seqan3::detail::align_config_id::scoring};
 };
 
 /*!\name Type deduction guides

diff --git a/include/seqan3/alignment/configuration/align_config_vectorised.hpp b/include/seqan3/alignment/configuration/align_config_vectorised.hpp
@@ -52,6 +52,6 @@ namespace seqan3::align_cfg
  *
  * \include test/snippet/alignment/configuration/align_cfg_vectorised_example.cpp
  */
-inline constexpr detail::vectorised_tag vectorised{};
+inline constexpr seqan3::detail::vectorised_tag vectorised{};
 
 } // namespace seqan3::align_cfg