From 67cbcb71eb10b282963e0df630997f0df68a4c82 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 14 Feb 2017 17:44:24 +0100
Subject: [PATCH] move initializer_list iter/citer to range.hh

---
 ostd/algorithm.hh        |  1 -
 ostd/initializer_list.hh | 27 ---------------------------
 ostd/range.hh            | 11 +++++++++++
 3 files changed, 11 insertions(+), 28 deletions(-)
 delete mode 100644 ostd/initializer_list.hh

diff --git a/ostd/algorithm.hh b/ostd/algorithm.hh
index a1ca809..e6112a8 100644
--- a/ostd/algorithm.hh
+++ b/ostd/algorithm.hh
@@ -13,7 +13,6 @@
 
 #include "ostd/range.hh"
 #include "ostd/utility.hh"
-#include "ostd/initializer_list.hh"
 
 namespace ostd {
 
diff --git a/ostd/initializer_list.hh b/ostd/initializer_list.hh
deleted file mode 100644
index bc1a5a4..0000000
--- a/ostd/initializer_list.hh
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Initializer list support for OctaSTD.
- *
- * This file is part of OctaSTD. See COPYING.md for futher information.
- */
-
-#ifndef OSTD_INITIALIZER_LIST_HH
-#define OSTD_INITIALIZER_LIST_HH
-
-#include <initializer_list>
-
-#include "ostd/range.hh"
-
-namespace ostd {
-
-template<typename T>
-IteratorRange<T const *> iter(std::initializer_list<T> init) noexcept {
-    return IteratorRange<T const *>(init.begin(), init.end());
-}
-
-template<typename T>
-IteratorRange<T const *> citer(std::initializer_list<T> init) noexcept {
-    return IteratorRange<T const *>(init.begin(), init.end());
-}
-
-}
-
-#endif
diff --git a/ostd/range.hh b/ostd/range.hh
index 54b1b64..9a1c423 100644
--- a/ostd/range.hh
+++ b/ostd/range.hh
@@ -14,6 +14,7 @@
 #include <utility>
 #include <iterator>
 #include <type_traits>
+#include <initializer_list>
 
 #include "ostd/types.hh"
 #include "ostd/utility.hh"
@@ -1807,6 +1808,16 @@ IteratorRange<T> make_range(T beg, size_t n) {
     return IteratorRange<T>{beg, beg + n};
 }
 
+template<typename T>
+IteratorRange<T const *> iter(std::initializer_list<T> init) noexcept {
+    return IteratorRange<T const *>(init.begin(), init.end());
+}
+
+template<typename T>
+IteratorRange<T const *> citer(std::initializer_list<T> init) noexcept {
+    return IteratorRange<T const *>(init.begin(), init.end());
+}
+
 template<typename T, size_t N>
 struct ranged_traits<T[N]> {
     static IteratorRange<T *> iter(T (&array)[N]) {