diff options
author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-05-27 13:38:30 +0000 |
---|---|---|
committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-05-27 13:38:30 +0000 |
commit | 95a447fd9c0029dfc3b14da76d319a07d293f51d (patch) | |
tree | 6576dd7ccad4426615fdfb0ebe89dd338ee4aa06 | |
parent | fd8e78fb975d102fb61107505e1be7767d9666e3 (diff) | |
download | ATCD-95a447fd9c0029dfc3b14da76d319a07d293f51d.tar.gz |
ChangeLogTag: Tue May 27 13:34:12 UTC 2008 Jeff Parsons <j.parsons@vanderbilt.edu>
-rw-r--r-- | TAO/ChangeLog | 56 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Statistic.cpp | 7 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Statistic.h | 3 |
3 files changed, 43 insertions, 23 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index d0721fc2383..466223ea649 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,31 +1,41 @@ +Tue May 27 13:34:12 UTC 2008 Jeff Parsons <j.parsons@vanderbilt.edu> + + * orbsvcs/orbsvcs/Notify/MonitorControl/Statistic.h: + * orbsvcs/orbsvcs/Notify/MonitorControl/Statistic.cpp: + + Added implementation for the overload of receive() taking + a size_t argument. Even though there is an implementation + in the base class, we were getting warnings from some of + the Red Hat Linux builds. + Sun May 25 00:37:12 UTC 2008 J.T. Conklin <jtc@acorntoolworks.com> - * docs/tutorials/Quoter/Simple/Client/Makefile.am: - * docs/tutorials/Quoter/Simple/ImprovedServer/Makefile.am: - * docs/tutorials/Quoter/Simple/Server/Makefile.am: - * orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile.am: - * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am: - * orbsvcs/examples/Notify/Federation/Agent/Makefile.am: - * orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am: - * orbsvcs/examples/Notify/MC/monitor/Makefile.am: - * orbsvcs/orbsvcs/Makefile.am: - * orbsvcs/tests/Notify/MC/Makefile.am: - * orbsvcs/tests/unit/Notify/MC/Control/Makefile.am: - * orbsvcs/tests/unit/Notify/MC/MonitorControlExt/Makefile.am: - * orbsvcs/tests/unit/Notify/MC/MonitorManager/Makefile.am: - * orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/Makefile.am: - * orbsvcs/tests/unit/Notify/MC/Statistic/Makefile.am: - * orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Makefile.am: - * tao/Makefile.am: - * tests/Makefile.am: - * tests/POA/Adapter_Activator/Makefile.am: - * tests/POA/Explicit_Activation/Makefile.am: - * tests/POA/On_Demand_Activation/Makefile.am: - * tests/POA/Reference_Counted_Servant/Makefile.am: + * docs/tutorials/Quoter/Simple/Client/Makefile.am: + * docs/tutorials/Quoter/Simple/ImprovedServer/Makefile.am: + * docs/tutorials/Quoter/Simple/Server/Makefile.am: + * orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile.am: + * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am: + * orbsvcs/examples/Notify/Federation/Agent/Makefile.am: + * orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am: + * orbsvcs/examples/Notify/MC/monitor/Makefile.am: + * orbsvcs/orbsvcs/Makefile.am: + * orbsvcs/tests/Notify/MC/Makefile.am: + * orbsvcs/tests/unit/Notify/MC/Control/Makefile.am: + * orbsvcs/tests/unit/Notify/MC/MonitorControlExt/Makefile.am: + * orbsvcs/tests/unit/Notify/MC/MonitorManager/Makefile.am: + * orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/Makefile.am: + * orbsvcs/tests/unit/Notify/MC/Statistic/Makefile.am: + * orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Makefile.am: + * tao/Makefile.am: + * tests/Makefile.am: + * tests/POA/Adapter_Activator/Makefile.am: + * tests/POA/Explicit_Activation/Makefile.am: + * tests/POA/On_Demand_Activation/Makefile.am: + * tests/POA/Reference_Counted_Servant/Makefile.am: Regenerated. - * configure.ac: + * configure.ac: Update for new directories. diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Statistic.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Statistic.cpp index d93a186e5e0..187d78b8bfa 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Statistic.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Statistic.cpp @@ -86,6 +86,13 @@ TAO_Statistic::receive (double data) } void +TAO_Statistic::receive (size_t data) +{ + double converted = static_cast<double> (data); + this->receive (converted); +} + +void TAO_Statistic::receive (const TAO_Statistic::List& data) { if (this->type_ != TS_LIST) diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Statistic.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Statistic.h index 342289aa178..9599604f631 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Statistic.h +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Statistic.h @@ -51,6 +51,9 @@ public: /// Override of the base class method. virtual void receive (double data); + /// Override of the base class method. + virtual void receive (size_t data); + /// Take the data and store it. /// It is assumed that the type of data corresponds to /// the type specified during construction. |