summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2004-08-14 08:45:59 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2004-08-14 08:45:59 +0000
commit79553aed0b222256303814589ada8c6c6b52b91e (patch)
tree362838cf37bbf04fedb24b4c46777425f1e77a21
parent9334ff059fe30d0e4149e219b20e1e9661a7a603 (diff)
downloadATCD-79553aed0b222256303814589ada8c6c6b52b91e.tar.gz
ChangeLogTag:Sat Aug 14 01:43:16 2004 Ossama Othman <ossama@dre.vanderbilt.edu>
-rw-r--r--ChangeLog7
-rw-r--r--ace/CDR_Base.h4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d52cd3092ec..5b0aa53fec8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Aug 14 01:43:16 2004 Ossama Othman <ossama@dre.vanderbilt.edu>
+
+ * ace/CDR_Base.h (ACE_CDR):
+
+ Parenthesize boolean condition that is the first argument to the
+ ACE::IfThenElse<> template to avoid any potential confusion.
+
Sat Aug 14 00:33:59 2004 Ossama Othman <ossama@dre.vanderbilt.edu>
* ace/IfThenElse.h (IfThenElse):
diff --git a/ace/CDR_Base.h b/ace/CDR_Base.h
index c2635e56929..7f884443d6e 100644
--- a/ace/CDR_Base.h
+++ b/ace/CDR_Base.h
@@ -162,11 +162,11 @@ public:
/**
* @name Basic OMG IDL Types
*
- * These types are for use in the CDRclasses. The cleanest way to
+ * These types are for use in the CDR classes. The cleanest way to
* avoid complaints from all compilers is to define them all.
*/
//@{
- typedef ACE::IfThenElse<sizeof (bool) == 1,
+ typedef ACE::IfThenElse<(sizeof (bool) == 1),
bool,
unsigned char>::result_type Boolean;
typedef unsigned char Octet;