Explicitly denote BPrivate to avoid clashes

This commit is contained in:
Ingo Weinhold 2013-09-10 00:36:54 +02:00
parent a87c7d67e3
commit 18f5cd171b
3 changed files with 11 additions and 11 deletions

View File

@ -109,7 +109,7 @@ private:
friend class BMessenger;
friend class BView;
friend class BHandler;
friend class BPrivate::BLooperList;
friend class ::BPrivate::BLooperList;
friend port_id _get_looper_port_(const BLooper* );
virtual void _ReservedLooper1();
@ -153,7 +153,7 @@ private:
BHandler* resolve_specifier(BHandler* target, BMessage* msg);
void UnlockFully();
BPrivate::BDirectMessageTarget* fDirectTarget;
::BPrivate::BDirectMessageTarget* fDirectTarget;
BMessage* fLastMessage;
port_id fMsgPort;
int32 fAtomicCount;

View File

@ -269,12 +269,12 @@ private:
} // namespace BPrivate
using BPrivate::ObjectDeleter;
using BPrivate::ArrayDeleter;
using BPrivate::MemoryDeleter;
using BPrivate::CObjectDeleter;
using BPrivate::MethodDeleter;
using BPrivate::FileDescriptorCloser;
using ::BPrivate::ObjectDeleter;
using ::BPrivate::ArrayDeleter;
using ::BPrivate::MemoryDeleter;
using ::BPrivate::CObjectDeleter;
using ::BPrivate::MethodDeleter;
using ::BPrivate::FileDescriptorCloser;
#endif // _AUTO_DELETER_H

View File

@ -171,8 +171,8 @@ protected:
} // namespace BPrivate
using BPrivate::AutoLocker;
using BPrivate::AutoLockerReadLocking;
using BPrivate::AutoLockerWriteLocking;
using ::BPrivate::AutoLocker;
using ::BPrivate::AutoLockerReadLocking;
using ::BPrivate::AutoLockerWriteLocking;
#endif // _AUTO_LOCKER_H