Explicitly denote BPrivate to avoid clashes
This commit is contained in:
parent
a87c7d67e3
commit
18f5cd171b
@ -109,7 +109,7 @@ private:
|
|||||||
friend class BMessenger;
|
friend class BMessenger;
|
||||||
friend class BView;
|
friend class BView;
|
||||||
friend class BHandler;
|
friend class BHandler;
|
||||||
friend class BPrivate::BLooperList;
|
friend class ::BPrivate::BLooperList;
|
||||||
friend port_id _get_looper_port_(const BLooper* );
|
friend port_id _get_looper_port_(const BLooper* );
|
||||||
|
|
||||||
virtual void _ReservedLooper1();
|
virtual void _ReservedLooper1();
|
||||||
@ -153,7 +153,7 @@ private:
|
|||||||
BHandler* resolve_specifier(BHandler* target, BMessage* msg);
|
BHandler* resolve_specifier(BHandler* target, BMessage* msg);
|
||||||
void UnlockFully();
|
void UnlockFully();
|
||||||
|
|
||||||
BPrivate::BDirectMessageTarget* fDirectTarget;
|
::BPrivate::BDirectMessageTarget* fDirectTarget;
|
||||||
BMessage* fLastMessage;
|
BMessage* fLastMessage;
|
||||||
port_id fMsgPort;
|
port_id fMsgPort;
|
||||||
int32 fAtomicCount;
|
int32 fAtomicCount;
|
||||||
|
@ -269,12 +269,12 @@ private:
|
|||||||
} // namespace BPrivate
|
} // namespace BPrivate
|
||||||
|
|
||||||
|
|
||||||
using BPrivate::ObjectDeleter;
|
using ::BPrivate::ObjectDeleter;
|
||||||
using BPrivate::ArrayDeleter;
|
using ::BPrivate::ArrayDeleter;
|
||||||
using BPrivate::MemoryDeleter;
|
using ::BPrivate::MemoryDeleter;
|
||||||
using BPrivate::CObjectDeleter;
|
using ::BPrivate::CObjectDeleter;
|
||||||
using BPrivate::MethodDeleter;
|
using ::BPrivate::MethodDeleter;
|
||||||
using BPrivate::FileDescriptorCloser;
|
using ::BPrivate::FileDescriptorCloser;
|
||||||
|
|
||||||
|
|
||||||
#endif // _AUTO_DELETER_H
|
#endif // _AUTO_DELETER_H
|
||||||
|
@ -171,8 +171,8 @@ protected:
|
|||||||
|
|
||||||
} // namespace BPrivate
|
} // namespace BPrivate
|
||||||
|
|
||||||
using BPrivate::AutoLocker;
|
using ::BPrivate::AutoLocker;
|
||||||
using BPrivate::AutoLockerReadLocking;
|
using ::BPrivate::AutoLockerReadLocking;
|
||||||
using BPrivate::AutoLockerWriteLocking;
|
using ::BPrivate::AutoLockerWriteLocking;
|
||||||
|
|
||||||
#endif // _AUTO_LOCKER_H
|
#endif // _AUTO_LOCKER_H
|
||||||
|
Loading…
Reference in New Issue
Block a user