From e436fa38701fbeec8250636bff40bb56507337ff Mon Sep 17 00:00:00 2001
From: Mathew Sutcliffe <oktal3700@gmail.com>
Date: Fri, 7 Nov 2014 23:35:52 +0000
Subject: [PATCH] refs #345 Tuple tweaks to improve error messages.

---
 src/blackmisc/tuple.h         | 18 +++++++++---------
 src/blackmisc/tuple_private.h |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/blackmisc/tuple.h b/src/blackmisc/tuple.h
index 435a6d7d3..726e3b1e0 100644
--- a/src/blackmisc/tuple.h
+++ b/src/blackmisc/tuple.h
@@ -239,9 +239,9 @@ namespace BlackMisc
          *          Can be used like <CODE> std::tie </CODE>.
          */
         //! @{
-        static std::tuple<> toTuple(const T &object);
-        static std::tuple<> toTuple(T &object);
-        static std::tuple<> constToTuple(const T &object);
+        static std::tuple<> toTuple(const T &object) = delete;
+        static std::tuple<> toTuple(T &object) = delete;
+        static std::tuple<> constToTuple(const T &object) = delete;
         //! @}
 
         /*!
@@ -249,22 +249,22 @@ namespace BlackMisc
          * \brief   Returns a tuple of structs, each of which contains a reference to one of object's data members and its attched metadata.
          */
         //! @{
-        static std::tuple<> toMetaTuple(const T &object);
-        static std::tuple<> toMetaTuple(T &object);
+        static std::tuple<> toMetaTuple(const T &object) = delete;
+        static std::tuple<> toMetaTuple(T &object) = delete;
         //! @}
 
         /*!
          * \name    Static Private Member Functions
          * \brief   Returns an object with information extracted from the stringified macro argument.
          */
-        static const Parser &parser();
+        static const Parser &parser() = delete;
 
         /*!
          * \name    Static Private Member Functions
          * \brief   Returns a list of the names of the tuple members.
          * \deprecated This information is now embedded in the meta tuples.
          */
-        static const QStringList &jsonMembers();
+        static const QStringList &jsonMembers() = delete;
     };
 
     // Needed so that our qHash overload doesn't hide the qHash overloads in the global namespace.
@@ -402,7 +402,7 @@ namespace BlackMisc
     QJsonObject serializeJson(std::tuple<Ts...> tu)
     {
         QJsonObject json;
-        Private::assertMeta<std::tuple<Ts...>>();
+        Private::assertMeta(tu);
         Private::TupleHelper::serializeJson(json, tu, Private::skipFlaggedIndices<TupleConverterBase::DisabledForJson>(tu));
         return json;
     }
@@ -414,7 +414,7 @@ namespace BlackMisc
     template <class... Ts>
     void deserializeJson(const QJsonObject &json, std::tuple<Ts...> tu)
     {
-        Private::assertMeta<std::tuple<Ts...>>();
+        Private::assertMeta(tu);
         Private::TupleHelper::deserializeJson(json, tu, Private::skipFlaggedIndices<TupleConverterBase::DisabledForJson>(tu));
     }
 
diff --git a/src/blackmisc/tuple_private.h b/src/blackmisc/tuple_private.h
index 16c223c05..2f4e7d961 100644
--- a/src/blackmisc/tuple_private.h
+++ b/src/blackmisc/tuple_private.h
@@ -163,9 +163,9 @@ namespace BlackMisc
 
         // Compile-time assert for functions which require a meta tuple
         template <class Tu>
-        struct assertMeta { static_assert(std::is_void<Tu>::value, "Function expected a meta tuple, got a value tuple"); };
+        void assertMeta(const Tu &) { static_assert(std::is_void<Tu>::value, "Function expected a meta tuple, got a value tuple"); }
         template <class... Ts, qint64... Fs>
-        struct assertMeta<std::tuple<Attribute<Ts, Fs>...>> {};
+        void assertMeta(const std::tuple<Attribute<Ts, Fs>...> &) {}
 
         // Convert a meta tuple to a value tuple
         template <class Tu, size_t... Is>