diff options
| author | Michele Calgaro <[email protected]> | 2021-02-13 14:35:13 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2021-02-13 14:36:16 +0900 |
| commit | 0fa6ad42e8e3ec60d90d94f214ae4496f379bcf2 (patch) | |
| tree | b367c9aea1b713bed2c21268fae60062ee980e3b /src | |
| parent | 529485e7e30dd24c4c71a343cd8bf4cfc2a08808 (diff) | |
| download | tqt3-0fa6ad42e8e3ec60d90d94f214ae4496f379bcf2.tar.gz tqt3-0fa6ad42e8e3ec60d90d94f214ae4496f379bcf2.zip | |
Fixed broken Q_FULL_TEMPLATE_INSTANTIATION define (renamed to TQ_FULL_TEMPLATE_INSTANTIATION).
Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 0f480dc43f6a3dc50b438a17fc2526ca444065ec)
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/ntqglobal.h | 12 | ||||
| -rw-r--r-- | src/tools/ntqmap.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/tools/ntqglobal.h b/src/tools/ntqglobal.h index 8d1da7d1c..bc67fcae4 100644 --- a/src/tools/ntqglobal.h +++ b/src/tools/ntqglobal.h @@ -290,9 +290,9 @@ # define QT_NO_TEMPLATE_VARIANT /* Wcc does not fill in functions needed by valuelists, maps, and valuestacks implicitly */ -# define Q_FULL_TEMPLATE_INSTANTIATION +# define TQ_FULL_TEMPLATE_INSTANTIATION /* can we just compare the structures? */ -# define Q_FULL_TEMPLATE_INSTANTIATION_MEMCMP +# define TQ_FULL_TEMPLATE_INSTANTIATION_MEMCMP /* these are not useful to our customers */ # define QT_QWS_NO_SHM # define QT_NO_QWS_MULTIPROCESS @@ -304,7 +304,7 @@ # define Q_CC_GNU # define Q_C_CALLBACKS # if __GNUC__ == 2 && __GNUC_MINOR__ <= 7 -# define Q_FULL_TEMPLATE_INSTANTIATION +# define TQ_FULL_TEMPLATE_INSTANTIATION # endif /* GCC 2.95 knows "using" but does not support it correctly */ # if __GNUC__ == 2 && __GNUC_MINOR__ <= 95 @@ -354,7 +354,7 @@ but it is not defined on older compilers like C Set 3.1 */ #elif defined(__xlC__) # define Q_CC_XLC -# define Q_FULL_TEMPLATE_INSTANTIATION +# define TQ_FULL_TEMPLATE_INSTANTIATION # if __xlC__ < 0x400 # define Q_NO_BOOL_TYPE # define Q_NO_EXPLICIT_KEYWORD @@ -538,7 +538,7 @@ # else # define Q_CC_HP # define Q_NO_BOOL_TYPE -# define Q_FULL_TEMPLATE_INSTANTIATION +# define TQ_FULL_TEMPLATE_INSTANTIATION # define Q_BROKEN_TEMPLATE_SPECIALIZATION # define Q_NO_EXPLICIT_KEYWORD # endif @@ -1095,7 +1095,7 @@ Q_EXPORT const char *tqInstallPathShare(); Just in case other code relies on it we better trigger a warning mandating a real implementation. */ -#ifdef Q_FULL_TEMPLATE_INSTANTIATION +#ifdef TQ_FULL_TEMPLATE_INSTANTIATION # define Q_DUMMY_COMPARISON_OPERATOR(C) \ bool operator==( const C& ) const { \ tqWarning( #C"::operator==( const "#C"& ) got called." ); \ diff --git a/src/tools/ntqmap.h b/src/tools/ntqmap.h index 3139e7fe9..f4cf4b9c8 100644 --- a/src/tools/ntqmap.h +++ b/src/tools/ntqmap.h @@ -733,7 +733,7 @@ public: void remove( iterator it ) { detach(); sh->remove( it ); } void remove( const Key& k ); -#if defined(Q_FULL_TEMPLATE_INSTANTIATION) +#if defined(TQ_FULL_TEMPLATE_INSTANTIATION) bool operator==( const TQMap<Key,T>& ) const { return FALSE; } #ifndef QT_NO_STL bool operator==( const std::map<Key,T>& ) const { return FALSE; } |