summaryrefslogtreecommitdiff
path: root/ACEXML
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2004-04-23 03:45:34 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2004-04-23 03:45:34 +0000
commit58c72fe2b4b078e6ebbbe644ad8a11e359e501c5 (patch)
tree3ada2fbfd8b936b793977df03a2ea7aa39a77057 /ACEXML
parent2db032628c43ba0b2abaabcbeffc1c1c0eead943 (diff)
downloadATCD-58c72fe2b4b078e6ebbbe644ad8a11e359e501c5.tar.gz
ChangeLogTag:Thu Apr 22 20:01:12 2004 Ossama Othman <ossama@dre.vanderbilt.edu>
Diffstat (limited to 'ACEXML')
-rw-r--r--ACEXML/common/AttributesImpl.h2
-rw-r--r--ACEXML/common/AttributesImpl.i8
-rw-r--r--ACEXML/common/URL_Addr.h4
-rw-r--r--ACEXML/common/URL_Addr.inl6
-rw-r--r--ACEXML/parser/parser/ParserContext.h2
-rw-r--r--ACEXML/parser/parser/ParserContext.inl4
6 files changed, 16 insertions, 10 deletions
diff --git a/ACEXML/common/AttributesImpl.h b/ACEXML/common/AttributesImpl.h
index 266343b2200..3531f96b119 100644
--- a/ACEXML/common/AttributesImpl.h
+++ b/ACEXML/common/AttributesImpl.h
@@ -99,7 +99,7 @@ public:
ACEXML_Attribute &operator= (const ACEXML_Attribute &rhs);
/// Comparison operator.
- int operator!= (const ACEXML_Attribute&rhs) const;
+ bool operator!= (const ACEXML_Attribute&rhs) const;
private:
/// @var uri_ Namespace URI of an attribute
diff --git a/ACEXML/common/AttributesImpl.i b/ACEXML/common/AttributesImpl.i
index 9749b46ba38..75fc288950d 100644
--- a/ACEXML/common/AttributesImpl.i
+++ b/ACEXML/common/AttributesImpl.i
@@ -1,4 +1,6 @@
-// -*- C++ -*- $Id$
+// -*- C++ -*-
+//
+//$Id$
#include "ace/ACE.h"
#include "ace/OS_NS_string.h"
@@ -140,13 +142,13 @@ ACEXML_Attribute::operator= (const ACEXML_Attribute &rhs)
return *this;
}
-ACEXML_INLINE int
+ACEXML_INLINE bool
ACEXML_Attribute::operator!= (const ACEXML_Attribute &rhs) const
{
return (ACE_OS::strcmp (this->uri_, rhs.uri ()) == 0 &&
ACE_OS::strcmp (this->localName_, rhs.localName ()) == 0 &&
ACE_OS::strcmp (this->qName_, rhs .qName ()) == 0 &&
ACE_OS::strcmp (this->type_, rhs.type ()) == 0 &&
- ACE_OS::strcmp (this->value_, rhs.value ()) == 0 ? 0 : 1);
+ ACE_OS::strcmp (this->value_, rhs.value ()) == 0 ? false : true);
}
diff --git a/ACEXML/common/URL_Addr.h b/ACEXML/common/URL_Addr.h
index 2ec75461e61..d7f7b4b6702 100644
--- a/ACEXML/common/URL_Addr.h
+++ b/ACEXML/common/URL_Addr.h
@@ -96,10 +96,10 @@ public:
* Compare two addresses for equality. The addresses are considered
* equal if they contain the same IP address, port number, and path name.
*/
- int operator == (const ACEXML_URL_Addr &SAP) const;
+ bool operator == (const ACEXML_URL_Addr &SAP) const;
/// Compare two addresses for inequality.
- int operator != (const ACEXML_URL_Addr &SAP) const;
+ bool operator != (const ACEXML_URL_Addr &SAP) const;
/// Computes and returns hash value.
virtual u_long hash (void) const;
diff --git a/ACEXML/common/URL_Addr.inl b/ACEXML/common/URL_Addr.inl
index ba6d34b5e4b..b1ac1db8322 100644
--- a/ACEXML/common/URL_Addr.inl
+++ b/ACEXML/common/URL_Addr.inl
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+//
// $Id$
#include "ace/ACE.h"
@@ -34,7 +36,7 @@ ACEXML_URL_Addr::hash (void) const
return result;
}
-ACE_INLINE int
+ACE_INLINE bool
ACEXML_URL_Addr::operator== (const ACEXML_URL_Addr &addr) const
{
return ACE_OS::strcmp (addr.get_path_name (), this->get_path_name ()) == 0
@@ -42,7 +44,7 @@ ACEXML_URL_Addr::operator== (const ACEXML_URL_Addr &addr) const
&& addr.get_ip_address () == this->get_ip_address ();
}
-ACE_INLINE int
+ACE_INLINE bool
ACEXML_URL_Addr::operator!= (const ACEXML_URL_Addr &addr) const
{
return !(*this == addr);
diff --git a/ACEXML/parser/parser/ParserContext.h b/ACEXML/parser/parser/ParserContext.h
index aa2eae60e09..6bb7c4122ad 100644
--- a/ACEXML/parser/parser/ParserContext.h
+++ b/ACEXML/parser/parser/ParserContext.h
@@ -39,7 +39,7 @@ public:
ACEXML_LocatorImpl* locator);
/// Comparison operator
- int operator!= (const ACEXML_Parser_Context& src);
+ bool operator!= (const ACEXML_Parser_Context& src);
/// Destructor
virtual ~ACEXML_Parser_Context();
diff --git a/ACEXML/parser/parser/ParserContext.inl b/ACEXML/parser/parser/ParserContext.inl
index 5e64c7ddeac..2814cf63476 100644
--- a/ACEXML/parser/parser/ParserContext.inl
+++ b/ACEXML/parser/parser/ParserContext.inl
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+//
// $Id$
@@ -26,7 +28,7 @@ ACEXML_Parser_Context::ACEXML_Parser_Context (const ACEXML_Parser_Context& src)
}
-ACEXML_INLINE int
+ACEXML_INLINE bool
ACEXML_Parser_Context::operator!= (const ACEXML_Parser_Context& src)
{
return (this->instream_ != src.instream_ && this->locator_ != src.locator_);