From d2613beea0cef3c5517aac8a2f81a5483af6f96d Mon Sep 17 00:00:00 2001
From: mcorino <mcorino@users.noreply.github.com>
Date: Thu, 3 Nov 2011 08:46:51 +0000
Subject: Thu Nov 03 08:45:13 UTC 2011  Martin Corino  <mcorino@remedy.nl>

---
 TAO/ChangeLog                             | 9 +++++++--
 TAO/tests/Bug_3531b_Regression/server.cpp | 5 +++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 9c7e144dc06..0d194847c36 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,9 +1,14 @@
+Thu Nov 03 08:45:13 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        * tests/Bug_3531b_Regression/server.cpp:
+          Fixed compile warning on Solaris10 build.
+
 Wed Nov 02 13:30:13 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
 
         * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
-        Put narrow in var, use ACE_NEW  with CIAO_FACET
+          Put narrow in var, use ACE_NEW  with CIAO_FACET
+
 
-        
 Wed Nov 02 08:30:13 UTC 2011  Martin Corino  <mcorino@remedy.nl>
 
         Merged changes from Remedy work branch.
diff --git a/TAO/tests/Bug_3531b_Regression/server.cpp b/TAO/tests/Bug_3531b_Regression/server.cpp
index 086d101761f..9087887df96 100644
--- a/TAO/tests/Bug_3531b_Regression/server.cpp
+++ b/TAO/tests/Bug_3531b_Regression/server.cpp
@@ -185,6 +185,11 @@ public:
       workers->process_cmd ();
     return 0;
   };
+
+  virtual int handle_events (ACE_Time_Value &)
+  {
+    return this->handle_events ();
+  }
 };
 
 // Our own Resource_Factory for testing purposes.  This just returns
-- 
cgit v1.2.1