diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/PropertyNames.cpp | 5 | ||||
| -rw-r--r-- | cpp/src/Ice/PropertyNames.h | 2 | ||||
| -rw-r--r-- | cpp/src/IceStorm/Subscriber.cpp | 8 |
3 files changed, 6 insertions, 9 deletions
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp index d6e3b64678c..79b3014958f 100644 --- a/cpp/src/Ice/PropertyNames.cpp +++ b/cpp/src/Ice/PropertyNames.cpp @@ -1,7 +1,7 @@ // // Copyright (c) ZeroC, Inc. All rights reserved. // -// Generated by makeprops.py from file ./config/PropertyNames.xml, Fri Jan 29 15:05:58 2021 +// Generated by makeprops.py from file ./config/PropertyNames.xml, Wed Feb 3 10:19:18 2021 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -1168,7 +1168,6 @@ const IceInternal::Property Glacier2PropsData[] = IceInternal::Property("Glacier2.Client.ThreadPool.ThreadIdleTime", false, 0), IceInternal::Property("Glacier2.Client.ThreadPool.ThreadPriority", false, 0), IceInternal::Property("Glacier2.Client.MessageSizeMax", false, 0), - IceInternal::Property("Glacier2.Client.AlwaysBatch", false, 0), IceInternal::Property("Glacier2.Client.Buffered", false, 0), IceInternal::Property("Glacier2.Client.ForwardContext", false, 0), IceInternal::Property("Glacier2.Client.SleepTime", false, 0), @@ -1243,7 +1242,6 @@ const IceInternal::Property Glacier2PropsData[] = IceInternal::Property("Glacier2.Server.ThreadPool.ThreadIdleTime", false, 0), IceInternal::Property("Glacier2.Server.ThreadPool.ThreadPriority", false, 0), IceInternal::Property("Glacier2.Server.MessageSizeMax", false, 0), - IceInternal::Property("Glacier2.Server.AlwaysBatch", false, 0), IceInternal::Property("Glacier2.Server.Buffered", false, 0), IceInternal::Property("Glacier2.Server.ForwardContext", false, 0), IceInternal::Property("Glacier2.Server.SleepTime", false, 0), @@ -1269,7 +1267,6 @@ const IceInternal::Property Glacier2PropsData[] = IceInternal::Property("Glacier2.SSLSessionManager.CollocationOptimized", false, 0), IceInternal::Property("Glacier2.SSLSessionManager.Context.*", false, 0), IceInternal::Property("Glacier2.SSLSessionManager", false, 0), - IceInternal::Property("Glacier2.SessionTimeout", false, 0), IceInternal::Property("Glacier2.Trace.RoutingTable", false, 0), IceInternal::Property("Glacier2.Trace.Session", false, 0), }; diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h index 42bf1fce9bc..71f3f64b9a1 100644 --- a/cpp/src/Ice/PropertyNames.h +++ b/cpp/src/Ice/PropertyNames.h @@ -1,7 +1,7 @@ // // Copyright (c) ZeroC, Inc. All rights reserved. // -// Generated by makeprops.py from file ./config/PropertyNames.xml, Fri Jan 29 15:05:58 2021 +// Generated by makeprops.py from file ./config/PropertyNames.xml, Wed Feb 3 10:19:18 2021 // IMPORTANT: Do not edit this file -- any edits made here will be lost! diff --git a/cpp/src/IceStorm/Subscriber.cpp b/cpp/src/IceStorm/Subscriber.cpp index a7ea42d3c13..9edfe04ea21 100644 --- a/cpp/src/IceStorm/Subscriber.cpp +++ b/cpp/src/IceStorm/Subscriber.cpp @@ -869,10 +869,10 @@ Subscriber::Subscriber(shared_ptr<Instance> instance, if(_instance->observer()) { _observer.attach(_instance->observer()->getSubscriberObserver(_instance->serviceName(), - rec.topicName, - rec.obj, - rec.theQoS, - rec.theTopic, + _rec.topicName, + _rec.obj, + _rec.theQoS, + _rec.theTopic, toSubscriberState(_state), 0)); } |