From 9ce9884376379fc8f7ed08032bce3ac00477ebd4 Mon Sep 17 00:00:00 2001
From: Denis Blank <denis.blank@outlook.com>
Date: Tue, 30 Jan 2018 21:50:13 +0100
Subject: [PATCH] Rename the inclusion guards slightly

---
 include/continuable/continuable-api.hpp          | 6 +++---
 include/continuable/continuable-base.hpp         | 6 +++---
 include/continuable/continuable-promise-base.hpp | 6 +++---
 include/continuable/continuable-testing.hpp      | 6 +++---
 include/continuable/continuable-trait.hpp        | 6 +++---
 include/continuable/continuable-transforms.hpp   | 6 +++---
 include/continuable/continuable-types.hpp        | 6 +++---
 include/continuable/continuable.hpp              | 6 +++---
 include/continuable/detail/awaiting.hpp          | 6 +++---
 include/continuable/detail/base.hpp              | 6 +++---
 include/continuable/detail/composition.hpp       | 6 +++---
 include/continuable/detail/expected.hpp          | 6 +++---
 include/continuable/detail/features.hpp          | 6 +++---
 include/continuable/detail/hints.hpp             | 6 +++---
 include/continuable/detail/testing.hpp           | 6 +++---
 include/continuable/detail/traits.hpp            | 6 +++---
 include/continuable/detail/transforms.hpp        | 6 +++---
 include/continuable/detail/types.hpp             | 6 +++---
 include/continuable/detail/util.hpp              | 6 +++---
 19 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/include/continuable/continuable-api.hpp b/include/continuable/continuable-api.hpp
index 37fad66..48a084f 100644
--- a/include/continuable/continuable-api.hpp
+++ b/include/continuable/continuable-api.hpp
@@ -28,8 +28,8 @@
   SOFTWARE.
 */
 
-#ifndef CONTINUABLE_DETAIL_API_HPP_INCLUDED__
-#define CONTINUABLE_DETAIL_API_HPP_INCLUDED__
+#ifndef CONTINUABLE_DETAIL_API_HPP_INCLUDED
+#define CONTINUABLE_DETAIL_API_HPP_INCLUDED
 
 /// Declares the continuable library namespace.
 ///
@@ -80,4 +80,4 @@ class continuable_base;
 namespace detail {}
 } // namespace cti
 
-#endif // CONTINUABLE_DETAIL_API_HPP_INCLUDED__
+#endif // CONTINUABLE_DETAIL_API_HPP_INCLUDED
diff --git a/include/continuable/continuable-base.hpp b/include/continuable/continuable-base.hpp
index 9da4c64..164a732 100644
--- a/include/continuable/continuable-base.hpp
+++ b/include/continuable/continuable-base.hpp
@@ -28,8 +28,8 @@
   SOFTWARE.
 **/
 
-#ifndef CONTINUABLE_BASE_HPP_INCLUDED__
-#define CONTINUABLE_BASE_HPP_INCLUDED__
+#ifndef CONTINUABLE_BASE_HPP_INCLUDED
+#define CONTINUABLE_BASE_HPP_INCLUDED
 
 #include <cassert>
 #include <cstdint>
@@ -744,4 +744,4 @@ auto when_seq(Continuables&&... continuables) {
 }
 } // namespace cti
 
-#endif // CONTINUABLE_BASE_HPP_INCLUDED__
+#endif // CONTINUABLE_BASE_HPP_INCLUDED
diff --git a/include/continuable/continuable-promise-base.hpp b/include/continuable/continuable-promise-base.hpp
index 8b0e62e..4feabdb 100644
--- a/include/continuable/continuable-promise-base.hpp
+++ b/include/continuable/continuable-promise-base.hpp
@@ -28,8 +28,8 @@
   SOFTWARE.
 **/
 
-#ifndef CONTINUABLE_PROMISE_BASE_HPP_INCLUDED__
-#define CONTINUABLE_PROMISE_BASE_HPP_INCLUDED__
+#ifndef CONTINUABLE_PROMISE_BASE_HPP_INCLUDED
+#define CONTINUABLE_PROMISE_BASE_HPP_INCLUDED
 
 #include <type_traits>
 #include <utility>
@@ -104,4 +104,4 @@ public:
 };
 } // namespace cti
 
-#endif // CONTINUABLE_PROMISE_BASE_HPP_INCLUDED__
+#endif // CONTINUABLE_PROMISE_BASE_HPP_INCLUDED
diff --git a/include/continuable/continuable-testing.hpp b/include/continuable/continuable-testing.hpp
index 4bf07fb..40ad250 100644
--- a/include/continuable/continuable-testing.hpp
+++ b/include/continuable/continuable-testing.hpp
@@ -28,8 +28,8 @@
   SOFTWARE.
 **/
 
-#ifndef CONTINUABLE_TESTING_HPP_INCLUDED__
-#define CONTINUABLE_TESTING_HPP_INCLUDED__
+#ifndef CONTINUABLE_TESTING_HPP_INCLUDED
+#define CONTINUABLE_TESTING_HPP_INCLUDED
 
 #include <continuable/continuable-api.hpp>
 #include <continuable/detail/testing.hpp>
@@ -163,4 +163,4 @@
   ASSERT_ASYNC_BINARY_EXCEPTION_VALIDATION(                                    \
       cti::detail::testing::asserting_eq_check(), __VA_ARGS__)
 
-#endif // CONTINUABLE_TESTING_HPP_INCLUDED__
+#endif // CONTINUABLE_TESTING_HPP_INCLUDED
diff --git a/include/continuable/continuable-trait.hpp b/include/continuable/continuable-trait.hpp
index cdbc0ef..d5d10d8 100644
--- a/include/continuable/continuable-trait.hpp
+++ b/include/continuable/continuable-trait.hpp
@@ -28,8 +28,8 @@
   SOFTWARE.
 **/
 
-#ifndef CONTINUABLE_TRAIT_HPP_INCLUDED__
-#define CONTINUABLE_TRAIT_HPP_INCLUDED__
+#ifndef CONTINUABLE_TRAIT_HPP_INCLUDED
+#define CONTINUABLE_TRAIT_HPP_INCLUDED
 
 #include <cstdint>
 
@@ -72,4 +72,4 @@ public:
 };
 } // namespace cti
 
-#endif // CONTINUABLE_TRAIT_HPP_INCLUDED__
+#endif // CONTINUABLE_TRAIT_HPP_INCLUDED
diff --git a/include/continuable/continuable-transforms.hpp b/include/continuable/continuable-transforms.hpp
index 6f94a25..1f211c2 100644
--- a/include/continuable/continuable-transforms.hpp
+++ b/include/continuable/continuable-transforms.hpp
@@ -28,8 +28,8 @@
   SOFTWARE.
 **/
 
-#ifndef CONTINUABLE_TRANSFORMS_HPP_INCLUDED__
-#define CONTINUABLE_TRANSFORMS_HPP_INCLUDED__
+#ifndef CONTINUABLE_TRANSFORMS_HPP_INCLUDED
+#define CONTINUABLE_TRANSFORMS_HPP_INCLUDED
 
 #include <continuable/continuable-api.hpp>
 #include <continuable/detail/transforms.hpp>
@@ -85,4 +85,4 @@ inline auto flatten() {
 } // namespace transforms
 } // namespace cti
 
-#endif // CONTINUABLE_TRANSFORMS_HPP_INCLUDED__
+#endif // CONTINUABLE_TRANSFORMS_HPP_INCLUDED
diff --git a/include/continuable/continuable-types.hpp b/include/continuable/continuable-types.hpp
index b51e2e5..b6d818d 100644
--- a/include/continuable/continuable-types.hpp
+++ b/include/continuable/continuable-types.hpp
@@ -28,8 +28,8 @@
   SOFTWARE.
 **/
 
-#ifndef CONTINUABLE_TYPES_HPP_INCLUDED__
-#define CONTINUABLE_TYPES_HPP_INCLUDED__
+#ifndef CONTINUABLE_TYPES_HPP_INCLUDED
+#define CONTINUABLE_TYPES_HPP_INCLUDED
 
 #include <cstdint>
 
@@ -106,4 +106,4 @@ using promise = typename detail::unique_trait_of<
 // clang-format on
 } // namespace cti
 
-#endif // CONTINUABLE_TYPES_HPP_INCLUDED__
+#endif // CONTINUABLE_TYPES_HPP_INCLUDED
diff --git a/include/continuable/continuable.hpp b/include/continuable/continuable.hpp
index 5cdf423..a74fe2c 100644
--- a/include/continuable/continuable.hpp
+++ b/include/continuable/continuable.hpp
@@ -28,8 +28,8 @@
   SOFTWARE.
 **/
 
-#ifndef CONTINUABLE_HPP_INCLUDED__
-#define CONTINUABLE_HPP_INCLUDED__
+#ifndef CONTINUABLE_HPP_INCLUDED
+#define CONTINUABLE_HPP_INCLUDED
 
 #include <continuable/continuable-api.hpp>
 #include <continuable/continuable-base.hpp>
@@ -38,4 +38,4 @@
 #include <continuable/continuable-transforms.hpp>
 #include <continuable/continuable-types.hpp>
 
-#endif // CONTINUABLE_HPP_INCLUDED__
+#endif // CONTINUABLE_HPP_INCLUDED
diff --git a/include/continuable/detail/awaiting.hpp b/include/continuable/detail/awaiting.hpp
index 0974de8..b61a5f7 100644
--- a/include/continuable/detail/awaiting.hpp
+++ b/include/continuable/detail/awaiting.hpp
@@ -28,8 +28,8 @@
   SOFTWARE.
 **/
 
-#ifndef CONTINUABLE_DETAIL_AWAITING_HPP_INCLUDED__
-#define CONTINUABLE_DETAIL_AWAITING_HPP_INCLUDED__
+#ifndef CONTINUABLE_DETAIL_AWAITING_HPP_INCLUDED
+#define CONTINUABLE_DETAIL_AWAITING_HPP_INCLUDED
 
 // Exlude this header when coroutines are not available
 #ifdef CONTINUABLE_HAS_EXPERIMENTAL_COROUTINE
@@ -162,4 +162,4 @@ struct coroutine_traits<
 } // namespace std
 
 #endif // CONTINUABLE_HAS_EXPERIMENTAL_COROUTINE
-#endif // CONTINUABLE_DETAIL_UTIL_HPP_INCLUDED__
+#endif // CONTINUABLE_DETAIL_UTIL_HPP_INCLUDED
diff --git a/include/continuable/detail/base.hpp b/include/continuable/detail/base.hpp
index b8ff045..359c7cb 100644
--- a/include/continuable/detail/base.hpp
+++ b/include/continuable/detail/base.hpp
@@ -28,8 +28,8 @@
   SOFTWARE.
 **/
 
-#ifndef CONTINUABLE_DETAIL_BASE_HPP_INCLUDED__
-#define CONTINUABLE_DETAIL_BASE_HPP_INCLUDED__
+#ifndef CONTINUABLE_DETAIL_BASE_HPP_INCLUDED
+#define CONTINUABLE_DETAIL_BASE_HPP_INCLUDED
 
 #include <tuple>
 #include <type_traits>
@@ -580,4 +580,4 @@ auto wrap_continuation(Continuation&& continuation) {
 } // namespace detail
 } // namespace cti
 
-#endif // CONTINUABLE_DETAIL_BASE_HPP_INCLUDED__
+#endif // CONTINUABLE_DETAIL_BASE_HPP_INCLUDED
diff --git a/include/continuable/detail/composition.hpp b/include/continuable/detail/composition.hpp
index 11e0a3f..8d6f371 100644
--- a/include/continuable/detail/composition.hpp
+++ b/include/continuable/detail/composition.hpp
@@ -28,8 +28,8 @@
   SOFTWARE.
 **/
 
-#ifndef CONTINUABLE_DETAIL_COMPOSITION_HPP_INCLUDED__
-#define CONTINUABLE_DETAIL_COMPOSITION_HPP_INCLUDED__
+#ifndef CONTINUABLE_DETAIL_COMPOSITION_HPP_INCLUDED
+#define CONTINUABLE_DETAIL_COMPOSITION_HPP_INCLUDED
 
 #include <atomic>
 #include <memory>
@@ -504,4 +504,4 @@ auto sequential_connect(Left&& left, Right&& right) {
 } // namespace detail
 } // namespace cti
 
-#endif // CONTINUABLE_DETAIL_COMPOSITION_HPP_INCLUDED__
+#endif // CONTINUABLE_DETAIL_COMPOSITION_HPP_INCLUDED
diff --git a/include/continuable/detail/expected.hpp b/include/continuable/detail/expected.hpp
index 18c81fa..c3f226e 100644
--- a/include/continuable/detail/expected.hpp
+++ b/include/continuable/detail/expected.hpp
@@ -28,8 +28,8 @@
   SOFTWARE.
 **/
 
-#ifndef CONTINUABLE_DETAIL_EXPECTED_HPP_INCLUDED__
-#define CONTINUABLE_DETAIL_EXPECTED_HPP_INCLUDED__
+#ifndef CONTINUABLE_DETAIL_EXPECTED_HPP_INCLUDED
+#define CONTINUABLE_DETAIL_EXPECTED_HPP_INCLUDED
 
 #include <cassert>
 #include <memory>
@@ -392,4 +392,4 @@ using expected_result_trait_t = detail::expected_result_trait<decltype(
 } // namespace detail
 } // namespace cti
 
-#endif // CONTINUABLE_DETAIL_EXPECTED_HPP_INCLUDED__
+#endif // CONTINUABLE_DETAIL_EXPECTED_HPP_INCLUDED
diff --git a/include/continuable/detail/features.hpp b/include/continuable/detail/features.hpp
index b083dae..432b73c 100644
--- a/include/continuable/detail/features.hpp
+++ b/include/continuable/detail/features.hpp
@@ -27,8 +27,8 @@
   SOFTWARE.
 **/
 
-#ifndef CONTINUABLE_DETAIL_FEATURES_HPP_INCLUDED__
-#define CONTINUABLE_DETAIL_FEATURES_HPP_INCLUDED__
+#ifndef CONTINUABLE_DETAIL_FEATURES_HPP_INCLUDED
+#define CONTINUABLE_DETAIL_FEATURES_HPP_INCLUDED
 
 // Defines CONTINUABLE_WITH_NO_EXCEPTIONS when exception support is disabled
 #ifndef CONTINUABLE_WITH_NO_EXCEPTIONS
@@ -70,4 +70,4 @@
 /// This is enabled by the CMake project
 // #undef CONTINUABLE_HAS_EXPERIMENTAL_COROUTINE
 
-#endif // CONTINUABLE_DETAIL_FEATURES_HPP_INCLUDED__
+#endif // CONTINUABLE_DETAIL_FEATURES_HPP_INCLUDED
diff --git a/include/continuable/detail/hints.hpp b/include/continuable/detail/hints.hpp
index 2deac17..69197be 100644
--- a/include/continuable/detail/hints.hpp
+++ b/include/continuable/detail/hints.hpp
@@ -28,8 +28,8 @@
   SOFTWARE.
 **/
 
-#ifndef CONTINUABLE_DETAIL_HINTS_HPP_INCLUDED__
-#define CONTINUABLE_DETAIL_HINTS_HPP_INCLUDED__
+#ifndef CONTINUABLE_DETAIL_HINTS_HPP_INCLUDED
+#define CONTINUABLE_DETAIL_HINTS_HPP_INCLUDED
 
 #include <type_traits>
 
@@ -69,4 +69,4 @@ hint_of(traits::identity<
 } // namespace detail
 } // namespace cti
 
-#endif // CONTINUABLE_DETAIL_HINTS_HPP_INCLUDED__
+#endif // CONTINUABLE_DETAIL_HINTS_HPP_INCLUDED
diff --git a/include/continuable/detail/testing.hpp b/include/continuable/detail/testing.hpp
index a608967..822e44a 100644
--- a/include/continuable/detail/testing.hpp
+++ b/include/continuable/detail/testing.hpp
@@ -28,8 +28,8 @@
   SOFTWARE.
 **/
 
-#ifndef CONTINUABLE_DETAIL_TESTING_HPP_INCLUDED__
-#define CONTINUABLE_DETAIL_TESTING_HPP_INCLUDED__
+#ifndef CONTINUABLE_DETAIL_TESTING_HPP_INCLUDED
+#define CONTINUABLE_DETAIL_TESTING_HPP_INCLUDED
 
 #include <type_traits>
 #include <utility>
@@ -198,4 +198,4 @@ void assert_async_types(C&& continuable, traits::identity<Args...> expected) {
 } // namespace detail
 } // namespace cti
 
-#endif // CONTINUABLE_DETAIL_TESTING_HPP_INCLUDED__
+#endif // CONTINUABLE_DETAIL_TESTING_HPP_INCLUDED
diff --git a/include/continuable/detail/traits.hpp b/include/continuable/detail/traits.hpp
index 251e77a..a0ddb3f 100644
--- a/include/continuable/detail/traits.hpp
+++ b/include/continuable/detail/traits.hpp
@@ -28,8 +28,8 @@
   SOFTWARE.
 **/
 
-#ifndef CONTINUABLE_DETAIL_TRAITS_HPP_INCLUDED__
-#define CONTINUABLE_DETAIL_TRAITS_HPP_INCLUDED__
+#ifndef CONTINUABLE_DETAIL_TRAITS_HPP_INCLUDED
+#define CONTINUABLE_DETAIL_TRAITS_HPP_INCLUDED
 
 #include <cstdint>
 #include <initializer_list>
@@ -416,4 +416,4 @@ using fail = std::integral_constant<bool, !std::is_same<T, T>::value>;
 } // namespace detail
 } // namespace cti
 
-#endif // CONTINUABLE_DETAIL_TRAITS_HPP_INCLUDED__
+#endif // CONTINUABLE_DETAIL_TRAITS_HPP_INCLUDED
diff --git a/include/continuable/detail/transforms.hpp b/include/continuable/detail/transforms.hpp
index c1b1c60..ec1de64 100644
--- a/include/continuable/detail/transforms.hpp
+++ b/include/continuable/detail/transforms.hpp
@@ -28,8 +28,8 @@
   SOFTWARE.
 **/
 
-#ifndef CONTINUABLE_DETAIL_TRANSFORMS_HPP_INCLUDED__
-#define CONTINUABLE_DETAIL_TRANSFORMS_HPP_INCLUDED__
+#ifndef CONTINUABLE_DETAIL_TRANSFORMS_HPP_INCLUDED
+#define CONTINUABLE_DETAIL_TRANSFORMS_HPP_INCLUDED
 
 #include <future>
 
@@ -138,4 +138,4 @@ auto as_future(continuable_base<Data, Annotation>&& continuable) {
 } // namespace detail
 } // namespace cti
 
-#endif // CONTINUABLE_DETAIL_TRANSFORMS_HPP_INCLUDED__
+#endif // CONTINUABLE_DETAIL_TRANSFORMS_HPP_INCLUDED
diff --git a/include/continuable/detail/types.hpp b/include/continuable/detail/types.hpp
index dccc9e9..92cb237 100644
--- a/include/continuable/detail/types.hpp
+++ b/include/continuable/detail/types.hpp
@@ -28,8 +28,8 @@
   SOFTWARE.
 **/
 
-#ifndef CONTINUABLE_DETAIL_TYPES_HPP_INCLUDED__
-#define CONTINUABLE_DETAIL_TYPES_HPP_INCLUDED__
+#ifndef CONTINUABLE_DETAIL_TYPES_HPP_INCLUDED
+#define CONTINUABLE_DETAIL_TYPES_HPP_INCLUDED
 
 #include <continuable/continuable-api.hpp>
 #include <continuable/detail/features.hpp>
@@ -67,4 +67,4 @@ struct dispatch_error_tag {};
 } // namespace detail
 } // namespace cti
 
-#endif // CONTINUABLE_DETAIL_TYPES_HPP_INCLUDED__
+#endif // CONTINUABLE_DETAIL_TYPES_HPP_INCLUDED
diff --git a/include/continuable/detail/util.hpp b/include/continuable/detail/util.hpp
index f25c784..daca84f 100644
--- a/include/continuable/detail/util.hpp
+++ b/include/continuable/detail/util.hpp
@@ -28,8 +28,8 @@
   SOFTWARE.
 **/
 
-#ifndef CONTINUABLE_DETAIL_UTIL_HPP_INCLUDED__
-#define CONTINUABLE_DETAIL_UTIL_HPP_INCLUDED__
+#ifndef CONTINUABLE_DETAIL_UTIL_HPP_INCLUDED
+#define CONTINUABLE_DETAIL_UTIL_HPP_INCLUDED
 
 #include <cassert>
 #include <tuple>
@@ -300,4 +300,4 @@ auto fold(F&& folder, First&& first, Second&& second, Rest&&... rest) {
       PACK)
 #endif // CONTINUABLE_HAS_CXX17_FOLD_EXPRESSION
 
-#endif // CONTINUABLE_DETAIL_UTIL_HPP_INCLUDED__
+#endif // CONTINUABLE_DETAIL_UTIL_HPP_INCLUDED