Move all tuple_*.h files into sigc++/tuple-utils/

16 files changed, 25 insertions, 25 deletions

diff --git a/sigc++/adaptors/bind.h b/sigc++/adaptors/bind.h
index 6458a7d..9b4ef4e 100644
--- a/sigc++/adaptors/bind.h
+++ b/sigc++/adaptors/bind.h
@@ -3,10 +3,10 @@
 #include <sigc++/adaptors/adaptor_trait.h>
 #include <sigc++/adaptors/bound_argument.h>
 #include <tuple>
-#include <sigc++/tuple_for_each.h>
-#include <sigc++/tuple_start.h>
-#include <sigc++/tuple_end.h>
-#include <sigc++/tuple_transform_each.h>
+#include <sigc++/tuple-utils/tuple_for_each.h>
+#include <sigc++/tuple-utils/tuple_start.h>
+#include <sigc++/tuple-utils/tuple_end.h>
+#include <sigc++/tuple-utils/tuple_transform_each.h>
 
 
 //TODO: See comment in functor_trait.h.
diff --git a/sigc++/adaptors/hide.h b/sigc++/adaptors/hide.h
index afed14c..20ad588 100644
--- a/sigc++/adaptors/hide.h
+++ b/sigc++/adaptors/hide.h
@@ -2,9 +2,9 @@
 #define _SIGC_ADAPTORS_HIDE_H_
 
 #include <sigc++/adaptors/adaptor_trait.h>
-#include <sigc++/tuple_cat.h>
-#include <sigc++/tuple_end.h>
-#include <sigc++/tuple_start.h>
+#include <sigc++/tuple-utils/tuple_cat.h>
+#include <sigc++/tuple-utils/tuple_end.h>
+#include <sigc++/tuple-utils/tuple_start.h>
 
 namespace sigc {
 
diff --git a/sigc++/adaptors/track_obj.h b/sigc++/adaptors/track_obj.h
index 2816054..2e15ccd 100644
--- a/sigc++/adaptors/track_obj.h
+++ b/sigc++/adaptors/track_obj.h
@@ -3,7 +3,7 @@
 
 #include <sigc++/adaptors/adaptor_trait.h>
 #include <sigc++/limit_reference.h>
-#include <sigc++/tuple_for_each.h>
+#include <sigc++/tuple-utils/tuple_for_each.h>
 
 namespace sigc {
 
diff --git a/sigc++/filelist.am b/sigc++/filelist.am
index 2b49389..eb94725 100644
--- a/sigc++/filelist.am
+++ b/sigc++/filelist.am
@@ -51,12 +51,12 @@ sigc_public_h =				\
 	signal_base.h			\
 	slot.h			\
 	trackable.h			\
-	tuple_cat.h \
-	tuple_cdr.h \
-	tuple_end.h \
-	tuple_for_each.h \
-	tuple_start.h \
-	tuple_transform_each.h \
+	tuple-utils/tuple_cat.h \
+	tuple-utils/tuple_cdr.h \
+	tuple-utils/tuple_end.h \
+	tuple-utils/tuple_for_each.h \
+	tuple-utils/tuple_start.h \
+	tuple-utils/tuple_transform_each.h \
 	type_traits.h			\
 	visit_each.h			\
 	adaptors/adaptor_base.h \
diff --git a/sigc++/tuple_cat.h b/sigc++/tuple-utils/tuple_cat.h
index 8cb8d25..8cb8d25 100644
--- a/sigc++/tuple_cat.h
+++ b/sigc++/tuple-utils/tuple_cat.h
diff --git a/sigc++/tuple_cdr.h b/sigc++/tuple-utils/tuple_cdr.h
index 580296b..580296b 100644
--- a/sigc++/tuple_cdr.h
+++ b/sigc++/tuple-utils/tuple_cdr.h
diff --git a/sigc++/tuple_end.h b/sigc++/tuple-utils/tuple_end.h
index d36afdd..1f9a073 100644
--- a/sigc++/tuple_end.h
+++ b/sigc++/tuple-utils/tuple_end.h
@@ -17,7 +17,7 @@
 #ifndef SIGC_TUPLE_UTILS_TUPLE_END_H
 #define SIGC_TUPLE_UTILS_TUPLE_END_H
 
-#include <sigc++/tuple_cdr.h>
+#include <sigc++/tuple-utils/tuple_cdr.h>
 
 namespace sigc {
 
diff --git a/sigc++/tuple_for_each.h b/sigc++/tuple-utils/tuple_for_each.h
index 1bf98bd..1bf98bd 100644
--- a/sigc++/tuple_for_each.h
+++ b/sigc++/tuple-utils/tuple_for_each.h
diff --git a/sigc++/tuple_start.h b/sigc++/tuple-utils/tuple_start.h
index 95fda2e..95fda2e 100644
--- a/sigc++/tuple_start.h
+++ b/sigc++/tuple-utils/tuple_start.h
diff --git a/sigc++/tuple_transform_each.h b/sigc++/tuple-utils/tuple_transform_each.h
index ec95aab..0558333 100644
--- a/sigc++/tuple_transform_each.h
+++ b/sigc++/tuple-utils/tuple_transform_each.h
@@ -17,10 +17,10 @@
 #ifndef SIGC_TUPLE_UTILS_TUPLE_TRANSFORM_EACH_H
 #define SIGC_TUPLE_UTILS_TUPLE_TRANSFORM_EACH_H
 
-#include <sigc++/tuple_cat.h>
-#include <sigc++/tuple_cdr.h>
-#include <sigc++/tuple_end.h>
-#include <sigc++/tuple_start.h>
+#include <sigc++/tuple-utils/tuple_cat.h>
+#include <sigc++/tuple-utils/tuple_cdr.h>
+#include <sigc++/tuple-utils/tuple_end.h>
+#include <sigc++/tuple-utils/tuple_start.h>
 #include <type_traits>
 
 namespace sigc {
diff --git a/tests/test_tuple_cat.cc b/tests/test_tuple_cat.cc
index d266483..fb40867 100644
--- a/tests/test_tuple_cat.cc
+++ b/tests/test_tuple_cat.cc
@@ -16,7 +16,7 @@
 
 #include <cassert>
 #include <cstdlib>
-#include <sigc++/tuple_cat.h>
+#include <sigc++/tuple-utils/tuple_cat.h>
 #include <utility>
 //#include <functional>
 
diff --git a/tests/test_tuple_cdr.cc b/tests/test_tuple_cdr.cc
index b0d74f3..3c142dc 100644
--- a/tests/test_tuple_cdr.cc
+++ b/tests/test_tuple_cdr.cc
@@ -16,7 +16,7 @@
 
 #include <cassert>
 #include <cstdlib>
-#include <sigc++/tuple_cdr.h>
+#include <sigc++/tuple-utils/tuple_cdr.h>
 #include <utility>
 #include <functional>
 
diff --git a/tests/test_tuple_end.cc b/tests/test_tuple_end.cc
index ad4b063..86c018a 100644
--- a/tests/test_tuple_end.cc
+++ b/tests/test_tuple_end.cc
@@ -16,7 +16,7 @@
 
 #include <cassert>
 #include <cstdlib>
-#include <sigc++/tuple_end.h>
+#include <sigc++/tuple-utils/tuple_end.h>
 #include <functional>
 
 void
diff --git a/tests/test_tuple_for_each.cc b/tests/test_tuple_for_each.cc
index b621c57..b7607ef 100644
--- a/tests/test_tuple_for_each.cc
+++ b/tests/test_tuple_for_each.cc
@@ -16,7 +16,7 @@
 
 #include <cassert>
 #include <cstdlib>
-#include <sigc++/tuple_for_each.h>
+#include <sigc++/tuple-utils/tuple_for_each.h>
 #include <utility>
 //#include <typeinfo>
 #include <iostream>
diff --git a/tests/test_tuple_start.cc b/tests/test_tuple_start.cc
index 00e4f30..7add8a0 100644
--- a/tests/test_tuple_start.cc
+++ b/tests/test_tuple_start.cc
@@ -16,7 +16,7 @@
 
 #include <cassert>
 #include <cstdlib>
-#include <sigc++/tuple_start.h>
+#include <sigc++/tuple-utils/tuple_start.h>
 #include <functional>
 
 void
diff --git a/tests/test_tuple_transform_each.cc b/tests/test_tuple_transform_each.cc
index 18b95d6..21f1d5a 100644
--- a/tests/test_tuple_transform_each.cc
+++ b/tests/test_tuple_transform_each.cc
@@ -16,7 +16,7 @@
 
 #include <cassert>
 #include <cstdlib>
-#include <sigc++/tuple_transform_each.h>
+#include <sigc++/tuple-utils/tuple_transform_each.h>
 #include <utility>
 #include <functional>