diff options
| author | Jose <jose@zeroc.com> | 2016-06-15 18:06:00 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-06-15 18:06:00 +0200 |
| commit | 99855eefd7419c24e9b204fb851ec95adc581b4e (patch) | |
| tree | 0d79a68449d770c3c550b43121c0d6d43f602d14 /cpp/src/Ice/InstrumentationI.cpp | |
| parent | Allow java libraries to override pom scm data (diff) | |
| parent | Stack trace test expec files for Linux (diff) | |
| download | ice-99855eefd7419c24e9b204fb851ec95adc581b4e.tar.bz2 ice-99855eefd7419c24e9b204fb851ec95adc581b4e.tar.xz ice-99855eefd7419c24e9b204fb851ec95adc581b4e.zip | |
Merge branch '3.6-stretch' into 3.6
Diffstat (limited to 'cpp/src/Ice/InstrumentationI.cpp')
| -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) { } |