summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qsharedpointer.cpp
diff options
context:
space:
mode:
authorminiak <milan.burda@gmail.com>2010-08-03 16:33:12 (GMT)
committerOlivier Goffart <olivier.goffart@nokia.com>2010-08-03 16:35:28 (GMT)
commit26f43dcc70a0bcc8aec96a0ca6f648c543b97b10 (patch)
treea387f04203570a75e347abd78cf765e9903c9e36 /src/corelib/tools/qsharedpointer.cpp
parent02e5a6c9abe9562ce2b2057c0b89f65d371c5b40 (diff)
downloadQt-26f43dcc70a0bcc8aec96a0ca6f648c543b97b10.zip
Qt-26f43dcc70a0bcc8aec96a0ca6f648c543b97b10.tar.gz
Qt-26f43dcc70a0bcc8aec96a0ca6f648c543b97b10.tar.bz2
It is no longer necessary to check for QT_NO_MEMBER_TEMPLATES
Merge-request: 756 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Diffstat (limited to 'src/corelib/tools/qsharedpointer.cpp')
-rw-r--r--src/corelib/tools/qsharedpointer.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/corelib/tools/qsharedpointer.cpp b/src/corelib/tools/qsharedpointer.cpp
index 1b4b356..bad2897 100644
--- a/src/corelib/tools/qsharedpointer.cpp
+++ b/src/corelib/tools/qsharedpointer.cpp
@@ -1275,8 +1275,6 @@ QT_END_NAMESPACE
-#if !defined(QT_NO_MEMBER_TEMPLATES)
-
//# define QT_SHARED_POINTER_BACKTRACE_SUPPORT
# ifdef QT_SHARED_POINTER_BACKTRACE_SUPPORT
# if defined(__GLIBC__) && (__GLIBC__ >= 2) && !defined(__UCLIBC__) && !defined(QT_LINUXBASE)
@@ -1501,5 +1499,3 @@ void QtSharedPointer::internalSafetyCheckCleanCheck()
}
QT_END_NAMESPACE
-
-#endif