summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
Diffstat (limited to 'TAO')
-rw-r--r--TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp5
-rw-r--r--TAO/tao/DynamicAny/DynAnyFactory.h5
-rw-r--r--TAO/tao/DynamicInterface/Context.cpp9
-rw-r--r--TAO/tao/DynamicInterface/Context.h14
-rw-r--r--TAO/tao/DynamicInterface/Context.inl5
-rw-r--r--TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp5
-rw-r--r--TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h2
-rw-r--r--TAO/tao/Invocation_Adapter.h9
8 files changed, 14 insertions, 40 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
index 85f7e25cbf1..bc9e3aaaac4 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
@@ -123,9 +123,8 @@ be_visitor_interface_tie_sh::visit_interface (be_interface *node)
<< "T *ptr_;" << be_nl
<< "PortableServer::POA_var poa_;" << be_nl
<< "::CORBA::Boolean rel_;" << be_nl_2
- << "// copy and assignment are not allowed" << be_nl
- << tiename << " (const " << tiename << " &);" << be_nl
- << "void operator= (const " << tiename << " &);" << be_uidt_nl
+ << tiename << " (const " << tiename << " &) = delete;" << be_nl
+ << "void operator= (const " << tiename << " &) = delete;" << be_uidt_nl
<< "};";
return 0;
diff --git a/TAO/tao/DynamicAny/DynAnyFactory.h b/TAO/tao/DynamicAny/DynAnyFactory.h
index 08864b9686e..8250d118d2b 100644
--- a/TAO/tao/DynamicAny/DynAnyFactory.h
+++ b/TAO/tao/DynamicAny/DynAnyFactory.h
@@ -67,9 +67,8 @@ public:
static CORBA::TypeCode_ptr strip_alias (CORBA::TypeCode_ptr tc);
private:
- // Not allowed.
- TAO_DynAnyFactory (const TAO_DynAnyFactory &src);
- TAO_DynAnyFactory &operator= (const TAO_DynAnyFactory &src);
+ TAO_DynAnyFactory (const TAO_DynAnyFactory &src) = delete;
+ TAO_DynAnyFactory &operator= (const TAO_DynAnyFactory &src) = delete;
};
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicInterface/Context.cpp b/TAO/tao/DynamicInterface/Context.cpp
index c94438783e7..d4ac999a9d8 100644
--- a/TAO/tao/DynamicInterface/Context.cpp
+++ b/TAO/tao/DynamicInterface/Context.cpp
@@ -10,15 +10,6 @@
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-CORBA::Context::Context ()
- : refcount_ (1)
-{
-}
-
-CORBA::Context::~Context ()
-{
-}
-
CORBA::ULong
CORBA::Context::_incr_refcount ()
{
diff --git a/TAO/tao/DynamicInterface/Context.h b/TAO/tao/DynamicInterface/Context.h
index 39230031607..3bbc17f3bef 100644
--- a/TAO/tao/DynamicInterface/Context.h
+++ b/TAO/tao/DynamicInterface/Context.h
@@ -69,9 +69,8 @@ namespace CORBA
class TAO_DynamicInterface_Export Context
{
public:
- Context (void);
-
- ~Context (void);
+ Context () = default;
+ ~Context () = default;
// = Pseudo-object methods
static Context *_duplicate (Context*);
@@ -109,7 +108,7 @@ namespace CORBA
private:
/// Reference counter.
- std::atomic<uint32_t> refcount_;
+ std::atomic<uint32_t> refcount_ { 1 };
};
/**
@@ -123,7 +122,7 @@ namespace CORBA
{
public:
/// Constructor.
- ContextList (void);
+ ContextList () = default;
/// Constructor - initialize given a length and an array of
/// strings.
@@ -169,9 +168,8 @@ namespace CORBA
typedef CORBA::ContextList_out _out_type;
private:
- // Not allowed.
- ContextList (const ContextList &);
- ContextList &operator= (const ContextList &);
+ ContextList (const ContextList &) = delete;
+ ContextList &operator= (const ContextList &) = delete;
/// Reference counter.
std::atomic<uint32_t> refcount_;
diff --git a/TAO/tao/DynamicInterface/Context.inl b/TAO/tao/DynamicInterface/Context.inl
index adc82cb7a4f..0c6fe49dd3d 100644
--- a/TAO/tao/DynamicInterface/Context.inl
+++ b/TAO/tao/DynamicInterface/Context.inl
@@ -25,11 +25,6 @@ CORBA::Context::_nil ()
// *************************************************************
ACE_INLINE
-CORBA::ContextList::ContextList ()
-{
-}
-
-ACE_INLINE
CORBA::ULong
CORBA::ContextList::count ()
{
diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
index d36706cacf9..10dd960187b 100644
--- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
+++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
@@ -16,11 +16,6 @@ TAO_DII_Deferred_Reply_Dispatcher::TAO_DII_Deferred_Reply_Dispatcher (
{
}
-// Destructor.
-TAO_DII_Deferred_Reply_Dispatcher::~TAO_DII_Deferred_Reply_Dispatcher (void)
-{
-}
-
// Dispatch the reply.
int
TAO_DII_Deferred_Reply_Dispatcher::dispatch_reply (
diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h
index 232e9d76d51..0e259322511 100644
--- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h
+++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h
@@ -58,7 +58,7 @@ public:
protected:
/// Destructor.
- ~TAO_DII_Deferred_Reply_Dispatcher (void);
+ ~TAO_DII_Deferred_Reply_Dispatcher () = default;
private:
/// Where the reply needs to go.
diff --git a/TAO/tao/Invocation_Adapter.h b/TAO/tao/Invocation_Adapter.h
index 9f2304da7f4..b46e6032395 100644
--- a/TAO/tao/Invocation_Adapter.h
+++ b/TAO/tao/Invocation_Adapter.h
@@ -244,12 +244,9 @@ namespace TAO
TAO_Operation_Details &details);
private:
- /// Don't allow default initializations
- Invocation_Adapter ();
-
- // Prevent copying
- Invocation_Adapter (Invocation_Adapter const &);
- Invocation_Adapter & operator= (const Invocation_Adapter &);
+ Invocation_Adapter () = delete;
+ Invocation_Adapter (Invocation_Adapter const &) = delete;
+ Invocation_Adapter & operator= (const Invocation_Adapter &) = delete;
/**
* This method returns the right collocation strategy, if any,