summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG-3.6.md7
-rw-r--r--cpp/test/Slice/errorDetection/ChangedMeaning.ice10
-rw-r--r--python/BuildInstructionsLinuxOSX.md2
-rw-r--r--python/BuildInstructionsWindows.md2
-rw-r--r--ruby/BuildInstructionsWindows.md6
5 files changed, 16 insertions, 11 deletions
diff --git a/CHANGELOG-3.6.md b/CHANGELOG-3.6.md
index d8ea1f94fb3..8ede4eabad3 100644
--- a/CHANGELOG-3.6.md
+++ b/CHANGELOG-3.6.md
@@ -13,6 +13,7 @@ particular aspect of Ice.
- [C++ Changes](#c-changes)
- [C# Changes](#c-changes-1)
- [Java Changes](#java-changes)
+ - [Python Changes](#python-changes)
- [Ruby Changes](#ruby-changes)
- [Changes in Ice 3.6.1](#changes-in-ice-361)
- [General Changes](#general-changes-1)
@@ -27,7 +28,7 @@ particular aspect of Ice.
- [JavaScript Changes](#javascript-changes-1)
- [Objective-C Changes](#objective-c-changes)
- [PHP Changes](#php-changes-1)
- - [Python Changes](#python-changes)
+ - [Python Changes](#python-changes-1)
- [Ruby Changes](#ruby-changes-1)
# Changes in Ice 3.6.2
@@ -82,6 +83,10 @@ These are the changes since Ice 3.6.1.
- Fixed an IceGridGUI bug where the GUI started minimized in OS X.
+## Python Changes
+
+- Added compatibility with Python 3.5.
+
## Ruby Changes
- Added compatibility with Ruby 2.3.
diff --git a/cpp/test/Slice/errorDetection/ChangedMeaning.ice b/cpp/test/Slice/errorDetection/ChangedMeaning.ice
index 83309f6c47a..13948e5c778 100644
--- a/cpp/test/Slice/errorDetection/ChangedMeaning.ice
+++ b/cpp/test/Slice/errorDetection/ChangedMeaning.ice
@@ -16,7 +16,7 @@ sequence<long> ls;
struct s00
{
- ls ls; // OK as Ice 3.6 (data member has its own scope)
+ ls ls; // OK as of Ice 3.6 (data member has its own scope)
ls l;
};
@@ -28,7 +28,7 @@ struct s0
struct s1
{
ls mem;
- long ls; // OK as Ice 3.6 (data member has its own scope)
+ long ls; // OK as of Ice 3.6 (data member has its own scope)
};
struct s2
@@ -124,15 +124,15 @@ interface ParamTest
{
void op(long param);
void op2(counter param);
- void param(counter counter); // OK as Ice 3.6 (parameters has its own scope)
- void op3(long counter, counter x); // OK as Ice 3.6.1 (Second "counter" is not a type)
+ void param(counter counter); // OK as of Ice 3.6 (parameters have their own scope)
+ void op3(long counter, counter x); // OK as of Ice 3.6.1 (second "counter" is not a type)
void op4(long param, long param);
};
sequence<int> IS;
struct x
{
- IS is; // OK as Ice 3.6 (parameters has its own scope)
+ IS is; // OK as of Ice 3.6 (data member has its own scope)
};
struct y
diff --git a/python/BuildInstructionsLinuxOSX.md b/python/BuildInstructionsLinuxOSX.md
index e6ba526558f..f49d52db7d5 100644
--- a/python/BuildInstructionsLinuxOSX.md
+++ b/python/BuildInstructionsLinuxOSX.md
@@ -14,7 +14,7 @@ operating systems and compiler versions listed for our [supported platforms][2].
### Python Versions
-Ice for Python supports Python versions 2.6, 2.7, 3.3 or 3.4. Note however that
+Ice for Python supports Python versions 2.6, 2.7, and 3.5. Note however that
your Python installation must have been built with a C++ compiler that is
compatible with the one used to build Ice for C++.
diff --git a/python/BuildInstructionsWindows.md b/python/BuildInstructionsWindows.md
index 97d6b811ddf..39c5007f3e0 100644
--- a/python/BuildInstructionsWindows.md
+++ b/python/BuildInstructionsWindows.md
@@ -14,7 +14,7 @@ our [supported platforms][2].
### Python Versions
-Ice for Python supports Python versions 2.6, 2.7, 3.3 or 3.4. Note however that
+Ice for Python supports Python versions 2.6, 2.7, and 3.5. Note however that
your Python installation must have been built with a C++ compiler that is
compatible with the one used to build Ice for C++.
diff --git a/ruby/BuildInstructionsWindows.md b/ruby/BuildInstructionsWindows.md
index 44b462588cf..0c12d36f7ab 100644
--- a/ruby/BuildInstructionsWindows.md
+++ b/ruby/BuildInstructionsWindows.md
@@ -29,8 +29,8 @@ environment:
1. You have installed the Ice 3.6.2 distribution using the ZeroC installer. The
default installation directory is `C:\Program Files (x86)\ZeroC\Ice-3.6.2`.
-2. You have installed Ruby 2.2.1 using the Windows installer. The default
-installation directory is `C:\Ruby221`.
+2. You have installed Ruby 2.2.4 using the Windows installer. The default
+installation directory is `C:\Ruby224`.
3. You have installed the Ruby Development Kit 4.7.2 in `C:\RubyDevKit-4.7.2`.
4. For 32-bit builds, you have installed mingw 4.7.3 in `C:\mingw-4.7.3`.
@@ -41,7 +41,7 @@ relevant path names in the steps below to match your configuration.
Open a Windows command prompt and add Ruby to your environment:
- > C:\Ruby221\bin\setrbvars.bat
+ > C:\Ruby224\bin\setrbvars.bat
Run the `devkitvars.bat` batch file from the Ruby development kit to setup your
environment: