Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added deprecated attribute to ACE_Copy_Disabled #2324

Merged
merged 5 commits into from
Feb 5, 2025
Merged

Added deprecated attribute to ACE_Copy_Disabled #2324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2923fc9
Added deprecated attribute
jwillemsen Feb 5, 2025
a60c7a6
Try before export
jwillemsen Feb 5, 2025
7e8912c
Mark constructor ACE_Copy_Disabled as default, removed cpp
jwillemsen Feb 5, 2025
f83abbb
Added docu
jwillemsen Feb 5, 2025
afe6592
Removed export macro as this is now header only
jwillemsen Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions ACE/ace/Copy_Disabled.cpp
View file
Open in desktop

This file was deleted.

18 changes: 15 additions & 3 deletions ACE/ace/Copy_Disabled.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

#include /**/ "ace/pre.h"

#include /**/ "ace/ACE_export.h"
#include /**/ "ace/config-lite.h"

#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
Expand Down Expand Up @@ -42,12 +42,24 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
* {
* // code here
* };
*
* @deprecated This class is deprecated. Instead of using inheritance,
* directly delete copy operations in your class:
*
* class Foo
* {
* public:
* Foo(const Foo&) = delete;
* Foo(Foo&&) = delete;
* Foo& operator=(const Foo&) = delete;
* Foo& operator=(Foo&&) = delete;
* };
*/
class ACE_Export ACE_Copy_Disabled
class [[deprecated]] ACE_Copy_Disabled
{
public:
/// Default constructor
ACE_Copy_Disabled ();
ACE_Copy_Disabled () = default;

private:
ACE_Copy_Disabled (const ACE_Copy_Disabled &) = delete;
Expand Down
2 changes: 1 addition & 1 deletion ACE/ace/ace.mpc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf,
Configuration_Import_Export.cpp
Connection_Recycling_Strategy.cpp
Containers.cpp
Copy_Disabled.cpp
Date_Time.cpp
DEV.cpp
DEV_Addr.cpp
Expand Down Expand Up @@ -400,6 +399,7 @@ project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf,
CORBA_macros.h
Codeset_Symbols.h
Condition_T.h
Copy_Disabled.h
Countdown_Time.h
Default_Constants.h
Event_Base.h
Expand Down
2 changes: 1 addition & 1 deletion ACE/ace/ace_for_tao.mpc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace,
Condition_Attributes.cpp
Condition_Recursive_Thread_Mutex.cpp
Condition_Thread_Mutex.cpp
Copy_Disabled.cpp
DLL_Manager.cpp
Dirent.cpp // Required by TAO_IDL
Dirent_Selector.cpp
Expand Down Expand Up @@ -307,6 +306,7 @@ project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace,
Bound_Ptr.h
CORBA_macros.h
Condition_T.h
Copy_Disabled.h
Countdown_Time.h
Default_Constants.h
Event_Base.h
Expand Down