diff options
| author | Jose <jose@zeroc.com> | 2016-06-14 17:22:53 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-06-14 17:22:53 +0200 |
| commit | 23e150233a4a11d72a1736ed3108d6488e3c17b1 (patch) | |
| tree | 4ed57be52c0c216344504890cdd3ed3ace67e18b /cpp/src | |
| parent | kFreeBSD and Debian build & test fixes: (diff) | |
| download | ice-23e150233a4a11d72a1736ed3108d6488e3c17b1.tar.bz2 ice-23e150233a4a11d72a1736ed3108d6488e3c17b1.tar.xz ice-23e150233a4a11d72a1736ed3108d6488e3c17b1.zip | |
Fixed ICE-7185 - Global destructor segfault in powerpc
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/InstrumentationI.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/cpp/src/Ice/InstrumentationI.cpp b/cpp/src/Ice/InstrumentationI.cpp index 86897e44943..b590686df45 100644 --- a/cpp/src/Ice/InstrumentationI.cpp +++ b/cpp/src/Ice/InstrumentationI.cpp @@ -25,8 +25,6 @@ using namespace IceMX; namespace { -Context emptyCtx; - int ThreadMetrics::* getThreadStateMetric(ThreadState s) { @@ -354,7 +352,7 @@ public: }; static Attributes attributes; - InvocationHelper(const ObjectPrx& proxy, const string& op, const Context& ctx = emptyCtx) : + InvocationHelper(const ObjectPrx& proxy, const string& op, const Context& ctx) : _proxy(proxy), _operation(op), _context(ctx) { } |