ChangeLogTag:Tue Dec 04 08:16:59 2001 Carlos O'Ryan <coryan@uci.edu>

7 files changed, 41 insertions, 10 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 0a1a7e7df1a..20acbaca61b 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,24 @@
+Tue Dec 04 08:16:59 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+	* orbsvcs/performance-tests/EC_Scalability/Makefile:
+	* orbsvcs/performance-tests/EC_Federated_Scalability/Makefile:
+	  Disable build on platforms that lack corba messaging.
+
+	* orbsvcs/performance-tests/EC_Federated_Scalability/Servant_var.h:
+	* orbsvcs/performance-tests/EC_Federated_Scalability/Servant_var.inl:
+	  Fixed compilation problems, a default argument value was used in
+	  the inline constructor definition.
+	  Also fixed a number of warnings about conversion operators that
+	  returned 'const pointers' instead of the intended 'pointer to
+	  const', the former has little meaning on a return value.
+
+	* orbsvcs/performance-tests/EC_Federated_Scalability/Peer.cpp:
+	  Use ._retn() instead of allocating a new sequence, avoid a
+	  warning along the way.
+
+	* orbsvcs/performance-tests/EC_Scalability/client.cpp:
+	  Fixed signed/unsigned comparison warning.
+
 Mon Dec  3 16:27:08 2001  Carlos O'Ryan  <coryan@uci.edu>
 
 	* orbsvcs/performance-tests/Makefile:
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Makefile b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Makefile
index 93f6d5d417b..1be2f79e6f6 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Makefile
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Makefile
@@ -13,7 +13,7 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs \
 
 IDL_FILES = Control
 IDL_SRC = ControlC.cpp ControlS.cpp
-BIN = client server
+BIN_UNCHECKED = client server
 
 server_OBJS=$(addsuffix .o,server Coordinator ControlC ControlS)
 client_OBJS=$(addsuffix .o,client Consumer Supplier Loopback_Consumer Loopback_Supplier Loopback Peer ControlC ControlS)
@@ -27,6 +27,11 @@ TAO_IDLFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs -Ge 1
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(TAO_ROOT)/rules.tao.GNU
+
+ifeq ($(corba_messaging),1)
+BIN=$(BIN_UNCHECKED)
+endif
+
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Peer.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Peer.cpp
index 41ceb64c5f2..4e896f896e5 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Peer.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Peer.cpp
@@ -109,7 +109,7 @@ ECFS_Peer::run_experiment (CORBA::Long consumer_count,
   ACE_CHECK_RETURN (0);
   for (int i = 0; i != consumer_count; ++i)
     {
-      consumer[i] = 
+      consumer[i] =
         Servant_var<ECFS_Consumer> (new ECFS_Consumer (experiment_id,
                                                        iterations));
       consumer[i]->connect (this->event_channel_.in (), ACE_TRY_ENV);
@@ -167,7 +167,7 @@ ECFS_Peer::run_experiment (CORBA::Long consumer_count,
   gsf = ACE_High_Res_Timer::global_scale_factor ();
   ACE_DEBUG ((LM_DEBUG, "Done (%d)\n", gsf));
 
-  return new Control::Samples (samples);
+  return samples._retn ();
 }
 
 void
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Servant_var.h b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Servant_var.h
index 6410a470e5a..618a3b50f43 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Servant_var.h
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Servant_var.h
@@ -34,11 +34,11 @@ public:
   //@{
   /** @name Smart pointer operations
    */
-  SERVANT * const operator->() const;
+  const SERVANT *operator->() const;
   SERVANT *operator->();
 
   operator SERVANT *();
-  operator SERVANT * const() const;
+  operator const SERVANT *() const;
   //@}
 
   //@{
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Servant_var.inl b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Servant_var.inl
index 188499c3153..30711eac8b1 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Servant_var.inl
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Servant_var.inl
@@ -8,7 +8,7 @@
  */
 
 template<typename SERVANT> ACE_INLINE
-Servant_var<SERVANT>::Servant_var (SERVANT *s = 0)
+Servant_var<SERVANT>::Servant_var (SERVANT *s)
   : ptr_ (s)
 {
 }
@@ -45,7 +45,7 @@ Servant_var<SERVANT>::operator-> ()
   return this->ptr_;
 }
 
-template<typename SERVANT> ACE_INLINE SERVANT* const
+template<typename SERVANT> ACE_INLINE const SERVANT*
 Servant_var<SERVANT>::operator-> () const
 {
   return this->ptr_;
@@ -58,7 +58,7 @@ Servant_var<SERVANT>::operator SERVANT *()
 }
 
 template<typename SERVANT> ACE_INLINE
-Servant_var<SERVANT>::operator SERVANT * const () const
+Servant_var<SERVANT>::operator const SERVANT * () const
 {
   return this->ptr_;
 }
diff --git a/TAO/orbsvcs/performance-tests/EC_Scalability/Makefile b/TAO/orbsvcs/performance-tests/EC_Scalability/Makefile
index cf56776fa56..2c5f10a8800 100644
--- a/TAO/orbsvcs/performance-tests/EC_Scalability/Makefile
+++ b/TAO/orbsvcs/performance-tests/EC_Scalability/Makefile
@@ -11,7 +11,7 @@ endif
 CPPFLAGS += -I$(TAO_ROOT)/orbsvcs \
             -I$(TAO_ROOT)
 
-BIN = client server
+BIN_UNCHECKED = client server
 
 server_OBJS=$(addsuffix .o,server)
 client_OBJS=$(addsuffix .o,client Consumer Supplier Client_Task)
@@ -24,6 +24,11 @@ SRC = $(server_OBJS:.o=.cpp) $(client_OBJS:.o=.cpp)
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(TAO_ROOT)/rules.tao.GNU
+
+ifeq ($(corba_messaging),1)
+BIN=$(BIN_UNCHECKED)
+endif
+
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
diff --git a/TAO/orbsvcs/performance-tests/EC_Scalability/client.cpp b/TAO/orbsvcs/performance-tests/EC_Scalability/client.cpp
index 751ee31c9ed..f96039920c0 100644
--- a/TAO/orbsvcs/performance-tests/EC_Scalability/client.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Scalability/client.cpp
@@ -188,7 +188,7 @@ main (int argc, char *argv [])
       ACE_DEBUG ((LM_DEBUG, "Done (%d)\n", gsf));
 
       ACE_Sample_History history (iterations);
-      for (size_t j = 0; j != iterations; ++j)
+      for (int j = 0; j != iterations; ++j)
         {
           ACE_UINT64 value = 0;
           for (int i = 0; i != consumer_count; ++i)