summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvenkita <venkita@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-08-27 18:27:10 +0000
committervenkita <venkita@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-08-27 18:27:10 +0000
commit81e517a179c940e79dbc56736beb484ac1665a52 (patch)
tree22a1a16b7f01f6ec1a52bae9a7ed9c743fc1e4ce
parent33f2d38f58e5f3a959eb1074d2a8884cf3f2d23d (diff)
downloadATCD-81e517a179c940e79dbc56736beb484ac1665a52.tar.gz
ChangeLogTag: Wed Aug 27 13:25:20 2003 Venkita Subramonian <venkita@cs.wustl.edu>
-rw-r--r--ChangeLog5
-rw-r--r--Kokyu/Kokyu_defs.h4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 57989304771..1976325bb3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Aug 27 13:25:20 2003 Venkita Subramonian <venkita@cs.wustl.edu>
+
+ * Kokyu/Kokyu_defs.h: Added inline qualification to operator != to
+ fix warnings in SunOS_SunCC53 build.
+
Wed Aug 27 17:06:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>
* examples/Reactor/Proactor/test_cancel.cpp:
diff --git a/Kokyu/Kokyu_defs.h b/Kokyu/Kokyu_defs.h
index 4c08c209701..cfa65b46289 100644
--- a/Kokyu/Kokyu_defs.h
+++ b/Kokyu/Kokyu_defs.h
@@ -84,7 +84,7 @@ namespace Kokyu
int immediate_activation_;
};
-
+
struct QoSDescriptor
{
Priority_t preemption_priority_;
@@ -129,7 +129,7 @@ namespace Kokyu
} //end of namespace
//to satisfy ACE_Array<ConfigInfo>
-int operator != (const Kokyu::ConfigInfo& lhs, const Kokyu::ConfigInfo& rhs);
+ACE_INLINE int operator != (const Kokyu::ConfigInfo& lhs, const Kokyu::ConfigInfo& rhs);
#if defined (__ACE_INLINE__)
#include "Kokyu_defs.i"