CL-Softwares
/
Nut
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add template to template method call

This commit is contained in:
Hamed Masafi 2019-08-04 11:48:15 +04:30
parent f17a35a0d7
commit b9fa7d9495
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -71,7 +71,7 @@ before_script:
- '[[ "$TRAVIS_OS_NAME" != linux || "$PPA" == */opt-* ]] || export QT_SELECT=qt5' - '[[ "$TRAVIS_OS_NAME" != linux || "$PPA" == */opt-* ]] || export QT_SELECT=qt5'
- mkdir -p "$TRAVIS_BUILD_DIR-build" - mkdir -p "$TRAVIS_BUILD_DIR-build"
- cd "$TRAVIS_BUILD_DIR-build" - cd "$TRAVIS_BUILD_DIR-build"
- echo 'QT -= gui' >> ""$TRAVIS_BUILD_DIR/ci-test-init.pri" - echo 'QT -= gui' >> "$TRAVIS_BUILD_DIR/ci-test-init.pri"
- qmake -r -Wall -Wlogic -Wparser CONFIG+=debug_and_release "$TRAVIS_BUILD_DIR/nut.pro" - qmake -r -Wall -Wlogic -Wparser CONFIG+=debug_and_release "$TRAVIS_BUILD_DIR/nut.pro"
script: script:

1
ci-test-init.pri
View File

@ -1,3 +1,4 @@
#QT -= gui #QT -= gui
DEFINES += NUT_PATH=\\\"$$PWD/../../\\\" DEFINES += NUT_PATH=\\\"$$PWD/../../\\\"

4
src/tableset.h
View File

@ -102,7 +102,7 @@ template<class T>
Q_OUTOFLINE_TEMPLATE Row<T> TableSet<T >::at(int i) const Q_OUTOFLINE_TEMPLATE Row<T> TableSet<T >::at(int i) const
{ {
#ifdef NUT_SHARED_POINTER #ifdef NUT_SHARED_POINTER
return data->childs.at(i).objectCast<T>(); return data->childs.at(i).template objectCast<T>();
#else #else
return reinterpret_cast<T*>(data->childs.at(i)); return reinterpret_cast<T*>(data->childs.at(i));
#endif #endif
@ -112,7 +112,7 @@ template<class T>
Q_OUTOFLINE_TEMPLATE const Row<T> TableSet<T>::operator[](int i) const Q_OUTOFLINE_TEMPLATE const Row<T> TableSet<T>::operator[](int i) const
{ {
#ifdef NUT_SHARED_POINTER #ifdef NUT_SHARED_POINTER
return data->childs.at(i).objectCast<T>(); return data->childs.at(i).template objectCast<T>();
#else #else
return reinterpret_cast<T*>(data->childs.at(i)); return reinterpret_cast<T*>(data->childs.at(i));
#endif #endif