Re: [Debian-med-packaging] Bug#876147: Bug#876147: camp frequently FTBFS on 64bit big endian: camptest-qt (Failed)
Flavien Bridault <[email protected]>
| Newsgroups | gmane.linux.debian.ports.sparc,gmane.linux.debian.ports.s390,gmane.linux.debian.ports.powerpc |
|---|---|
| Message-ID | <[email protected]> |
Weird, it applies well for me on the master branch of the debian repository. Try the patch attached to this email or directly this link https://patch-diff.githubusercontent.com/raw/fw4spl-org/camp/pull/2.diff Le 16/04/2018 à 11:21, John Paul Adrian Glaubitz a écrit : > On 04/16/2018 11:16 AM, John Paul Adrian Glaubitz wrote: >>> Meanwhile I commited a fix upstream >>> (https://github.com/fw4spl-org/camp/pull/2) so I would just want to try >>> it before proposing the fix in the package. >> I'll test that for you on s390x. > > That patch doesn't apply to the Debian version of camp: > > glaubitz@zelenka:~/camp/camp-0.8.1$ patch -p1 < ~/fix-s390x.patch > patching file .gitignore > patching file include/camp/qt/qtfunction.hpp > patching file include/camp/qt/qthelper.hpp > patching file include/camp/valuemapper.hpp > Hunk #2 FAILED at 40. > Hunk #3 succeeded at 96 (offset 2 lines). > Hunk #4 succeeded at 126 (offset 2 lines). > Hunk #5 succeeded at 139 (offset 2 lines). > Hunk #6 succeeded at 156 (offset 2 lines). > Hunk #7 succeeded at 183 (offset 2 lines). > Hunk #8 succeeded at 205 (offset 2 lines). > Hunk #9 succeeded at 234 (offset 2 lines). > Hunk #10 succeeded at 250 (offset 2 lines). > Hunk #11 succeeded at 279 (offset 2 lines). > Hunk #12 succeeded at 326 (offset 2 lines). > Hunk #13 succeeded at 345 (offset 2 lines). > 1 out of 13 hunks FAILED -- saving rejects to file > include/camp/valuemapper.hpp.rej > patching file test/arrayproperty.hpp > Hunk #2 FAILED at 32. > Hunk #3 succeeded at 78 (offset 2 lines). > 1 out of 3 hunks FAILED -- saving rejects to file > test/arrayproperty.hpp.rej > patching file test/qt/propertymapping.cpp > Hunk #2 succeeded at 34 with fuzz 2 (offset 2 lines). > Hunk #3 succeeded at 47 (offset 2 lines). > Hunk #4 succeeded at 95 (offset 2 lines). > Hunk #5 succeeded at 106 (offset 2 lines). > glaubitz@zelenka:~/camp/camp-0.8.1$ > -- *Flavien BRIDAULT* Ingénieur de Recherche [email protected] *IRCAD France* 1, place de l'Hôpital - 67091 Strasbourg Cedex - FRANCE http://www.ircad.fr/ <http://www.ircad.fr/>
fix-s390.diff
(text/x-patch, 27.4 KB)
diff --git a/.gitignore b/.gitignore
index ce734c4..9a073a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,7 @@ qtc-gdbmacros/
*.o
*.a
moc_*
+build/
*.cmake
CMakeFiles/
diff --git a/include/camp/qt/qtfunction.hpp b/include/camp/qt/qtfunction.hpp
index 96484ab..912383b 100644
--- a/include/camp/qt/qtfunction.hpp
+++ b/include/camp/qt/qtfunction.hpp
@@ -15,10 +15,10 @@
** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
** copies of the Software, and to permit persons to whom the Software is
** furnished to do so, subject to the following conditions:
-**
+**
** The above copyright notice and this permission notice shall be included in
** all copies or substantial portions of the Software.
-**
+**
** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -86,7 +86,7 @@ class QtFunction : public camp::Function
case 1:
{
- QVariant arg1 = QtHelper::valueToVariant(args[0]);
+ const auto arg1 = QtHelper::argumentToVariant(args[0], m_metaMethod.parameterType(0));
m_metaMethod.invoke(object.get<T*>(), Qt::DirectConnection, ret
, QGenericArgument(arg1.typeName(), arg1.data()));
break;
@@ -94,8 +94,8 @@ class QtFunction : public camp::Function
case 2:
{
- QVariant arg1 = QtHelper::valueToVariant(args[0]);
- QVariant arg2 = QtHelper::valueToVariant(args[1]);
+ const auto arg1 = QtHelper::argumentToVariant(args[0], m_metaMethod.parameterType(0));
+ const auto arg2 = QtHelper::argumentToVariant(args[1], m_metaMethod.parameterType(1));
m_metaMethod.invoke(object.get<T*>(), Qt::DirectConnection, ret
, QGenericArgument(arg1.typeName(), arg1.data())
, QGenericArgument(arg2.typeName(), arg2.data()));
@@ -104,9 +104,9 @@ class QtFunction : public camp::Function
case 3:
{
- QVariant arg1 = QtHelper::valueToVariant(args[0]);
- QVariant arg2 = QtHelper::valueToVariant(args[1]);
- QVariant arg3 = QtHelper::valueToVariant(args[2]);
+ const auto arg1 = QtHelper::argumentToVariant(args[0], m_metaMethod.parameterType(0));
+ const auto arg2 = QtHelper::argumentToVariant(args[1], m_metaMethod.parameterType(1));
+ const auto arg3 = QtHelper::argumentToVariant(args[2], m_metaMethod.parameterType(2));
m_metaMethod.invoke(object.get<T*>(), Qt::DirectConnection, ret
, QGenericArgument(arg1.typeName(), arg1.data())
, QGenericArgument(arg2.typeName(), arg2.data())
@@ -116,10 +116,10 @@ class QtFunction : public camp::Function
case 4:
{
- QVariant arg1 = QtHelper::valueToVariant(args[0]);
- QVariant arg2 = QtHelper::valueToVariant(args[1]);
- QVariant arg3 = QtHelper::valueToVariant(args[2]);
- QVariant arg4 = QtHelper::valueToVariant(args[3]);
+ const auto arg1 = QtHelper::argumentToVariant(args[0], m_metaMethod.parameterType(0));
+ const auto arg2 = QtHelper::argumentToVariant(args[1], m_metaMethod.parameterType(1));
+ const auto arg3 = QtHelper::argumentToVariant(args[2], m_metaMethod.parameterType(2));
+ const auto arg4 = QtHelper::argumentToVariant(args[3], m_metaMethod.parameterType(3));
m_metaMethod.invoke(object.get<T*>(), Qt::DirectConnection, ret
, QGenericArgument(arg1.typeName(), arg1.data())
, QGenericArgument(arg2.typeName(), arg2.data())
@@ -130,11 +130,11 @@ class QtFunction : public camp::Function
case 5:
{
- QVariant arg1 = QtHelper::valueToVariant(args[0]);
- QVariant arg2 = QtHelper::valueToVariant(args[1]);
- QVariant arg3 = QtHelper::valueToVariant(args[2]);
- QVariant arg4 = QtHelper::valueToVariant(args[3]);
- QVariant arg5 = QtHelper::valueToVariant(args[4]);
+ const auto arg1 = QtHelper::argumentToVariant(args[0], m_metaMethod.parameterType(0));
+ const auto arg2 = QtHelper::argumentToVariant(args[1], m_metaMethod.parameterType(1));
+ const auto arg3 = QtHelper::argumentToVariant(args[2], m_metaMethod.parameterType(2));
+ const auto arg4 = QtHelper::argumentToVariant(args[3], m_metaMethod.parameterType(3));
+ const auto arg5 = QtHelper::argumentToVariant(args[4], m_metaMethod.parameterType(4));
m_metaMethod.invoke(object.get<T*>(), Qt::DirectConnection, ret
, QGenericArgument(arg1.typeName(), arg1.data())
, QGenericArgument(arg2.typeName(), arg2.data())
diff --git a/include/camp/qt/qthelper.hpp b/include/camp/qt/qthelper.hpp
index 154b24c..0050718 100644
--- a/include/camp/qt/qthelper.hpp
+++ b/include/camp/qt/qthelper.hpp
@@ -15,10 +15,10 @@
** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
** copies of the Software, and to permit persons to whom the Software is
** furnished to do so, subject to the following conditions:
-**
+**
** The above copyright notice and this permission notice shall be included in
** all copies or substantial portions of the Software.
-**
+**
** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -105,11 +105,11 @@ class QtHelper
case QMetaType::QString: return QVariant::String;
case QMetaType::QByteArray: return QVariant::ByteArray;
case QMetaType::VoidStar: return QVariant::Invalid;
- case QMetaType::Long: return QVariant::Int;
+ case QMetaType::Long: return (sizeof(int) == sizeof(long)) ? QVariant::Int : QVariant::LongLong;
case QMetaType::LongLong: return QVariant::LongLong;
case QMetaType::Short: return QVariant::Int;
case QMetaType::Char: return QVariant::Char;
- case QMetaType::ULong: return QVariant::UInt;
+ case QMetaType::ULong: return (sizeof(int) == sizeof(long)) ? QVariant::UInt : QVariant::ULongLong;
case QMetaType::ULongLong: return QVariant::ULongLong;
case QMetaType::UShort: return QVariant::UInt;
case QMetaType::UChar: return QVariant::Char;
@@ -166,12 +166,18 @@ class QtHelper
*/
static QVariant valueToVariant(const camp::Value& value)
{
+ auto toInt = [](const camp::Value& value)
+ {
+ return value.to<long>() > static_cast<long>(std::numeric_limits<int>::max())
+ ? QVariant(value.to<long long>())
+ : QVariant(value.to<int>());
+ };
switch (value.type())
{
default:
case camp::noType: return QVariant();
case camp::boolType: return QVariant(value.to<bool>());
- case camp::intType: return QVariant(value.to<int>());
+ case camp::intType: return toInt(value);
case camp::realType: return QVariant(value.to<double>());
case camp::stringType: return QVariant(value.to<QString>());
case camp::enumType: return QVariant(value.to<int>());
@@ -179,6 +185,38 @@ class QtHelper
}
}
+ /**
+ * \brief Convert a CAMP value to a QGenericArgument
+ *
+ * \param value Source camp::Value to convert
+ *
+ * \return \a value converted to a QGenericArgument
+ */
+ static QVariant argumentToVariant(const camp::Value& value, int metaType)
+ {
+ switch (metaType)
+ {
+ default:
+ case QMetaType::Void: return QVariant();
+ case QMetaType::Bool: return value.to<bool>();
+ case QMetaType::Int: return value.to<int>();
+ case QMetaType::UInt: return value.to<unsigned int>();
+ case QMetaType::Double: return value.to<double>();
+ case QMetaType::QChar: return value.to<char>();
+ case QMetaType::QString: return value.to<QString>();
+ case QMetaType::Long: return sizeof(int) == sizeof(long) ? value.to<int>(): value.to<long long>();
+ case QMetaType::LongLong: return value.to<long long>();
+ case QMetaType::Short: return value.to<short>();
+ case QMetaType::Char: return value.to<char>();
+ case QMetaType::ULong: return sizeof(int) == sizeof(long) ? value.to<unsigned int>(): value.to<unsigned long long>();
+ case QMetaType::ULongLong: return value.to<unsigned long long>();;
+ case QMetaType::UShort: return value.to<unsigned short>();;
+ case QMetaType::UChar: return value.to<unsigned char>();;
+ case QMetaType::Float: return value.to<float>();
+ }
+ }
+
+
/**
* \brief Convert a QVariant to a CAMP value
*
diff --git a/include/camp/valuemapper.hpp b/include/camp/valuemapper.hpp
index d02e432..96f277b 100644
--- a/include/camp/valuemapper.hpp
+++ b/include/camp/valuemapper.hpp
@@ -15,10 +15,10 @@
** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
** copies of the Software, and to permit persons to whom the Software is
** furnished to do so, subject to the following conditions:
-**
+**
** The above copyright notice and this permission notice shall be included in
** all copies or substantial portions of the Software.
-**
+**
** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -40,8 +40,8 @@
#include <camp/arraymapper.hpp>
#include <camp/errors.hpp>
#include <boost/lexical_cast.hpp>
-#include <boost/type_traits.hpp>
-#include <boost/utility/enable_if.hpp>
+
+#include <type_traits>
namespace camp_ext
@@ -94,13 +94,13 @@ namespace camp_ext
* {
* // The corresponding CAMP type is "string"
* static const int type = camp::string;
- *
+ *
* // Convert from MyStringClass to std::string
* static std::string to(const MyStringClass& source)
* {
* return source.to_std_string();
* }
- *
+ *
* // Convert from any type to MyStringClass
* // Be smart, juste reuse ValueMapper<std::string> :)
* template <typename T>
@@ -124,7 +124,9 @@ struct ValueMapper
static camp::UserObject to(const T& source) {return camp::UserObject(source);}
static T from(bool) {CAMP_ERROR(camp::BadType(camp::boolType, camp::mapType<T>()));}
+ static T from(int) {CAMP_ERROR(camp::BadType(camp::intType, camp::mapType<T>()));}
static T from(long) {CAMP_ERROR(camp::BadType(camp::intType, camp::mapType<T>()));}
+ static T from(long long) {CAMP_ERROR(camp::BadType(camp::intType, camp::mapType<T>()));}
static T from(double) {CAMP_ERROR(camp::BadType(camp::realType, camp::mapType<T>()));}
static T from(const std::string&) {CAMP_ERROR(camp::BadType(camp::stringType, camp::mapType<T>()));}
static T from(const camp::EnumObject&) {CAMP_ERROR(camp::BadType(camp::enumType, camp::mapType<T>()));}
@@ -135,7 +137,7 @@ struct ValueMapper
* Specialization of ValueMapper for abstract types
*/
template <typename T>
-struct ValueMapper<T, typename boost::enable_if<boost::is_abstract<T> >::type>
+struct ValueMapper<T, typename std::enable_if<std::is_abstract<T>::value >::type>
{
static const int type = camp::userType;
static camp::UserObject to(const T& source) {return camp::UserObject(source);}
@@ -152,8 +154,9 @@ struct ValueMapper<bool>
static bool from(bool source) {return source;}
static bool from(long source) {return source != 0;}
+ static bool from(long long source) {return source != 0;}
static bool from(double source) {return source != 0.;}
- static bool from(const std::string& source)
+ static bool from(const std::string& source)
{
bool result;
if(source.compare("true") == 0)
@@ -178,16 +181,18 @@ struct ValueMapper<bool>
* Specialization of ValueMapper for integers
*/
template <typename T>
-struct ValueMapper<T, typename boost::enable_if_c<boost::is_integral<T>::value
- && !boost::is_const<T>::value // to avoid conflict with ValueMapper<const T>
- && !boost::is_reference<T>::value // to avoid conflict with ValueMapper<T&>
- >::type>
+struct ValueMapper<T, typename std::enable_if<std::is_integral<T>::value
+ && !std::is_const<T>::value // to avoid conflict with ValueMapper<const T>
+ && !std::is_reference<T>::value // to avoid conflict with ValueMapper<T&>
+ >::type>
{
static const int type = camp::intType;
static long to(T source) {return static_cast<long>(source);}
static T from(bool source) {return static_cast<T>(source);}
+ static T from(int source) {return static_cast<T>(source);}
static T from(long source) {return static_cast<T>(source);}
+ static T from(long long ) {CAMP_ERROR(camp::BadType(camp::userType, camp::intType));}
static T from(double source) {return static_cast<T>(source);}
static T from(const std::string& source) {return boost::lexical_cast<T>(source);}
static T from(const camp::EnumObject& source) {return static_cast<T>(source.value());}
@@ -198,16 +203,19 @@ struct ValueMapper<T, typename boost::enable_if_c<boost::is_integral<T>::value
* Specialization of ValueMapper for reals
*/
template <typename T>
-struct ValueMapper<T, typename boost::enable_if_c<boost::is_float<T>::value
- && !boost::is_const<T>::value // to avoid conflict with ValueMapper<const T>
- && !boost::is_reference<T>::value // to avoid conflict with ValueMapper<T&>
- >::type>
+struct ValueMapper<T, typename std::enable_if<std::is_floating_point<T>::value
+ && !std::is_const<T>::value // to avoid conflict with ValueMapper<const T>
+ && !std::is_reference<T>::value // to avoid conflict with ValueMapper<T&>
+ >::type>
{
static const int type = camp::realType;
static double to(T source) {return static_cast<double>(source);}
static T from(bool source) {return static_cast<T>(source);}
+ static T from(int source) {return static_cast<T>(source);}
static T from(long source) {return static_cast<T>(source);}
+ static T from(long long source) {return static_cast<T>(source);}
+ static T from(float source) {return static_cast<T>(source);}
static T from(double source) {return static_cast<T>(source);}
static T from(const std::string& source) {return boost::lexical_cast<T>(source);}
static T from(const camp::EnumObject& source) {return static_cast<T>(source.value());}
@@ -224,7 +232,9 @@ struct ValueMapper<std::string>
static const std::string& to(const std::string& source) {return source;}
static std::string from(bool source) {return boost::lexical_cast<std::string>(source);}
+ static std::string from(int source) {return boost::lexical_cast<std::string>(source);}
static std::string from(long source) {return boost::lexical_cast<std::string>(source);}
+ static std::string from(long long source) {return boost::lexical_cast<std::string>(source);}
static std::string from(double source) {return boost::lexical_cast<std::string>(source);}
static std::string from(const std::string& source) {return source;}
static std::string from(const camp::EnumObject& source) {return source.name();}
@@ -238,10 +248,10 @@ struct ValueMapper<std::string>
* Warning: special case for char[] and const char[], they are strings not arrays
*/
template <typename T>
-struct ValueMapper<T, typename boost::enable_if_c<camp::detail::IsArray<T>::value
- && !boost::is_same<typename camp_ext::ArrayMapper<T>::ElementType, char>::value
- && !boost::is_same<typename camp_ext::ArrayMapper<T>::ElementType, const char>::value
- >::type>
+struct ValueMapper<T, typename std::enable_if<camp::detail::IsArray<T>::value
+ && !std::is_same<typename camp_ext::ArrayMapper<T>::ElementType, char>::value
+ && !std::is_same<typename camp_ext::ArrayMapper<T>::ElementType, const char>::value
+ >::type>
{
static const int type = camp::arrayType;
};
@@ -267,16 +277,18 @@ struct ValueMapper<const char[N]>
* Specialization of ValueMapper for enum types
*/
template <typename T>
-struct ValueMapper<T, typename boost::enable_if_c<boost::is_enum<T>::value
- && !boost::is_const<T>::value // to avoid conflict with ValueMapper<const T>
- && !boost::is_reference<T>::value // to avoid conflict with ValueMapper<T&>
- >::type>
+struct ValueMapper<T, typename std::enable_if<std::is_enum<T>::value
+ && !std::is_const<T>::value // to avoid conflict with ValueMapper<const T>
+ && !std::is_reference<T>::value // to avoid conflict with ValueMapper<T&>
+ >::type>
{
static const int type = camp::enumType;
static camp::EnumObject to(T source) {return camp::EnumObject(source);}
static T from(bool source) {return static_cast<T>(static_cast<long>(source));}
+ static T from(int source) {return static_cast<T>(source);}
static T from(long source) {return static_cast<T>(source);}
+ static T from(long long source) {return static_cast<T>(source);}
static T from(double source) {return static_cast<T>(static_cast<long>(source));}
static T from(const camp::EnumObject& source) {return static_cast<T>(source.value());}
static T from(const camp::UserObject&) {CAMP_ERROR(camp::BadType(camp::userType, camp::enumType));}
@@ -312,11 +324,13 @@ struct ValueMapper<camp::EnumObject>
static const camp::EnumObject& to(const camp::EnumObject& source) {return source;}
static const camp::EnumObject& from(const camp::EnumObject& source) {return source;}
- static camp::UserObject from(bool) {CAMP_ERROR(camp::BadType(camp::boolType, camp::enumType));}
- static camp::UserObject from(long) {CAMP_ERROR(camp::BadType(camp::intType, camp::enumType));}
- static camp::UserObject from(double) {CAMP_ERROR(camp::BadType(camp::realType, camp::enumType));}
- static camp::UserObject from(const std::string&) {CAMP_ERROR(camp::BadType(camp::stringType, camp::enumType));}
- static camp::UserObject from(const camp::UserObject&) {CAMP_ERROR(camp::BadType(camp::enumType, camp::enumType));}
+ static camp::UserObject from(bool) {CAMP_ERROR(camp::BadType(camp::boolType, camp::enumType));}
+ static camp::UserObject from(int) {CAMP_ERROR(camp::BadType(camp::intType, camp::enumType));}
+ static camp::UserObject from(long) {CAMP_ERROR(camp::BadType(camp::intType, camp::enumType));}
+ static camp::UserObject from(long long) {CAMP_ERROR(camp::BadType(camp::intType, camp::enumType));}
+ static camp::UserObject from(double) {CAMP_ERROR(camp::BadType(camp::realType, camp::enumType));}
+ static camp::UserObject from(const std::string&) {CAMP_ERROR(camp::BadType(camp::stringType, camp::enumType));}
+ static camp::UserObject from(const camp::UserObject&) {CAMP_ERROR(camp::BadType(camp::enumType, camp::enumType));}
};
/*
@@ -329,11 +343,13 @@ struct ValueMapper<camp::UserObject>
static const camp::UserObject& to(const camp::UserObject& source) {return source;}
static const camp::UserObject& from(const camp::UserObject& source) {return source;}
- static camp::UserObject from(bool) {CAMP_ERROR(camp::BadType(camp::boolType, camp::userType));}
- static camp::UserObject from(long) {CAMP_ERROR(camp::BadType(camp::intType, camp::userType));}
- static camp::UserObject from(double) {CAMP_ERROR(camp::BadType(camp::realType, camp::userType));}
- static camp::UserObject from(const std::string&) {CAMP_ERROR(camp::BadType(camp::stringType, camp::userType));}
- static camp::UserObject from(const camp::EnumObject&) {CAMP_ERROR(camp::BadType(camp::enumType, camp::userType));}
+ static camp::UserObject from(bool) {CAMP_ERROR(camp::BadType(camp::boolType, camp::userType));}
+ static camp::UserObject from(int) {CAMP_ERROR(camp::BadType(camp::intType, camp::userType));}
+ static camp::UserObject from(long) {CAMP_ERROR(camp::BadType(camp::intType, camp::userType));}
+ static camp::UserObject from(long long) {CAMP_ERROR(camp::BadType(camp::intType, camp::userType));}
+ static camp::UserObject from(double) {CAMP_ERROR(camp::BadType(camp::realType, camp::userType));}
+ static camp::UserObject from(const std::string&) {CAMP_ERROR(camp::BadType(camp::stringType, camp::userType));}
+ static camp::UserObject from(const camp::EnumObject&) {CAMP_ERROR(camp::BadType(camp::enumType, camp::userType));}
};
/*
diff --git a/test/arrayproperty.hpp b/test/arrayproperty.hpp
index b2ae921..3fa1d02 100644
--- a/test/arrayproperty.hpp
+++ b/test/arrayproperty.hpp
@@ -13,10 +13,10 @@
** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
** copies of the Software, and to permit persons to whom the Software is
** furnished to do so, subject to the following conditions:
-**
+**
** The above copyright notice and this permission notice shall be included in
** all copies or substantial portions of the Software.
-**
+**
** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -32,7 +32,7 @@
#include <camp/camptype.hpp>
#include <camp/class.hpp>
-#include <boost/array.hpp>
+#include <array>
#include <list>
#include <vector>
@@ -76,7 +76,7 @@ namespace ArrayPropertyTest
}
bool bools[2];
- boost::array<int, 3> ints;
+ std::array<int, 3> ints;
std::vector<std::string> strings;
std::list<MyType> objects;
};
diff --git a/test/qt/propertymapping.cpp b/test/qt/propertymapping.cpp
index 817b565..8f36000 100644
--- a/test/qt/propertymapping.cpp
+++ b/test/qt/propertymapping.cpp
@@ -13,10 +13,10 @@
** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
** copies of the Software, and to permit persons to whom the Software is
** furnished to do so, subject to the following conditions:
-**
+**
** The above copyright notice and this permission notice shall be included in
** all copies or substantial portions of the Software.
-**
+**
** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -32,6 +32,8 @@
#include <camp/classget.hpp>
#include <boost/test/unit_test.hpp>
+#include <numeric>
+
using namespace PropertyMappingTest;
//-----------------------------------------------------------------------------
@@ -43,7 +45,7 @@ struct PropertyMappingFixture
object.setBool(true);
object.setInt(-10);
- object.setULong(20);
+ object.setULong(std::numeric_limits<unsigned long>::max() - 1);
object.setDouble(0.55);
object.setString("hello");
object.setEnum(MyClass::two);
@@ -91,7 +93,7 @@ BOOST_AUTO_TEST_CASE(get)
{
BOOST_CHECK_EQUAL(metaclass->property("m_bool_read").get(object).to<bool>(), true);
BOOST_CHECK_EQUAL(metaclass->property("m_int_read").get(object).to<int>(), -10);
- BOOST_CHECK_EQUAL(metaclass->property("m_ulong_read").get(object).to<unsigned long>(), 20);
+ BOOST_CHECK_EQUAL(metaclass->property("m_ulong_read").get(object).to<unsigned long>(), std::numeric_limits<unsigned long>::max() - 1);
BOOST_CHECK_CLOSE(metaclass->property("m_double_read").get(object).to<double>(), 0.55, 1E-5);
BOOST_CHECK_EQUAL(metaclass->property("m_string_read").get(object).to<QString>(), "hello");
BOOST_CHECK_EQUAL(metaclass->property("m_enum_read").get(object).to<MyClass::Enum>(), MyClass::two);
@@ -102,14 +104,14 @@ BOOST_AUTO_TEST_CASE(set)
{
metaclass->property("m_bool").set(object, false);
metaclass->property("m_int").set(object, -2);
- metaclass->property("m_ulong").set(object, 50);
+ metaclass->property("m_ulong").set(object, std::numeric_limits<unsigned long>::max() - 1);
metaclass->property("m_double").set(object, -8.8);
metaclass->property("m_string").set(object, "bonjour");
metaclass->property("m_enum").set(object, MyClass::three);
BOOST_CHECK_EQUAL(metaclass->property("m_bool").get(object).to<bool>(), false);
BOOST_CHECK_EQUAL(metaclass->property("m_int").get(object).to<int>(), -2);
- BOOST_CHECK_EQUAL(metaclass->property("m_ulong").get(object).to<unsigned long>(), 50);
+ BOOST_CHECK_EQUAL(metaclass->property("m_ulong").get(object).to<unsigned long>(), std::numeric_limits<unsigned long>::max() - 1);
BOOST_CHECK_CLOSE(metaclass->property("m_double").get(object).to<double>(), -8.8, 1E-5);
BOOST_CHECK_EQUAL(metaclass->property("m_string").get(object).to<QString>(), "bonjour");
BOOST_CHECK_EQUAL(metaclass->property("m_enum").get(object).to<MyClass::Enum>(), MyClass::three);
signature.asc
(application/pgp-signature, 819 B)
-----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJa1HO/AAoJEEAYFxYTWcUU1+EP/jCw80DpR38orU0kZ1+DccYu Sxir66Wzv8BnarGh2dSQS/5BNf0osgVpoYxcVXpKywW9xdYNIGbu1ykZNDcDUKHQ ny9TfW27tBa+YXRuP1OPOziP/IwGIXyQc0CiMuYwk1CFPjNA3LUfTgvbVZmRVMHV wNC7pGSLzuZCH5JPCcDeFpIwBGaFeTqslOup2fNYQYkABKUQImq6hd77c5U1xRAm sKl7pXagTC26O2A3c738men1SOIUwT0pBAmEXzUbDz4Y9ENl1fyTt+/6zXLye5lI nH90fvRr0yzf5MZoD0P5TBIIeMYHL37UIixskdct0IYsby6cfihOc+CE3RsSzD1C voBlZls19woss87Qer8ktr3IcaRSGRmifWFdWDT/NsTn9GQ4DQapkemhbdLQ7pL1 xbLWBwYIF1WLOQLRYJcIJ9a32Oo9Dq7VNRuJMWF6Q6ZE3d44BuCnJH3bIBKnTtAa fBQ67tP50lanI3U7xdlVp2/g+h7Q6IC0DWJiBM/KgBw2a4q7a4F0Nei4xqlgx0DP dNG6H949KgYQDiz1MDDYmx1RzbJMUvbs+Mf+h4OKkghD0Rer+ii/5qkWK3NkiJGO tmRbnSUC3y9AFRZ3yQxFvKziVpkLSSbPBAL7VrhbfemgY7Vw5zAkUvtJsR63YEDu fPbc33hN3ukxH2tTRzhn =CL3O -----END PGP SIGNATURE-----