summaryrefslogtreecommitdiff
path: root/TAO/tao/PI
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/PI')
-rw-r--r--TAO/tao/PI/ORBInitInfo.h9
-rw-r--r--TAO/tao/PI/PICurrent.h4
-rw-r--r--TAO/tao/PI/PICurrent_Impl.h4
3 files changed, 2 insertions, 15 deletions
diff --git a/TAO/tao/PI/ORBInitInfo.h b/TAO/tao/PI/ORBInitInfo.h
index 9f5f800645f..9e64004cea7 100644
--- a/TAO/tao/PI/ORBInitInfo.h
+++ b/TAO/tao/PI/ORBInitInfo.h
@@ -211,7 +211,6 @@ public:
virtual const char* _interface_repository_id () const;
protected:
-
/// Destructor is protected to enforce proper memory management
/// through the reference counting mechanism.
~TAO_ORBInitInfo ();
@@ -222,14 +221,10 @@ protected:
void check_validity ();
private:
-
- /// Prevent copying through the copy constructor and the assignment
- /// operator.
- TAO_ORBInitInfo (const TAO_ORBInitInfo &);
- void operator= (const TAO_ORBInitInfo &);
+ TAO_ORBInitInfo (const TAO_ORBInitInfo &) = delete;
+ void operator= (const TAO_ORBInitInfo &) = delete;
private:
-
/// Reference to the ORB Core.
TAO_ORB_Core *orb_core_;
diff --git a/TAO/tao/PI/PICurrent.h b/TAO/tao/PI/PICurrent.h
index 78ae7d699ec..d832921457c 100644
--- a/TAO/tao/PI/PICurrent.h
+++ b/TAO/tao/PI/PICurrent.h
@@ -101,12 +101,8 @@ namespace TAO
virtual ~PICurrent () = default;
private:
- /// Prevent copying through the copy constructor and the assignment
- /// operator.
- //@{
PICurrent (const PICurrent &) = delete;
void operator= (const PICurrent &) = delete;
- //@}
private:
/// Reference to the orb core.
diff --git a/TAO/tao/PI/PICurrent_Impl.h b/TAO/tao/PI/PICurrent_Impl.h
index 7819fdda9cc..cad2844f78d 100644
--- a/TAO/tao/PI/PICurrent_Impl.h
+++ b/TAO/tao/PI/PICurrent_Impl.h
@@ -94,12 +94,8 @@ namespace TAO
*/
Table & current_slot_table ();
- /// Prevent copying through the copy constructor and the assignment
- /// operator.
- //@{
PICurrent_Impl (const PICurrent_Impl &) = delete;
void operator= (const PICurrent_Impl &) = delete;
- //@}
private:
/// Allow for stack of PICurrent_Impl as required.