summaryrefslogtreecommitdiff
path: root/TAO/tao
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao')
-rw-r--r--TAO/tao/CodecFactory/CDR_Encaps_Codec.h6
-rw-r--r--TAO/tao/CodecFactory/CodecFactory_impl.h6
-rw-r--r--TAO/tao/IORInterceptor/IORInfo.h6
-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
-rw-r--r--TAO/tao/TransportCurrent/Current_Impl.h28
-rw-r--r--TAO/tao/TransportCurrent/IIOP_Current_Impl.h68
8 files changed, 48 insertions, 83 deletions
diff --git a/TAO/tao/CodecFactory/CDR_Encaps_Codec.h b/TAO/tao/CodecFactory/CDR_Encaps_Codec.h
index 74a9c76c8aa..38e0722bc1c 100644
--- a/TAO/tao/CodecFactory/CDR_Encaps_Codec.h
+++ b/TAO/tao/CodecFactory/CDR_Encaps_Codec.h
@@ -88,10 +88,8 @@ protected:
void check_type_for_encoding (const CORBA::Any & data);
private:
- /// Prevent copying through the copy constructor and the assignment
- /// operator.
- TAO_CDR_Encaps_Codec (const TAO_CDR_Encaps_Codec &);
- void operator= (const TAO_CDR_Encaps_Codec &);
+ TAO_CDR_Encaps_Codec (const TAO_CDR_Encaps_Codec &) = delete;
+ void operator= (const TAO_CDR_Encaps_Codec &) = delete;
private:
/// The major GIOP version associated with this Codec.
diff --git a/TAO/tao/CodecFactory/CodecFactory_impl.h b/TAO/tao/CodecFactory/CodecFactory_impl.h
index 971c637d876..120478f0b2e 100644
--- a/TAO/tao/CodecFactory/CodecFactory_impl.h
+++ b/TAO/tao/CodecFactory/CodecFactory_impl.h
@@ -55,10 +55,8 @@ public:
virtual IOP::Codec_ptr create_codec_with_codesets (const IOP::Encoding_1_2 & enc);
private:
- /// Prevent copying through the copy constructor and the assignment
- /// operator.
- TAO_CodecFactory (const TAO_CodecFactory &);
- void operator= (const TAO_CodecFactory &);
+ TAO_CodecFactory (const TAO_CodecFactory &) = delete;
+ void operator= (const TAO_CodecFactory &) = delete;
IOP::Codec_ptr create_codec_i (CORBA::Octet major,
CORBA::Octet minor,
diff --git a/TAO/tao/IORInterceptor/IORInfo.h b/TAO/tao/IORInterceptor/IORInfo.h
index 35d3dad6103..add90ed5270 100644
--- a/TAO/tao/IORInterceptor/IORInfo.h
+++ b/TAO/tao/IORInterceptor/IORInfo.h
@@ -113,10 +113,8 @@ protected:
void check_validity (void);
private:
- /// Prevent copying through the copy constructor and the assignment
- /// operator.
- TAO_IORInfo (const TAO_IORInfo &);
- void operator= (const TAO_IORInfo &);
+ TAO_IORInfo (const TAO_IORInfo &) = delete;
+ void operator= (const TAO_IORInfo &) = delete;
private:
/// Pointer to POA
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.
diff --git a/TAO/tao/TransportCurrent/Current_Impl.h b/TAO/tao/TransportCurrent/Current_Impl.h
index 60cc585f680..cbc30649131 100644
--- a/TAO/tao/TransportCurrent/Current_Impl.h
+++ b/TAO/tao/TransportCurrent/Current_Impl.h
@@ -38,7 +38,6 @@ namespace TAO
, public virtual ::CORBA::LocalObject
{
public:
-
/// Constructor.
Current_Impl (TAO_ORB_Core* core, size_t tss_slot_id);
@@ -47,32 +46,31 @@ namespace TAO
* PortableInterceptor::Current interface.
*/
//@{
- virtual CORBA::Long id (void);
+ virtual CORBA::Long id ();
- virtual CounterT bytes_sent (void);
+ virtual CounterT bytes_sent ();
- virtual CounterT bytes_received (void);
+ virtual CounterT bytes_received ();
- virtual CounterT messages_sent (void);
+ virtual CounterT messages_sent ();
- virtual CounterT messages_received (void);
+ virtual CounterT messages_received ();
- virtual ::TimeBase::TimeT open_since (void);
+ virtual ::TimeBase::TimeT open_since ();
//@}
protected:
-
/**
* Some helper methods
*/
//@{
/// A (strategy) method used to obtain the transport ptr
- const TAO_Transport* transport (void) const;
+ const TAO_Transport* transport () const;
/// A Stats instance. If protocol is unavailable (0) or the
/// TAO_HAS_TRANSPORT_CURRENT macro is defined as anything but
/// 1, a single static instance will be used.
- const TAO::Transport::Stats* transport_stats (void) const;
+ const TAO::Transport::Stats* transport_stats () const;
//@}
/// Destructor is protected to enforce the fact this class is
@@ -82,16 +80,10 @@ namespace TAO
virtual ~Current_Impl (void);
private:
-
- /// Prevent copying through the copy constructor and the
- /// assignment operator.
- //@{
- Current_Impl (const Current_Impl &);
- void operator= (const Current_Impl &);
- //@}
+ Current_Impl (const Current_Impl &) = delete;
+ void operator= (const Current_Impl &) = delete;
private:
-
// The ORB (core) that owes us.
TAO_ORB_Core* core_;
diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Impl.h b/TAO/tao/TransportCurrent/IIOP_Current_Impl.h
index 1eec30bb5ed..3e94c9d88b9 100644
--- a/TAO/tao/TransportCurrent/IIOP_Current_Impl.h
+++ b/TAO/tao/TransportCurrent/IIOP_Current_Impl.h
@@ -44,53 +44,45 @@ namespace TAO
class TAO_Transport_Current_Export IIOP_Current_Impl
: public virtual IIOP::Current
, public virtual Current_Impl
- {
- public:
+ {
+ public:
+ /// Constructor.
+ IIOP_Current_Impl (TAO_ORB_Core* core, size_t tss_slot_id);
- /// Constructor.
- IIOP_Current_Impl (TAO_ORB_Core* core, size_t tss_slot_id);
+ //@{
+ virtual ::CORBA::Long id ();
- //@{
- virtual ::CORBA::Long id (void);
+ virtual ::SSLIOP::Current_ptr ssliop_current ();
- virtual ::SSLIOP::Current_ptr ssliop_current (void);
+ virtual ::CORBA::Long remote_port ();
- virtual ::CORBA::Long remote_port (void);
+ virtual char* remote_host ();
- virtual char* remote_host (void);
+ virtual ::CORBA::Long local_port ();
- virtual ::CORBA::Long local_port (void);
+ virtual char* local_host ();
+ //@}
- virtual char* local_host (void);
- //@}
+ protected:
+ /// Destructor
+ /**
+ * Protected destructor to enforce the fact this class is reference
+ * counted, and should not be destroyed using delete() by anything
+ * other than the reference counting mechanism.
+ */
+ virtual ~IIOP_Current_Impl ();
- protected:
- /// Destructor
- /**
- * Protected destructor to enforce the fact this class is reference
- * counted, and should not be destroyed using delete() by anything
- * other than the reference counting mechanism.
- */
- virtual ~IIOP_Current_Impl (void);
+ private:
+ /// Returns the IIOP connection handler associated with the
+ /// Transport. Will throw NoContext if the (selected) transport
+ /// () == 0, or if transport->connection_handler () == 0. Will
+ /// throw NoContext, if no transport has been selected yet.
+ TAO_IIOP_Connection_Handler* handler (void);
- private:
-
- /// Returns the IIOP connection handler associated with the
- /// Transport. Will throw NoContext if the (selected) transport
- /// () == 0, or if transport->connection_handler () == 0. Will
- /// throw NoContext, if no transport has been selected yet.
- TAO_IIOP_Connection_Handler* handler (void);
-
- private:
-
- /// Prevent copying through the copy constructor and
- /// assignment operator.
- //@{
- IIOP_Current_Impl (const IIOP_Current_Impl &);
- void operator= (const IIOP_Current_Impl &);
- //@}
-
- };
+ private:
+ IIOP_Current_Impl (const IIOP_Current_Impl &) = delete;
+ void operator= (const IIOP_Current_Impl &) = delete;
+ };
}
}
View Lorry Controller Status