diff options
| author | ZeroC Staff <git@zeroc.com> | 2009-02-18 13:05:12 -0330 |
|---|---|---|
| committer | ZeroC Staff <git@zeroc.com> | 2009-02-18 13:05:12 -0330 |
| commit | cd854a4add71f2819842da9ad031b5cc97574278 (patch) | |
| tree | cf891e364926ffa2654244454c84694ef3caf431 /cpp/src/Slice/PythonUtil.cpp | |
| parent | Function returning pointer was returning false (diff) | |
| parent | bug 1593 - add support for java.io.Serializable (diff) | |
| download | ice-cd854a4add71f2819842da9ad031b5cc97574278.tar.bz2 ice-cd854a4add71f2819842da9ad031b5cc97574278.tar.xz ice-cd854a4add71f2819842da9ad031b5cc97574278.zip | |
Merge branch 'R3_3_branch' of ssh://dwayne@git.zeroc.com/home/git/ice into R3_3_branch
Diffstat (limited to 'cpp/src/Slice/PythonUtil.cpp')
| -rw-r--r-- | cpp/src/Slice/PythonUtil.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/cpp/src/Slice/PythonUtil.cpp b/cpp/src/Slice/PythonUtil.cpp index 7dc251b25df..cd0f126c9e1 100644 --- a/cpp/src/Slice/PythonUtil.cpp +++ b/cpp/src/Slice/PythonUtil.cpp @@ -1843,6 +1843,16 @@ Slice::Python::generate(const UnitPtr& un, bool all, bool checksum, const vector out << nl << "import Ice, IcePy, __builtin__"; + // + // For backward-compatibility with generated code from Ice 3.3.0, we add a definition + // of _struct_marker to the Ice module if necessary. + // + out << nl; + out << nl << "if not Ice.__dict__.has_key(\"_struct_marker\"):"; + out.inc(); + out << nl << "Ice._struct_marker = object()"; + out.dec(); + if(!all) { vector<string> paths = includePaths; |