forked from qt-creator/qt-creator
Debugger: Only auto test dumper for boost >= 1.54
Change-Id: Ib8d0f2c6ed0323eb969c6a6eed9ea0a6c0e3cf8e Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
@@ -599,10 +599,8 @@ struct DataBase
|
||||
mutable GdbVersion neededGdbVersion; // DEC. 70600
|
||||
mutable LldbVersion neededLldbVersion;
|
||||
mutable QtVersion neededQtVersion; // HEX! 0x50300
|
||||
mutable GccVersion neededGccVersion; // DEC. 40702
|
||||
mutable BoostVersion neededBoostVersion; // ((BOOST_VERSION >> 20) & 0xF) << "."
|
||||
// << ((BOOST_VERSION >> 8) & 0xFFF) << "."
|
||||
// << (BOOST_VERSION & 0xFF)
|
||||
mutable GccVersion neededGccVersion; // DEC. 40702 for 4.7.2
|
||||
mutable BoostVersion neededBoostVersion; // DEC. 105400 for 1.54.0
|
||||
};
|
||||
|
||||
class Data : public DataBase
|
||||
@@ -5054,6 +5052,7 @@ GdbEngine
|
||||
|
||||
QTest::newRow("BoostUnorderedSet")
|
||||
<< Data("#include <boost/unordered_set.hpp>\n"
|
||||
"#include <boost/version.hpp>\n"
|
||||
"#include <string>\n",
|
||||
|
||||
"boost::unordered_set<int> s1;\n"
|
||||
@@ -5065,7 +5064,7 @@ GdbEngine
|
||||
"s2.insert(\"def\");\n")
|
||||
|
||||
+ BoostProfile()
|
||||
+ BoostVersion((1u<<20) + (42u<<8)) // FIXME: Not checked
|
||||
+ BoostVersion(1 * 100000 + 54 * 100) // FIXME: Not checked
|
||||
+ GdbVersion(70600) // Crude replacement instead
|
||||
|
||||
+ Check("s1", "<2 items>", "boost::unordered::unordered_set<int>")
|
||||
|
||||
@@ -39,6 +39,7 @@
|
||||
#include <private/qobject_p.h>
|
||||
|
||||
#ifdef HAS_BOOST
|
||||
#include <boost/version.hpp>
|
||||
#include <boost/unordered/unordered_set.hpp>
|
||||
#endif
|
||||
|
||||
@@ -192,6 +193,7 @@ void tst_offsets::offsets_data()
|
||||
}
|
||||
|
||||
#ifdef HAS_BOOST
|
||||
#if BOOST_VERSION >= (1 * 100000 + 54 * 100)
|
||||
{
|
||||
boost::unordered::unordered_set<int> *p = 0;
|
||||
|
||||
@@ -203,6 +205,7 @@ void tst_offsets::offsets_data()
|
||||
<< int((char *)&p->table_.buckets_ - (char *)p) << 20 << 40;
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user