summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Mesnier <mesnier_p@ociweb.com>2014-10-20 15:47:51 +0000
committerPhil Mesnier <mesnier_p@ociweb.com>2014-10-20 15:47:51 +0000
commitddac25b787533d6c66f44851ad37fd9e423a05e3 (patch)
tree00142a6fc0fd1af67efdf38d43b0927f6983b80d
parent7e0d477a1c51627f4040c4a01a1c5b6c762ce4db (diff)
downloadATCD-ddac25b787533d6c66f44851ad37fd9e423a05e3.tar.gz
Mon Oct 20 15:37:35 UTC 2014 Phil Mesnier <mesnier_p@ociweb.com>
-rw-r--r--TAO/ChangeLog51
-rw-r--r--TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp6
-rw-r--r--TAO/TAO_IDL/be/be_visitor_component/facet_exh.cpp7
-rw-r--r--TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp2
-rw-r--r--TAO/TAO_IDL/be_include/be_visitor_component/executor_exh.h5
-rw-r--r--TAO/TAO_IDL/be_include/be_visitor_component/facet_exh.h5
-rw-r--r--TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h4
-rw-r--r--TAO/TAO_IDL/driver/drv_preproc.cpp4
-rw-r--r--TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp3
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h3
-rw-r--r--TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h5
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.inl5
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.inl5
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp8
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp3
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h5
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp3
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp5
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp3
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp3
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp4
-rwxr-xr-xTAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl12
-rw-r--r--TAO/tao/Adapter_Registry.cpp5
-rw-r--r--TAO/tao/Adapter_Registry.h5
-rw-r--r--TAO/tao/RTCORBA/Thread_Pool.cpp4
-rw-r--r--TAO/tao/RTCORBA/Thread_Pool.h2
-rw-r--r--TAO/tao/RTScheduling/Current.cpp4
-rw-r--r--TAO/tao/RTScheduling/Current.h4
-rw-r--r--TAO/tao/Strategies/SHMIOP_Connection_Handler.h5
-rw-r--r--TAO/utils/logWalker/GIOP_Buffer.cpp2
-rw-r--r--TAO/utils/logWalker/PeerObject.cpp8
-rw-r--r--TAO/utils/logWalker/PeerObject.h4
-rw-r--r--TAO/utils/nsgroup/nsgroup.cpp2
48 files changed, 126 insertions, 113 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 611b3816355..796506bea2f 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,54 @@
+Mon Oct 20 15:37:35 UTC 2014 Phil Mesnier <mesnier_p@ociweb.com>
+
+ * TAO_IDL/be/be_visitor_component/executor_exh.cpp:
+ * TAO_IDL/be/be_visitor_component/facet_exh.cpp:
+ * TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp:
+ * TAO_IDL/be_include/be_visitor_component/executor_exh.h:
+ * TAO_IDL/be_include/be_visitor_component/facet_exh.h:
+ * TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h:
+ * TAO_IDL/driver/drv_preproc.cpp:
+ * orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp:
+ * orbsvcs/orbsvcs/AV/RTCP_Channel.h:
+ * orbsvcs/orbsvcs/AV/RTCP_Channel.cpp:
+ * orbsvcs/orbsvcs/Concurrency/CC_LockSet.h:
+ * orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp:
+ * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h:
+ * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.inl:
+ * orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h:
+ * orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.inl:
+ * orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h:
+ * orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp:
+ * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h:
+ * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp:
+ * orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h:
+ * orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp:
+ * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h:
+ * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp:
+ * orbsvcs/orbsvcs/Log/NotifyLog_i.h:
+ * orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h:
+ * orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp:
+ * orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h:
+ * orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp:
+ * orbsvcs/orbsvcs/Notify/XML_Loader.h:
+ * orbsvcs/orbsvcs/Notify/XML_Loader.cpp:
+ * orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h:
+ * orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp:
+ * orbsvcs/orbsvcs/Trader/Constraint_l.cpp:
+ * orbsvcs/orbsvcs/Trader/Constraint_y.cpp:
+ * orbsvcs/tests/ImplRepo/RestartServer/run_test.pl:
+ * tao/Adapter_Registry.h:
+ * tao/Adapter_Registry.cpp:
+ * tao/RTCORBA/Thread_Pool.h:
+ * tao/RTCORBA/Thread_Pool.cpp:
+ * tao/RTScheduling/Current.h:
+ * tao/RTScheduling/Current.cpp:
+ * tao/Strategies/SHMIOP_Connection_Handler.h:
+ * utils/logWalker/GIOP_Buffer.cpp:
+ * utils/logWalker/PeerObject.h:
+ * utils/logWalker/PeerObject.cpp:
+ * utils/nsgroup/nsgroup.cpp:
+ Clean up unused member warnings identified by clang 6.0.
+
Mon Oct 13 17:25:22 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl>
* orbsvcs/orbsvcs/Naming/Naming_Server.h:
diff --git a/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp b/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp
index 15cc9e8840f..c4c90802992 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp
@@ -16,9 +16,9 @@
be_visitor_executor_exh::be_visitor_executor_exh (
be_visitor_context *ctx)
- : be_visitor_component_scope (ctx),
- comment_start_border_ ("/**"),
- comment_end_border_ (" */")
+ : be_visitor_component_scope (ctx)
+ // comment_start_border_ ("/**"),
+ // comment_end_border_ (" */")
{
// This is initialized in the base class to svnt_export_macro()
// or skel_export_macro(), since there are many more visitor
diff --git a/TAO/TAO_IDL/be/be_visitor_component/facet_exh.cpp b/TAO/TAO_IDL/be/be_visitor_component/facet_exh.cpp
index 840f52f66e0..7b7a452280c 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/facet_exh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/facet_exh.cpp
@@ -16,9 +16,9 @@
be_visitor_facet_exh::be_visitor_facet_exh (
be_visitor_context *ctx)
- : be_visitor_component_scope (ctx),
- comment_start_border_ ("/**"),
- comment_end_border_ (" */")
+ : be_visitor_component_scope (ctx)
+ // comment_start_border_ ("/**"),
+ // comment_end_border_ (" */")
{
// This is initialized in the base class to svnt_export_macro()
// or skel_export_macro(), since there are many more visitor
@@ -134,4 +134,3 @@ be_visitor_facet_exh::method_helper (be_interface *derived,
return 0;
}
-
diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
index b2ceff3cd2a..c4a6da2c97e 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
@@ -57,10 +57,8 @@ Scoped_Compute_Queue_Guard::~Scoped_Compute_Queue_Guard (void)
be_visitor_typecode_defn::be_visitor_typecode_defn (be_visitor_context * ctx)
: be_visitor_scope (ctx),
recursion_detect_ (false),
- computed_tc_size_ (0),
computed_encap_len_ (0),
computed_scope_encap_len_ (0),
- tc_offset_ (0),
index_ (0)
{
if (be_global->gen_anyop_files ())
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/executor_exh.h b/TAO/TAO_IDL/be_include/be_visitor_component/executor_exh.h
index 39de3ef3b7d..ae25551f3ed 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/executor_exh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/executor_exh.h
@@ -33,8 +33,8 @@ public:
virtual int visit_provides (be_provides *node);
virtual int visit_consumes (be_consumes *node);
private:
- const char *comment_start_border_;
- const char *comment_end_border_;
+ // const char *comment_start_border_;
+ // const char *comment_end_border_;
};
// =============================================
@@ -58,4 +58,3 @@ private:
};
#endif /* _BE_COMPONENT_EXECUTOR_EXH_H_ */
-
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/facet_exh.h b/TAO/TAO_IDL/be_include/be_visitor_component/facet_exh.h
index b78803ae15e..5f7b8586ac4 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/facet_exh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/facet_exh.h
@@ -34,9 +34,8 @@ public:
TAO_OutStream *os);
private:
- const char *comment_start_border_;
- const char *comment_end_border_;
+ // const char *comment_start_border_;
+ // const char *comment_end_border_;
};
#endif /* _BE_COMPONENT_FACET_EXH_H_ */
-
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h b/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h
index ac5b57c9f17..67613fd2d84 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h
@@ -114,7 +114,7 @@ private:
friend class Scoped_Compute_Queue_Guard;
/// the tc size of the node under consideration
- ACE_CDR::Long computed_tc_size_;
+ // ACE_CDR::Long computed_tc_size_;
/// the encap length of the node under consideration
ACE_CDR::Long computed_encap_len_;
@@ -125,7 +125,7 @@ private:
// the following are used for recursive and repeated typecodes
/// current computed length of the typecode
- ACE_CDR::Long tc_offset_;
+ // ACE_CDR::Long tc_offset_;
/// queue to keep nodes
ACE_Unbounded_Queue <QNode*> compute_queue_;
diff --git a/TAO/TAO_IDL/driver/drv_preproc.cpp b/TAO/TAO_IDL/driver/drv_preproc.cpp
index da7d481e881..5d1aab4f15a 100644
--- a/TAO/TAO_IDL/driver/drv_preproc.cpp
+++ b/TAO/TAO_IDL/driver/drv_preproc.cpp
@@ -99,10 +99,10 @@ static long output_arg_index = 0;
ACE_TCHAR const TCHAR_DIR_DOT[] = ACE_TEXT(".");
#if defined (ACE_HAS_TCHAR_DIRENT)
-ACE_TCHAR const DIR_DOT[] = ACE_TEXT(".");
+// ACE_TCHAR const DIR_DOT[] = ACE_TEXT(".");
ACE_TCHAR const DIR_DOT_DOT[] = ACE_TEXT("..");
#else
-char const DIR_DOT[] = ".";
+// char const DIR_DOT[] = ".";
char const DIR_DOT_DOT[] = "..";
#endif /* ACE_HAS_TCHAR_DIRENT */
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
index 157d7d4ddc4..22766f6b718 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
@@ -10,7 +10,7 @@
#include "ace/OS_NS_sys_time.h"
const int WAIT_FOR_REGISTRATION_TIME = 10; //sec
-const int MAX_ID_STRING = 10;
+// const int MAX_ID_STRING = 10;
EventChannelFactory_i::EventChannelFactory_i(const char* conf_filename, CORBA::ORB_ptr orb_ptr)
: conf_file(conf_filename), id(0), orb(orb_ptr)
@@ -177,4 +177,3 @@ CORBA::Object_ptr EventChannelFactory_i::create_process (
return 0;
}
-
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp
index 12b9969f9f1..a1bb326b1ab 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp
@@ -316,7 +316,6 @@ RTCP_Channel_Out::RTCP_Channel_Out(void)
:cname_ ("cname"),
active_ (0),
timestamp_ (0),
- timestamp_offset_ (0),
packets_sent_ (0),
octets_sent_ (0)
{
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h
index a9d717a33b0..5a5ea72523a 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h
@@ -207,9 +207,6 @@ private:
/// The timestamp of the last RTP packet sent.
unsigned int timestamp_;
- /// The initial offset of the timestamp.
- unsigned int timestamp_offset_;
-
/// The total number of packets sent.
unsigned int packets_sent_;
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
index 706d60ebe13..e96e808665d 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
@@ -19,7 +19,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
// Default constructor.
CC_LockSet::CC_LockSet (void)
- : related_lockset_ (0)
{
try
{
@@ -33,8 +32,7 @@ CC_LockSet::CC_LockSet (void)
// Constructor used to create related lock sets.
-CC_LockSet::CC_LockSet (CosConcurrencyControl::LockSet_ptr related)
- : related_lockset_ (related)
+CC_LockSet::CC_LockSet (CosConcurrencyControl::LockSet_ptr )
{
try
{
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
index 6ba6b207376..b1a28328a79 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
@@ -169,7 +169,7 @@ private:
* <LockSetCoordinator> is not implemented (it has the
* responsibilities of dropping the locks).
*/
- CosConcurrencyControl::LockSet_ptr related_lockset_;
+ // CosConcurrencyControl::LockSet_ptr related_lockset_;
/// Mapping between requested and held lock modes. Used by compatible
/// (...). Uses the internal enumeration as indices.
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
index feba800d772..189b90a85a7 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
@@ -127,16 +127,13 @@ class TAO_CEC_Pull_Event : public TAO_ESF_Worker<TAO_CEC_ProxyPullConsumer>
{
public:
TAO_CEC_Pull_Event (TAO_CEC_ConsumerAdmin *consumer_admin,
- TAO_CEC_SupplierControl *control);
+ TAO_CEC_SupplierControl *);
virtual void work (TAO_CEC_ProxyPullConsumer *consumer);
private:
/// Used to propagate the events.
TAO_CEC_ConsumerAdmin *consumer_admin_;
-
- /// To report failed or dead suppliers
- TAO_CEC_SupplierControl *supplier_control_;
};
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.inl
index 319de5688f5..c48ec1202d6 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.inl
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.inl
@@ -6,9 +6,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
TAO_CEC_Pull_Event::TAO_CEC_Pull_Event (TAO_CEC_ConsumerAdmin *consumer_admin,
- TAO_CEC_SupplierControl *control)
- : consumer_admin_ (consumer_admin),
- supplier_control_ (control)
+ TAO_CEC_SupplierControl *)
+ : consumer_admin_ (consumer_admin)
{
}
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
index 7c39f234645..ec4121ee68c 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
@@ -94,7 +94,7 @@ class TAO_CEC_Propagate_Typed_Event : public TAO_ESF_Worker<TAO_CEC_ProxyPushSup
{
public:
TAO_CEC_Propagate_Typed_Event (const TAO_CEC_TypedEvent& typed_event,
- TAO_CEC_TypedEventChannel* typed_event_channel);
+ TAO_CEC_TypedEventChannel*);
void work (TAO_CEC_ProxyPushSupplier *supplier);
@@ -103,7 +103,7 @@ private:
const TAO_CEC_TypedEvent typed_event_;
/// The typed EC
- TAO_CEC_TypedEventChannel* typed_event_channel_;
+ // TAO_CEC_TypedEventChannel* typed_event_channel_;
};
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.inl
index 95f43d05ee6..1a03d37ce61 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.inl
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.inl
@@ -14,9 +14,8 @@ TAO_CEC_TypedConsumerAdmin::
ACE_INLINE
TAO_CEC_Propagate_Typed_Event::TAO_CEC_Propagate_Typed_Event (
const TAO_CEC_TypedEvent& typed_event,
- TAO_CEC_TypedEventChannel* typed_event_channel)
- : typed_event_ (typed_event),
- typed_event_channel_ (typed_event_channel)
+ TAO_CEC_TypedEventChannel* )
+ : typed_event_ (typed_event)
{
}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
index 619835dc43a..d73fad387bf 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
@@ -18,8 +18,7 @@ TAO_EC_MT_Dispatching::TAO_EC_MT_Dispatching (int nthreads,
thread_priority_ (thread_priority),
force_activate_ (force_activate),
task_(0, service_object),
- active_ (0),
- queue_full_service_object_ (service_object)
+ active_ (0)
{
this->task_.open (&this->thread_manager_);
}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h
index 4bdb60096a3..ddea8dced19 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h
@@ -87,7 +87,7 @@ private:
int active_;
/// Service Object information
- TAO_EC_Queue_Full_Service_Object* queue_full_service_object_;
+ // TAO_EC_Queue_Full_Service_Object* queue_full_service_object_;
};
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
index 4512722d588..1743749c7a5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
@@ -233,11 +233,10 @@ TAO_EC_ProxyPushConsumer::_decr_refcnt (void)
TAO_EC_ProxyPushConsumer_Guard::
TAO_EC_ProxyPushConsumer_Guard (ACE_Lock *lock,
CORBA::ULong &refcount,
- TAO_EC_Event_Channel_Base *ec,
+ TAO_EC_Event_Channel_Base *,
TAO_EC_ProxyPushConsumer *proxy)
: lock_ (lock),
refcount_ (refcount),
- event_channel_ (ec),
proxy_ (proxy),
locked_ (false)
{
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
index 7291649b468..797c0da1054 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
@@ -206,7 +206,7 @@ private:
CORBA::ULong &refcount_;
/// The event channel used to destroy the proxy
- TAO_EC_Event_Channel_Base *event_channel_;
+ // TAO_EC_Event_Channel_Base *event_channel_;
/// The proxy whose lifetime is controlled by the reference count
TAO_EC_ProxyPushConsumer *proxy_;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
index 658d83cd482..e87f3619963 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
@@ -16,15 +16,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
extern unsigned long TAO_EC_TPC_debug_level;
-TAO_EC_TPC_Dispatching::TAO_EC_TPC_Dispatching (int nthreads,
+TAO_EC_TPC_Dispatching::TAO_EC_TPC_Dispatching (int ,
int thread_creation_flags,
int thread_priority,
- int force_activate,
+ int ,
TAO_EC_Queue_Full_Service_Object* so)
- : nthreads_(nthreads)
- , thread_creation_flags_ (thread_creation_flags)
+ : thread_creation_flags_ (thread_creation_flags)
, thread_priority_ (thread_priority)
- , force_activate_ (force_activate)
, consumer_task_map_(TAO_EC_TPC_DISPATCHING_DEFAULT_MAP_SIZE)
, queue_full_service_object_(so)
{
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h
index 89b1cfbb81b..9be54ebe3c6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h
@@ -66,7 +66,7 @@ private:
ACE_Thread_Manager thread_manager_;
/// The number of active tasks
- int nthreads_;
+ // int nthreads_;
/// The flags (THR_BOUND, THR_NEW_LWP, etc.) used to create the
/// dispatching threads.
@@ -77,7 +77,7 @@ private:
/// If activation at the requested priority fails then we fallback on
/// the defaults for thread activation.
- int force_activate_;
+ // int force_activate_;
typedef ACE_Hash_Map_Manager_Ex<RtecEventComm::PushConsumer_ptr,TAO_EC_Dispatching_Task*,ACE_Pointer_Hash<RtecEventComm::PushConsumer_ptr>,ACE_Equal_To<RtecEventComm::PushConsumer_ptr>,ACE_Null_Mutex> MAPTYPE;
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
index ffd44487930..0f2f1e1d1d6 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
@@ -17,8 +17,7 @@
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-TAO_FT_Service_Callbacks::TAO_FT_Service_Callbacks (TAO_ORB_Core *orb_core)
- : orb_core_ (orb_core)
+TAO_FT_Service_Callbacks::TAO_FT_Service_Callbacks (TAO_ORB_Core *)
{
}
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
index d2685042f83..465b320281b 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
@@ -44,7 +44,7 @@ class TAO_FT_ClientORB_Export TAO_FT_Service_Callbacks : public TAO_Service_Call
{
public:
/// Constructor
- TAO_FT_Service_Callbacks (TAO_ORB_Core *orb_core);
+ TAO_FT_Service_Callbacks (TAO_ORB_Core *);
/// Dtor
virtual ~TAO_FT_Service_Callbacks (void);
@@ -94,9 +94,6 @@ private:
CORBA::Boolean restart_policy_check (IOP::ServiceContextList &service_list,
const TAO_Profile *profile);
-private:
- /// The ORB core in which we have been activated
- TAO_ORB_Core *orb_core_;
};
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h
index 8801d5f21b3..23fd3eb4724 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h
@@ -150,7 +150,7 @@ private:
CosNotifyChannelAdmin::EventChannel_var event_channel_;
/// The Event Channel ID that the log uses.
- CosNotifyChannelAdmin::ChannelID channelID_;
+ // CosNotifyChannelAdmin::ChannelID channelID_;
/// The EventChannelFactory used to create the EventChannel above.
CosNotifyChannelAdmin::EventChannelFactory_var notify_factory_;
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp
index 977607067ac..225fc5eb8a0 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp
@@ -67,8 +67,7 @@ TAO_FT_Naming_Manager::TAO_FT_Naming_Manager (void)
use_global_ (false),
global_strategy_ (::FT_Naming::ROUND_ROBIN),
built_in_balancing_strategy_name_ (1),
- object_group_property_name_ (1),
- shutdown_ (0)
+ object_group_property_name_ (1)
{
// The name for the property which contains the load balancing strategy value
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h
index fdb5b1d4b2c..4108efbb66d 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h
@@ -337,8 +337,6 @@ private:
PortableGroup::Name object_group_property_name_;
- bool shutdown_;
-
};
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp
index 2e6ccfcb800..e79f55877a7 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp
@@ -25,11 +25,10 @@ TAO_Storable_Naming_Context_Activator::TAO_Storable_Naming_Context_Activator (
CORBA::ORB_ptr orb,
TAO::Storable_Factory *persistence_factory,
TAO_Storable_Naming_Context_Factory *context_impl_factory,
- const ACE_TCHAR *persistence_directory)
+ const ACE_TCHAR *)
: orb_(orb),
persistence_factory_(persistence_factory),
- context_impl_factory_(context_impl_factory),
- persistence_directory_(persistence_directory)
+ context_impl_factory_(context_impl_factory)
{
}
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h
index d7cbfeb79ba..bfb20a98e72 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h
@@ -52,7 +52,7 @@ public:
CORBA::ORB_ptr orb,
TAO::Storable_Factory *factory,
TAO_Storable_Naming_Context_Factory *context_impl_factory,
- const ACE_TCHAR *persistence_directory);
+ const ACE_TCHAR *);
virtual ~TAO_Storable_Naming_Context_Activator();
@@ -82,8 +82,6 @@ private:
/// The factory for constructing naming contexts within the index
TAO_Storable_Naming_Context_Factory *context_impl_factory_;
-
- const ACE_TCHAR *persistence_directory_;
};
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
index 9b6accca631..5809d42f63a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
@@ -52,8 +52,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
namespace TAO_Notify
{
XML_Loader::XML_Loader ()
- : input_ (0)
- , live_ (false)
+ : live_ (false)
{
}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h
index ccf66a66324..f91eb3f7a81 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h
@@ -67,8 +67,6 @@ public:
private:
/// The name of the file from which data is read.
ACE_TString file_name_;
- /// A stream representing our current output.
- FILE * input_;
typedef ACE_Unbounded_Stack<Topology_Object*> TopoStack;
TopoStack object_stack_;
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp
index bd89d905f7b..2f4ba24ee23 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp
@@ -16,8 +16,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_UIPMC_Protocol_Factory::TAO_UIPMC_Protocol_Factory (void)
: TAO_Protocol_Factory (IOP::TAG_UIPMC),
- major_ (TAO_DEF_GIOP_MAJOR),
- minor_ (TAO_DEF_GIOP_MINOR),
+ // major_ (TAO_DEF_GIOP_MAJOR),
+ // minor_ (TAO_DEF_GIOP_MINOR),
listen_on_all_ (false),
listener_interfaces_ ()
{
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h
index 1caf60ae296..187808133e1 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h
@@ -58,8 +58,8 @@ public:
private:
/// Changing the version number can be used to provide backwards
/// compatibility with old clients.
- int major_;
- int minor_;
+ // int major_;
+ // int minor_;
/// Should we override the default behaviour (whatever it is) to listen on
/// all interfaces
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp
index 804b04ff30b..866c482274d 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp
@@ -1227,7 +1227,7 @@ register char *yy_bp;
}
#endif /* ifndef YY_NO_UNPUT */
-
+#if 0
#ifndef YY_NO_INPUT
#ifdef __cplusplus
static int yyinput()
@@ -1301,6 +1301,7 @@ static int input()
return c;
}
#endif /* YY_NO_INPUT */
+#endif /* 0 */
#ifdef YY_USE_PROTOS
void yyrestart( FILE *input_file )
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp
index 6ac6210a27e..9daf1192701 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp
@@ -1,6 +1,6 @@
#ifndef lint
-static char const
-yyrcsid[] = "$Id$";
+// static char const
+// yyrcsid[] = "$Id$";
#endif
#include "ace/os_include/os_stdlib.h"
#define YYBYACC 1
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl
index 9d502a77a40..0f1b0335f60 100755
--- a/TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl
@@ -9,11 +9,15 @@ use PerlACE::TestTarget;
$status = 0;
$debug_level = '0';
+$mode = "-a NORMAL ";
foreach $i (@ARGV) {
if ($i eq '-debug') {
$debug_level = '10';
}
+ elsif ($i eq '-manual') {
+ $mode = "-a MANUAL ";
+ }
}
my $extra_timeout = 45;
@@ -83,9 +87,11 @@ $ACT = $act->CreateProcess ($imr_activator, "-d 1 ".
"-o $act_actiorfile ".
"-ORBInitRef ImplRepoService=file://$act_imriorfile");
-$TI = $ti->CreateProcess ($tao_imr, "-ORBInitRef ImplRepoService=file://$ti_imriorfile ".
- "add MessengerService ".
- "-c \"$srv_server -orbobjrefstyle url -ORBUseIMR 1 -ORBInitRef ImplRepoService=file://$imr_imriorfile\" ");
+$TI = $ti->CreateProcess ($tao_imr,
+ "-ORBInitRef ImplRepoService=file://$ti_imriorfile ".
+ "add MessengerService ".
+ $mode .
+ "-c \"$srv_server -orbobjrefstyle url -ORBUseIMR 1 -ORBInitRef ImplRepoService=file://$imr_imriorfile\" ");
diff --git a/TAO/tao/Adapter_Registry.cpp b/TAO/tao/Adapter_Registry.cpp
index 21ce5a21138..cd334c5326b 100644
--- a/TAO/tao/Adapter_Registry.cpp
+++ b/TAO/tao/Adapter_Registry.cpp
@@ -14,9 +14,8 @@
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-TAO_Adapter_Registry::TAO_Adapter_Registry (TAO_ORB_Core *oc)
- : orb_core_ (oc),
- adapters_capacity_ (16), // @@ Make it configurable
+TAO_Adapter_Registry::TAO_Adapter_Registry (TAO_ORB_Core *)
+ : adapters_capacity_ (16), // @@ Make it configurable
adapters_count_ (0),
adapters_ (0)
{
diff --git a/TAO/tao/Adapter_Registry.h b/TAO/tao/Adapter_Registry.h
index 4f46af64fa8..da2625d1040 100644
--- a/TAO/tao/Adapter_Registry.h
+++ b/TAO/tao/Adapter_Registry.h
@@ -50,7 +50,7 @@ class TAO_Adapter;
class TAO_Export TAO_Adapter_Registry
{
public:
- explicit TAO_Adapter_Registry (TAO_ORB_Core *orb_core);
+ explicit TAO_Adapter_Registry (TAO_ORB_Core *);
/// Close the
~TAO_Adapter_Registry (void);
@@ -96,9 +96,6 @@ private:
ACE_UNIMPLEMENTED_FUNC (TAO_Adapter_Registry (const TAO_Adapter_Registry &))
ACE_UNIMPLEMENTED_FUNC (TAO_Adapter_Registry &operator= (const TAO_Adapter_Registry &))
- /// The ORB Core
- TAO_ORB_Core *orb_core_;
-
/**
* @name A simple array of adapters.
*/
diff --git a/TAO/tao/RTCORBA/Thread_Pool.cpp b/TAO/tao/RTCORBA/Thread_Pool.cpp
index 6081d741bd9..84e0d645154 100644
--- a/TAO/tao/RTCORBA/Thread_Pool.cpp
+++ b/TAO/tao/RTCORBA/Thread_Pool.cpp
@@ -498,7 +498,7 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager,
allow_request_buffering_ (allow_request_buffering),
max_buffered_requests_ (max_buffered_requests),
max_request_buffer_size_ (max_request_buffer_size),
- lifespan_ (lifespan),
+ // lifespan_ (lifespan),
dynamic_thread_time_ (dynamic_thread_time),
lanes_ (0),
number_of_lanes_ (1),
@@ -539,7 +539,7 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager,
allow_request_buffering_ (allow_request_buffering),
max_buffered_requests_ (max_buffered_requests),
max_request_buffer_size_ (max_request_buffer_size),
- lifespan_ (lifespan),
+ // lifespan_ (lifespan),
dynamic_thread_time_ (dynamic_thread_time),
lanes_ (0),
number_of_lanes_ (lanes.length ()),
diff --git a/TAO/tao/RTCORBA/Thread_Pool.h b/TAO/tao/RTCORBA/Thread_Pool.h
index 7154a9517ec..2a6277dbda0 100644
--- a/TAO/tao/RTCORBA/Thread_Pool.h
+++ b/TAO/tao/RTCORBA/Thread_Pool.h
@@ -337,7 +337,7 @@ private:
CORBA::Boolean allow_request_buffering_;
CORBA::ULong max_buffered_requests_;
CORBA::ULong max_request_buffer_size_;
- TAO_RT_ORBInitializer::TAO_RTCORBA_DT_LifeSpan const lifespan_;
+ // TAO_RT_ORBInitializer::TAO_RTCORBA_DT_LifeSpan const lifespan_;
ACE_Time_Value const dynamic_thread_time_;
TAO_Thread_Lane **lanes_;
diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp
index ebed2944da4..ba0d8928ba9 100644
--- a/TAO/tao/RTScheduling/Current.cpp
+++ b/TAO/tao/RTScheduling/Current.cpp
@@ -574,7 +574,7 @@ DTTask::activate_task (RTCORBA::Priority base_priority,
}
DTTask::DTTask (TAO_ORB_Core *orb,
- DT_Hash_Map *dt_hash,
+ DT_Hash_Map *,
TAO_RTScheduler_Current_i* new_current,
RTScheduling::ThreadAction_ptr start,
CORBA::VoidData data,
@@ -582,7 +582,7 @@ DTTask::DTTask (TAO_ORB_Core *orb,
CORBA::Policy_ptr sched_param,
CORBA::Policy_ptr implicit_sched_param)
:orb_ (orb),
- dt_hash_ (dt_hash),
+ // dt_hash_ (dt_hash),
current_ (new_current),
start_ (RTScheduling::ThreadAction::_duplicate (start)),
data_ (data),
diff --git a/TAO/tao/RTScheduling/Current.h b/TAO/tao/RTScheduling/Current.h
index e9c50e0ba92..49c424d4c3b 100644
--- a/TAO/tao/RTScheduling/Current.h
+++ b/TAO/tao/RTScheduling/Current.h
@@ -308,7 +308,7 @@ class DTTask : public ACE_Task <ACE_SYNCH>
{
public:
DTTask (TAO_ORB_Core* orb,
- DT_Hash_Map* dt_hash,
+ DT_Hash_Map* ,
TAO_RTScheduler_Current_i*,
RTScheduling::ThreadAction_ptr start,
CORBA::VoidData data,
@@ -325,7 +325,7 @@ public:
private:
TAO_ORB_Core* orb_;
- DT_Hash_Map* dt_hash_;
+ // DT_Hash_Map* dt_hash_;
TAO_RTScheduler_Current_i* current_;
RTScheduling::ThreadAction_var start_;
CORBA::VoidData data_;
diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.h b/TAO/tao/Strategies/SHMIOP_Connection_Handler.h
index 0dc238ae6b2..9fcad7ce6fa 100644
--- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.h
+++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.h
@@ -96,11 +96,6 @@ protected:
virtual int handle_write_ready (const ACE_Time_Value *timeout);
//@}
-private:
- /// Flag that we will be passing to the event handler to indicate
- /// whether the handle will be resumed by the method or not.
- int resume_flag_;
-
};
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/utils/logWalker/GIOP_Buffer.cpp b/TAO/utils/logWalker/GIOP_Buffer.cpp
index bb56112241b..a5ecf8606ae 100644
--- a/TAO/utils/logWalker/GIOP_Buffer.cpp
+++ b/TAO/utils/logWalker/GIOP_Buffer.cpp
@@ -103,7 +103,7 @@ struct ReplyHeader_1_0 { // Renamed from ReplyHeader
-static const size_t target_offset_12 = GIOP_Buffer::giop_header_len + 12;
+//static const size_t target_offset_12 = GIOP_Buffer::giop_header_len + 12;
// 12 = req_id + flags + RESVD + addr disp.
diff --git a/TAO/utils/logWalker/PeerObject.cpp b/TAO/utils/logWalker/PeerObject.cpp
index 00ec6e7f9c9..11df9a0b8fb 100644
--- a/TAO/utils/logWalker/PeerObject.cpp
+++ b/TAO/utils/logWalker/PeerObject.cpp
@@ -4,10 +4,10 @@
#include "PeerObject.h"
#include "Invocation.h"
-PeerObject::PeerObject (long id, const char *name, PeerProcess *parent)
- :ident_(id),
- name_(name),
- parent_(parent)
+PeerObject::PeerObject (long id, const char *name, PeerProcess *)
+ :ident_(id)
+ ,name_(name)
+ // ,parent_(parent)
{
}
diff --git a/TAO/utils/logWalker/PeerObject.h b/TAO/utils/logWalker/PeerObject.h
index dcb15acd81c..cffcfe1c6e9 100644
--- a/TAO/utils/logWalker/PeerObject.h
+++ b/TAO/utils/logWalker/PeerObject.h
@@ -19,7 +19,7 @@ typedef ACE_Unbounded_Queue_Iterator<Invocation*> InvocationIter;
class PeerObject
{
public:
- PeerObject (long ident, const char *name, PeerProcess *parent);
+ PeerObject (long ident, const char *name, PeerProcess * );
virtual ~PeerObject (void);
void add_invocation (Invocation *inv);
@@ -31,7 +31,7 @@ public:
private:
long ident_;
ACE_CString name_;
- PeerProcess *parent_;
+ //PeerProcess *parent_;
Invocations invocations_;
};
diff --git a/TAO/utils/nsgroup/nsgroup.cpp b/TAO/utils/nsgroup/nsgroup.cpp
index d541f44fd93..323a06ead75 100644
--- a/TAO/utils/nsgroup/nsgroup.cpp
+++ b/TAO/utils/nsgroup/nsgroup.cpp
@@ -123,7 +123,6 @@ private:
/// parsed command line arguments
const ACE_TCHAR *group_arg_;
const ACE_TCHAR *policy_arg_;
- const ACE_TCHAR *typeid_arg_;
const ACE_TCHAR *location_arg_;
const ACE_TCHAR *ior_arg_;
const ACE_TCHAR *namepath_arg_;
@@ -136,7 +135,6 @@ private:
nsgroup_cmd_(NSGROUP::NSGROUP_NONE),
group_arg_ (0),
policy_arg_ (0),
- typeid_arg_ (0),
location_arg_ (0),
ior_arg_ (0),
namepath_arg_ (0)