diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-10-26 16:06:41 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-10-26 16:06:41 +0200 |
| commit | e811b38b5f593f49f54be82385537ac1abeb0f94 (patch) | |
| tree | 3a633d6ed7407cdbfef7c39f028f201542a081bd /cpp | |
| parent | Fixed UDP IPv6 test failures on OS X (diff) | |
| download | ice-e811b38b5f593f49f54be82385537ac1abeb0f94.tar.bz2 ice-e811b38b5f593f49f54be82385537ac1abeb0f94.tar.xz ice-e811b38b5f593f49f54be82385537ac1abeb0f94.zip | |
Minor metrics fixes
Diffstat (limited to 'cpp')
| -rwxr-xr-x | cpp/allTests.py | 2 | ||||
| -rw-r--r-- | cpp/src/Ice/InstrumentationI.cpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/cpp/allTests.py b/cpp/allTests.py index 6f4aa7d1925..2228c1915eb 100755 --- a/cpp/allTests.py +++ b/cpp/allTests.py @@ -116,7 +116,7 @@ tests = [ if TestUtil.isWin32() or os.getuid() == 0: tests += [ ("IceUtil/priority", ["core", "nodarwin"]), - ("Ice/threadPoolPriority", ["core", "nodarwin"]) + ("Ice/threadPoolPriority", ["core", "nodarwin", "nomx"]) ] if __name__ == "__main__": diff --git a/cpp/src/Ice/InstrumentationI.cpp b/cpp/src/Ice/InstrumentationI.cpp index 4631859341d..0790bd34689 100644 --- a/cpp/src/Ice/InstrumentationI.cpp +++ b/cpp/src/Ice/InstrumentationI.cpp @@ -605,7 +605,6 @@ public: { add("parent", &EndpointHelper::getParent); add("id", &EndpointHelper::getId); - add("endpoint", &EndpointHelper::getEndpoint); addEndpointAttributes<EndpointHelper>(*this); } }; |