diff options
Diffstat (limited to 'ACE/ace/ETCL')
-rw-r--r-- | ACE/ace/ETCL/ETCL_Constraint.cpp | 19 | ||||
-rw-r--r-- | ACE/ace/ETCL/ETCL_Constraint.h | 12 | ||||
-rw-r--r-- | ACE/ace/ETCL/ETCL_Constraint.inl | 11 | ||||
-rw-r--r-- | ACE/ace/ETCL/ETCL_l.cpp | 1 |
4 files changed, 13 insertions, 30 deletions
diff --git a/ACE/ace/ETCL/ETCL_Constraint.cpp b/ACE/ace/ETCL/ETCL_Constraint.cpp index 4e8f6d129a8..3cb945b39ae 100644 --- a/ACE/ace/ETCL/ETCL_Constraint.cpp +++ b/ACE/ace/ETCL/ETCL_Constraint.cpp @@ -12,11 +12,11 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -ETCL_Constraint::ETCL_Constraint (void) +ETCL_Constraint::ETCL_Constraint () { } -ETCL_Constraint::~ETCL_Constraint (void) +ETCL_Constraint::~ETCL_Constraint () { } @@ -29,8 +29,7 @@ ETCL_Constraint::accept (ETCL_Constraint_Visitor * /* visitor */) // **************************************************************** ETCL_Literal_Constraint::ETCL_Literal_Constraint ( - const ETCL_Literal_Constraint & lit - ) + const ETCL_Literal_Constraint & lit) : ETCL_Constraint(), type_ (ACE_ETCL_UNKNOWN) { @@ -50,8 +49,7 @@ ETCL_Literal_Constraint::ETCL_Literal_Constraint ( } ETCL_Literal_Constraint::ETCL_Literal_Constraint ( - ACE_CDR::Boolean boolean - ) + ACE_CDR::Boolean boolean) : type_ (ACE_ETCL_BOOLEAN) { this->op_.bool_ = boolean; @@ -122,7 +120,7 @@ ETCL_Literal_Constraint::operator ACE_CDR::ULong (void) const } } -ETCL_Literal_Constraint::operator ACE_CDR::Long (void) const +ETCL_Literal_Constraint::operator ACE_CDR::Long () const { switch (this->type_) { @@ -147,7 +145,7 @@ ETCL_Literal_Constraint::operator ACE_CDR::Long (void) const } } -ETCL_Literal_Constraint::operator ACE_CDR::Double (void) const +ETCL_Literal_Constraint::operator ACE_CDR::Double () const { switch (this->type_) { @@ -163,7 +161,7 @@ ETCL_Literal_Constraint::operator ACE_CDR::Double (void) const } } -ETCL_Literal_Constraint::operator const char* (void) const +ETCL_Literal_Constraint::operator const char* () const { switch (this->type_) { @@ -537,9 +535,6 @@ ETCL_Component_Array::accept (ETCL_Constraint_Visitor *visitor) // **************************************************************** -ETCL_Special::~ETCL_Special (void) -{} - int ETCL_Special::accept (ETCL_Constraint_Visitor *visitor) { diff --git a/ACE/ace/ETCL/ETCL_Constraint.h b/ACE/ace/ETCL/ETCL_Constraint.h index 1e4ddf7aac7..96dc8e1909b 100644 --- a/ACE/ace/ETCL/ETCL_Constraint.h +++ b/ACE/ace/ETCL/ETCL_Constraint.h @@ -262,16 +262,16 @@ private: class ACE_ETCL_Export ETCL_Special : public ETCL_Constraint { public: - ETCL_Special (); + ETCL_Special () = default; ETCL_Special (int type); - virtual ~ETCL_Special (); + ~ETCL_Special () override = default; int type () const; virtual int accept (ETCL_Constraint_Visitor *visitor); private: - int type_; + int type_ {}; }; class ACE_ETCL_Export ETCL_Component : public ETCL_Constraint @@ -387,7 +387,7 @@ private: class ACE_ETCL_Export ETCL_Preference : public ETCL_Constraint { public: - ETCL_Preference (); + ETCL_Preference () = default; ETCL_Preference (int type, ETCL_Constraint *subexpr = 0); virtual ~ETCL_Preference (); @@ -398,8 +398,8 @@ public: virtual int accept (ETCL_Constraint_Visitor *visitor); private: - int type_; - ETCL_Constraint *subexpr_; + int type_ {}; + ETCL_Constraint *subexpr_ {}; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/ETCL/ETCL_Constraint.inl b/ACE/ace/ETCL/ETCL_Constraint.inl index b10fd67cd31..6caa59440bf 100644 --- a/ACE/ace/ETCL/ETCL_Constraint.inl +++ b/ACE/ace/ETCL/ETCL_Constraint.inl @@ -159,11 +159,6 @@ ETCL_Component_Array::component () const // **************************************************************** ACE_INLINE -ETCL_Special::ETCL_Special () - : type_ (0) -{} - -ACE_INLINE ETCL_Special::ETCL_Special (int type) : type_ (type) {} @@ -306,12 +301,6 @@ ETCL_Binary_Expr::lhs () const // **************************************************************** ACE_INLINE -ETCL_Preference::ETCL_Preference () - : type_ (0), - subexpr_ (0) -{} - -ACE_INLINE ETCL_Preference::ETCL_Preference (int type, ETCL_Constraint *subexpr) : type_ (type), diff --git a/ACE/ace/ETCL/ETCL_l.cpp b/ACE/ace/ETCL/ETCL_l.cpp index 05f062af484..237c26c934a 100644 --- a/ACE/ace/ETCL/ETCL_l.cpp +++ b/ACE/ace/ETCL/ETCL_l.cpp @@ -462,7 +462,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL ACE_BEGIN_VERSIONED_NAMESPACE_DECL static const char* extract_string(char*); -//static const char * extract_string(char*); #define YY_LEX_DEBUG |