diff options
| author | Martin Pejcoch <martin.pejcoch@nokia.com> | 2011-06-09 15:26:22 (GMT) |
|---|---|---|
| committer | Martin Pejcoch <martin.pejcoch@nokia.com> | 2011-06-10 11:25:51 (GMT) |
| commit | b9664d5aecc05f63ef705962f4d92155fb0ce0bf (patch) | |
| tree | e0a17ca95efa15320356e3ee30586cb2c17a068e /src/opengl/gl2paintengineex/qtriangulator.cpp | |
| parent | 7b287a3861b2b71a31dfea53b5c93a0cb7d99fcc (diff) | |
| download | Qt-b9664d5aecc05f63ef705962f4d92155fb0ce0bf.zip Qt-b9664d5aecc05f63ef705962f4d92155fb0ce0bf.tar.gz Qt-b9664d5aecc05f63ef705962f4d92155fb0ce0bf.tar.bz2 | |
Fixing OpenGL module build error on Solaris
Even though the code was correct, the CC 5.9 compiler was producing
an error.
Task-number: QTBUG-19641
Reviewed by: Kim Motoyoshi Kalland
Reviewed by: Samuel Rødal
Diffstat (limited to 'src/opengl/gl2paintengineex/qtriangulator.cpp')
| -rw-r--r-- | src/opengl/gl2paintengineex/qtriangulator.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/opengl/gl2paintengineex/qtriangulator.cpp b/src/opengl/gl2paintengineex/qtriangulator.cpp index 7c3be2b..5293eff 100644 --- a/src/opengl/gl2paintengineex/qtriangulator.cpp +++ b/src/opengl/gl2paintengineex/qtriangulator.cpp @@ -1309,6 +1309,9 @@ inline void QRingBuffer<T>::enqueue(const T &x) //============================================================================// // QTriangulator // //============================================================================// + +typedef QRBTree<int>::Node *QRBTreeIntNodePointer; + template<typename T> class QTriangulator { @@ -1775,7 +1778,7 @@ bool QTriangulator<T>::ComplexToSimple::edgeIsLeftOfEdge(int leftEdgeIndex, int } template <typename T> -QRBTree<int>::Node *QTriangulator<T>::ComplexToSimple::searchEdgeLeftOf(int edgeIndex) const +QRBTreeIntNodePointer QTriangulator<T>::ComplexToSimple::searchEdgeLeftOf(int edgeIndex) const { QRBTree<int>::Node *current = m_edgeList.root; QRBTree<int>::Node *result = 0; @@ -1791,7 +1794,7 @@ QRBTree<int>::Node *QTriangulator<T>::ComplexToSimple::searchEdgeLeftOf(int edge } template <typename T> -QRBTree<int>::Node *QTriangulator<T>::ComplexToSimple::searchEdgeLeftOf(int edgeIndex, QRBTree<int>::Node *after) const +QRBTreeIntNodePointer QTriangulator<T>::ComplexToSimple::searchEdgeLeftOf(int edgeIndex, QRBTree<int>::Node *after) const { if (!m_edgeList.root) return after; |