diff options
| author | Jose <jose@zeroc.com> | 2019-05-28 20:43:19 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-05-28 20:43:19 +0200 |
| commit | 51f4e57cf710969d0f06c98c0f77f7c227796cf9 (patch) | |
| tree | 68d03beb19961b2e70de6756891fe0379a751d97 | |
| parent | Add Swift documentation comments (diff) | |
| download | ice-51f4e57cf710969d0f06c98c0f77f7c227796cf9.tar.bz2 ice-51f4e57cf710969d0f06c98c0f77f7c227796cf9.tar.xz ice-51f4e57cf710969d0f06c98c0f77f7c227796cf9.zip | |
Minor fixes
| -rw-r--r-- | cpp/src/Ice/CommunicatorI.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/Slice/Parser.cpp | 1 | ||||
| -rw-r--r-- | csharp/src/Ice/Proxy.cs | 2 | ||||
| -rw-r--r-- | csharp/src/Ice/Util.cs | 2 | ||||
| -rw-r--r-- | csharp/src/Ice/Value.cs | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/cpp/src/Ice/CommunicatorI.cpp b/cpp/src/Ice/CommunicatorI.cpp index a23570870f1..b88bbe4b94b 100644 --- a/cpp/src/Ice/CommunicatorI.cpp +++ b/cpp/src/Ice/CommunicatorI.cpp @@ -19,7 +19,7 @@ #include <IceUtil/MutexPtrLock.h> #include <Ice/UUID.h> #ifdef ICE_SWIFT -#include <Ice/ThreadPool.h> +# include <Ice/ThreadPool.h> #endif using namespace std; diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp index 52004688edf..e0ed44f449e 100644 --- a/cpp/src/Slice/Parser.cpp +++ b/cpp/src/Slice/Parser.cpp @@ -4358,6 +4358,7 @@ Slice::ClassDef::isDelegate() const { return isLocal() && isInterface() && hasMetaData("delegate") && allOperations().size() == 1; } + Slice::ClassDef::ClassDef(const ContainerPtr& container, const string& name, int id, bool intf, const ClassList& bases, bool local) : SyntaxTreeBase(container->unit()), diff --git a/csharp/src/Ice/Proxy.cs b/csharp/src/Ice/Proxy.cs index 1de18d13ce5..ba7fed5fe1f 100644 --- a/csharp/src/Ice/Proxy.cs +++ b/csharp/src/Ice/Proxy.cs @@ -515,7 +515,7 @@ namespace Ice /// <summary> /// Returns whether this proxy communicates only via secure endpoints. /// </summary> - /// <returns>True if this proxy communicates only vi secure endpoints; false, otherwise.</returns> + /// <returns>True if this proxy communicates only via secure endpoints; false, otherwise.</returns> bool ice_isSecure(); /// <summary> diff --git a/csharp/src/Ice/Util.cs b/csharp/src/Ice/Util.cs index dfd3691a743..155c5c7e06d 100644 --- a/csharp/src/Ice/Util.cs +++ b/csharp/src/Ice/Util.cs @@ -545,7 +545,7 @@ namespace Ice /// Converts a string to an encoding version. /// </summary> /// <param name="version">The string to convert.</param> - /// <returns>The converted object identity.</returns> + /// <returns>The converted encoding version.</returns> public static EncodingVersion stringToEncodingVersion(string version) { byte major, minor; diff --git a/csharp/src/Ice/Value.cs b/csharp/src/Ice/Value.cs index 107554398f2..9ba12086345 100644 --- a/csharp/src/Ice/Value.cs +++ b/csharp/src/Ice/Value.cs @@ -39,7 +39,7 @@ namespace Ice } /// <summary> - /// This Ice run time invokes this method vafter unmarshaling an object's data members. This allows a + /// This Ice run time invokes this method after unmarshaling an object's data members. This allows a /// subclass to override this method in order to perform additional initialization. /// </summary> public virtual void ice_postUnmarshal() |