[SCM] Packaging for omninotify branch, master, updated. upstream/2.1-27-g978853e
Frédéric-Emmanuel P?==?UTF-8?Q?ICCA
picca at synchrotron-soleil.fr
Tue Jun 14 14:40:41 UTC 2011
The following commit has been merged in the master branch:
commit 978853eab5fcc5cb05c60e2c7fe2137fcdbc5259
Author: Frédéric-Emmanuel PICCA <picca at synchrotron-soleil.fr>
Date: Tue Jun 14 16:36:53 2011 +0200
regenerate the patch series with gbp-pq
diff --git a/debian/patches/features/fix_64bits_platforms b/debian/patches/features/0001-fix_64bits_platforms.patch
similarity index 79%
rename from debian/patches/features/fix_64bits_platforms
rename to debian/patches/features/0001-fix_64bits_platforms.patch
index ca46462..c83ef83 100644
--- a/debian/patches/features/fix_64bits_platforms
+++ b/debian/patches/features/0001-fix_64bits_platforms.patch
@@ -1,29 +1,33 @@
-Description: Upstream changes introduced in version 2.1-1
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- omninotify (2.1-1) unstable; urgency=low
- .
- * Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP>
- .
- The person named in the Author field signed this changelog entry.
-Author: Picca Frederic-Emmanuel <picca at synchrotron-soleil.fr>
+From: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
+Date: Tue, 14 Jun 2011 16:34:45 +0200
+Subject: fix_64bits_platforms
---
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
+ DEBUG.mk | 1 +
+ idl/AttNotification.idl | 31 +++++++++-----
+ include/CosEventChannelAdmin_i.h | 4 ++
+ include/CosNotifyChannelAdmin_i.h | 30 ++++++++++++++
+ include/CosNotifyFilter_i.h | 5 +-
+ include/RDIHashFuncs.h | 15 +++++++
+ include/RDITimeWrappers.h | 4 +-
+ include/RDIstrstream.h | 2 +
+ include/omniorb_poa_wrappers_impl.h | 2 +-
+ lib/ChannelAdmin_i.cc | 76 +++++++++++++++++-----------------
+ lib/CosEventProxy.cc | 28 +++++++++++--
+ lib/EventChannel_i.cc | 15 ++++---
+ lib/FilterAdmin_i.cc | 35 ++++++++++++----
+ lib/Filter_i.cc | 12 +++---
+ lib/ProxyConsumer.cc | 59 ++++++++++++++++++++++++---
+ lib/ProxySupplier.cc | 42 +++++++++++++++++++
+ lib/RDITimeWrappers.cc | 2 +-
+ lib/RDIstrstream.cc | 2 +
+ mk/beforeauto.mk.in | 13 +++---
+ 19 files changed, 284 insertions(+), 94 deletions(-)
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- omninotify-2.1.orig/DEBUG.mk
-+++ omninotify-2.1/DEBUG.mk
+diff --git a/DEBUG.mk b/DEBUG.mk
+index 808902e..560c7b1 100644
+--- a/DEBUG.mk
++++ b/DEBUG.mk
@@ -4,6 +4,7 @@
# There are three things you may wish to change:
@@ -32,8 +36,10 @@ Last-Update: <YYYY-MM-DD>
#EnableDebugLog = 1
# (2) Uncomment the following to disable object garbage collection
---- omninotify-2.1.orig/idl/AttNotification.idl
-+++ omninotify-2.1/idl/AttNotification.idl
+diff --git a/idl/AttNotification.idl b/idl/AttNotification.idl
+index adcbdac..ae26c19 100644
+--- a/idl/AttNotification.idl
++++ b/idl/AttNotification.idl
@@ -132,8 +132,15 @@ module AttNotification {
IactSeq children(in boolean only_cleanup_candidates);
@@ -118,276 +124,278 @@ Last-Update: <YYYY-MM-DD>
};
// ------------------------------ Admins ------------------------------
---- omninotify-2.1.orig/mk/beforeauto.mk.in
-+++ omninotify-2.1/mk/beforeauto.mk.in
-@@ -943,20 +943,21 @@ IMPORT_CPPFLAGS += -D__aix__
+diff --git a/include/CosEventChannelAdmin_i.h b/include/CosEventChannelAdmin_i.h
+index 8357275..075e8f9 100644
+--- a/include/CosEventChannelAdmin_i.h
++++ b/include/CosEventChannelAdmin_i.h
+@@ -62,6 +62,7 @@ public:
+ AttN::NameSeq* my_name( WRAPPED_DECLARG_VOID );
+ AttN::IactSeq* children(CORBA::Boolean only_cleanup_candidates);
+ CORBA::Boolean safe_cleanup();
++ CORBA::Object *remote_object();
- CMAKEDEPEND += -D_AIX
- CXXMAKEDEPEND += -D_AIX
-+CXXLINKOPTIONS += -brtl -bnoipath -blibpath:/usr/lib:$(prefix)/lib
+ // Methods from CosEvC::PushConsumer Interface
+ void push(const CORBA::Any& data WRAPPED_DECLARG );
+@@ -122,6 +123,7 @@ public:
+ AttN::NameSeq* my_name( WRAPPED_DECLARG_VOID );
+ AttN::IactSeq* children(CORBA::Boolean only_cleanup_candidates);
+ CORBA::Boolean safe_cleanup();
++ CORBA::Object *remote_object();
- # the following definitions were provided by Tiga
--CXXOPTIONS = -qstaticinline -qmaxmem=8192 -qlonglong -qlongdouble
--COPTIONS = -qmaxmem=8192 -qlonglong -qlongdouble
-+CXXOPTIONS = -qstaticinline -qmaxmem=32768 -qlonglong -qlongdouble
-+COPTIONS = -qmaxmem=32768 -qlonglong -qlongdouble
- OMNITHREAD_POSIX_CPPFLAGS = -DNoNanoSleep -DPthreadDraftVersion=10
- OMNITHREAD_CPPFLAGS = -D_REENTRANT
- OMNITHREAD_LIB += -lpthread
+ // Methods from CosEvC::PullConsumer Interface
+ void disconnect_pull_consumer( WRAPPED_DECLARG_VOID );
+@@ -191,6 +193,7 @@ public:
+ AttN::NameSeq* my_name( WRAPPED_DECLARG_VOID );
+ AttN::IactSeq* children(CORBA::Boolean only_cleanup_candidates);
+ CORBA::Boolean safe_cleanup();
++ CORBA::Object *remote_object();
- # this works only for xlc version >= 5
--SharedLibraryPlatformLinkFlagsTemplate = -G
-+SharedLibraryPlatformLinkFlagsTemplate = -G -qmkshrobj \
-+ -bnoipath -blibpath:/usr/lib:$(prefix)/lib
+ // Methods from CosEvCA::ProxyPushSupplier Interface
+ void connect_push_consumer(CosEvC::PushConsumer_ptr consumer
+@@ -260,6 +263,7 @@ public:
+ AttN::NameSeq* my_name( WRAPPED_DECLARG_VOID );
+ AttN::IactSeq* children(CORBA::Boolean only_cleanup_candidates);
+ CORBA::Boolean safe_cleanup();
++ CORBA::Object *remote_object();
--# Please notice the last line. You can't use "-qmkshobj" instead of
--# "-G". Somehow, if you do that, a number of symbols are unresolved
--# when linking.
-+# Please notice the last line. You need both -G and -qmkshrobj to get
-+# true shared objects working properly.
+ // Methods from CosEvCA::ProxyPullSupplier
+ void connect_pull_consumer(CosEvC::PullConsumer_ptr consumer
+diff --git a/include/CosNotifyChannelAdmin_i.h b/include/CosNotifyChannelAdmin_i.h
+index 73ff9dc..fbc569a 100644
+--- a/include/CosNotifyChannelAdmin_i.h
++++ b/include/CosNotifyChannelAdmin_i.h
+@@ -317,6 +317,8 @@ public:
+ void connect_any_pull_consumer(CosEvC::PullConsumer_ptr cons
+ WRAPPED_DECLARG );
- endif
++ CORBA::Object *remote_object( WRAPPED_DECLARG_VOID );
++
+ // Methods from CosEvC::PullSupplier Interface
+ CORBA::Any* pull( WRAPPED_DECLARG_VOID );
+ CORBA::Any* try_pull(CORBA::Boolean& has_event WRAPPED_DECLARG );
+@@ -363,6 +365,8 @@ class StructuredProxyPullSupplier_i :
+ void connect_structured_pull_consumer(
+ CosNC::StructuredPullConsumer_ptr consumer WRAPPED_DECLARG );
+
++ CORBA::Object *remote_object( WRAPPED_DECLARG_VOID );
++
+ // Methods from CosNC::StructuredPullSupplier Interface
+ CosN::StructuredEvent* pull_structured_event( WRAPPED_DECLARG_VOID );
+ CosN::StructuredEvent* try_pull_structured_event(CORBA::Boolean& has_event
+@@ -410,6 +414,8 @@ class SequenceProxyPullSupplier_i :
+ void connect_sequence_pull_consumer(
+ CosNC::SequencePullConsumer_ptr consumer WRAPPED_DECLARG );
---- omninotify-2.1.orig/lib/FilterAdmin_i.cc
-+++ omninotify-2.1/lib/FilterAdmin_i.cc
-@@ -308,7 +308,7 @@ FilterFactory_i::do_command(const char*
++ CORBA::Object *remote_object( WRAPPED_DECLARG_VOID );
++
+ // Methods from CosNC::SequencePullSupplier Interface
+ CosN::EventBatch* pull_structured_events(CORBA::Long max_number
+ WRAPPED_DECLARG );
+@@ -466,6 +472,9 @@ public:
+ // Methods from CosNA::ProxyPushSupplier Interface
+ void connect_any_push_consumer(
+ CosEvC::PushConsumer_ptr consumer WRAPPED_DECLARG );
++
++ CORBA::Object *remote_object( WRAPPED_DECLARG_VOID );
++
+ void suspend_connection( WRAPPED_DECLARG_VOID );
+ void resume_connection( WRAPPED_DECLARG_VOID );
- FAdminHelper::FAdminHelper(const char *resty) :
- _resty(resty), _serial(1),
-- _filters(RDI_ULongHash, RDI_ULongRank)
-+ _filters(RDI_CorbaULongHash, RDI_CorbaULongRank)
- {;}
+@@ -518,6 +527,9 @@ class StructuredProxyPushSupplier_i :
+ // Methods from CosNA::StructuredProxyPushSupplier Interface
+ void connect_structured_push_consumer(
+ CosNC::StructuredPushConsumer_ptr consumer WRAPPED_DECLARG );
++
++ CORBA::Object *remote_object( WRAPPED_DECLARG_VOID );
++
+ void suspend_connection( WRAPPED_DECLARG_VOID );
+ void resume_connection( WRAPPED_DECLARG_VOID );
- FAdminHelper::~FAdminHelper()
-@@ -326,11 +326,16 @@ FAdminHelper::add_filter_i(RDI_LocksHeld
- CosNF::FilterID fltrID;
- Filter_i* fltr = Filter_i::Filter2Filter_i(new_filter);
+@@ -569,6 +581,9 @@ public:
+ // Methods from CosNA::SequenceProxyPushSupplier Interface
+ void connect_sequence_push_consumer(
+ CosNC::SequencePushConsumer_ptr consumer WRAPPED_DECLARG );
++
++ CORBA::Object *remote_object( WRAPPED_DECLARG_VOID );
++
+ void suspend_connection( WRAPPED_DECLARG_VOID );
+ void resume_connection( WRAPPED_DECLARG_VOID );
-- RDI_Assert(fltr, "Filter was not created by READY\n");
-+ //RDI_Assert(fltr, "Filter was not created by READY\n");
+@@ -849,6 +864,8 @@ public:
+ void connect_any_push_supplier(CosEvC::PushSupplier_ptr supplier
+ WRAPPED_DECLARG);
- fltrID = _serial++;
- entry.filter = fltr;
-- entry.callback_id = fltr->attach_callback_i(held, filter_holder, need_schange);
-+ if (fltr)
-+ entry.callback_id = fltr->attach_callback_i(held, filter_holder, need_schange);
-+ else
-+ entry.remote_filter = CosNF::Filter::_duplicate(new_filter);
-+
++ CORBA::Object *remote_object( WRAPPED_DECLARG_VOID );
+
- if ( _filters.insert(fltrID, entry) ) {
- RDIDbgFAdminLog("Failed to register new filter in hash table\n");
- return 0;
-@@ -382,7 +387,11 @@ FAdminHelper::get_filter(CosNF::FilterID
+ // Methods from CosEvC::PushConsumer Interface
+ void push(const CORBA::Any& data WRAPPED_DECLARG );
+ void disconnect_push_consumer( WRAPPED_DECLARG_VOID );
+@@ -888,6 +905,8 @@ public:
+ // Methods from CosNA::StructuredProxyPushConsumer Interface
+ void connect_structured_push_supplier(
+ CosNC::StructuredPushSupplier_ptr supplier WRAPPED_DECLARG );
++
++ CORBA::Object *remote_object( WRAPPED_DECLARG_VOID );
- if ( _filters.lookup(fltrID, entry) ) {
- RDIDbgFAdminLog("Get Filter " << entry.filter << " [" << fltrID << "]\n");
-- CosNF::Filter_var res = WRAPPED_IMPL2OREF(CosNF::Filter, entry.filter);
-+ CosNF::Filter_var res;
-+ if (entry.filter)
-+ res = WRAPPED_IMPL2OREF(CosNF::Filter, entry.filter);
-+ else
-+ res = entry.remote_filter;
- return res;
- }
- throw CosNF::FilterNotFound();
-@@ -418,10 +427,12 @@ FAdminHelper::remove_filter(RDI_LocksHel
- throw CosNF::FilterNotFound();
- }
- Filter_i *f = entry.filter;
-- f->fadmin_removal_i(held, entry.callback_id, filter_holder);
-+ if (f)
-+ f->fadmin_removal_i(held, entry.callback_id, filter_holder);
- RDIDbgFAdminLog("remove_filter: removing filter [" << fltrID << "] from hash table\n");
- _filters.remove(fltrID);
-- WRAPPED_RELEASE_IMPL(f);
-+ if (f)
-+ WRAPPED_RELEASE_IMPL(f);
- }
+ // Methods from CosNC::StructuredPushConsumer Interface
+ void push_structured_event(const CosN::StructuredEvent& event WRAPPED_DECLARG);
+@@ -931,6 +950,8 @@ class SequenceProxyPushConsumer_i :
+ void connect_sequence_push_supplier(CosNC::SequencePushSupplier_ptr supplier
+ WRAPPED_DECLARG );
- #undef WHATFN
-@@ -435,8 +446,11 @@ FAdminHelper::remove_all_filters(RDI_Loc
- for ( fcur = _filters.cursor(); fcur.is_valid(); fcur++ ) {
- FAdminFilterEntry &entry = fcur.val();
- // RDIDbgForceLog("XXX_REMOVE " << WHATFN << " calling fadmin_removal_i(held, entry.callback_id, filter_holder)");
-- entry.filter->fadmin_removal_i(held, entry.callback_id, filter_holder);
-- WRAPPED_RELEASE_IMPL(entry.filter);
-+ if (entry.filter)
-+ {
-+ entry.filter->fadmin_removal_i(held, entry.callback_id, filter_holder);
-+ WRAPPED_RELEASE_IMPL(entry.filter);
-+ }
- }
- _filters.clear();
- }
-@@ -453,7 +467,10 @@ FAdminHelper::out_info_filters(RDIstrstr
- } else {
- for ( fcur = _filters.cursor(); fcur.is_valid(); fcur++ ) {
- FAdminFilterEntry &entry = fcur.val();
-- entry.filter->out_info_descr(str);
-+ if (entry.filter)
-+ entry.filter->out_info_descr(str);
-+ else
-+ str << "Remote Filter \n";
- }
- }
- }
---- omninotify-2.1.orig/lib/EventChannel_i.cc
-+++ omninotify-2.1/lib/EventChannel_i.cc
-@@ -65,8 +65,8 @@ EventChannel_i::EventChannel_i(EventChan
- _reporter(0), _rep_wait(), _rep_exit(0), _repisactive(0), _repInterval(0),
- _events(0), _qos_lock(), _stats_lock(), _performance_timer(),
- _proxy_events(8192,1024), _admin_group(0),
-- _supl_admin(RDI_ULongHash, RDI_ULongRank),
-- _cons_admin(RDI_ULongHash, RDI_ULongRank),
-+ _supl_admin(RDI_CorbaULongHash, RDI_CorbaULongRank),
-+ _cons_admin(RDI_CorbaULongHash, RDI_CorbaULongRank),
- _evtypes(RDI_EventType::hash, RDI_EventType::rank),
- _pull_supplier(0), _push_consumer(0),
- _ochange_pool(0), _schange_pool(0)
-@@ -75,7 +75,7 @@ EventChannel_i::EventChannel_i(EventChan
- _rep_wait = _oplockptr->add_condition();
- _rep_exit = _oplockptr->add_condition();
- char buf[20];
-- sprintf(buf, "chan%ld", myserial);
-+ sprintf(buf, "chan%ld", (long)myserial);
- _my_name.length(_my_name.length()+1);
- _my_name[_my_name.length()-1] = (const char*)buf;
++ CORBA::Object *remote_object( WRAPPED_DECLARG_VOID );
++
+ // Methods from CosNC::SequencePushConsumer Interface
+ void push_structured_events(const CosN::EventBatch& events WRAPPED_DECLARG );
+ void disconnect_sequence_push_consumer( WRAPPED_DECLARG_VOID );
+@@ -976,6 +997,9 @@ class ProxyPullConsumer_i :
+ // Methods from CosNA::ProxyPullConsumer Interface
+ void connect_any_pull_supplier(
+ CosEvC::PullSupplier_ptr supplier WRAPPED_DECLARG );
++
++ CORBA::Object *remote_object( WRAPPED_DECLARG_VOID );
++
+ void suspend_connection( WRAPPED_DECLARG_VOID );
+ void resume_connection( WRAPPED_DECLARG_VOID );
-@@ -1580,7 +1580,8 @@ EventChannelFactory_i::EventChannelFacto
- const RDI_AdminQoS& defadm,
- RDI_ServerQoS* s_qos) :
- _oplockptr(0), _ffactory(ffactory), _serial(0), _defqos(defqos),
-- _defadm(defadm), _server_qos(s_qos), _channel(RDI_ULongHash, RDI_ULongRank)
-+ _defadm(defadm), _server_qos(s_qos),
-+ _channel(RDI_CorbaULongHash, RDI_CorbaULongRank)
- {
- RDI_OPLOCK_INIT("chanfact");
- _my_name.length(2);
-@@ -2127,12 +2128,12 @@ EventChannel_i::child_names( WRAPPED_IMP
- RDI_HashCursor<CosNA::AdminID, ConsumerAdmin_i *> c;
- unsigned int idx = 0;
- for (c = _cons_admin.cursor(); c.is_valid(); ++c) {
-- sprintf(buf, "cadmin%ld", c.key());
-+ sprintf(buf, "cadmin%ld", (long)c.key());
- (*names)[idx++] = (const char*)buf;
- }
- RDI_HashCursor<CosNA::AdminID, SupplierAdmin_i *> s;
- for (s = _supl_admin.cursor(); s.is_valid(); ++s) {
-- sprintf(buf, "sadmin%ld", s.key());
-+ sprintf(buf, "sadmin%ld", (long)s.key());
- (*names)[idx++] = (const char*)buf;
- }
- return names;
-@@ -2527,7 +2528,7 @@ EventChannelFactory_i::child_names( WRAP
- unsigned int index = 0;
- RDI_HashCursor<CosNA::ChannelID, EventChannel_i*> cursor;
- for ( cursor = _channel.cursor(); cursor.is_valid(); index++, ++cursor ) {
-- sprintf(buf, "chan%ld", cursor.key());
-+ sprintf(buf, "chan%ld", (long)cursor.key());
- (*names)[index] = (const char*)buf;
- }
- return names;
---- omninotify-2.1.orig/lib/CosEventProxy.cc
-+++ omninotify-2.1/lib/CosEventProxy.cc
-@@ -51,7 +51,7 @@ EventProxyPushConsumer_i::EventProxyPush
- {
- RDI_OPLOCK_INIT("EventProxyPushConsumer");
- char buf[20];
-- sprintf(buf, "proxy%ld", prxid);
-+ sprintf(buf, "proxy%ld", (long)prxid);
- _my_name.length(_my_name.length()+1);
- _my_name[_my_name.length()-1] = (const char*)buf;
- _supplier = CosEvC::PushSupplier::_nil();
-@@ -229,7 +229,7 @@ EventProxyPullConsumer_i::EventProxyPull
- {
- RDI_OPLOCK_INIT("EventProxyPullConsumer");
- char buf[20];
-- sprintf(buf, "proxy%ld", prxid);
-+ sprintf(buf, "proxy%ld", (long)prxid);
- _my_name.length(_my_name.length()+1);
- _my_name[_my_name.length()-1] = (const char*)buf;
- _supplier = CosEvC::PullSupplier::_nil();
-@@ -645,7 +645,7 @@ EventProxyPushSupplier_i::EventProxyPush
- {
- RDI_OPLOCK_INIT("EventProxyPushSupplier");
- char buf[20];
-- sprintf(buf, "proxy%ld", prxid);
-+ sprintf(buf, "proxy%ld", (long)prxid);
- _my_name.length(_my_name.length()+1);
- _my_name[_my_name.length()-1] = (const char*)buf;
- _consumer = CosEvC::PushConsumer::_nil();
-@@ -1030,7 +1030,7 @@ EventProxyPullSupplier_i::EventProxyPull
- {
- RDI_OPLOCK_INIT("EventProxyPullSupplier");
- char buf[20];
-- sprintf(buf, "proxy%ld", prxid);
-+ sprintf(buf, "proxy%ld", (long)prxid);
- _my_name.length(_my_name.length()+1);
- _my_name[_my_name.length()-1] = (const char*)buf;
- _consumer = CosEvC::PullConsumer::_nil();
-@@ -1328,6 +1328,11 @@ EventProxyPushConsumer_i::safe_cleanup()
- return 1;
- }
-
-+CORBA::Object* EventProxyPushConsumer_i::remote_object()
-+{
-+ return(CORBA::Object::_duplicate(_supplier));
-+}
+@@ -1032,6 +1056,9 @@ class StructuredProxyPullConsumer_i :
+ // Methods from CosNA::StructuredProxyPullConsumer Interface
+ void connect_structured_pull_supplier(
+ CosNC::StructuredPullSupplier_ptr supplier WRAPPED_DECLARG );
+
- #undef WHATFN
- #define WHATFN "EventProxyPushConsumer_i::my_name"
- AttN::NameSeq*
-@@ -1432,6 +1437,11 @@ EventProxyPullConsumer_i::safe_cleanup()
- return 1;
- }
-
-+CORBA::Object* EventProxyPullConsumer_i::remote_object()
-+{
-+ return(CORBA::Object::_duplicate(_supplier));
-+}
++ CORBA::Object *remote_object( WRAPPED_DECLARG_VOID );
+
- #undef WHATFN
- #define WHATFN "EventProxyPullConsumer_i::my_name"
- AttN::NameSeq*
-@@ -1537,6 +1547,11 @@ EventProxyPushSupplier_i::safe_cleanup()
- return 1;
- }
+ void suspend_connection( WRAPPED_DECLARG_VOID );
+ void resume_connection( WRAPPED_DECLARG_VOID );
-+CORBA::Object* EventProxyPushSupplier_i::remote_object()
-+{
-+ return(CORBA::Object::_duplicate(_consumer));
-+}
+@@ -1087,6 +1114,9 @@ class SequenceProxyPullConsumer_i :
+ // Methods from CosNA::SequenceProxyPullConsumer Interface
+ void connect_sequence_pull_supplier(
+ CosNC::SequencePullSupplier_ptr supplier WRAPPED_DECLARG );
+
- #undef WHATFN
- #define WHATFN "EventProxyPushSupplier_i::my_name"
- AttN::NameSeq*
-@@ -1642,6 +1657,11 @@ EventProxyPullSupplier_i::safe_cleanup()
- return 1;
++ CORBA::Object *remote_object( WRAPPED_DECLARG_VOID );
++
+ void suspend_connection( WRAPPED_DECLARG_VOID );
+ void resume_connection( WRAPPED_DECLARG_VOID );
+
+diff --git a/include/CosNotifyFilter_i.h b/include/CosNotifyFilter_i.h
+index 46f1a7e..0ae09df 100644
+--- a/include/CosNotifyFilter_i.h
++++ b/include/CosNotifyFilter_i.h
+@@ -200,7 +200,7 @@ public:
+
+ CORBA::Boolean has_callbacks() { return _callbacks.length() ? 1:0; }
+ CORBA::Boolean has_callbacks_i() { return _callbacks_i.length() ? 1:0; }
+- unsigned long getID() const { return _fid; }
++ CosNF::FilterID getID() const { return _fid; }
+
+ RDIstrstream& log_output(RDIstrstream& str) const;
+
+@@ -242,7 +242,7 @@ private:
+ #endif
+ AttN::NameSeq _my_name;
+ FilterFactory_i* _factory;
+- unsigned long _fid;
++ CosNF::FilterID _fid;
+ long _idcounter;
+ unsigned long _hashvalue;
+ RDI_TimeT _last_detach;
+@@ -452,6 +452,7 @@ private:
+ typedef struct FAdminFilterEntry_s {
+ CosNF::CallbackID callback_id;
+ Filter_i* filter;
++ CosNF::Filter_var remote_filter;
+ } FAdminFilterEntry;
+
+ class FAdminHelper {
+diff --git a/include/RDIHashFuncs.h b/include/RDIHashFuncs.h
+index f78140d..a84fef1 100644
+--- a/include/RDIHashFuncs.h
++++ b/include/RDIHashFuncs.h
+@@ -33,6 +33,7 @@
+ #define __RDI_HASH_FUNCS_H__
+
+ #include "RDIStringDefs.h"
++#include "corba_wrappers.h"
+
+ // HASH AND RANK FUNCTIONS
+ // * Hash and Rank function definitions, together with several
+@@ -105,5 +106,19 @@ inline unsigned int RDI_StrHash(const void* K)
+ return h;
}
-+CORBA::Object* EventProxyPullSupplier_i::remote_object()
-+{
-+ return(CORBA::Object::_duplicate(_consumer));
++inline unsigned int RDI_CorbaSLongHash(const void* K)
++{ CORBA::Long l = *((CORBA::Long *) K); return (l < 0) ? -l : l; }
++
++inline unsigned int RDI_CorbaULongHash(const void* K)
++{ return *((CORBA::ULong *) K); }
++
++inline int RDI_CorbaSLongRank(const void* L, const void* R)
++{ return *((CORBA::Long *) L) - *((CORBA::Long *) R); }
++
++inline int RDI_CorbaULongRank(const void* L, const void* R)
++{ CORBA::ULong l = *((CORBA::ULong *) L), r = *((CORBA::ULong *) R);
++ return (l < r) ? -1 : ((l > r) ? 1 : 0);
+}
+
- #undef WHATFN
- #define WHATFN "EventProxyPullSupplier_i::my_name"
- AttN::NameSeq*
---- omninotify-2.1.orig/lib/RDITimeWrappers.cc
-+++ omninotify-2.1/lib/RDITimeWrappers.cc
-@@ -146,7 +146,7 @@ static int RDI_TimeT_fmt_local_buf_idx =
- #undef WHATFN
- #define WHATFN "RDI_TimeT::fmt_local"
- const char *RDI_TimeT::fmt_local() {
-- CORBA::ULong ts, tm;
-+ unsigned long ts, tm;
- get_posixbase_secs_msecs(ts, tm);
- time_t secs_as_time_t = ts;
- TW_SCOPE_LOCK(otime_lock, RDI_out_time_lock, "RDI_out_time", WHATFN);
---- omninotify-2.1.orig/lib/ChannelAdmin_i.cc
-+++ omninotify-2.1/lib/ChannelAdmin_i.cc
-@@ -54,12 +54,12 @@ ConsumerAdmin_i::ConsumerAdmin_i(EventCh
+ #endif /* __RDI_HASH_FUNCS_H__ */
+
+diff --git a/include/RDITimeWrappers.h b/include/RDITimeWrappers.h
+index 4d7f5c7..897cb41 100644
+--- a/include/RDITimeWrappers.h
++++ b/include/RDITimeWrappers.h
+@@ -235,7 +235,7 @@ public:
+
+ // pretty-printing of absolute local time -- no newline
+ void out_local(RDIstrstream& str) {
+- CORBA::ULong ts, tn;
++ unsigned long ts, tn;
+ get_posixbase_secs_nanosecs(ts, tn);
+ RDI_posixbase_out_time(str, ts, tn);
+ str << " (local time)";
+@@ -395,7 +395,7 @@ public:
+ }
+ // pretty-printing of absolute univ time -- no newline
+ void out_gmt(RDIstrstream& str) {
+- CORBA::ULong ts, tn;
++ unsigned long ts, tn;
+ get_gmt_posixbase_secs_nanosecs(ts, tn);
+ RDI_posixbase_out_time(str, ts, tn);
+ str << " (greenwich mean time)";
+diff --git a/include/RDIstrstream.h b/include/RDIstrstream.h
+index 07aa56c..c75628c 100644
+--- a/include/RDIstrstream.h
++++ b/include/RDIstrstream.h
+@@ -62,9 +62,11 @@ public:
+ RDIstrstream& operator<<(short n) {return operator<<((int)n);}
+ RDIstrstream& operator<<(unsigned short n) {return operator<<((unsigned int)n);}
+ #ifdef HAS_LongLong
++#if SIZEOF_LONG_LONG != SIZEOF_LONG
+ RDIstrstream& operator<<(WRAPPED_CORBA_LONGLONG_TYPE n);
+ RDIstrstream& operator<<(WRAPPED_CORBA_ULONGLONG_TYPE n);
+ #endif
++#endif
+ #ifdef HAS_Cplusplus_Bool
+ RDIstrstream& operator<<(bool b) { return operator<<((int)b); }
+ #endif
+diff --git a/include/omniorb_poa_wrappers_impl.h b/include/omniorb_poa_wrappers_impl.h
+index ca192b4..d4b56a7 100644
+--- a/include/omniorb_poa_wrappers_impl.h
++++ b/include/omniorb_poa_wrappers_impl.h
+@@ -51,7 +51,7 @@ void WRAPPED_ORB_OA::init(int& argc, char** argv) {
+ _orb = CORBA::ORB_init(argc, argv, ORB_INIT_NAME);
+ #elif defined(__OMNIORB4__)
+ char maxgiopcon[100];
+- sprintf(maxgiopcon, "%lu", _max_giop_connections);
++ sprintf(maxgiopcon, "%lu", (unsigned long)_max_giop_connections);
+ const char* onepercon = _one_call_per_connection ? "1" : "0";
+ const char* options[][2] = { { "maxGIOPConnectionPerServer", (const char*)maxgiopcon },
+ { "oneCallPerConnection", onepercon },
+diff --git a/lib/ChannelAdmin_i.cc b/lib/ChannelAdmin_i.cc
+index cc30753..981e608 100644
+--- a/lib/ChannelAdmin_i.cc
++++ b/lib/ChannelAdmin_i.cc
+@@ -54,12 +54,12 @@ ConsumerAdmin_i::ConsumerAdmin_i(EventChannel_i* channel,
_fa_helper("cadmin_fa_helper"), _channel(channel), _qosprop(0),
_serial(serial), _and_or_oper(op), _rqstypes(), _prx_serial(1),
_num_proxies(0), _cosevent_push(), _cosevent_pull(),
@@ -406,7 +414,7 @@ Last-Update: <YYYY-MM-DD>
{
RDI_OPLOCK_INIT("cadmin");
_qosprop = new RDI_NotifQoS(_channel->qos_properties());
-@@ -71,7 +71,7 @@ ConsumerAdmin_i::ConsumerAdmin_i(EventCh
+@@ -71,7 +71,7 @@ ConsumerAdmin_i::ConsumerAdmin_i(EventChannel_i* channel,
_last_use.set_curtime();
#endif
char buf[20];
@@ -415,7 +423,7 @@ Last-Update: <YYYY-MM-DD>
_my_name.length(_my_name.length()+1);
_my_name[_my_name.length()-1] = (const char*)buf;
WRAPPED_REGISTER_IMPL2(this, &_my_name);
-@@ -1692,12 +1692,12 @@ SupplierAdmin_i::SupplierAdmin_i(EventCh
+@@ -1692,12 +1692,12 @@ SupplierAdmin_i::SupplierAdmin_i(EventChannel_i* channel,
_num_proxies(0),
_evtypes(RDI_EventType::hash, RDI_EventType::rank),
_cosevent_push(), _cosevent_pull(),
@@ -434,7 +442,7 @@ Last-Update: <YYYY-MM-DD>
{
RDI_OPLOCK_INIT("sadmin");
_qosprop = new RDI_NotifQoS(_channel->qos_properties());
-@@ -1706,7 +1706,7 @@ SupplierAdmin_i::SupplierAdmin_i(EventCh
+@@ -1706,7 +1706,7 @@ SupplierAdmin_i::SupplierAdmin_i(EventChannel_i* channel,
_last_use.set_curtime();
#endif
char buf[20];
@@ -443,7 +451,7 @@ Last-Update: <YYYY-MM-DD>
_my_name.length(_my_name.length()+1);
_my_name[_my_name.length()-1] = (const char*)buf;
WRAPPED_REGISTER_IMPL2(this, &_my_name);
-@@ -3084,27 +3084,27 @@ ConsumerAdmin_i::child_names( WRAPPED_IM
+@@ -3084,27 +3084,27 @@ ConsumerAdmin_i::child_names( WRAPPED_IMPLARG_VOID )
RDI_HashCursor<CosNA::ProxyID, StructuredProxyPullSupplier_i *> sc2;
RDI_HashCursor<CosNA::ProxyID, SequenceProxyPullSupplier_i * > bc2;
for ( ac1 = _prx_any_push.cursor(); ac1.is_valid(); ++ac1, ++num ) {
@@ -477,7 +485,7 @@ Last-Update: <YYYY-MM-DD>
(*names)[num] = (const char*)buf;
}
return names;
-@@ -3326,7 +3326,7 @@ ConsumerAdmin_i::do_go_command(RDIstrstr
+@@ -3326,7 +3326,7 @@ ConsumerAdmin_i::do_go_command(RDIstrstream& str, RDIParseCmd& p,
RDI_HashCursor<CosNA::ProxyID, SequenceProxyPullSupplier_i * > bc2;
if (targ1_set == 0) {
for ( ac1 = _prx_any_push.cursor(); ac1.is_valid(); ++ac1 ) {
@@ -486,7 +494,7 @@ Last-Update: <YYYY-MM-DD>
if (RDI_STR_EQ_I(go_targ, buf)) {
targ1 = WRAPPED_IMPL2OREF(AttN::ProxyPushSupplier, ac1.val());
targ1_set = 1;
-@@ -3336,7 +3336,7 @@ ConsumerAdmin_i::do_go_command(RDIstrstr
+@@ -3336,7 +3336,7 @@ ConsumerAdmin_i::do_go_command(RDIstrstream& str, RDIParseCmd& p,
}
if (targ1_set == 0) {
for ( sc1 = _prx_struc_push.cursor(); sc1.is_valid(); ++sc1 ) {
@@ -495,7 +503,7 @@ Last-Update: <YYYY-MM-DD>
if (RDI_STR_EQ_I(go_targ, buf)) {
targ1 = WRAPPED_IMPL2OREF(AttN::StructuredProxyPushSupplier, sc1.val());
targ1_set = 1;
-@@ -3346,7 +3346,7 @@ ConsumerAdmin_i::do_go_command(RDIstrstr
+@@ -3346,7 +3346,7 @@ ConsumerAdmin_i::do_go_command(RDIstrstream& str, RDIParseCmd& p,
}
if (targ1_set == 0) {
for ( bc1 = _prx_batch_push.cursor(); bc1.is_valid(); ++bc1 ) {
@@ -504,7 +512,7 @@ Last-Update: <YYYY-MM-DD>
if (RDI_STR_EQ_I(go_targ, buf)) {
targ1 = WRAPPED_IMPL2OREF(AttN::SequenceProxyPushSupplier, bc1.val());
targ1_set = 1;
-@@ -3356,7 +3356,7 @@ ConsumerAdmin_i::do_go_command(RDIstrstr
+@@ -3356,7 +3356,7 @@ ConsumerAdmin_i::do_go_command(RDIstrstream& str, RDIParseCmd& p,
}
if (targ1_set == 0) {
for ( ac2 = _prx_any_pull.cursor(); ac2.is_valid(); ++ac2 ) {
@@ -513,7 +521,7 @@ Last-Update: <YYYY-MM-DD>
if (RDI_STR_EQ_I(go_targ, buf)) {
targ1 = WRAPPED_IMPL2OREF(AttN::ProxyPullSupplier, ac2.val());
targ1_set = 1;
-@@ -3366,7 +3366,7 @@ ConsumerAdmin_i::do_go_command(RDIstrstr
+@@ -3366,7 +3366,7 @@ ConsumerAdmin_i::do_go_command(RDIstrstream& str, RDIParseCmd& p,
}
if (targ1_set == 0) {
for ( sc2 = _prx_struc_pull.cursor(); sc2.is_valid(); ++sc2 ) {
@@ -522,7 +530,7 @@ Last-Update: <YYYY-MM-DD>
if (RDI_STR_EQ_I(go_targ, buf)) {
targ1 = WRAPPED_IMPL2OREF(AttN::StructuredProxyPullSupplier, sc2.val());
targ1_set = 1;
-@@ -3376,7 +3376,7 @@ ConsumerAdmin_i::do_go_command(RDIstrstr
+@@ -3376,7 +3376,7 @@ ConsumerAdmin_i::do_go_command(RDIstrstream& str, RDIParseCmd& p,
}
if (targ1_set == 0) {
for ( bc2 = _prx_batch_pull.cursor(); bc2.is_valid(); ++bc2 ) {
@@ -531,7 +539,7 @@ Last-Update: <YYYY-MM-DD>
if (RDI_STR_EQ_I(go_targ, buf)) {
targ1 = WRAPPED_IMPL2OREF(AttN::SequenceProxyPullSupplier, bc2.val());
targ1_set = 1;
-@@ -3543,27 +3543,27 @@ SupplierAdmin_i::child_names( WRAPPED_IM
+@@ -3543,27 +3543,27 @@ SupplierAdmin_i::child_names( WRAPPED_IMPLARG_VOID )
RDI_HashCursor<CosNA::ProxyID, StructuredProxyPullConsumer_i *> sc2;
RDI_HashCursor<CosNA::ProxyID, SequenceProxyPullConsumer_i *> bc2;
for ( ac1 = _prx_any_push.cursor(); ac1.is_valid(); ++ac1, ++num ) {
@@ -565,7 +573,7 @@ Last-Update: <YYYY-MM-DD>
(*names)[num] = (const char*)buf;
}
return names;
-@@ -3784,7 +3784,7 @@ SupplierAdmin_i::do_go_command(RDIstrstr
+@@ -3784,7 +3784,7 @@ SupplierAdmin_i::do_go_command(RDIstrstream& str, RDIParseCmd& p,
RDI_HashCursor<CosNA::ProxyID, SequenceProxyPullConsumer_i *> bc2;
if (targ1_set == 0) {
for ( ac1 = _prx_any_push.cursor(); ac1.is_valid(); ++ac1 ) {
@@ -574,7 +582,7 @@ Last-Update: <YYYY-MM-DD>
if (RDI_STR_EQ_I(go_targ, buf)) {
targ1 = WRAPPED_IMPL2OREF(AttN::ProxyPushConsumer, ac1.val());
targ1_set = 1;
-@@ -3794,7 +3794,7 @@ SupplierAdmin_i::do_go_command(RDIstrstr
+@@ -3794,7 +3794,7 @@ SupplierAdmin_i::do_go_command(RDIstrstream& str, RDIParseCmd& p,
}
if (targ1_set == 0) {
for ( sc1 = _prx_struc_push.cursor(); sc1.is_valid(); ++sc1 ) {
@@ -583,7 +591,7 @@ Last-Update: <YYYY-MM-DD>
if (RDI_STR_EQ_I(go_targ, buf)) {
targ1 = WRAPPED_IMPL2OREF(AttN::StructuredProxyPushConsumer, sc1.val());
targ1_set = 1;
-@@ -3804,7 +3804,7 @@ SupplierAdmin_i::do_go_command(RDIstrstr
+@@ -3804,7 +3804,7 @@ SupplierAdmin_i::do_go_command(RDIstrstream& str, RDIParseCmd& p,
}
if (targ1_set == 0) {
for ( bc1 = _prx_batch_push.cursor(); bc1.is_valid(); ++bc1 ) {
@@ -592,7 +600,7 @@ Last-Update: <YYYY-MM-DD>
if (RDI_STR_EQ_I(go_targ, buf)) {
targ1 = WRAPPED_IMPL2OREF(AttN::SequenceProxyPushConsumer, bc1.val());
targ1_set = 1;
-@@ -3814,7 +3814,7 @@ SupplierAdmin_i::do_go_command(RDIstrstr
+@@ -3814,7 +3814,7 @@ SupplierAdmin_i::do_go_command(RDIstrstream& str, RDIParseCmd& p,
}
if (targ1_set == 0) {
for ( ac2 = _prx_any_pull.cursor(); ac2.is_valid(); ++ac2 ) {
@@ -601,7 +609,7 @@ Last-Update: <YYYY-MM-DD>
if (RDI_STR_EQ_I(go_targ, buf)) {
targ1 = WRAPPED_IMPL2OREF(AttN::ProxyPullConsumer, ac2.val());
targ1_set = 1;
-@@ -3824,7 +3824,7 @@ SupplierAdmin_i::do_go_command(RDIstrstr
+@@ -3824,7 +3824,7 @@ SupplierAdmin_i::do_go_command(RDIstrstream& str, RDIParseCmd& p,
}
if (targ1_set == 0) {
for ( sc2 = _prx_struc_pull.cursor(); sc2.is_valid(); ++sc2 ) {
@@ -610,7 +618,7 @@ Last-Update: <YYYY-MM-DD>
if (RDI_STR_EQ_I(go_targ, buf)) {
targ1 = WRAPPED_IMPL2OREF(AttN::StructuredProxyPullConsumer, sc2.val());
targ1_set = 1;
-@@ -3834,7 +3834,7 @@ SupplierAdmin_i::do_go_command(RDIstrstr
+@@ -3834,7 +3834,7 @@ SupplierAdmin_i::do_go_command(RDIstrstream& str, RDIParseCmd& p,
}
if (targ1_set == 0) {
for ( bc2 = _prx_batch_pull.cursor(); bc2.is_valid(); ++bc2 ) {
@@ -619,150 +627,293 @@ Last-Update: <YYYY-MM-DD>
if (RDI_STR_EQ_I(go_targ, buf)) {
targ1 = WRAPPED_IMPL2OREF(AttN::SequenceProxyPullConsumer, bc2.val());
targ1_set = 1;
---- omninotify-2.1.orig/lib/Filter_i.cc
-+++ omninotify-2.1/lib/Filter_i.cc
-@@ -75,7 +75,7 @@ ConstraintImpl* ConstraintImpl::create(c
- TW_Mutex Filter_i::_classlock;
- CORBA::Long Filter_i::_classctr = 0;
- RDIFilterKeyMap* Filter_i::_class_keymap =
-- new RDIFilterKeyMap(RDI_SLongHash, RDI_SLongRank,128,20);
-+ new RDIFilterKeyMap(RDI_CorbaSLongHash, RDI_CorbaSLongRank,128,20);
-
- #undef WHATFN
- #define WHATFN "Filter_i::Filter_i"
-@@ -85,8 +85,8 @@ Filter_i::Filter_i(const char* grammar,
- _constraint_grammar(CORBA_STRING_DUP(grammar)),
- _constraints(0), _constraint_impls(0),
- _callback_serial(1), _callback_i_serial(1),
-- _callbacks(RDI_ULongHash, RDI_ULongRank),
-- _callbacks_i(RDI_ULongHash, RDI_ULongRank),
-+ _callbacks(RDI_CorbaULongHash, RDI_CorbaULongRank),
-+ _callbacks_i(RDI_CorbaULongHash, RDI_CorbaULongRank),
- _flt_dom_ev_types(RDI_EventType::hash, RDI_EventType::rank),
- _flt_all_ev_types(RDI_EventType::hash, RDI_EventType::rank)
+diff --git a/lib/CosEventProxy.cc b/lib/CosEventProxy.cc
+index 9bf6107..fc7e22a 100644
+--- a/lib/CosEventProxy.cc
++++ b/lib/CosEventProxy.cc
+@@ -51,7 +51,7 @@ EventProxyPushConsumer_i::EventProxyPushConsumer_i(SupplierAdmin_i* admin,
{
-@@ -119,7 +119,7 @@ Filter_i::Filter_i(const char* grammar,
- }
- } // end filter class lock scope
+ RDI_OPLOCK_INIT("EventProxyPushConsumer");
char buf[20];
-- sprintf(buf, "filter%ld", _fid);
-+ sprintf(buf, "filter%ld", (long)_fid);
+- sprintf(buf, "proxy%ld", prxid);
++ sprintf(buf, "proxy%ld", (long)prxid);
_my_name.length(_my_name.length()+1);
_my_name[_my_name.length()-1] = (const char*)buf;
- #ifndef NO_OBJ_GC
-@@ -1231,7 +1231,7 @@ MappingFilter_i::MappingFilter_i(const c
- { // introduce mappingfilter class lock scope
- TW_SCOPE_LOCK(class_lock, _classlock, "mappingfilter_class", WHATFN);
- _classctr++;
-- sprintf(buf, "mapfilter%ld", _classctr);
-+ sprintf(buf, "mapfilter%ld", (long)_classctr);
- } // end mappingfilter class lock scope
+ _supplier = CosEvC::PushSupplier::_nil();
+@@ -229,7 +229,7 @@ EventProxyPullConsumer_i::EventProxyPullConsumer_i(SupplierAdmin_i* admin,
+ {
+ RDI_OPLOCK_INIT("EventProxyPullConsumer");
+ char buf[20];
+- sprintf(buf, "proxy%ld", prxid);
++ sprintf(buf, "proxy%ld", (long)prxid);
_my_name.length(_my_name.length()+1);
_my_name[_my_name.length()-1] = (const char*)buf;
-@@ -1465,7 +1465,7 @@ Filter_i::all_filter_names()
- unsigned int idx = 0;
- for ( cursor = _class_keymap->cursor(); cursor.is_valid(); ++cursor) {
- char buf[20];
-- sprintf(buf, "filter%ld", cursor.key());
-+ sprintf(buf, "filter%ld", (long)cursor.key());
- (*names)[idx++] = (const char*)buf;
- }
- return names;
---- omninotify-2.1.orig/lib/ProxySupplier.cc
-+++ omninotify-2.1/lib/ProxySupplier.cc
-@@ -701,6 +701,14 @@ RDIProxySupplier::safe_cleanup()
+ _supplier = CosEvC::PullSupplier::_nil();
+@@ -645,7 +645,7 @@ EventProxyPushSupplier_i::EventProxyPushSupplier_i(ConsumerAdmin_i* admin,
+ {
+ RDI_OPLOCK_INIT("EventProxyPushSupplier");
+ char buf[20];
+- sprintf(buf, "proxy%ld", prxid);
++ sprintf(buf, "proxy%ld", (long)prxid);
+ _my_name.length(_my_name.length()+1);
+ _my_name[_my_name.length()-1] = (const char*)buf;
+ _consumer = CosEvC::PushConsumer::_nil();
+@@ -1030,7 +1030,7 @@ EventProxyPullSupplier_i::EventProxyPullSupplier_i(ConsumerAdmin_i* admin,
+ {
+ RDI_OPLOCK_INIT("EventProxyPullSupplier");
+ char buf[20];
+- sprintf(buf, "proxy%ld", prxid);
++ sprintf(buf, "proxy%ld", (long)prxid);
+ _my_name.length(_my_name.length()+1);
+ _my_name[_my_name.length()-1] = (const char*)buf;
+ _consumer = CosEvC::PullConsumer::_nil();
+@@ -1328,6 +1328,11 @@ EventProxyPushConsumer_i::safe_cleanup()
return 1;
}
-+/* since the _consumer attributes are declared at the final class level, we can't return them in this base class
-+CORBA::Object* RDIProxySupplier::remote_object()
++CORBA::Object* EventProxyPushConsumer_i::remote_object()
+{
-+ return(CORBA::Object::_duplicate(_consumer));
++ return(CORBA::Object::_duplicate(_supplier));
+}
-+*/
+
-+
- // ------------------ ** Local-only routines ** --------------------------
-
- #ifndef NO_OBJ_GC
-@@ -1011,6 +1019,11 @@ ProxyPullSupplier_i::connect_any_pull_co
- _active = 1;
+ #undef WHATFN
+ #define WHATFN "EventProxyPushConsumer_i::my_name"
+ AttN::NameSeq*
+@@ -1432,6 +1437,11 @@ EventProxyPullConsumer_i::safe_cleanup()
+ return 1;
}
-+CORBA::Object* ProxyPullSupplier_i::remote_object()
++CORBA::Object* EventProxyPullConsumer_i::remote_object()
+{
-+ return(CORBA::Object::_duplicate(_consumer));
++ return(CORBA::Object::_duplicate(_supplier));
+}
+
#undef WHATFN
- #define WHATFN "ProxyPullSupplier_i::add_event"
- void
-@@ -1242,6 +1255,11 @@ StructuredProxyPullSupplier_i::connect_s
- _active = 1;
+ #define WHATFN "EventProxyPullConsumer_i::my_name"
+ AttN::NameSeq*
+@@ -1537,6 +1547,11 @@ EventProxyPushSupplier_i::safe_cleanup()
+ return 1;
}
-+CORBA::Object* StructuredProxyPullSupplier_i::remote_object()
++CORBA::Object* EventProxyPushSupplier_i::remote_object()
+{
+ return(CORBA::Object::_duplicate(_consumer));
+}
+
#undef WHATFN
- #define WHATFN "StructuredProxyPullSupplier_i::add_event"
- void
-@@ -1564,6 +1582,12 @@ SequenceProxyPullSupplier_i::connect_seq
- _active = 1;
+ #define WHATFN "EventProxyPushSupplier_i::my_name"
+ AttN::NameSeq*
+@@ -1642,6 +1657,11 @@ EventProxyPullSupplier_i::safe_cleanup()
+ return 1;
}
-+CORBA::Object* SequenceProxyPullSupplier_i::remote_object()
++CORBA::Object* EventProxyPullSupplier_i::remote_object()
+{
+ return(CORBA::Object::_duplicate(_consumer));
+}
+
-+
#undef WHATFN
- #define WHATFN "SequenceProxyPullSupplier_i::add_event"
- void
-@@ -1736,6 +1760,12 @@ ProxyPushSupplier_i::connect_any_push_co
+ #define WHATFN "EventProxyPullSupplier_i::my_name"
+ AttN::NameSeq*
+diff --git a/lib/EventChannel_i.cc b/lib/EventChannel_i.cc
+index d2a1a01..fa52dcf 100644
+--- a/lib/EventChannel_i.cc
++++ b/lib/EventChannel_i.cc
+@@ -65,8 +65,8 @@ EventChannel_i::EventChannel_i(EventChannelFactory_i* cfactory,
+ _reporter(0), _rep_wait(), _rep_exit(0), _repisactive(0), _repInterval(0),
+ _events(0), _qos_lock(), _stats_lock(), _performance_timer(),
+ _proxy_events(8192,1024), _admin_group(0),
+- _supl_admin(RDI_ULongHash, RDI_ULongRank),
+- _cons_admin(RDI_ULongHash, RDI_ULongRank),
++ _supl_admin(RDI_CorbaULongHash, RDI_CorbaULongRank),
++ _cons_admin(RDI_CorbaULongHash, RDI_CorbaULongRank),
+ _evtypes(RDI_EventType::hash, RDI_EventType::rank),
+ _pull_supplier(0), _push_consumer(0),
+ _ochange_pool(0), _schange_pool(0)
+@@ -75,7 +75,7 @@ EventChannel_i::EventChannel_i(EventChannelFactory_i* cfactory,
+ _rep_wait = _oplockptr->add_condition();
+ _rep_exit = _oplockptr->add_condition();
+ char buf[20];
+- sprintf(buf, "chan%ld", myserial);
++ sprintf(buf, "chan%ld", (long)myserial);
+ _my_name.length(_my_name.length()+1);
+ _my_name[_my_name.length()-1] = (const char*)buf;
+
+@@ -1580,7 +1580,8 @@ EventChannelFactory_i::EventChannelFactory_i(FilterFactory_i* ffactory,
+ const RDI_AdminQoS& defadm,
+ RDI_ServerQoS* s_qos) :
+ _oplockptr(0), _ffactory(ffactory), _serial(0), _defqos(defqos),
+- _defadm(defadm), _server_qos(s_qos), _channel(RDI_ULongHash, RDI_ULongRank)
++ _defadm(defadm), _server_qos(s_qos),
++ _channel(RDI_CorbaULongHash, RDI_CorbaULongRank)
+ {
+ RDI_OPLOCK_INIT("chanfact");
+ _my_name.length(2);
+@@ -2127,12 +2128,12 @@ EventChannel_i::child_names( WRAPPED_IMPLARG_VOID )
+ RDI_HashCursor<CosNA::AdminID, ConsumerAdmin_i *> c;
+ unsigned int idx = 0;
+ for (c = _cons_admin.cursor(); c.is_valid(); ++c) {
+- sprintf(buf, "cadmin%ld", c.key());
++ sprintf(buf, "cadmin%ld", (long)c.key());
+ (*names)[idx++] = (const char*)buf;
}
- }
+ RDI_HashCursor<CosNA::AdminID, SupplierAdmin_i *> s;
+ for (s = _supl_admin.cursor(); s.is_valid(); ++s) {
+- sprintf(buf, "sadmin%ld", s.key());
++ sprintf(buf, "sadmin%ld", (long)s.key());
+ (*names)[idx++] = (const char*)buf;
+ }
+ return names;
+@@ -2527,7 +2528,7 @@ EventChannelFactory_i::child_names( WRAPPED_IMPLARG_VOID )
+ unsigned int index = 0;
+ RDI_HashCursor<CosNA::ChannelID, EventChannel_i*> cursor;
+ for ( cursor = _channel.cursor(); cursor.is_valid(); index++, ++cursor ) {
+- sprintf(buf, "chan%ld", cursor.key());
++ sprintf(buf, "chan%ld", (long)cursor.key());
+ (*names)[index] = (const char*)buf;
+ }
+ return names;
+diff --git a/lib/FilterAdmin_i.cc b/lib/FilterAdmin_i.cc
+index ebbc16a..670df7e 100644
+--- a/lib/FilterAdmin_i.cc
++++ b/lib/FilterAdmin_i.cc
+@@ -308,7 +308,7 @@ FilterFactory_i::do_command(const char* cmnd, CORBA::Boolean& success,
-+CORBA::Object* ProxyPushSupplier_i::remote_object()
-+{
-+ return(CORBA::Object::_duplicate(_consumer));
-+}
-+
+ FAdminHelper::FAdminHelper(const char *resty) :
+ _resty(resty), _serial(1),
+- _filters(RDI_ULongHash, RDI_ULongRank)
++ _filters(RDI_CorbaULongHash, RDI_CorbaULongRank)
+ {;}
+
+ FAdminHelper::~FAdminHelper()
+@@ -326,11 +326,16 @@ FAdminHelper::add_filter_i(RDI_LocksHeld& held,
+ CosNF::FilterID fltrID;
+ Filter_i* fltr = Filter_i::Filter2Filter_i(new_filter);
+
+- RDI_Assert(fltr, "Filter was not created by READY\n");
++ //RDI_Assert(fltr, "Filter was not created by READY\n");
+
+ fltrID = _serial++;
+ entry.filter = fltr;
+- entry.callback_id = fltr->attach_callback_i(held, filter_holder, need_schange);
++ if (fltr)
++ entry.callback_id = fltr->attach_callback_i(held, filter_holder, need_schange);
++ else
++ entry.remote_filter = CosNF::Filter::_duplicate(new_filter);
++
+
- #undef WHATFN
- #define WHATFN "ProxyPushSupplier_i::suspend_connection"
- void
-@@ -2177,6 +2207,12 @@ StructuredProxyPushSupplier_i::connect_s
+ if ( _filters.insert(fltrID, entry) ) {
+ RDIDbgFAdminLog("Failed to register new filter in hash table\n");
+ return 0;
+@@ -382,7 +387,11 @@ FAdminHelper::get_filter(CosNF::FilterID fltrID)
+
+ if ( _filters.lookup(fltrID, entry) ) {
+ RDIDbgFAdminLog("Get Filter " << entry.filter << " [" << fltrID << "]\n");
+- CosNF::Filter_var res = WRAPPED_IMPL2OREF(CosNF::Filter, entry.filter);
++ CosNF::Filter_var res;
++ if (entry.filter)
++ res = WRAPPED_IMPL2OREF(CosNF::Filter, entry.filter);
++ else
++ res = entry.remote_filter;
+ return res;
+ }
+ throw CosNF::FilterNotFound();
+@@ -418,10 +427,12 @@ FAdminHelper::remove_filter(RDI_LocksHeld& held,
+ throw CosNF::FilterNotFound();
}
+ Filter_i *f = entry.filter;
+- f->fadmin_removal_i(held, entry.callback_id, filter_holder);
++ if (f)
++ f->fadmin_removal_i(held, entry.callback_id, filter_holder);
+ RDIDbgFAdminLog("remove_filter: removing filter [" << fltrID << "] from hash table\n");
+ _filters.remove(fltrID);
+- WRAPPED_RELEASE_IMPL(f);
++ if (f)
++ WRAPPED_RELEASE_IMPL(f);
}
-+CORBA::Object* StructuredProxyPushSupplier_i::remote_object()
-+{
-+ return(CORBA::Object::_duplicate(_consumer));
-+}
-+
-+
#undef WHATFN
- #define WHATFN "StructuredProxyPushSupplier_i::suspend_connection"
- void
-@@ -2590,6 +2626,12 @@ SequenceProxyPushSupplier_i::connect_seq
+@@ -435,8 +446,11 @@ FAdminHelper::remove_all_filters(RDI_LocksHeld& held,
+ for ( fcur = _filters.cursor(); fcur.is_valid(); fcur++ ) {
+ FAdminFilterEntry &entry = fcur.val();
+ // RDIDbgForceLog("XXX_REMOVE " << WHATFN << " calling fadmin_removal_i(held, entry.callback_id, filter_holder)");
+- entry.filter->fadmin_removal_i(held, entry.callback_id, filter_holder);
+- WRAPPED_RELEASE_IMPL(entry.filter);
++ if (entry.filter)
++ {
++ entry.filter->fadmin_removal_i(held, entry.callback_id, filter_holder);
++ WRAPPED_RELEASE_IMPL(entry.filter);
++ }
+ }
+ _filters.clear();
+ }
+@@ -453,7 +467,10 @@ FAdminHelper::out_info_filters(RDIstrstream& str)
+ } else {
+ for ( fcur = _filters.cursor(); fcur.is_valid(); fcur++ ) {
+ FAdminFilterEntry &entry = fcur.val();
+- entry.filter->out_info_descr(str);
++ if (entry.filter)
++ entry.filter->out_info_descr(str);
++ else
++ str << "Remote Filter \n";
+ }
}
}
+diff --git a/lib/Filter_i.cc b/lib/Filter_i.cc
+index 3da97dd..6b9d054 100644
+--- a/lib/Filter_i.cc
++++ b/lib/Filter_i.cc
+@@ -75,7 +75,7 @@ ConstraintImpl* ConstraintImpl::create(const CosNF::ConstraintExp& constraint)
+ TW_Mutex Filter_i::_classlock;
+ CORBA::Long Filter_i::_classctr = 0;
+ RDIFilterKeyMap* Filter_i::_class_keymap =
+- new RDIFilterKeyMap(RDI_SLongHash, RDI_SLongRank,128,20);
++ new RDIFilterKeyMap(RDI_CorbaSLongHash, RDI_CorbaSLongRank,128,20);
-+CORBA::Object* SequenceProxyPushSupplier_i::remote_object()
-+{
-+ return(CORBA::Object::_duplicate(_consumer));
-+}
-+
-+
#undef WHATFN
- #define WHATFN "SequenceProxyPushSupplier_i::suspend_connection"
- void
---- omninotify-2.1.orig/lib/ProxyConsumer.cc
-+++ omninotify-2.1/lib/ProxyConsumer.cc
+ #define WHATFN "Filter_i::Filter_i"
+@@ -85,8 +85,8 @@ Filter_i::Filter_i(const char* grammar, FilterFactory_i* factory) :
+ _constraint_grammar(CORBA_STRING_DUP(grammar)),
+ _constraints(0), _constraint_impls(0),
+ _callback_serial(1), _callback_i_serial(1),
+- _callbacks(RDI_ULongHash, RDI_ULongRank),
+- _callbacks_i(RDI_ULongHash, RDI_ULongRank),
++ _callbacks(RDI_CorbaULongHash, RDI_CorbaULongRank),
++ _callbacks_i(RDI_CorbaULongHash, RDI_CorbaULongRank),
+ _flt_dom_ev_types(RDI_EventType::hash, RDI_EventType::rank),
+ _flt_all_ev_types(RDI_EventType::hash, RDI_EventType::rank)
+ {
+@@ -119,7 +119,7 @@ Filter_i::Filter_i(const char* grammar, FilterFactory_i* factory) :
+ }
+ } // end filter class lock scope
+ char buf[20];
+- sprintf(buf, "filter%ld", _fid);
++ sprintf(buf, "filter%ld", (long)_fid);
+ _my_name.length(_my_name.length()+1);
+ _my_name[_my_name.length()-1] = (const char*)buf;
+ #ifndef NO_OBJ_GC
+@@ -1231,7 +1231,7 @@ MappingFilter_i::MappingFilter_i(const char* grammar, const CORBA::Any& value,
+ { // introduce mappingfilter class lock scope
+ TW_SCOPE_LOCK(class_lock, _classlock, "mappingfilter_class", WHATFN);
+ _classctr++;
+- sprintf(buf, "mapfilter%ld", _classctr);
++ sprintf(buf, "mapfilter%ld", (long)_classctr);
+ } // end mappingfilter class lock scope
+ _my_name.length(_my_name.length()+1);
+ _my_name[_my_name.length()-1] = (const char*)buf;
+@@ -1465,7 +1465,7 @@ Filter_i::all_filter_names()
+ unsigned int idx = 0;
+ for ( cursor = _class_keymap->cursor(); cursor.is_valid(); ++cursor) {
+ char buf[20];
+- sprintf(buf, "filter%ld", cursor.key());
++ sprintf(buf, "filter%ld", (long)cursor.key());
+ (*names)[idx++] = (const char*)buf;
+ }
+ return names;
+diff --git a/lib/ProxyConsumer.cc b/lib/ProxyConsumer.cc
+index b45dbd8..00f34c2 100644
+--- a/lib/ProxyConsumer.cc
++++ b/lib/ProxyConsumer.cc
@@ -444,6 +444,13 @@ RDIProxyConsumer::safe_cleanup()
return 1;
}
@@ -777,7 +928,7 @@ Last-Update: <YYYY-MM-DD>
// RDINotifSupplier methods:
void
RDIProxyConsumer::propagate_schange(RDI_LocksHeld& held,
-@@ -654,13 +661,22 @@ RDIProxyConsumer::_match_event_proxy_lev
+@@ -654,13 +661,22 @@ RDIProxyConsumer::_match_event_proxy_level(const CosN::StructuredEvent* event, R
filter = _fa_helper.get_filter((*filterseq)[ix]);
rdfilter = Filter_i::Filter2Filter_i(filter);
if (rdfilter) // XXX
@@ -806,7 +957,7 @@ Last-Update: <YYYY-MM-DD>
}
}
delete filterseq;
-@@ -861,6 +877,11 @@ ProxyPullConsumer_i::connect_any_pull_su
+@@ -861,6 +877,11 @@ ProxyPullConsumer_i::connect_any_pull_supplier(CosEvC::PullSupplier_ptr supplier
}
}
@@ -818,7 +969,7 @@ Last-Update: <YYYY-MM-DD>
#undef WHATFN
#define WHATFN "ProxyPullConsumer_i::suspend_connection"
void
-@@ -1294,6 +1315,11 @@ StructuredProxyPullConsumer_i::connect_s
+@@ -1294,6 +1315,11 @@ StructuredProxyPullConsumer_i::connect_structured_pull_supplier(CosNC::Structure
}
}
@@ -830,7 +981,7 @@ Last-Update: <YYYY-MM-DD>
#undef WHATFN
#define WHATFN "StructuredProxyPullConsumer_i::suspend_connection"
void
-@@ -1750,6 +1776,11 @@ SequenceProxyPullConsumer_i::connect_seq
+@@ -1750,6 +1776,11 @@ SequenceProxyPullConsumer_i::connect_sequence_pull_supplier(CosNC::SequencePullS
}
}
@@ -842,7 +993,7 @@ Last-Update: <YYYY-MM-DD>
#undef WHATFN
#define WHATFN "SequenceProxyPullConsumer_i::suspend_connection"
void
-@@ -2234,6 +2265,12 @@ ProxyPushConsumer_i::connect_any_push_su
+@@ -2234,6 +2265,12 @@ ProxyPushConsumer_i::connect_any_push_supplier(CosEvC::PushSupplier_ptr supplier
}
}
@@ -855,7 +1006,7 @@ Last-Update: <YYYY-MM-DD>
#undef WHATFN
#define WHATFN "ProxyPushConsumer_i::disconnect_push_consumer"
void
-@@ -2376,6 +2413,11 @@ StructuredProxyPushConsumer_i::connect_s
+@@ -2376,6 +2413,11 @@ StructuredProxyPushConsumer_i::connect_structured_push_supplier(CosNC::Structure
}
}
@@ -867,7 +1018,7 @@ Last-Update: <YYYY-MM-DD>
#undef WHATFN
#define WHATFN "StructuredProxyPushConsumer_i::disconnect_structured_push_consumer"
void
-@@ -2520,6 +2562,11 @@ SequenceProxyPushConsumer_i::connect_seq
+@@ -2520,6 +2562,11 @@ SequenceProxyPushConsumer_i::connect_sequence_push_supplier(CosNC::SequencePushS
}
}
@@ -879,274 +1030,164 @@ Last-Update: <YYYY-MM-DD>
#undef WHATFN
#define WHATFN "SequenceProxyPushConsumer_i::disconnect_sequence_push_consumer"
void
---- omninotify-2.1.orig/lib/RDIstrstream.cc
-+++ omninotify-2.1/lib/RDIstrstream.cc
-@@ -196,6 +196,7 @@ RDIstrstream::operator<<(unsigned long n
+diff --git a/lib/ProxySupplier.cc b/lib/ProxySupplier.cc
+index 29c688a..6f52bb6 100644
+--- a/lib/ProxySupplier.cc
++++ b/lib/ProxySupplier.cc
+@@ -701,6 +701,14 @@ RDIProxySupplier::safe_cleanup()
+ return 1;
}
- #ifdef HAS_LongLong
-+#if SIZEOF_LONG_LONG != SIZEOF_LONG
- RDIstrstream&
- RDIstrstream::operator<<(WRAPPED_CORBA_LONGLONG_TYPE n)
- {
-@@ -216,6 +217,7 @@ RDIstrstream::operator<<(WRAPPED_CORBA_U
- return *this;
- }
- #endif
-+#endif
++/* since the _consumer attributes are declared at the final class level, we can't return them in this base class
++CORBA::Object* RDIProxySupplier::remote_object()
++{
++ return(CORBA::Object::_duplicate(_consumer));
++}
++*/
++
++
+ // ------------------ ** Local-only routines ** --------------------------
- #ifndef NO_FLOAT
- RDIstrstream&
---- omninotify-2.1.orig/include/CosNotifyFilter_i.h
-+++ omninotify-2.1/include/CosNotifyFilter_i.h
-@@ -200,7 +200,7 @@ public:
+ #ifndef NO_OBJ_GC
+@@ -1011,6 +1019,11 @@ ProxyPullSupplier_i::connect_any_pull_consumer(CosEvC::PullConsumer_ptr consumer
+ _active = 1;
+ }
- CORBA::Boolean has_callbacks() { return _callbacks.length() ? 1:0; }
- CORBA::Boolean has_callbacks_i() { return _callbacks_i.length() ? 1:0; }
-- unsigned long getID() const { return _fid; }
-+ CosNF::FilterID getID() const { return _fid; }
++CORBA::Object* ProxyPullSupplier_i::remote_object()
++{
++ return(CORBA::Object::_duplicate(_consumer));
++}
++
+ #undef WHATFN
+ #define WHATFN "ProxyPullSupplier_i::add_event"
+ void
+@@ -1242,6 +1255,11 @@ StructuredProxyPullSupplier_i::connect_structured_pull_consumer(CosNC::Structure
+ _active = 1;
+ }
- RDIstrstream& log_output(RDIstrstream& str) const;
++CORBA::Object* StructuredProxyPullSupplier_i::remote_object()
++{
++ return(CORBA::Object::_duplicate(_consumer));
++}
++
+ #undef WHATFN
+ #define WHATFN "StructuredProxyPullSupplier_i::add_event"
+ void
+@@ -1564,6 +1582,12 @@ SequenceProxyPullSupplier_i::connect_sequence_pull_consumer(CosNC::SequencePullC
+ _active = 1;
+ }
-@@ -242,7 +242,7 @@ private:
- #endif
- AttN::NameSeq _my_name;
- FilterFactory_i* _factory;
-- unsigned long _fid;
-+ CosNF::FilterID _fid;
- long _idcounter;
- unsigned long _hashvalue;
- RDI_TimeT _last_detach;
-@@ -452,6 +452,7 @@ private:
- typedef struct FAdminFilterEntry_s {
- CosNF::CallbackID callback_id;
- Filter_i* filter;
-+ CosNF::Filter_var remote_filter;
- } FAdminFilterEntry;
-
- class FAdminHelper {
---- omninotify-2.1.orig/include/omniorb_poa_wrappers_impl.h
-+++ omninotify-2.1/include/omniorb_poa_wrappers_impl.h
-@@ -51,7 +51,7 @@ void WRAPPED_ORB_OA::init(int& argc, cha
- _orb = CORBA::ORB_init(argc, argv, ORB_INIT_NAME);
- #elif defined(__OMNIORB4__)
- char maxgiopcon[100];
-- sprintf(maxgiopcon, "%lu", _max_giop_connections);
-+ sprintf(maxgiopcon, "%lu", (unsigned long)_max_giop_connections);
- const char* onepercon = _one_call_per_connection ? "1" : "0";
- const char* options[][2] = { { "maxGIOPConnectionPerServer", (const char*)maxgiopcon },
- { "oneCallPerConnection", onepercon },
---- omninotify-2.1.orig/include/CosNotifyChannelAdmin_i.h
-+++ omninotify-2.1/include/CosNotifyChannelAdmin_i.h
-@@ -317,6 +317,8 @@ public:
- void connect_any_pull_consumer(CosEvC::PullConsumer_ptr cons
- WRAPPED_DECLARG );
-
-+ CORBA::Object *remote_object( WRAPPED_DECLARG_VOID );
-+
- // Methods from CosEvC::PullSupplier Interface
- CORBA::Any* pull( WRAPPED_DECLARG_VOID );
- CORBA::Any* try_pull(CORBA::Boolean& has_event WRAPPED_DECLARG );
-@@ -363,6 +365,8 @@ class StructuredProxyPullSupplier_i :
- void connect_structured_pull_consumer(
- CosNC::StructuredPullConsumer_ptr consumer WRAPPED_DECLARG );
-
-+ CORBA::Object *remote_object( WRAPPED_DECLARG_VOID );
-+
- // Methods from CosNC::StructuredPullSupplier Interface
- CosN::StructuredEvent* pull_structured_event( WRAPPED_DECLARG_VOID );
- CosN::StructuredEvent* try_pull_structured_event(CORBA::Boolean& has_event
-@@ -410,6 +414,8 @@ class SequenceProxyPullSupplier_i :
- void connect_sequence_pull_consumer(
- CosNC::SequencePullConsumer_ptr consumer WRAPPED_DECLARG );
-
-+ CORBA::Object *remote_object( WRAPPED_DECLARG_VOID );
-+
- // Methods from CosNC::SequencePullSupplier Interface
- CosN::EventBatch* pull_structured_events(CORBA::Long max_number
- WRAPPED_DECLARG );
-@@ -466,6 +472,9 @@ public:
- // Methods from CosNA::ProxyPushSupplier Interface
- void connect_any_push_consumer(
- CosEvC::PushConsumer_ptr consumer WRAPPED_DECLARG );
-+
-+ CORBA::Object *remote_object( WRAPPED_DECLARG_VOID );
-+
- void suspend_connection( WRAPPED_DECLARG_VOID );
- void resume_connection( WRAPPED_DECLARG_VOID );
-
-@@ -518,6 +527,9 @@ class StructuredProxyPushSupplier_i :
- // Methods from CosNA::StructuredProxyPushSupplier Interface
- void connect_structured_push_consumer(
- CosNC::StructuredPushConsumer_ptr consumer WRAPPED_DECLARG );
-+
-+ CORBA::Object *remote_object( WRAPPED_DECLARG_VOID );
-+
- void suspend_connection( WRAPPED_DECLARG_VOID );
- void resume_connection( WRAPPED_DECLARG_VOID );
-
-@@ -569,6 +581,9 @@ public:
- // Methods from CosNA::SequenceProxyPushSupplier Interface
- void connect_sequence_push_consumer(
- CosNC::SequencePushConsumer_ptr consumer WRAPPED_DECLARG );
-+
-+ CORBA::Object *remote_object( WRAPPED_DECLARG_VOID );
++CORBA::Object* SequenceProxyPullSupplier_i::remote_object()
++{
++ return(CORBA::Object::_duplicate(_consumer));
++}
+
- void suspend_connection( WRAPPED_DECLARG_VOID );
- void resume_connection( WRAPPED_DECLARG_VOID );
-
-@@ -849,6 +864,8 @@ public:
- void connect_any_push_supplier(CosEvC::PushSupplier_ptr supplier
- WRAPPED_DECLARG);
-
-+ CORBA::Object *remote_object( WRAPPED_DECLARG_VOID );
+
- // Methods from CosEvC::PushConsumer Interface
- void push(const CORBA::Any& data WRAPPED_DECLARG );
- void disconnect_push_consumer( WRAPPED_DECLARG_VOID );
-@@ -888,6 +905,8 @@ public:
- // Methods from CosNA::StructuredProxyPushConsumer Interface
- void connect_structured_push_supplier(
- CosNC::StructuredPushSupplier_ptr supplier WRAPPED_DECLARG );
-+
-+ CORBA::Object *remote_object( WRAPPED_DECLARG_VOID );
-
- // Methods from CosNC::StructuredPushConsumer Interface
- void push_structured_event(const CosN::StructuredEvent& event WRAPPED_DECLARG);
-@@ -931,6 +950,8 @@ class SequenceProxyPushConsumer_i :
- void connect_sequence_push_supplier(CosNC::SequencePushSupplier_ptr supplier
- WRAPPED_DECLARG );
+ #undef WHATFN
+ #define WHATFN "SequenceProxyPullSupplier_i::add_event"
+ void
+@@ -1736,6 +1760,12 @@ ProxyPushSupplier_i::connect_any_push_consumer(CosEvC::PushConsumer_ptr consumer
+ }
+ }
-+ CORBA::Object *remote_object( WRAPPED_DECLARG_VOID );
-+
- // Methods from CosNC::SequencePushConsumer Interface
- void push_structured_events(const CosN::EventBatch& events WRAPPED_DECLARG );
- void disconnect_sequence_push_consumer( WRAPPED_DECLARG_VOID );
-@@ -976,6 +997,9 @@ class ProxyPullConsumer_i :
- // Methods from CosNA::ProxyPullConsumer Interface
- void connect_any_pull_supplier(
- CosEvC::PullSupplier_ptr supplier WRAPPED_DECLARG );
++CORBA::Object* ProxyPushSupplier_i::remote_object()
++{
++ return(CORBA::Object::_duplicate(_consumer));
++}
+
-+ CORBA::Object *remote_object( WRAPPED_DECLARG_VOID );
+
- void suspend_connection( WRAPPED_DECLARG_VOID );
- void resume_connection( WRAPPED_DECLARG_VOID );
+ #undef WHATFN
+ #define WHATFN "ProxyPushSupplier_i::suspend_connection"
+ void
+@@ -2177,6 +2207,12 @@ StructuredProxyPushSupplier_i::connect_structured_push_consumer(CosNC::Structure
+ }
+ }
-@@ -1032,6 +1056,9 @@ class StructuredProxyPullConsumer_i :
- // Methods from CosNA::StructuredProxyPullConsumer Interface
- void connect_structured_pull_supplier(
- CosNC::StructuredPullSupplier_ptr supplier WRAPPED_DECLARG );
++CORBA::Object* StructuredProxyPushSupplier_i::remote_object()
++{
++ return(CORBA::Object::_duplicate(_consumer));
++}
+
-+ CORBA::Object *remote_object( WRAPPED_DECLARG_VOID );
+
- void suspend_connection( WRAPPED_DECLARG_VOID );
- void resume_connection( WRAPPED_DECLARG_VOID );
+ #undef WHATFN
+ #define WHATFN "StructuredProxyPushSupplier_i::suspend_connection"
+ void
+@@ -2590,6 +2626,12 @@ SequenceProxyPushSupplier_i::connect_sequence_push_consumer(CosNC::SequencePushC
+ }
+ }
-@@ -1087,6 +1114,9 @@ class SequenceProxyPullConsumer_i :
- // Methods from CosNA::SequenceProxyPullConsumer Interface
- void connect_sequence_pull_supplier(
- CosNC::SequencePullSupplier_ptr supplier WRAPPED_DECLARG );
++CORBA::Object* SequenceProxyPushSupplier_i::remote_object()
++{
++ return(CORBA::Object::_duplicate(_consumer));
++}
+
-+ CORBA::Object *remote_object( WRAPPED_DECLARG_VOID );
+
- void suspend_connection( WRAPPED_DECLARG_VOID );
- void resume_connection( WRAPPED_DECLARG_VOID );
+ #undef WHATFN
+ #define WHATFN "SequenceProxyPushSupplier_i::suspend_connection"
+ void
+diff --git a/lib/RDITimeWrappers.cc b/lib/RDITimeWrappers.cc
+index 6d61164..fb09303 100644
+--- a/lib/RDITimeWrappers.cc
++++ b/lib/RDITimeWrappers.cc
+@@ -146,7 +146,7 @@ static int RDI_TimeT_fmt_local_buf_idx = 0;
+ #undef WHATFN
+ #define WHATFN "RDI_TimeT::fmt_local"
+ const char *RDI_TimeT::fmt_local() {
+- CORBA::ULong ts, tm;
++ unsigned long ts, tm;
+ get_posixbase_secs_msecs(ts, tm);
+ time_t secs_as_time_t = ts;
+ TW_SCOPE_LOCK(otime_lock, RDI_out_time_lock, "RDI_out_time", WHATFN);
+diff --git a/lib/RDIstrstream.cc b/lib/RDIstrstream.cc
+index 369c553..a342406 100644
+--- a/lib/RDIstrstream.cc
++++ b/lib/RDIstrstream.cc
+@@ -196,6 +196,7 @@ RDIstrstream::operator<<(unsigned long n)
+ }
---- omninotify-2.1.orig/include/RDIstrstream.h
-+++ omninotify-2.1/include/RDIstrstream.h
-@@ -62,9 +62,11 @@ public:
- RDIstrstream& operator<<(short n) {return operator<<((int)n);}
- RDIstrstream& operator<<(unsigned short n) {return operator<<((unsigned int)n);}
#ifdef HAS_LongLong
+#if SIZEOF_LONG_LONG != SIZEOF_LONG
- RDIstrstream& operator<<(WRAPPED_CORBA_LONGLONG_TYPE n);
- RDIstrstream& operator<<(WRAPPED_CORBA_ULONGLONG_TYPE n);
+ RDIstrstream&
+ RDIstrstream::operator<<(WRAPPED_CORBA_LONGLONG_TYPE n)
+ {
+@@ -216,6 +217,7 @@ RDIstrstream::operator<<(WRAPPED_CORBA_ULONGLONG_TYPE n)
+ return *this;
+ }
#endif
+#endif
- #ifdef HAS_Cplusplus_Bool
- RDIstrstream& operator<<(bool b) { return operator<<((int)b); }
- #endif
---- omninotify-2.1.orig/include/RDITimeWrappers.h
-+++ omninotify-2.1/include/RDITimeWrappers.h
-@@ -235,7 +235,7 @@ public:
-
- // pretty-printing of absolute local time -- no newline
- void out_local(RDIstrstream& str) {
-- CORBA::ULong ts, tn;
-+ unsigned long ts, tn;
- get_posixbase_secs_nanosecs(ts, tn);
- RDI_posixbase_out_time(str, ts, tn);
- str << " (local time)";
-@@ -395,7 +395,7 @@ public:
- }
- // pretty-printing of absolute univ time -- no newline
- void out_gmt(RDIstrstream& str) {
-- CORBA::ULong ts, tn;
-+ unsigned long ts, tn;
- get_gmt_posixbase_secs_nanosecs(ts, tn);
- RDI_posixbase_out_time(str, ts, tn);
- str << " (greenwich mean time)";
---- omninotify-2.1.orig/include/CosEventChannelAdmin_i.h
-+++ omninotify-2.1/include/CosEventChannelAdmin_i.h
-@@ -62,6 +62,7 @@ public:
- AttN::NameSeq* my_name( WRAPPED_DECLARG_VOID );
- AttN::IactSeq* children(CORBA::Boolean only_cleanup_candidates);
- CORBA::Boolean safe_cleanup();
-+ CORBA::Object *remote_object();
-
- // Methods from CosEvC::PushConsumer Interface
- void push(const CORBA::Any& data WRAPPED_DECLARG );
-@@ -122,6 +123,7 @@ public:
- AttN::NameSeq* my_name( WRAPPED_DECLARG_VOID );
- AttN::IactSeq* children(CORBA::Boolean only_cleanup_candidates);
- CORBA::Boolean safe_cleanup();
-+ CORBA::Object *remote_object();
- // Methods from CosEvC::PullConsumer Interface
- void disconnect_pull_consumer( WRAPPED_DECLARG_VOID );
-@@ -191,6 +193,7 @@ public:
- AttN::NameSeq* my_name( WRAPPED_DECLARG_VOID );
- AttN::IactSeq* children(CORBA::Boolean only_cleanup_candidates);
- CORBA::Boolean safe_cleanup();
-+ CORBA::Object *remote_object();
+ #ifndef NO_FLOAT
+ RDIstrstream&
+diff --git a/mk/beforeauto.mk.in b/mk/beforeauto.mk.in
+index fbd69a8..dbc9b1d 100644
+--- a/mk/beforeauto.mk.in
++++ b/mk/beforeauto.mk.in
+@@ -943,20 +943,21 @@ IMPORT_CPPFLAGS += -D__aix__
- // Methods from CosEvCA::ProxyPushSupplier Interface
- void connect_push_consumer(CosEvC::PushConsumer_ptr consumer
-@@ -260,6 +263,7 @@ public:
- AttN::NameSeq* my_name( WRAPPED_DECLARG_VOID );
- AttN::IactSeq* children(CORBA::Boolean only_cleanup_candidates);
- CORBA::Boolean safe_cleanup();
-+ CORBA::Object *remote_object();
+ CMAKEDEPEND += -D_AIX
+ CXXMAKEDEPEND += -D_AIX
++CXXLINKOPTIONS += -brtl -bnoipath -blibpath:/usr/lib:$(prefix)/lib
- // Methods from CosEvCA::ProxyPullSupplier
- void connect_pull_consumer(CosEvC::PullConsumer_ptr consumer
---- omninotify-2.1.orig/include/RDIHashFuncs.h
-+++ omninotify-2.1/include/RDIHashFuncs.h
-@@ -33,6 +33,7 @@
- #define __RDI_HASH_FUNCS_H__
+ # the following definitions were provided by Tiga
+-CXXOPTIONS = -qstaticinline -qmaxmem=8192 -qlonglong -qlongdouble
+-COPTIONS = -qmaxmem=8192 -qlonglong -qlongdouble
++CXXOPTIONS = -qstaticinline -qmaxmem=32768 -qlonglong -qlongdouble
++COPTIONS = -qmaxmem=32768 -qlonglong -qlongdouble
+ OMNITHREAD_POSIX_CPPFLAGS = -DNoNanoSleep -DPthreadDraftVersion=10
+ OMNITHREAD_CPPFLAGS = -D_REENTRANT
+ OMNITHREAD_LIB += -lpthread
- #include "RDIStringDefs.h"
-+#include "corba_wrappers.h"
+ # this works only for xlc version >= 5
+-SharedLibraryPlatformLinkFlagsTemplate = -G
++SharedLibraryPlatformLinkFlagsTemplate = -G -qmkshrobj \
++ -bnoipath -blibpath:/usr/lib:$(prefix)/lib
- // HASH AND RANK FUNCTIONS
- // * Hash and Rank function definitions, together with several
-@@ -105,5 +106,19 @@ inline unsigned int RDI_StrHash(const vo
- return h;
- }
+-# Please notice the last line. You can't use "-qmkshobj" instead of
+-# "-G". Somehow, if you do that, a number of symbols are unresolved
+-# when linking.
++# Please notice the last line. You need both -G and -qmkshrobj to get
++# true shared objects working properly.
-+inline unsigned int RDI_CorbaSLongHash(const void* K)
-+{ CORBA::Long l = *((CORBA::Long *) K); return (l < 0) ? -l : l; }
-+
-+inline unsigned int RDI_CorbaULongHash(const void* K)
-+{ return *((CORBA::ULong *) K); }
-+
-+inline int RDI_CorbaSLongRank(const void* L, const void* R)
-+{ return *((CORBA::Long *) L) - *((CORBA::Long *) R); }
-+
-+inline int RDI_CorbaULongRank(const void* L, const void* R)
-+{ CORBA::ULong l = *((CORBA::ULong *) L), r = *((CORBA::ULong *) R);
-+ return (l < r) ? -1 : ((l > r) ? 1 : 0);
-+}
-+
- #endif /* __RDI_HASH_FUNCS_H__ */
+ endif
+--
diff --git a/debian/patches/features/0002-fix_compilation.patch b/debian/patches/features/0002-fix_compilation.patch
new file mode 100644
index 0000000..fb59f06
--- /dev/null
+++ b/debian/patches/features/0002-fix_compilation.patch
@@ -0,0 +1,180 @@
+From: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
+Date: Tue, 14 Jun 2011 16:34:45 +0200
+Subject: fix_compilation
+
+---
+ examples/demo_add_filter.cc | 3 ++-
+ examples/demo_offer_change.cc | 3 ++-
+ examples/demo_subscription_change.cc | 3 ++-
+ examples/legacy_clients.cc | 5 +++--
+ examples/ndadmin.cc | 3 ++-
+ examples/parse_cmd_line.h | 3 ++-
+ examples/sample_clients.cc | 7 ++++---
+ examples/sample_functions.cc | 5 +++--
+ examples/some_notify_clients.cc | 3 ++-
+ include/ModFlexLexer.h | 3 ++-
+ lib/RDIParser_l.cc | 3 ++-
+ 11 files changed, 26 insertions(+), 15 deletions(-)
+
+diff --git a/examples/demo_add_filter.cc b/examples/demo_add_filter.cc
+index b7fa22d..191cf2a 100644
+--- a/examples/demo_add_filter.cc
++++ b/examples/demo_add_filter.cc
+@@ -1,6 +1,7 @@
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <stdio.h>
++using namespace std;
+
+ #include "CosNotifyShorthands.h"
+ #include "orb_init_name.h"
+diff --git a/examples/demo_offer_change.cc b/examples/demo_offer_change.cc
+index c31adb9..d9b6687 100644
+--- a/examples/demo_offer_change.cc
++++ b/examples/demo_offer_change.cc
+@@ -1,6 +1,7 @@
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <stdio.h>
++using namespace std;
+
+ #include "CosNotifyShorthands.h"
+ #include "orb_init_name.h"
+diff --git a/examples/demo_subscription_change.cc b/examples/demo_subscription_change.cc
+index 2987c0f..7758897 100644
+--- a/examples/demo_subscription_change.cc
++++ b/examples/demo_subscription_change.cc
+@@ -1,6 +1,7 @@
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <stdio.h>
++using namespace std;
+
+ #include "CosNotifyShorthands.h"
+ #include "orb_init_name.h"
+diff --git a/examples/legacy_clients.cc b/examples/legacy_clients.cc
+index 39d9389..43ecaa4 100644
+--- a/examples/legacy_clients.cc
++++ b/examples/legacy_clients.cc
+@@ -4,9 +4,10 @@
+ // See legacy_clients.h
+ // -------------------------------------------------------------- //
+
+-#include <iostream.h>
+-#include <iomanip.h>
++#include <iostream>
++#include <iomanip>
+ #include "thread_wrappers.h"
++using namespace std;
+
+ #include "CosNotifyShorthands.h"
+ #include "legacy_clients.h"
+diff --git a/examples/ndadmin.cc b/examples/ndadmin.cc
+index 6ffd1b4..6fdf135 100644
+--- a/examples/ndadmin.cc
++++ b/examples/ndadmin.cc
+@@ -6,7 +6,8 @@
+ #error COS_USES_BOA should not be set for this example
+ #endif
+
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+
+ #include "orb_init_name.h"
+ #include "get_channel.h"
+diff --git a/examples/parse_cmd_line.h b/examples/parse_cmd_line.h
+index 543ba43..9653287 100644
+--- a/examples/parse_cmd_line.h
++++ b/examples/parse_cmd_line.h
+@@ -4,7 +4,8 @@
+ #define _PARSE_CMD_LINE_H
+
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+
+ #include "CosNotifyShorthands.h"
+
+diff --git a/examples/sample_clients.cc b/examples/sample_clients.cc
+index bfaeba8..38bcd39 100644
+--- a/examples/sample_clients.cc
++++ b/examples/sample_clients.cc
+@@ -7,9 +7,10 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <fstream.h>
+-#include <iostream.h>
+-#include <iomanip.h>
++#include <fstream>
++#include <iostream>
++#include <iomanip>
++using namespace std;
+
+ #ifdef HAVE_UNISTD_H
+ # include <unistd.h>
+diff --git a/examples/sample_functions.cc b/examples/sample_functions.cc
+index aa4fe45..246ca8e 100644
+--- a/examples/sample_functions.cc
++++ b/examples/sample_functions.cc
+@@ -2,9 +2,10 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <iostream.h>
+-#include <iomanip.h>
++#include <iostream>
++#include <iomanip>
+ #include "sample_functions.h"
++using namespace std;
+
+ ///////////////////////////////////////////////////////////////////
+ // USER-DEFINED FUNCTION EXAMPLES //
+diff --git a/examples/some_notify_clients.cc b/examples/some_notify_clients.cc
+index bca8db6..ca8920d 100644
+--- a/examples/some_notify_clients.cc
++++ b/examples/some_notify_clients.cc
+@@ -4,7 +4,8 @@
+ #endif
+
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+
+ #include "orb_init_name.h"
+ #include "get_channel.h"
+diff --git a/include/ModFlexLexer.h b/include/ModFlexLexer.h
+index 0c051c4..f51567b 100644
+--- a/include/ModFlexLexer.h
++++ b/include/ModFlexLexer.h
+@@ -88,7 +88,8 @@
+ // Never included before - need to define base class.
+ #define __FLEX_LEXER_H
+
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+
+ extern "C++" {
+
+diff --git a/lib/RDIParser_l.cc b/lib/RDIParser_l.cc
+index ad3c3dc..33e137e 100644
+--- a/lib/RDIParser_l.cc
++++ b/lib/RDIParser_l.cc
+@@ -53,7 +53,8 @@
+ #ifdef __cplusplus
+
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+
+ /* Use prototypes in function declarations. */
+ #define YY_USE_PROTOS
+--
diff --git a/debian/patches/features/0003-fix_ldd_COS_missing.patch b/debian/patches/features/0003-fix_ldd_COS_missing.patch
new file mode 100644
index 0000000..836cd13
--- /dev/null
+++ b/debian/patches/features/0003-fix_ldd_COS_missing.patch
@@ -0,0 +1,53 @@
+From: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
+Date: Tue, 14 Jun 2011 16:34:45 +0200
+Subject: fix_ldd_COS_missing
+
+---
+ mk/beforeauto.mk.in | 2 +-
+ mkattlib/dir.mk | 5 ++++-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/mk/beforeauto.mk.in b/mk/beforeauto.mk.in
+index dbc9b1d..d61f2ae 100644
+--- a/mk/beforeauto.mk.in
++++ b/mk/beforeauto.mk.in
+@@ -686,7 +686,7 @@ INSTEXEFLAGS = -m 0755
+ CP = cp
+ MV = mv -f
+ CPP = @CPP@
+-OMKDEPEND = @OMKDEPEND@
++OMKDEPEND = @CC@ -M -MD -MG
+ RMDIRHIER = $(RM) -rf
+
+ CXXMAKEDEPEND = $(OMKDEPEND) -D__cplusplus
+diff --git a/mkattlib/dir.mk b/mkattlib/dir.mk
+index 2de363e..11b629c 100644
+--- a/mkattlib/dir.mk
++++ b/mkattlib/dir.mk
+@@ -5,6 +5,8 @@ ifdef Win32Platform
+ # a million and one undefined symbol errors. We include cos.mk to get
+ # the library name.
+ include $(BASE_OMNI_TREE)/mk/cos.mk
++else
++include $(BASE_OMNI_TREE)/mk/cos.mk
+ endif
+
+ # Uncomment the next line to build BOA versions of the ATT library
+@@ -16,6 +18,7 @@ vpath %.idl $(IMPORT_TREES:%=%/idl/COS) $(IMPORT_TREES:%=%/src/services/omniNoti
+ DIR_IDLFLAGS += -I. $(patsubst %,-I%/idl/COS,$(IMPORT_TREES))
+ DIR_IDLFLAGS += -I. $(patsubst %,-I%/src/services/omniNotify/idl,$(IMPORT_TREES))
+ DIR_IDLFLAGS += -I $(DATADIR)/idl/omniORB/COS
++DIR_IDLFLAGS += -I $(OMNIORB_ROOT)/share/idl/omniORB/COS
+
+ # Look for .hh files in <top>/include/COS
+ IMPORT_CPPFLAGS += $(patsubst %,-I%/include/COS,$(IMPORT_TREES))
+@@ -114,7 +117,7 @@ ifdef Win32Platform
+ imps := $(patsubst $(DLLDebugSearchPattern),$(DLLNoDebugSearchPattern), \
+ $(OMNIORB_LIB) $(COS_LIB))
+ else
+-imps := $(OMNIORB_LIB)
++imps := $(OMNIORB_LIB) $(COS_LIB)
+ endif
+
+
+--
diff --git a/debian/patches/features/fix_compilation b/debian/patches/features/fix_compilation
deleted file mode 100644
index 4044cd5..0000000
--- a/debian/patches/features/fix_compilation
+++ /dev/null
@@ -1,163 +0,0 @@
-Description: Upstream changes introduced in version 2.1-1
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- omninotify (2.1-1) unstable; urgency=low
- .
- * Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP>
- .
- The person named in the Author field signed this changelog entry.
-Author: Picca Frederic-Emmanuel <picca at synchrotron-soleil.fr>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- omninotify-2.1.orig/examples/ndadmin.cc
-+++ omninotify-2.1/examples/ndadmin.cc
-@@ -6,7 +6,8 @@
- #error COS_USES_BOA should not be set for this example
- #endif
-
--#include <iostream.h>
-+#include <iostream>
-+using namespace std;
-
- #include "orb_init_name.h"
- #include "get_channel.h"
---- omninotify-2.1.orig/examples/demo_add_filter.cc
-+++ omninotify-2.1/examples/demo_add_filter.cc
-@@ -1,6 +1,7 @@
- #include <stdlib.h>
--#include <iostream.h>
-+#include <iostream>
- #include <stdio.h>
-+using namespace std;
-
- #include "CosNotifyShorthands.h"
- #include "orb_init_name.h"
---- omninotify-2.1.orig/examples/demo_subscription_change.cc
-+++ omninotify-2.1/examples/demo_subscription_change.cc
-@@ -1,6 +1,7 @@
- #include <stdlib.h>
--#include <iostream.h>
-+#include <iostream>
- #include <stdio.h>
-+using namespace std;
-
- #include "CosNotifyShorthands.h"
- #include "orb_init_name.h"
---- omninotify-2.1.orig/examples/legacy_clients.cc
-+++ omninotify-2.1/examples/legacy_clients.cc
-@@ -4,9 +4,10 @@
- // See legacy_clients.h
- // -------------------------------------------------------------- //
-
--#include <iostream.h>
--#include <iomanip.h>
-+#include <iostream>
-+#include <iomanip>
- #include "thread_wrappers.h"
-+using namespace std;
-
- #include "CosNotifyShorthands.h"
- #include "legacy_clients.h"
---- omninotify-2.1.orig/examples/parse_cmd_line.h
-+++ omninotify-2.1/examples/parse_cmd_line.h
-@@ -4,7 +4,8 @@
- #define _PARSE_CMD_LINE_H
-
- #include <stdlib.h>
--#include <iostream.h>
-+#include <iostream>
-+using namespace std;
-
- #include "CosNotifyShorthands.h"
-
---- omninotify-2.1.orig/examples/sample_clients.cc
-+++ omninotify-2.1/examples/sample_clients.cc
-@@ -7,9 +7,10 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <fstream.h>
--#include <iostream.h>
--#include <iomanip.h>
-+#include <fstream>
-+#include <iostream>
-+#include <iomanip>
-+using namespace std;
-
- #ifdef HAVE_UNISTD_H
- # include <unistd.h>
---- omninotify-2.1.orig/examples/some_notify_clients.cc
-+++ omninotify-2.1/examples/some_notify_clients.cc
-@@ -4,7 +4,8 @@
- #endif
-
- #include <stdlib.h>
--#include <iostream.h>
-+#include <iostream>
-+using namespace std;
-
- #include "orb_init_name.h"
- #include "get_channel.h"
---- omninotify-2.1.orig/examples/sample_functions.cc
-+++ omninotify-2.1/examples/sample_functions.cc
-@@ -2,9 +2,10 @@
-
- #include <stdio.h>
- #include <stdlib.h>
--#include <iostream.h>
--#include <iomanip.h>
-+#include <iostream>
-+#include <iomanip>
- #include "sample_functions.h"
-+using namespace std;
-
- ///////////////////////////////////////////////////////////////////
- // USER-DEFINED FUNCTION EXAMPLES //
---- omninotify-2.1.orig/examples/demo_offer_change.cc
-+++ omninotify-2.1/examples/demo_offer_change.cc
-@@ -1,6 +1,7 @@
- #include <stdlib.h>
--#include <iostream.h>
-+#include <iostream>
- #include <stdio.h>
-+using namespace std;
-
- #include "CosNotifyShorthands.h"
- #include "orb_init_name.h"
---- omninotify-2.1.orig/lib/RDIParser_l.cc
-+++ omninotify-2.1/lib/RDIParser_l.cc
-@@ -53,7 +53,8 @@
- #ifdef __cplusplus
-
- #include <stdlib.h>
--#include <iostream.h>
-+#include <iostream>
-+using namespace std;
-
- /* Use prototypes in function declarations. */
- #define YY_USE_PROTOS
---- omninotify-2.1.orig/include/ModFlexLexer.h
-+++ omninotify-2.1/include/ModFlexLexer.h
-@@ -88,7 +88,8 @@
- // Never included before - need to define base class.
- #define __FLEX_LEXER_H
-
--#include <iostream.h>
-+#include <iostream>
-+using namespace std;
-
- extern "C++" {
-
diff --git a/debian/patches/features/fix_ldd_COS_missing b/debian/patches/features/fix_ldd_COS_missing
deleted file mode 100644
index 1e55648..0000000
--- a/debian/patches/features/fix_ldd_COS_missing
+++ /dev/null
@@ -1,63 +0,0 @@
-Description: Upstream changes introduced in version 2.1-1
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- omninotify (2.1-1) unstable; urgency=low
- .
- * Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP>
- .
- The person named in the Author field signed this changelog entry.
-Author: Picca Frederic-Emmanuel <picca at synchrotron-soleil.fr>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- omninotify-2.1.orig/mk/beforeauto.mk.in
-+++ omninotify-2.1/mk/beforeauto.mk.in
-@@ -686,7 +686,7 @@ INSTEXEFLAGS = -m 0755
- CP = cp
- MV = mv -f
- CPP = @CPP@
--OMKDEPEND = @OMKDEPEND@
-+OMKDEPEND = @CC@ -M -MD -MG
- RMDIRHIER = $(RM) -rf
-
- CXXMAKEDEPEND = $(OMKDEPEND) -D__cplusplus
---- omninotify-2.1.orig/mkattlib/dir.mk
-+++ omninotify-2.1/mkattlib/dir.mk
-@@ -5,6 +5,8 @@ ifdef Win32Platform
- # a million and one undefined symbol errors. We include cos.mk to get
- # the library name.
- include $(BASE_OMNI_TREE)/mk/cos.mk
-+else
-+include $(BASE_OMNI_TREE)/mk/cos.mk
- endif
-
- # Uncomment the next line to build BOA versions of the ATT library
-@@ -16,6 +18,7 @@ vpath %.idl $(IMPORT_TREES:%=%/idl/COS)
- DIR_IDLFLAGS += -I. $(patsubst %,-I%/idl/COS,$(IMPORT_TREES))
- DIR_IDLFLAGS += -I. $(patsubst %,-I%/src/services/omniNotify/idl,$(IMPORT_TREES))
- DIR_IDLFLAGS += -I $(DATADIR)/idl/omniORB/COS
-+DIR_IDLFLAGS += -I $(OMNIORB_ROOT)/share/idl/omniORB/COS
-
- # Look for .hh files in <top>/include/COS
- IMPORT_CPPFLAGS += $(patsubst %,-I%/include/COS,$(IMPORT_TREES))
-@@ -114,7 +117,7 @@ ifdef Win32Platform
- imps := $(patsubst $(DLLDebugSearchPattern),$(DLLNoDebugSearchPattern), \
- $(OMNIORB_LIB) $(COS_LIB))
- else
--imps := $(OMNIORB_LIB)
-+imps := $(OMNIORB_LIB) $(COS_LIB)
- endif
-
-
diff --git a/debian/patches/series b/debian/patches/series
index 1a241d9..d6bc6bd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-features/fix_64bits_platforms
-features/fix_compilation
-features/fix_ldd_COS_missing
+features/0001-fix_64bits_platforms.patch
+features/0002-fix_compilation.patch
+features/0003-fix_ldd_COS_missing.patch
--
Packaging for omninotify
More information about the debian-science-commits
mailing list