diff options
| author | Bernard Normier <bernard@zeroc.com> | 2006-10-27 20:04:28 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2006-10-27 20:04:28 +0000 |
| commit | be08cc3f416e6e8f4cd8c44c53f538d17ca1bef8 (patch) | |
| tree | 19572844043f86a25c4278220731de16873557a4 /cpp/src/Ice/ImplicitContextI.h | |
| parent | Updated depends (diff) | |
| download | ice-be08cc3f416e6e8f4cd8c44c53f538d17ca1bef8.tar.bz2 ice-be08cc3f416e6e8f4cd8c44c53f538d17ca1bef8.tar.xz ice-be08cc3f416e6e8f4cd8c44c53f538d17ca1bef8.zip | |
Implicit context java changes
Diffstat (limited to 'cpp/src/Ice/ImplicitContextI.h')
| -rw-r--r-- | cpp/src/Ice/ImplicitContextI.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Ice/ImplicitContextI.h b/cpp/src/Ice/ImplicitContextI.h index 8f20828eb19..f92f02a6734 100644 --- a/cpp/src/Ice/ImplicitContextI.h +++ b/cpp/src/Ice/ImplicitContextI.h @@ -37,11 +37,11 @@ public: virtual void write(const Context&, ::IceInternal::BasicStream*) const = 0; // - // Writes the underlying context plus the given context + // Combines the underlying context plus the given context // (entries in the given context overwrite entries in // the underlying context) // - virtual void write(const Context&, Context&) const = 0; + virtual void combine(const Context&, Context&) const = 0; }; |