rng2cpp.cpp build fail with qt5.5

[Treeve Jelbert]

On Thu, 28 May 2015 11:33:38 +0200 (CEST), Boudewijn Rempt wrote:
> I bet that's caused by this:
>
> #if QT_VERSION < 0x040800
> #   define assert(cond, what) (Q_ASSERT_X(cond, "",
> qPrintable(QString(what))))
> #else
> #   define assert(cond, what) (Q_ASSERT_X(cond, "", 
> qPrintable(what)))
> #endif
>

thanks, the following diff fixes it

diff --git a/devtools/rng2cpp/rng2cpp.cpp 
b/devtools/rng2cpp/rng2cpp.cpp
index 3dc3214..de65ac4 100644
--- a/devtools/rng2cpp/rng2cpp.cpp
+++ b/devtools/rng2cpp/rng2cpp.cpp
@@ -23,12 +23,10 @@
  #include <QtGlobal>
  #include <QSharedPointer>
  #include <QStringList>
+#include <QSet>
+#include <QVector>

-#if QT_VERSION < 0x040800
-#   define assert(cond, what) (Q_ASSERT_X(cond, "", 
qPrintable(QString(what))))
-#else
-#   define assert(cond, what) (Q_ASSERT_X(cond, "", qPrintable(what)))
-#endif
+#   define assert(cond, what) Q_ASSERT_X(cond, "", qPrintable(what))

  static const QString ns = "writeodf";



Regards, Treeve

> Boud
>
> On Thu, 28 May 2015, Treeve Jelbert wrote:
>
>> fails with qt-5.5.0 + gcc-5.1.0
>> ok with qt-5.4.2 + gcc-5.1.0
>> cmake-3.2.2
>>
>>
>> FAILED: /var/lib/sorcery/build/c++   -DBOOST_ALL_NO_LIB 
>> -DCAN_USE_QTWEBKIT -DHAVE_X11 -DQT_CORE_LIB
>>  -DQT_DISABLE_DEPRECATED_BEFORE=0 -DQT_NO_DEBUG 
>> -DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_
>> PLUS -DQT_XML_LIB -DSHOULD_BUILD_FONT_CONVERSION -D_GNU_SOURCE 
>> -D_LARGEFILE64_SOURCE -march=native
>> -mtune=native -m64 -pipe -O3 -Wno-deprecated-declarations  
>> -std=c++0x -fno-exceptions -Wall -Wextra
>>  -Wcast-align -Wchar-subscripts -Wformat-security -Wno-long-long 
>> -Wpointer-arith -Wundef -Wnon-virt
>> ual-dtor -Woverloaded-virtual -Werror=return-type  -march=bdver2 
>> -msse2 -msse3 -mssse3 -msse4.1 -ms
>> se4.2 -msse4a -mavx -msse2avx -mxop -mfma4  -Wabi -fabi-version=0 
>> -ffp-contract=fast -O3 -DNDEBUG -
>> fPIE -Idevtools/rng2cpp 
>> -I/var/git/qt5/kde5-apps/calligra/devtools/rng2cpp 
>> -I/var/git/qt5/kde5-apps
>> /calligra/interfaces -I. -I/var/git/qt5/kde5-apps/calligra 
>> -I/var/git/qt5/kde5-apps/calligra/libs/v
>> ersion -Ilibs/version -isystem /opt/qt5/include -isystem 
>> /opt/qt5/include/QtCore -isystem /opt/qt5/
>> mkspecs/linux-g++ -isystem /opt/qt5/include/QtXml    -Wno-deprecated 
>> -Wno-deprecated-declarations -
>> MMD -MT devtools/rng2cpp/CMakeFiles/rng2cpp.dir/rng2cpp.cpp.o -MF 
>> devtools/rng2cpp/CMakeFiles/rng2cpp.dir/rng2cpp.cpp.o.d -o 
>> devtools/rng2cpp/CMakeFiles/rng2cpp.dir/rng2cpp.cpp.o -c 
>> /var/git/qt5/kde5-apps/calligra/devtools/rng2cpp/rng2cpp.cpp
>> /var/git/qt5/kde5-apps/calligra/devtools/rng2cpp/rng2cpp.cpp: In 
>> function 'void merge(RNGItem*&, RN
>> GItem* const&)':
>> /var/git/qt5/kde5-apps/calligra/devtools/rng2cpp/rng2cpp.cpp:313:4: 
>> error: expected primary-express
>> ion before 'do'
>>      assert(a->allowedItems.contains(b), "");
>>     ^
>> /var/git/qt5/kde5-apps/calligra/devtools/rng2cpp/rng2cpp.cpp:313:4: 
>> error: expected ')' before 'do'
>> /var/git/qt5/kde5-apps/calligra/devtools/rng2cpp/rng2cpp.cpp: In 
>> function 'RNGItem* getDefines(QDom
>> Element, RNGItems&)':
>> /var/git/qt5/kde5-apps/calligra/devtools/rng2cpp/rng2cpp.cpp:577:12: 
>> error: expected primary-expres
>> sion before 'do'
>>              assert(!start, "Multiple start elements.");
>>             ^
>> /var/git/qt5/kde5-apps/calligra/devtools/rng2cpp/rng2cpp.cpp:577:12: 
>> error: expected ')' before 'do'
>> /var/git/qt5/kde5-apps/calligra/devtools/rng2cpp/rng2cpp.cpp: In 
>> function 'int reduce(RNGItems&)':
>> /var/git/qt5/kde5-apps/calligra/devtools/rng2cpp/rng2cpp.cpp:723:20: 
>> error: expected primary-expression before 'do'
>>                      assert(!user, "");
>>                     ^
>> /var/git/qt5/kde5-apps/calligra/devtools/rng2cpp/rng2cpp.cpp:723:20: 
>> error: expected ')' before 'do'
>> /var/git/qt5/kde5-apps/calligra/devtools/rng2cpp/rng2cpp.cpp: In 
>> function 'RNGItem* getDefine(const QString&, const RNGItems&)':
>> /var/git/qt5/kde5-apps/calligra/devtools/rng2cpp/rng2cpp.cpp:770:12: 
>> error: expected primary-expression before 'do'
>>              assert(!item, "Doubly defined element " + name + ".");
>>             ^
>> /var/git/qt5/kde5-apps/calligra/devtools/rng2cpp/rng2cpp.cpp:770:12: 
>> error: expected ')' before 'do'
>> /var/git/qt5/kde5-apps/calligra/devtools/rng2cpp/rng2cpp.cpp:774:4: 
>> error: expected primary-expression before 'do'
>>      assert(item, "Define not found " + name);
>>     ^
>> /var/git/qt5/kde5-apps/calligra/devtools/rng2cpp/rng2cpp.cpp:774:4: 
>> error: expected ')' before 'do'
>> _______________________________________________
>> calligra-devel mailing list
>> calligra-devel at kde.org
>> https://mail.kde.org/mailman/listinfo/calligra-devel
>>
> _______________________________________________
> calligra-devel mailing list
> calligra-devel at kde.org
> https://mail.kde.org/mailman/listinfo/calligra-devel