kits: Only export private dummy copy constructors for R5 ABI.
Fixes #546 (after all these years!)
This commit is contained in:
@@ -291,6 +291,7 @@ BApplication::BApplication(BMessage* data)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef _BEOS_R5_COMPATIBLE_
|
||||||
BApplication::BApplication(uint32 signature)
|
BApplication::BApplication(uint32 signature)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
@@ -301,6 +302,14 @@ BApplication::BApplication(const BApplication &rhs)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
BApplication&
|
||||||
|
BApplication::operator=(const BApplication &rhs)
|
||||||
|
{
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
BApplication::~BApplication()
|
BApplication::~BApplication()
|
||||||
{
|
{
|
||||||
Lock();
|
Lock();
|
||||||
@@ -340,13 +349,6 @@ BApplication::~BApplication()
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
BApplication&
|
|
||||||
BApplication::operator=(const BApplication &rhs)
|
|
||||||
{
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
void
|
||||||
BApplication::_InitData(const char* signature, bool initGUI, status_t* _error)
|
BApplication::_InitData(const char* signature, bool initGUI, status_t* _error)
|
||||||
{
|
{
|
||||||
|
|||||||
+13
-14
@@ -642,20 +642,6 @@ BHandler::_ObserverList()
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
BHandler::BHandler(const BHandler &)
|
|
||||||
{
|
|
||||||
// No copy construction allowed.
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
BHandler &
|
|
||||||
BHandler::operator=(const BHandler &)
|
|
||||||
{
|
|
||||||
// No assignments allowed.
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
void
|
||||||
BHandler::SetLooper(BLooper* looper)
|
BHandler::SetLooper(BLooper* looper)
|
||||||
{
|
{
|
||||||
@@ -682,6 +668,19 @@ _ReservedHandler1__8BHandler(BHandler* handler, uint32 what,
|
|||||||
handler->BHandler::SendNotices(what, notice);
|
handler->BHandler::SendNotices(what, notice);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
BHandler::BHandler(const BHandler &)
|
||||||
|
{
|
||||||
|
// No copy construction allowed.
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
BHandler &
|
||||||
|
BHandler::operator=(const BHandler &)
|
||||||
|
{
|
||||||
|
// No assignments allowed.
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void BHandler::_ReservedHandler2() {}
|
void BHandler::_ReservedHandler2() {}
|
||||||
|
|||||||
@@ -832,6 +832,7 @@ void BLooper::_ReservedLooper5() {}
|
|||||||
void BLooper::_ReservedLooper6() {}
|
void BLooper::_ReservedLooper6() {}
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef _BEOS_R5_COMPATIBLE_
|
||||||
BLooper::BLooper(const BLooper& other)
|
BLooper::BLooper(const BLooper& other)
|
||||||
{
|
{
|
||||||
// Copy construction not allowed
|
// Copy construction not allowed
|
||||||
@@ -844,6 +845,7 @@ BLooper::operator=(const BLooper& other)
|
|||||||
// Looper copying not allowed
|
// Looper copying not allowed
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
BLooper::BLooper(int32 priority, port_id port, const char* name)
|
BLooper::BLooper(int32 priority, port_id port, const char* name)
|
||||||
|
|||||||
@@ -168,6 +168,7 @@ void BMessageRunner::_ReservedMessageRunner5() {}
|
|||||||
void BMessageRunner::_ReservedMessageRunner6() {}
|
void BMessageRunner::_ReservedMessageRunner6() {}
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef _BEOS_R5_COMPATIBLE_
|
||||||
//! Privatized copy constructor to prevent usage.
|
//! Privatized copy constructor to prevent usage.
|
||||||
BMessageRunner::BMessageRunner(const BMessageRunner &)
|
BMessageRunner::BMessageRunner(const BMessageRunner &)
|
||||||
:
|
:
|
||||||
@@ -182,6 +183,7 @@ BMessageRunner::operator=(const BMessageRunner&)
|
|||||||
{
|
{
|
||||||
return* this;
|
return* this;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
/*! Initializes the BMessageRunner.
|
/*! Initializes the BMessageRunner.
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ static const int32 kIconForTypeResourceID = 0;
|
|||||||
static const int32 kCatalogEntryResourceID = 1;
|
static const int32 kCatalogEntryResourceID = 1;
|
||||||
|
|
||||||
// R5 also exports these (Tracker is using them):
|
// R5 also exports these (Tracker is using them):
|
||||||
// (maybe we better want to drop them silently and declare
|
// (maybe we better want to drop them silently and declare
|
||||||
// the above in a public Haiku header - and use that one in
|
// the above in a public Haiku header - and use that one in
|
||||||
// Tracker when compiled for Haiku)
|
// Tracker when compiled for Haiku)
|
||||||
extern const uint32 MINI_ICON_TYPE, LARGE_ICON_TYPE;
|
extern const uint32 MINI_ICON_TYPE, LARGE_ICON_TYPE;
|
||||||
@@ -578,7 +578,7 @@ BAppFileInfo::GetVersionInfo(version_info* info, version_kind kind) const
|
|||||||
} else
|
} else
|
||||||
return B_ERROR;
|
return B_ERROR;
|
||||||
|
|
||||||
// return result
|
// return result
|
||||||
return B_OK;
|
return B_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -958,6 +958,7 @@ void BAppFileInfo::_ReservedAppFileInfo2() {}
|
|||||||
void BAppFileInfo::_ReservedAppFileInfo3() {}
|
void BAppFileInfo::_ReservedAppFileInfo3() {}
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef _BEOS_R5_COMPATIBLE_
|
||||||
//! Privatized assignment operator to prevent usage.
|
//! Privatized assignment operator to prevent usage.
|
||||||
BAppFileInfo&
|
BAppFileInfo&
|
||||||
BAppFileInfo::operator=(const BAppFileInfo&)
|
BAppFileInfo::operator=(const BAppFileInfo&)
|
||||||
@@ -970,6 +971,7 @@ BAppFileInfo::operator=(const BAppFileInfo&)
|
|||||||
BAppFileInfo::BAppFileInfo(const BAppFileInfo&)
|
BAppFileInfo::BAppFileInfo(const BAppFileInfo&)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
/*! Initializes a BMimeType to the signature of the associated file.
|
/*! Initializes a BMimeType to the signature of the associated file.
|
||||||
|
|||||||
@@ -1200,6 +1200,7 @@ void BMimeType::_ReservedMimeType2() {}
|
|||||||
void BMimeType::_ReservedMimeType3() {}
|
void BMimeType::_ReservedMimeType3() {}
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef _BEOS_R5_COMPATIBLE_
|
||||||
// assignment operator.
|
// assignment operator.
|
||||||
// Unimplemented
|
// Unimplemented
|
||||||
BMimeType&
|
BMimeType&
|
||||||
@@ -1215,6 +1216,7 @@ BMimeType::operator=(const BMimeType &)
|
|||||||
BMimeType::BMimeType(const BMimeType &)
|
BMimeType::BMimeType(const BMimeType &)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
status_t
|
status_t
|
||||||
@@ -1240,7 +1242,7 @@ BMimeType::GetSupportedTypes(BMessage* types)
|
|||||||
\c B_STRING_TYPE in \a types.
|
\c B_STRING_TYPE in \a types.
|
||||||
|
|
||||||
For each supported type the result of BMimeType::GetSupportingApps() will
|
For each supported type the result of BMimeType::GetSupportingApps() will
|
||||||
afterwards include the signature of this application.
|
afterwards include the signature of this application.
|
||||||
|
|
||||||
\a fullSync specifies whether or not any types that are no longer
|
\a fullSync specifies whether or not any types that are no longer
|
||||||
listed as supported types as of this call to SetSupportedTypes() shall be
|
listed as supported types as of this call to SetSupportedTypes() shall be
|
||||||
|
|||||||
@@ -608,6 +608,7 @@ void BNodeInfo::_ReservedNodeInfo2() {}
|
|||||||
void BNodeInfo::_ReservedNodeInfo3() {}
|
void BNodeInfo::_ReservedNodeInfo3() {}
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef _BEOS_R5_COMPATIBLE_
|
||||||
/*! Assignment operator is declared private to prevent it from being created
|
/*! Assignment operator is declared private to prevent it from being created
|
||||||
automatically by the compiler.
|
automatically by the compiler.
|
||||||
*/
|
*/
|
||||||
@@ -624,3 +625,4 @@ BNodeInfo::operator=(const BNodeInfo &nodeInfo)
|
|||||||
BNodeInfo::BNodeInfo(const BNodeInfo &)
|
BNodeInfo::BNodeInfo(const BNodeInfo &)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user