diff options
| author | hjk <qtc-committer@nokia.com> | 2009-08-10 09:26:01 (GMT) |
|---|---|---|
| committer | hjk <qtc-committer@nokia.com> | 2009-08-10 13:17:25 (GMT) |
| commit | 4fe7c464be95fbbcb663a21f9519024486123248 (patch) | |
| tree | b23117352eae6123e4cb8de90789baa55e7e2b6c /src/corelib/tools/qsharedpointer.cpp | |
| parent | 2a1dcf7a47d81ad8b492c312dfd5e422ba2e3cd0 (diff) | |
| download | Qt-4fe7c464be95fbbcb663a21f9519024486123248.zip Qt-4fe7c464be95fbbcb663a21f9519024486123248.tar.gz Qt-4fe7c464be95fbbcb663a21f9519024486123248.tar.bz2 | |
Compile fix with namespaces
Diffstat (limited to 'src/corelib/tools/qsharedpointer.cpp')
| -rw-r--r-- | src/corelib/tools/qsharedpointer.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/corelib/tools/qsharedpointer.cpp b/src/corelib/tools/qsharedpointer.cpp index f18dee8..cdb7d1d 100644 --- a/src/corelib/tools/qsharedpointer.cpp +++ b/src/corelib/tools/qsharedpointer.cpp @@ -867,6 +867,8 @@ #if !defined(QT_NO_QOBJECT) #include "../kernel/qobject_p.h" +QT_BEGIN_NAMESPACE + /*! \internal This function is called for a just-created QObject \a obj, to enable @@ -910,6 +912,9 @@ QtSharedPointer::ExternalRefCountData *QtSharedPointer::ExternalRefCountData::ge } return d->sharedRefcount; } + +QT_END_NAMESPACE + #endif @@ -932,6 +937,8 @@ QtSharedPointer::ExternalRefCountData *QtSharedPointer::ExternalRefCountData::ge # include <unistd.h> # include <sys/wait.h> +QT_BEGIN_NAMESPACE + static inline QByteArray saveBacktrace() __attribute__((always_inline)); static inline QByteArray saveBacktrace() { @@ -992,6 +999,9 @@ static void printBacktrace(QByteArray stacktrace) waitpid(child, 0, 0); } } + +QT_END_NAMESPACE + # endif // BACKTRACE_SUPPORTED namespace { |