summaryrefslogtreecommitdiff
path: root/ACE
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2011-05-08 17:58:47 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2011-05-08 17:58:47 +0000
commite3321deb42494c3d81c6c79e35115f4bcee6feba (patch)
treebcf4c0e160bcdc58ff25bbe3badc8c1892325aae /ACE
parent99914ff658e0cbd8e2ec3a0bed0046506f3a136c (diff)
downloadATCD-e3321deb42494c3d81c6c79e35115f4bcee6feba.tar.gz
Sun May 8 17:57:50 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/ETCL/ETCL_Constraint.h: * ace/ETCL/ETCL_Constraint.inl: Fixed coverity errors
Diffstat (limited to 'ACE')
-rw-r--r--ACE/ChangeLog6
-rw-r--r--ACE/ace/ETCL/ETCL_Constraint.h40
-rw-r--r--ACE/ace/ETCL/ETCL_Constraint.inl49
3 files changed, 24 insertions, 71 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index e65b7927c1b..f0c20d05cc2 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,9 @@
+Sun May 8 17:57:50 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * ace/ETCL/ETCL_Constraint.h:
+ * ace/ETCL/ETCL_Constraint.inl:
+ Fixed coverity errors
+
Thu May 5 21:38:45 UTC 2011 Phil Mesnier <mesnier_p@ociweb.com>
* ace/Select_Reactor_T.cpp:
diff --git a/ACE/ace/ETCL/ETCL_Constraint.h b/ACE/ace/ETCL/ETCL_Constraint.h
index 747ae99102f..f54687da2a7 100644
--- a/ACE/ace/ETCL/ETCL_Constraint.h
+++ b/ACE/ace/ETCL/ETCL_Constraint.h
@@ -177,10 +177,9 @@ private:
class ACE_ETCL_Export ETCL_Union_Value : public ETCL_Constraint
{
public:
- ETCL_Union_Value (void);
ETCL_Union_Value (int sign,
ETCL_Constraint *integer);
- ETCL_Union_Value (ETCL_Constraint *string);
+ explicit ETCL_Union_Value (ETCL_Constraint *string = 0);
virtual ~ETCL_Union_Value (void);
int sign (void) const;
@@ -198,9 +197,8 @@ private:
class ACE_ETCL_Export ETCL_Union_Pos : public ETCL_Constraint
{
public:
- ETCL_Union_Pos (void);
- ETCL_Union_Pos (ETCL_Constraint *union_value,
- ETCL_Constraint *component);
+ ETCL_Union_Pos (ETCL_Constraint *union_value = 0,
+ ETCL_Constraint *component = 0);
virtual ~ETCL_Union_Pos (void);
ETCL_Union_Value *union_value (void) const;
@@ -216,9 +214,8 @@ private:
class ACE_ETCL_Export ETCL_Component_Pos : public ETCL_Constraint
{
public:
- ETCL_Component_Pos (void);
- ETCL_Component_Pos (ETCL_Constraint *integer,
- ETCL_Constraint *component);
+ ETCL_Component_Pos (ETCL_Constraint *integer = 0,
+ ETCL_Constraint *component = 0);
virtual ~ETCL_Component_Pos (void);
ETCL_Literal_Constraint *integer (void) const;
@@ -234,9 +231,8 @@ private:
class ACE_ETCL_Export ETCL_Component_Assoc : public ETCL_Constraint
{
public:
- ETCL_Component_Assoc (void);
- ETCL_Component_Assoc (ETCL_Constraint *identifier,
- ETCL_Constraint *component);
+ ETCL_Component_Assoc (ETCL_Constraint *identifier = 0,
+ ETCL_Constraint *component = 0);
virtual ~ETCL_Component_Assoc (void);
ETCL_Identifier *identifier (void) const;
@@ -252,9 +248,8 @@ private:
class ACE_ETCL_Export ETCL_Component_Array : public ETCL_Constraint
{
public:
- ETCL_Component_Array (void);
- ETCL_Component_Array (ETCL_Constraint *integer,
- ETCL_Constraint *component);
+ ETCL_Component_Array (ETCL_Constraint *integer = 0,
+ ETCL_Constraint *component = 0);
virtual ~ETCL_Component_Array (void);
ETCL_Literal_Constraint *integer (void) const;
@@ -285,9 +280,8 @@ private:
class ACE_ETCL_Export ETCL_Component : public ETCL_Constraint
{
public:
- ETCL_Component (void);
- ETCL_Component (ETCL_Constraint *identifier,
- ETCL_Constraint *component);
+ ETCL_Component (ETCL_Constraint *identifier = 0,
+ ETCL_Constraint *component = 0);
virtual ~ETCL_Component (void);
ETCL_Identifier *identifier (void) const;
@@ -303,8 +297,7 @@ private:
class ACE_ETCL_Export ETCL_Dot : public ETCL_Constraint
{
public:
- ETCL_Dot (void);
- ETCL_Dot (ETCL_Constraint *component);
+ explicit ETCL_Dot (ETCL_Constraint *component = 0);
virtual ~ETCL_Dot (void);
ETCL_Constraint *component (void) const;
@@ -318,8 +311,7 @@ private:
class ACE_ETCL_Export ETCL_Eval : public ETCL_Constraint
{
public:
- ETCL_Eval (void);
- ETCL_Eval (ETCL_Constraint *component);
+ explicit ETCL_Eval (ETCL_Constraint *component = 0);
virtual ~ETCL_Eval (void);
ETCL_Constraint *component (void) const;
@@ -333,8 +325,7 @@ private:
class ACE_ETCL_Export ETCL_Default : public ETCL_Constraint
{
public:
- ETCL_Default (void);
- ETCL_Default (ETCL_Constraint *component);
+ explicit ETCL_Default (ETCL_Constraint *component = 0);
virtual ~ETCL_Default (void);
ETCL_Constraint *component (void) const;
@@ -348,8 +339,7 @@ private:
class ACE_ETCL_Export ETCL_Exist : public ETCL_Constraint
{
public:
- ETCL_Exist (void);
- ETCL_Exist (ETCL_Constraint *component);
+ explicit ETCL_Exist (ETCL_Constraint *component = 0);
virtual ~ETCL_Exist (void);
ETCL_Constraint *component (void) const;
diff --git a/ACE/ace/ETCL/ETCL_Constraint.inl b/ACE/ace/ETCL/ETCL_Constraint.inl
index 3b6ac8d730c..02fb68014dd 100644
--- a/ACE/ace/ETCL/ETCL_Constraint.inl
+++ b/ACE/ace/ETCL/ETCL_Constraint.inl
@@ -27,10 +27,6 @@ ETCL_Identifier::value (void) const
// ****************************************************************
ACE_INLINE
-ETCL_Union_Value::ETCL_Union_Value (void)
-{}
-
-ACE_INLINE
ETCL_Union_Value::ETCL_Union_Value (int sign,
ETCL_Constraint *integer)
: sign_ (sign),
@@ -70,10 +66,6 @@ ETCL_Union_Value::string (void) const
// ****************************************************************
ACE_INLINE
-ETCL_Union_Pos::ETCL_Union_Pos (void)
-{}
-
-ACE_INLINE
ETCL_Union_Pos::ETCL_Union_Pos (ETCL_Constraint *union_value,
ETCL_Constraint *component)
: component_ (component)
@@ -97,14 +89,9 @@ ETCL_Union_Pos::component (void) const
// ****************************************************************
ACE_INLINE
-ETCL_Component_Pos::ETCL_Component_Pos (void)
-{}
-
-ACE_INLINE
ETCL_Component_Pos::ETCL_Component_Pos (
ETCL_Constraint *integer,
- ETCL_Constraint *component
- )
+ ETCL_Constraint *component)
: component_ (component)
{
this->integer_ =
@@ -126,14 +113,9 @@ ETCL_Component_Pos::component (void) const
// ****************************************************************
ACE_INLINE
-ETCL_Component_Assoc::ETCL_Component_Assoc (void)
-{}
-
-ACE_INLINE
ETCL_Component_Assoc::ETCL_Component_Assoc (
ETCL_Constraint *identifier,
- ETCL_Constraint *component
- )
+ ETCL_Constraint *component)
: component_ (component)
{
this->identifier_ =
@@ -155,14 +137,9 @@ ETCL_Component_Assoc::component (void) const
// ****************************************************************
ACE_INLINE
-ETCL_Component_Array::ETCL_Component_Array (void)
-{}
-
-ACE_INLINE
ETCL_Component_Array::ETCL_Component_Array (
ETCL_Constraint *integer,
- ETCL_Constraint *component
- )
+ ETCL_Constraint *component)
: component_ (component)
{
this->integer_ =
@@ -201,10 +178,6 @@ ETCL_Special::type (void) const
// ****************************************************************
ACE_INLINE
-ETCL_Component::ETCL_Component (void)
-{}
-
-ACE_INLINE
ETCL_Component::ETCL_Component (ETCL_Constraint *identifier,
ETCL_Constraint *component)
: component_ (component)
@@ -228,10 +201,6 @@ ETCL_Component::component (void) const
// ****************************************************************
ACE_INLINE
-ETCL_Dot::ETCL_Dot (void)
-{}
-
-ACE_INLINE
ETCL_Dot::ETCL_Dot (ETCL_Constraint *component)
: component_ (component)
{
@@ -246,10 +215,6 @@ ETCL_Dot::component (void) const
// ****************************************************************
ACE_INLINE
-ETCL_Eval::ETCL_Eval (void)
-{}
-
-ACE_INLINE
ETCL_Eval::ETCL_Eval (ETCL_Constraint *component)
: component_ (component)
{
@@ -264,10 +229,6 @@ ETCL_Eval::component (void) const
// ****************************************************************
ACE_INLINE
-ETCL_Default::ETCL_Default (void)
-{}
-
-ACE_INLINE
ETCL_Default::ETCL_Default (ETCL_Constraint *component)
: component_ (component)
{
@@ -282,10 +243,6 @@ ETCL_Default::component (void) const
// ****************************************************************
ACE_INLINE
-ETCL_Exist::ETCL_Exist (void)
-{}
-
-ACE_INLINE
ETCL_Exist::ETCL_Exist (ETCL_Constraint *component)
: component_ (component)
{