diff options
| author | Bernard Normier <bernard@zeroc.com> | 2007-11-28 10:00:43 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2007-11-28 10:00:43 -0500 |
| commit | 9b300be79e1feebd09f16e01adeb5a7a005cda2e (patch) | |
| tree | 59f531f3347d9087fdc641a1e05f1e4675bdb0c4 /cpp/test | |
| parent | First cut callback support (diff) | |
| parent | Added -D_STLP_NEW_PLATFORM_SDK for VC6 build (diff) | |
| download | ice-9b300be79e1feebd09f16e01adeb5a7a005cda2e.tar.bz2 ice-9b300be79e1feebd09f16e01adeb5a7a005cda2e.tar.xz ice-9b300be79e1feebd09f16e01adeb5a7a005cda2e.zip | |
Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice
Conflicts:
cpp/src/IceGrid/SessionServantManager.cpp
Diffstat (limited to 'cpp/test')
| -rw-r--r-- | cpp/test/Ice/background/Connector.h | 5 | ||||
| -rwxr-xr-x | cpp/test/IceGrid/session/run.py | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/cpp/test/Ice/background/Connector.h b/cpp/test/Ice/background/Connector.h index d8ffb10ea9a..bedfe307e07 100644 --- a/cpp/test/Ice/background/Connector.h +++ b/cpp/test/Ice/background/Connector.h @@ -26,10 +26,9 @@ public: virtual bool operator!=(const IceInternal::Connector&) const; virtual bool operator<(const IceInternal::Connector&) const; -private: - Connector(const IceInternal::ConnectorPtr& connector); - friend class EndpointI; + +private: const IceInternal::ConnectorPtr _connector; const ConfigurationPtr _configuration; diff --git a/cpp/test/IceGrid/session/run.py b/cpp/test/IceGrid/session/run.py index 8643ca13827..1a513cfd304 100755 --- a/cpp/test/IceGrid/session/run.py +++ b/cpp/test/IceGrid/session/run.py @@ -44,6 +44,8 @@ print "ok" IceGridAdmin.registryOptions += \ r' --IceGrid.Registry.DynamicRegistration' + \ + r' --IceGrid.Registry.SessionFilters' + \ + r' --IceGrid.Registry.AdminSessionFilters' + \ r' --IceGrid.Registry.PermissionsVerifier="ClientPermissionsVerifier"' + \ r' --IceGrid.Registry.AdminPermissionsVerifier="AdminPermissionsVerifier:tcp -p 12002"'+ \ r' --IceGrid.Registry.SSLPermissionsVerifier="SSLPermissionsVerifier"' |