[asterisk-scf-commits] asterisk-scf/integration/ice.git branch "vs2010-reinterpret_cast-pairinit" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Thu Mar 31 13:47:29 CDT 2011
branch "vs2010-reinterpret_cast-pairinit" has been updated
via 97db405dfaf86840c45629fb296e053780c0e584 (commit)
via 7934b1e7decbadb88d5a63fdceb1cf7775e7e419 (commit)
via 7e8fe82e04e25ce11305377e5f2992edb031e9fb (commit)
via 109ed351c3c8b3b43757f6322edf83a509418e88 (commit)
via 9e6ac154f85840502f15c61384d7d7dfa6e05ad3 (commit)
via 0860537db39fb7057e1b5bbeb5778ea448313afa (commit)
via 340a4be2438591d50fe168c761448ceb6f627214 (commit)
via 5d676a4a233f4dd8e088334d726fdee41650e8a0 (commit)
via 068d5366f5ca6779cb5b9ae037024f2da08bf21d (commit)
via cfd35498bdb1893155159520f62391420af1c020 (commit)
via 0a902683747b02c1579723ec78a6ad5e2d7901aa (commit)
via 55423a40ce533acd1e04744663754de219637ec6 (commit)
from 90740e524908a56808b7f2a60db4e1e281bf4be0 (commit)
Summary of changes:
cpp/demo/Database/Oracle/occi/.depend | 1 +
cpp/demo/Database/Oracle/occi/.depend.mak | 1 +
cpp/demo/Database/Oracle/proc/.depend | 1 +
cpp/demo/Database/Oracle/proc/.depend.mak | 1 +
cpp/demo/Freeze/backup/.depend | 4 +-
cpp/demo/Freeze/backup/.depend.mak | 4 +-
cpp/demo/Freeze/bench/.depend | 6 +-
cpp/demo/Freeze/bench/.depend.mak | 6 +-
cpp/demo/Freeze/casino/.depend | 16 +-
cpp/demo/Freeze/casino/.depend.mak | 16 +-
cpp/demo/Freeze/customEvictor/.depend | 20 +-
cpp/demo/Freeze/customEvictor/.depend.mak | 20 +-
cpp/demo/Freeze/library/.depend | 36 +-
cpp/demo/Freeze/library/.depend.mak | 36 +-
cpp/demo/Freeze/phonebook/.depend | 36 +-
cpp/demo/Freeze/phonebook/.depend.mak | 36 +-
cpp/demo/Freeze/transform/.depend | 24 +-
cpp/demo/Freeze/transform/.depend.mak | 24 +-
cpp/demo/Glacier2/callback/.depend | 8 +-
cpp/demo/Glacier2/callback/.depend.mak | 8 +-
cpp/demo/Glacier2/chat/.depend | 8 +-
cpp/demo/Glacier2/chat/.depend.mak | 8 +-
cpp/demo/Ice/MFC/client/.depend | 1 +
cpp/demo/Ice/MFC/client/.depend.mak | 1 +
cpp/demo/Ice/MFC/server/.depend | 1 +
cpp/demo/Ice/MFC/server/.depend.mak | 1 +
cpp/demo/Ice/async/.depend | 10 +-
cpp/demo/Ice/async/.depend.mak | 10 +-
cpp/demo/Ice/bidir/.depend | 8 +-
cpp/demo/Ice/bidir/.depend.mak | 8 +-
cpp/demo/Ice/callback/.depend | 8 +-
cpp/demo/Ice/callback/.depend.mak | 8 +-
cpp/demo/Ice/converter/.depend | 10 +-
cpp/demo/Ice/converter/.depend.mak | 10 +-
cpp/demo/Ice/hello/.depend | 8 +-
cpp/demo/Ice/hello/.depend.mak | 8 +-
cpp/demo/Ice/hello/Client.cpp | 2 +
cpp/demo/Ice/hello/HelloI.cpp | 3 +-
cpp/demo/Ice/hello/config.client | 1 +
cpp/demo/Ice/hello/config.server | 1 +
cpp/demo/Ice/interleaved/.depend | 8 +-
cpp/demo/Ice/interleaved/.depend.mak | 8 +-
cpp/demo/Ice/invoke/.depend | 8 +-
cpp/demo/Ice/invoke/.depend.mak | 8 +-
cpp/demo/Ice/latency/.depend | 6 +-
cpp/demo/Ice/latency/.depend.mak | 6 +-
cpp/demo/Ice/minimal/.depend | 8 +-
cpp/demo/Ice/minimal/.depend.mak | 8 +-
cpp/demo/Ice/multicast/.depend | 8 +-
cpp/demo/Ice/multicast/.depend.mak | 8 +-
cpp/demo/Ice/nested/.depend | 8 +-
cpp/demo/Ice/nested/.depend.mak | 8 +-
cpp/demo/Ice/nrvo/.depend | 8 +-
cpp/demo/Ice/nrvo/.depend.mak | 8 +-
cpp/demo/Ice/plugin/.depend | 10 +-
cpp/demo/Ice/plugin/.depend.mak | 10 +-
cpp/demo/Ice/session/.depend | 12 +-
cpp/demo/Ice/session/.depend.mak | 12 +-
cpp/demo/Ice/throughput/.depend | 8 +-
cpp/demo/Ice/throughput/.depend.mak | 8 +-
cpp/demo/Ice/value/.depend | 10 +-
cpp/demo/Ice/value/.depend.mak | 10 +-
cpp/demo/IceBox/hello/.depend | 8 +-
cpp/demo/IceBox/hello/.depend.mak | 8 +-
cpp/demo/IceGrid/allocate/.depend | 8 +-
cpp/demo/IceGrid/allocate/.depend.mak | 8 +-
cpp/demo/IceGrid/icebox/.depend | 8 +-
cpp/demo/IceGrid/icebox/.depend.mak | 8 +-
cpp/demo/IceGrid/replication/.depend | 8 +-
cpp/demo/IceGrid/replication/.depend.mak | 8 +-
cpp/demo/IceGrid/secure/.depend | 8 +-
cpp/demo/IceGrid/secure/.depend.mak | 8 +-
cpp/demo/IceGrid/sessionActivation/.depend | 8 +-
cpp/demo/IceGrid/sessionActivation/.depend.mak | 8 +-
cpp/demo/IceGrid/simple/.depend | 8 +-
cpp/demo/IceGrid/simple/.depend.mak | 8 +-
cpp/demo/IcePatch2/MFC/.depend.mak | 1 +
cpp/demo/IceStorm/clock/.depend | 6 +-
cpp/demo/IceStorm/clock/.depend.mak | 6 +-
cpp/demo/IceStorm/counter/.depend | 10 +-
cpp/demo/IceStorm/counter/.depend.mak | 10 +-
cpp/demo/IceStorm/replicated/.depend | 6 +-
cpp/demo/IceStorm/replicated/.depend.mak | 6 +-
cpp/demo/IceStorm/replicated2/.depend | 6 +-
cpp/demo/IceStorm/replicated2/.depend.mak | 6 +-
cpp/demo/book/evictor_filesystem/.depend | 16 +-
cpp/demo/book/evictor_filesystem/.depend.mak | 16 +-
cpp/demo/book/lifecycle/.depend | 14 +-
cpp/demo/book/lifecycle/.depend.mak | 14 +-
cpp/demo/book/map_filesystem/.depend | 20 +-
cpp/demo/book/map_filesystem/.depend.mak | 20 +-
cpp/demo/book/printer/.depend | 6 +-
cpp/demo/book/printer/.depend.mak | 6 +-
cpp/demo/book/simple_filesystem/.depend | 8 +-
cpp/demo/book/simple_filesystem/.depend.mak | 8 +-
cpp/include/Ice/BasicStream.h | 9 +-
cpp/include/Ice/Exception.h | 1 +
cpp/include/Ice/Object.h | 4 +
cpp/include/Ice/SlicedData.h | 119 +
cpp/include/Ice/Stream.h | 12 +-
cpp/include/Slice/Parser.h | 24 +-
cpp/src/Freeze/.depend | 46 +-
cpp/src/Freeze/.depend.mak | 46 +-
cpp/src/FreezeScript/.depend | 26 +-
cpp/src/FreezeScript/.depend.mak | 26 +-
cpp/src/Glacier2/.depend | 26 +-
cpp/src/Glacier2/.depend.mak | 26 +-
cpp/src/Glacier2Lib/.depend | 10 +-
cpp/src/Glacier2Lib/.depend.mak | 10 +-
cpp/src/Ice/.depend | 167 +-
cpp/src/Ice/.depend.mak | 167 +-
cpp/src/Ice/BasicStream.cpp | 102 +-
cpp/src/Ice/Makefile | 7 +-
cpp/src/Ice/Makefile.mak | 7 +-
cpp/src/Ice/SlicedData.cpp | 436 ++++
cpp/src/Ice/StreamI.cpp | 49 +-
cpp/src/Ice/StreamI.h | 12 +-
cpp/src/IceBox/.depend | 10 +-
cpp/src/IceBox/.depend.mak | 10 +-
cpp/src/IceGrid/.depend | 104 +-
cpp/src/IceGrid/.depend.mak | 104 +-
cpp/src/IceGrid/FreezeDB/.depend | 8 +-
cpp/src/IceGrid/FreezeDB/.depend.mak | 8 +-
cpp/src/IceGrid/SqlDB/.depend | 5 +-
cpp/src/IceGrid/SqlDB/.depend.mak | 5 +-
cpp/src/IceGridLib/.depend | 20 +-
cpp/src/IceGridLib/.depend.mak | 20 +-
cpp/src/IcePatch2/.depend | 8 +-
cpp/src/IcePatch2/.depend.mak | 8 +-
cpp/src/IcePatch2Lib/.depend | 8 +-
cpp/src/IcePatch2Lib/.depend.mak | 8 +-
cpp/src/IceSSL/.depend | 24 +-
cpp/src/IceSSL/.depend.mak | 24 +-
cpp/src/IceStorm/.depend | 44 +-
cpp/src/IceStorm/.depend.mak | 44 +-
cpp/src/IceStorm/FreezeDB/.depend | 22 +-
cpp/src/IceStorm/FreezeDB/.depend.mak | 22 +-
cpp/src/IceStorm/SqlDB/.depend | 4 +-
cpp/src/IceStorm/SqlDB/.depend.mak | 4 +-
cpp/src/IceStormLib/.depend | 2 +-
cpp/src/IceStormLib/.depend.mak | 2 +-
cpp/src/Slice/.depend | 2 +-
cpp/src/Slice/.depend.mak | 2 +-
cpp/src/Slice/CPlusPlusUtil.cpp | 6 +-
cpp/src/Slice/CsUtil.cpp | 16 +-
cpp/src/Slice/Grammar.cpp | 2251 ++++++++++++--------
cpp/src/Slice/Grammar.h | 79 +-
cpp/src/Slice/Grammar.y | 51 +-
cpp/src/Slice/JavaUtil.cpp | 8 +-
cpp/src/Slice/Makefile | 9 +
cpp/src/Slice/Parser.cpp | 127 +-
cpp/src/Slice/PythonUtil.cpp | 4 +
cpp/src/Slice/RubyUtil.cpp | 2 +
cpp/src/Slice/Scanner.cpp | 1593 ++++++++------
cpp/src/Slice/Scanner.l | 1 +
cpp/src/iceserviceinstall/.depend.mak | 1 +
cpp/src/slice2cpp/Gen.cpp | 276 +--
cpp/src/slice2cpp/Main.cpp | 13 +-
cpp/src/slice2cs/Gen.cpp | 255 +--
cpp/src/slice2java/Gen.cpp | 208 +--
cpp/src/slice2php/Main.cpp | 8 +-
cpp/test/Freeze/complex/.depend | 12 +-
cpp/test/Freeze/complex/.depend.mak | 12 +-
cpp/test/Freeze/dbmap/.depend | 12 +-
cpp/test/Freeze/dbmap/.depend.mak | 12 +-
cpp/test/Freeze/evictor/.depend | 8 +-
cpp/test/Freeze/evictor/.depend.mak | 8 +-
cpp/test/Freeze/fileLock/.depend | 2 +-
cpp/test/Freeze/fileLock/.depend.mak | 2 +-
cpp/test/FreezeScript/dbmap/.depend | 6 +-
cpp/test/FreezeScript/dbmap/.depend.mak | 6 +-
cpp/test/FreezeScript/evictor/.depend | 4 +-
cpp/test/FreezeScript/evictor/.depend.mak | 4 +-
cpp/test/Glacier2/attack/.depend | 8 +-
cpp/test/Glacier2/attack/.depend.mak | 8 +-
cpp/test/Glacier2/dynamicFiltering/.depend | 14 +-
cpp/test/Glacier2/dynamicFiltering/.depend.mak | 14 +-
cpp/test/Glacier2/router/.depend | 8 +-
cpp/test/Glacier2/router/.depend.mak | 8 +-
cpp/test/Glacier2/sessionControl/.depend | 10 +-
cpp/test/Glacier2/sessionControl/.depend.mak | 10 +-
cpp/test/Glacier2/ssl/.depend | 4 +-
cpp/test/Glacier2/ssl/.depend.mak | 4 +-
cpp/test/Glacier2/staticFiltering/.depend | 8 +-
cpp/test/Glacier2/staticFiltering/.depend.mak | 8 +-
cpp/test/Ice/adapterDeactivation/.depend | 20 +-
cpp/test/Ice/adapterDeactivation/.depend.mak | 20 +-
cpp/test/Ice/ami/.depend | 10 +-
cpp/test/Ice/ami/.depend.mak | 10 +-
cpp/test/Ice/background/.depend | 30 +-
cpp/test/Ice/background/.depend.mak | 30 +-
cpp/test/Ice/binding/.depend | 10 +-
cpp/test/Ice/binding/.depend.mak | 10 +-
cpp/test/Ice/checksum/.depend | 8 +-
cpp/test/Ice/checksum/.depend.mak | 8 +-
cpp/test/Ice/checksum/server/.depend | 8 +-
cpp/test/Ice/checksum/server/.depend.mak | 8 +-
cpp/test/Ice/custom/.depend | 48 +-
cpp/test/Ice/custom/.depend.mak | 48 +-
cpp/test/Ice/defaultServant/.depend | 8 +-
cpp/test/Ice/defaultServant/.depend.mak | 8 +-
cpp/test/Ice/defaultValue/.depend | 6 +-
cpp/test/Ice/defaultValue/.depend.mak | 6 +-
cpp/test/Ice/dispatcher/.depend | 10 +-
cpp/test/Ice/dispatcher/.depend.mak | 10 +-
cpp/test/Ice/exceptions/.depend | 27 +-
cpp/test/Ice/exceptions/.depend.mak | 27 +-
cpp/test/Ice/facets/.depend | 16 +-
cpp/test/Ice/facets/.depend.mak | 16 +-
cpp/test/Ice/faultTolerance/.depend | 10 +-
cpp/test/Ice/faultTolerance/.depend.mak | 10 +-
cpp/test/Ice/gc/.depend | 4 +-
cpp/test/Ice/gc/.depend.mak | 4 +-
cpp/test/Ice/hold/.depend | 12 +-
cpp/test/Ice/hold/.depend.mak | 12 +-
cpp/test/Ice/info/.depend | 14 +-
cpp/test/Ice/info/.depend.mak | 14 +-
cpp/test/Ice/inheritance/.depend | 16 +-
cpp/test/Ice/inheritance/.depend.mak | 16 +-
cpp/test/Ice/interceptor/.depend | 12 +-
cpp/test/Ice/interceptor/.depend.mak | 12 +-
cpp/test/Ice/invoke/.depend | 12 +-
cpp/test/Ice/invoke/.depend.mak | 12 +-
cpp/test/Ice/location/.depend | 12 +-
cpp/test/Ice/location/.depend.mak | 12 +-
cpp/test/Ice/objects/.depend | 14 +-
cpp/test/Ice/objects/.depend.mak | 14 +-
cpp/test/Ice/operations/.depend | 54 +-
cpp/test/Ice/operations/.depend.mak | 54 +-
cpp/test/Ice/proxy/.depend | 26 +-
cpp/test/Ice/proxy/.depend.mak | 26 +-
cpp/test/Ice/retry/.depend | 12 +-
cpp/test/Ice/retry/.depend.mak | 12 +-
cpp/test/Ice/servantLocator/.depend | 32 +-
cpp/test/Ice/servantLocator/.depend.mak | 32 +-
cpp/test/Ice/slicing/exceptions/.depend | 24 +-
cpp/test/Ice/slicing/exceptions/.depend.mak | 24 +-
cpp/test/Ice/slicing/exceptions/AllTests.cpp | 6 +-
cpp/test/Ice/slicing/exceptions/ClientPrivate.ice | 6 +-
cpp/test/Ice/slicing/exceptions/Test.ice | 6 +-
cpp/test/Ice/slicing/exceptions/TestAMD.ice | 6 +-
cpp/test/Ice/slicing/objects/.depend | 30 +-
cpp/test/Ice/slicing/objects/.depend.mak | 30 +-
cpp/test/Ice/slicing/objects/ClientPrivate.ice | 10 +-
cpp/test/Ice/slicing/objects/Test.ice | 3 +-
cpp/test/Ice/slicing/objects/TestAMD.ice | 3 +-
cpp/test/Ice/stream/.depend | 4 +-
cpp/test/Ice/stream/.depend.mak | 4 +-
cpp/test/Ice/stringConverter/.depend | 4 +-
cpp/test/Ice/stringConverter/.depend.mak | 4 +-
cpp/test/Ice/threadPoolPriority/.depend | 12 +-
cpp/test/Ice/threadPoolPriority/.depend.mak | 12 +-
cpp/test/Ice/timeout/.depend | 12 +-
cpp/test/Ice/timeout/.depend.mak | 12 +-
cpp/test/Ice/udp/.depend | 10 +-
cpp/test/Ice/udp/.depend.mak | 10 +-
cpp/test/IceBox/configuration/.depend | 10 +-
cpp/test/IceBox/configuration/.depend.mak | 10 +-
cpp/test/IceGrid/activation/.depend | 10 +-
cpp/test/IceGrid/activation/.depend.mak | 10 +-
cpp/test/IceGrid/admin/.depend | 2 +-
cpp/test/IceGrid/admin/.depend.mak | 2 +-
cpp/test/IceGrid/allocation/.depend | 12 +-
cpp/test/IceGrid/allocation/.depend.mak | 12 +-
cpp/test/IceGrid/deployer/.depend | 14 +-
cpp/test/IceGrid/deployer/.depend.mak | 14 +-
cpp/test/IceGrid/distribution/.depend | 10 +-
cpp/test/IceGrid/distribution/.depend.mak | 10 +-
cpp/test/IceGrid/replicaGroup/.depend | 14 +-
cpp/test/IceGrid/replicaGroup/.depend.mak | 14 +-
cpp/test/IceGrid/replication/.depend | 10 +-
cpp/test/IceGrid/replication/.depend.mak | 10 +-
cpp/test/IceGrid/session/.depend | 8 +-
cpp/test/IceGrid/session/.depend.mak | 8 +-
cpp/test/IceGrid/simple/.depend | 10 +-
cpp/test/IceGrid/simple/.depend.mak | 10 +-
cpp/test/IceGrid/update/.depend | 10 +-
cpp/test/IceGrid/update/.depend.mak | 10 +-
cpp/test/IceSSL/configuration/.depend | 12 +-
cpp/test/IceSSL/configuration/.depend.mak | 12 +-
cpp/test/IceStorm/federation/.depend | 6 +-
cpp/test/IceStorm/federation/.depend.mak | 6 +-
cpp/test/IceStorm/federation2/.depend | 6 +-
cpp/test/IceStorm/federation2/.depend.mak | 6 +-
cpp/test/IceStorm/rep1/.depend | 8 +-
cpp/test/IceStorm/rep1/.depend.mak | 8 +-
cpp/test/IceStorm/repgrid/.depend | 4 +-
cpp/test/IceStorm/repgrid/.depend.mak | 4 +-
cpp/test/IceStorm/repstress/.depend | 12 +-
cpp/test/IceStorm/repstress/.depend.mak | 12 +-
cpp/test/IceStorm/single/.depend | 6 +-
cpp/test/IceStorm/single/.depend.mak | 6 +-
cpp/test/IceStorm/stress/.depend | 6 +-
cpp/test/IceStorm/stress/.depend.mak | 6 +-
.../Slice/errorDetection/DummyAtGlobalLevel.ice | 27 -
cpp/test/Slice/keyword/.depend | 4 +-
cpp/test/Slice/keyword/.depend.mak | 4 +-
cpp/test/Slice/parser/.depend | 4 +-
cpp/test/Slice/parser/.depend.mak | 4 +-
cpp/test/Slice/structure/.depend | 4 +-
cpp/test/Slice/structure/.depend.mak | 4 +-
cs/src/Ice/.depend | 1 +
cs/src/Ice/.depend.mak | 1 +
cs/src/Ice/BasicStream.cs | 105 +-
cs/src/Ice/Makefile | 5 +-
cs/src/Ice/Makefile.mak | 6 +-
cs/src/Ice/SlicedData.cs | 268 +++
cs/src/Ice/Stream.cs | 56 +-
cs/src/Ice/StreamI.cs | 44 +-
cs/test/Ice/slicing/exceptions/ClientPrivate.ice | 6 +-
cs/test/Ice/slicing/exceptions/Test.ice | 6 +-
cs/test/Ice/slicing/exceptions/TestAMD.ice | 6 +-
cs/test/Ice/slicing/objects/AllTests.cs | 3 +-
cs/test/Ice/slicing/objects/ClientPrivate.ice | 8 +-
cs/test/Ice/slicing/objects/Test.ice | 3 +-
cs/test/Ice/slicing/objects/TestAMD.ice | 3 +-
java/build.xml | 1 +
java/src/Ice/InputStream.java | 30 +
java/src/Ice/InputStreamI.java | 24 +
java/src/Ice/OutputStream.java | 26 +-
java/src/Ice/OutputStreamI.java | 22 +-
java/src/Ice/PreservedTransformer.java | 15 +
java/src/Ice/SlicedData.java | 223 ++
java/src/IceInternal/BasicStream.java | 96 +-
java/test/Ice/slicing/exceptions/ClientPrivate.ice | 12 +-
java/test/Ice/slicing/exceptions/ServerPrivate.ice | 6 +-
.../Ice/slicing/exceptions/ServerPrivateAMD.ice | 6 +-
java/test/Ice/slicing/objects/AllTests.java | 2 +
java/test/Ice/slicing/objects/ClientPrivate.ice | 11 +-
java/test/Ice/slicing/objects/ServerPrivate.ice | 3 +-
java/test/Ice/slicing/objects/ServerPrivateAMD.ice | 3 +-
php/lib/Ice.php | 4 +-
php/lib/Ice_ns.php | 4 +-
php/src/IcePHP/Operation.cpp | 2 +
php/src/IcePHP/Types.cpp | 214 ++-
php/src/IcePHP/Types.h | 9 +
php/test/Ice/slicing/objects/Client.php | 136 +-
php/test/Ice/slicing/objects/ClientPrivate.ice | 35 +
php/test/Ice/slicing/objects/Test.ice | 5 +
py/config/Make.rules.mak | 7 +-
py/modules/IcePy/ObjectFactory.cpp | 2 +-
py/modules/IcePy/Operation.cpp | 30 +-
py/modules/IcePy/Types.cpp | 292 +++-
py/modules/IcePy/Types.h | 10 +
py/python/Ice.py | 7 +-
py/test/Ice/slicing/exceptions/AllTests.py | 116 +-
py/test/Ice/slicing/exceptions/ClientPrivate.ice | 40 +
py/test/Ice/slicing/exceptions/Server.py | 35 +
py/test/Ice/slicing/exceptions/ServerAMD.py | 43 +
py/test/Ice/slicing/exceptions/Test.ice | 25 +
py/test/Ice/slicing/exceptions/TestAMD.ice | 25 +
py/test/Ice/slicing/objects/AllTests.py | 280 +++-
py/test/Ice/slicing/objects/ClientPrivate.ice | 35 +
py/test/Ice/slicing/objects/Server.py | 5 +-
py/test/Ice/slicing/objects/ServerAMD.py | 2 +-
py/test/Ice/slicing/objects/Test.ice | 9 +-
py/test/Ice/slicing/objects/TestAMD.ice | 8 +-
rb/ruby/Ice.rb | 4 +-
rb/src/IceRuby/Communicator.cpp | 13 +-
rb/src/IceRuby/Operation.cpp | 4 +-
rb/src/IceRuby/Types.cpp | 183 ++-
rb/src/IceRuby/Types.h | 10 +
rb/test/Ice/slicing/objects/AllTests.rb | 196 ++
rb/test/Ice/slicing/objects/ClientPrivate.ice | 35 +
rb/test/Ice/slicing/objects/Test.ice | 5 +
vb/demo/Glacier2/callback/.depend.mak | 2 +-
vb/demo/Ice/async/.depend.mak | 2 +-
vb/demo/Ice/bidir/.depend.mak | 2 +-
vb/demo/Ice/callback/.depend.mak | 2 +-
vb/demo/Ice/hello/.depend.mak | 2 +-
vb/demo/Ice/invoke/.depend.mak | 2 +-
vb/demo/Ice/latency/.depend.mak | 2 +-
vb/demo/Ice/minimal/.depend.mak | 2 +-
vb/demo/Ice/nested/.depend.mak | 2 +-
vb/demo/Ice/session/.depend.mak | 2 +-
vb/demo/Ice/throughput/.depend.mak | 2 +-
vb/demo/Ice/value/.depend.mak | 2 +-
vb/demo/IceBox/hello/.depend.mak | 2 +-
vb/demo/IceGrid/simple/.depend.mak | 2 +-
vb/demo/IceStorm/clock/.depend.mak | 2 +-
vb/demo/book/printer/.depend.mak | 2 +-
vb/demo/book/simple_filesystem/.depend.mak | 2 +-
382 files changed, 7735 insertions(+), 4473 deletions(-)
create mode 100644 cpp/include/Ice/SlicedData.h
create mode 100644 cpp/src/Ice/SlicedData.cpp
delete mode 100644 cpp/test/Slice/errorDetection/DummyAtGlobalLevel.ice
create mode 100644 cs/src/Ice/SlicedData.cs
create mode 100644 java/src/Ice/PreservedTransformer.java
create mode 100644 java/src/Ice/SlicedData.java
create mode 100644 py/test/Ice/slicing/exceptions/ClientPrivate.ice
- Log -----------------------------------------------------------------
commit 97db405dfaf86840c45629fb296e053780c0e584
Author: Ken Hunt <ken.hunt at digium.com>
Date: Thu Mar 31 13:46:55 2011 -0500
Added VC100 and VC100_EXPRESS as valid compiler options.
diff --git a/py/config/Make.rules.mak b/py/config/Make.rules.mak
index 22aa243..99364ae 100644
--- a/py/config/Make.rules.mak
+++ b/py/config/Make.rules.mak
@@ -23,10 +23,10 @@ OPTIMIZE = yes
#
# Specify your C++ compiler. Supported values are:
-# VC60, VC90, VC90_EXPRESS
+# VC60, VC90, VC90_EXPRESS, VC100, VC100_EXPRESS
#
!if "$(CPP_COMPILER)" == ""
-CPP_COMPILER = VC90
+CPP_COMPILER = VC100
!endif
#
@@ -71,7 +71,8 @@ install_libdir = $(prefix)\python$(x64suffix)
!if "$(CPP_COMPILER)" != "VC60" && "$(CPP_COMPILER)" != "VC71" && \
"$(CPP_COMPILER)" != "VC80" && "$(CPP_COMPILER)" != "VC80_EXPRESS" && \
- "$(CPP_COMPILER)" != "VC90" && "$(CPP_COMPILER)" != "VC90_EXPRESS"
+ "$(CPP_COMPILER)" != "VC90" && "$(CPP_COMPILER)" != "VC90_EXPRESS" && \
+ "$(CPP_COMPILER)" != "VC100" && "$(CPP_COMPILER)" != "VC100_EXPRESS"
!error Invalid setting for CPP_COMPILER: $(CPP_COMPILER)
!endif
commit 7934b1e7decbadb88d5a63fdceb1cf7775e7e419
Merge: 90740e5 7e8fe82
Author: Ken Hunt <ken.hunt at digium.com>
Date: Thu Mar 31 12:55:29 2011 -0500
Merge branch 'master' of gitdepot:/asterisk-scf/release/ice into vs2010-reinterpret_cast-pairinit
commit 7e8fe82e04e25ce11305377e5f2992edb031e9fb
Merge: 109ed35 17f43db
Author: Brent Eagles <beagles at digium.com>
Date: Thu Mar 31 13:26:42 2011 -0230
Small fix to deal with paths with spaces when the path to the IceBox service
is fully specified in configuration.
commit 109ed351c3c8b3b43757f6322edf83a509418e88
Author: Brent Eagles <beagles at digium.com>
Date: Thu Mar 31 09:45:39 2011 -0230
- Re-add bin directory along with gitignore file (similar to lib
directory). This was probably removed in error in a previous commit.
diff --git a/cpp/bin/.gitignore b/cpp/bin/.gitignore
new file mode 100644
index 0000000..72e8ffc
--- /dev/null
+++ b/cpp/bin/.gitignore
@@ -0,0 +1 @@
+*
commit 9e6ac154f85840502f15c61384d7d7dfa6e05ad3
Merge: 0860537 5d676a4
Author: Brent Eagles <beagles at digium.com>
Date: Wed Mar 30 22:54:15 2011 -0230
Merge branch 'object-slice-preservation'
diff --cc cpp/include/Slice/Parser.h
index 24cf113,016121a..9414c9d
--- a/cpp/include/Slice/Parser.h
+++ b/cpp/include/Slice/Parser.h
@@@ -706,9 -628,10 +708,11 @@@ public
bool isInterface() const;
bool isA(const std::string&) const;
virtual bool isLocal() const;
+ virtual bool isUnsliceable() const;
+ virtual bool isParentUnsliceable() const;
bool hasDataMembers() const;
bool hasOperations() const;
+ bool hasGeneratedOperations() const;
bool hasDefaultValues() const;
virtual ContainedType containedType() const;
virtual bool uses(const ContainedPtr&) const;
@@@ -724,9 -647,10 +728,11 @@@ protected
bool _interface;
bool _hasDataMembers;
bool _hasOperations;
+ bool _hasGeneratedOperations;
ClassList _bases;
bool _local;
+ bool _unsliceable;
+ bool _parentIsUnsliceable;
};
// ----------------------------------------------------------------------
diff --cc cpp/src/Slice/PythonUtil.cpp
index d9ece5e,489f0e1..e5853f8
--- a/cpp/src/Slice/PythonUtil.cpp
+++ b/cpp/src/Slice/PythonUtil.cpp
@@@ -871,9 -794,11 +871,11 @@@ Slice::Python::CodeVisitor::visitClassD
}
DataMemberList members = p->dataMembers();
- _out << sp << nl << "_M_" << type << " = IcePy.defineClass('" << scoped << "', " << name << ", ";
+ _out << sp << nl << "_M_" << type << " = IcePy.defineClass('" << p->scoped(false) << "', " << name << ", ";
writeMetaData(p->getMetaData());
_out << ", " << (isAbstract ? "True" : "False") << ", ";
+ _out << (p->isUnsliceable() ? "True" : "False") << ", ";
+ _out << (p->isParentUnsliceable() ? "True" : "False") << ", ";
if(!base)
{
_out << "None";
diff --cc cpp/src/slice2cpp/Gen.cpp
index fbf9f32,b042c2f..dd5a09d
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@@ -4154,11 -4103,12 +4121,16 @@@ Slice::Gen::ObjectVisitor::visitClassDe
H << nl << "virtual ::std::vector< ::std::string> ice_ids"
<< "(const ::Ice::Current& = ::Ice::Current()) const;";
H << nl << "virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::Current()) const;";
- H << nl << "static const ::std::string& ice_staticId();";
+ H << nl << "static const ::std::string& ice_staticId()";
+ H << sb;
+ H << nl << "static const ::std::string __ice_staticId = " << '"' << p->scoped() << '"' << ";";
+ H << nl << "return __ice_staticId;";
+ H << eb;
+ bool switchWrites = p->isUnsliceable() && !p->isParentUnsliceable();
+ if(switchWrites)
+ {
+ H << nl << "bool ice_isUnsliceable() const { return true; }";
+ }
if(!dataMembers.empty())
{
H << sp;
diff --cc cpp/src/slice2java/Gen.cpp
index 88073eb,682cbb8..e016437
--- a/cpp/src/slice2java/Gen.cpp
+++ b/cpp/src/slice2java/Gen.cpp
@@@ -1384,22 -1227,10 +1352,9 @@@ Slice::JavaVisitor::writeDispatchAndMar
out << nl << "__is.endReadSlice();";
if(switchWrites)
{
- out << nl << "for(Ice.SkippedSlice i : __preserved)";
- out << sb;
- out << nl << "java.util.List<Ice.ObjectIdOffset> objs = __objectIdMap.get(i.typeId);";
- out << nl << "if(objs != null)";
-
+ out << nl << "if(__slicedData != null)";
out << sb;
- out << nl << "for(Ice.ObjectIdOffset offset : objs)";
- out << sb;
- out << nl << "Ice.ObjectPatcher mappedObj = __objectMap.get(offset.id);";
- out << nl << "if(mappedObj == null)";
- out << sb;
- out << nl << "Ice.ObjectPatcher patcher = new Ice.ObjectPatcher();";
- out << nl << "__objectMap.put(offset.id, patcher);";
- out << nl << "__is.addPreservedPatcher(patcher, offset.id);";
- out << eb;
- out << eb;
- out << eb;
+ out << nl << "__slicedData.__addPatchObjects(__is);";
out << eb;
}
out << nl << "super.__read(__is, true);";
diff --cc cpp/test/Ice/slicing/exceptions/Test.ice
index 4debac2,536d429..0bc5c2b
--- a/cpp/test/Ice/slicing/exceptions/Test.ice
+++ b/cpp/test/Ice/slicing/exceptions/Test.ice
@@@ -33,8 -33,8 +33,7 @@@ exception KnownMostDerived extends Know
string kmd;
};
- ["preserve"]
- exception BaseUnsliceable extends Base
-
+ unsliceable exception BaseUnsliceable extends Base
{
};
diff --cc cpp/test/Ice/slicing/objects/Test.ice
index 27f93e7,aa7f4da..a31dffc
--- a/cpp/test/Ice/slicing/objects/Test.ice
+++ b/cpp/test/Ice/slicing/objects/Test.ice
@@@ -29,8 -29,8 +29,7 @@@ class
B pb;
};
- ["preserve"]
- class BU extends B
-
+ unsliceable class BU extends B
{
};
diff --cc java/test/Ice/slicing/objects/ClientPrivate.ice
index dbd8535,a3fb1c9..22e9f16
--- a/java/test/Ice/slicing/objects/ClientPrivate.ice
+++ b/java/test/Ice/slicing/objects/ClientPrivate.ice
@@@ -32,8 -32,8 +32,7 @@@ class
B pb;
};
- ["preserve"]
- class BU extends B
-
+ unsliceable class BU extends B
{
};
diff --cc vb/demo/Glacier2/callback/.depend.mak
index 54e47dc,54e47dc..70e4952
--- a/vb/demo/Glacier2/callback/.depend.mak
+++ b/vb/demo/Glacier2/callback/.depend.mak
@@@ -1,1 -1,1 +1,1 @@@
--generated/Callback.cs: ./Callback.ice "$(SLICE2CS)" "$(SLICEPARSERLIB)"
++generated/Callback.cs: ./Callback.ice "$(SLICE2CS)" "$(SLICEPARSERLIB)"
diff --cc vb/demo/Ice/async/.depend.mak
index 7a6a44a,7a6a44a..60c26e2
--- a/vb/demo/Ice/async/.depend.mak
+++ b/vb/demo/Ice/async/.depend.mak
@@@ -1,1 -1,1 +1,1 @@@
--generated/Hello.cs: ./Hello.ice "$(SLICE2CS)" "$(SLICEPARSERLIB)"
++generated/Hello.cs: ./Hello.ice "$(SLICE2CS)" "$(SLICEPARSERLIB)"
diff --cc vb/demo/Ice/bidir/.depend.mak
index ea82f3e,ea82f3e..241065c
--- a/vb/demo/Ice/bidir/.depend.mak
+++ b/vb/demo/Ice/bidir/.depend.mak
@@@ -1,1 -1,1 +1,1 @@@
--generated/Callback.cs: ./Callback.ice ..\..\..\..\slice/Ice/Identity.ice "$(SLICE2CS)" "$(SLICEPARSERLIB)"
++generated/Callback.cs: ./Callback.ice ..\..\..\..\slice/Ice/Identity.ice "$(SLICE2CS)" "$(SLICEPARSERLIB)"
diff --cc vb/demo/Ice/callback/.depend.mak
index 54e47dc,54e47dc..70e4952
--- a/vb/demo/Ice/callback/.depend.mak
+++ b/vb/demo/Ice/callback/.depend.mak
@@@ -1,1 -1,1 +1,1 @@@
--generated/Callback.cs: ./Callback.ice "$(SLICE2CS)" "$(SLICEPARSERLIB)"
++generated/Callback.cs: ./Callback.ice "$(SLICE2CS)" "$(SLICEPARSERLIB)"
diff --cc vb/demo/Ice/hello/.depend.mak
index 7a6a44a,7a6a44a..60c26e2
--- a/vb/demo/Ice/hello/.depend.mak
+++ b/vb/demo/Ice/hello/.depend.mak
@@@ -1,1 -1,1 +1,1 @@@
--generated/Hello.cs: ./Hello.ice "$(SLICE2CS)" "$(SLICEPARSERLIB)"
++generated/Hello.cs: ./Hello.ice "$(SLICE2CS)" "$(SLICEPARSERLIB)"
diff --cc vb/demo/Ice/invoke/.depend.mak
index e74a069,e74a069..b9cb7d9
--- a/vb/demo/Ice/invoke/.depend.mak
+++ b/vb/demo/Ice/invoke/.depend.mak
@@@ -1,1 -1,1 +1,1 @@@
--generated/Printer.cs: ./Printer.ice "$(SLICE2CS)" "$(SLICEPARSERLIB)"
++generated/Printer.cs: ./Printer.ice "$(SLICE2CS)" "$(SLICEPARSERLIB)"
diff --cc vb/demo/Ice/latency/.depend.mak
index 1fffaca,1fffaca..43ff3bb
--- a/vb/demo/Ice/latency/.depend.mak
+++ b/vb/demo/Ice/latency/.depend.mak
@@@ -1,1 -1,1 +1,1 @@@
--generated/Latency.cs: ./Latency.ice "$(SLICE2CS)" "$(SLICEPARSERLIB)"
++generated/Latency.cs: ./Latency.ice "$(SLICE2CS)" "$(SLICEPARSERLIB)"
diff --cc vb/demo/Ice/minimal/.depend.mak
index 7a6a44a,7a6a44a..60c26e2
--- a/vb/demo/Ice/minimal/.depend.mak
+++ b/vb/demo/Ice/minimal/.depend.mak
@@@ -1,1 -1,1 +1,1 @@@
--generated/Hello.cs: ./Hello.ice "$(SLICE2CS)" "$(SLICEPARSERLIB)"
++generated/Hello.cs: ./Hello.ice "$(SLICE2CS)" "$(SLICEPARSERLIB)"
diff --cc vb/demo/Ice/nested/.depend.mak
index 0f57eab,0f57eab..d1d885b
--- a/vb/demo/Ice/nested/.depend.mak
+++ b/vb/demo/Ice/nested/.depend.mak
@@@ -1,1 -1,1 +1,1 @@@
--generated/Nested.cs: ./Nested.ice "$(SLICE2CS)" "$(SLICEPARSERLIB)"
++generated/Nested.cs: ./Nested.ice "$(SLICE2CS)" "$(SLICEPARSERLIB)"
diff --cc vb/demo/Ice/session/.depend.mak
index 3801625,3801625..72e8cc5
--- a/vb/demo/Ice/session/.depend.mak
+++ b/vb/demo/Ice/session/.depend.mak
@@@ -1,1 -1,1 +1,1 @@@
--generated/Session.cs: ./Session.ice "$(SLICE2CS)" "$(SLICEPARSERLIB)"
++generated/Session.cs: ./Session.ice "$(SLICE2CS)" "$(SLICEPARSERLIB)"
diff --cc vb/demo/Ice/throughput/.depend.mak
index 45ebb66,45ebb66..4398af7
--- a/vb/demo/Ice/throughput/.depend.mak
+++ b/vb/demo/Ice/throughput/.depend.mak
@@@ -1,1 -1,1 +1,1 @@@
--generated/Throughput.cs: ./Throughput.ice "$(SLICE2CS)" "$(SLICEPARSERLIB)"
++generated/Throughput.cs: ./Throughput.ice "$(SLICE2CS)" "$(SLICEPARSERLIB)"
diff --cc vb/demo/Ice/value/.depend.mak
index 7e0c6f5,7e0c6f5..f7ff50f
--- a/vb/demo/Ice/value/.depend.mak
+++ b/vb/demo/Ice/value/.depend.mak
@@@ -1,1 -1,1 +1,1 @@@
--generated/Value.cs: ./Value.ice "$(SLICE2CS)" "$(SLICEPARSERLIB)"
++generated/Value.cs: ./Value.ice "$(SLICE2CS)" "$(SLICEPARSERLIB)"
diff --cc vb/demo/IceBox/hello/.depend.mak
index 7a6a44a,7a6a44a..60c26e2
--- a/vb/demo/IceBox/hello/.depend.mak
+++ b/vb/demo/IceBox/hello/.depend.mak
@@@ -1,1 -1,1 +1,1 @@@
--generated/Hello.cs: ./Hello.ice "$(SLICE2CS)" "$(SLICEPARSERLIB)"
++generated/Hello.cs: ./Hello.ice "$(SLICE2CS)" "$(SLICEPARSERLIB)"
diff --cc vb/demo/IceGrid/simple/.depend.mak
index 7a6a44a,7a6a44a..60c26e2
--- a/vb/demo/IceGrid/simple/.depend.mak
+++ b/vb/demo/IceGrid/simple/.depend.mak
@@@ -1,1 -1,1 +1,1 @@@
--generated/Hello.cs: ./Hello.ice "$(SLICE2CS)" "$(SLICEPARSERLIB)"
++generated/Hello.cs: ./Hello.ice "$(SLICE2CS)" "$(SLICEPARSERLIB)"
diff --cc vb/demo/IceStorm/clock/.depend.mak
index a8f0e15,a8f0e15..c2d0011
--- a/vb/demo/IceStorm/clock/.depend.mak
+++ b/vb/demo/IceStorm/clock/.depend.mak
@@@ -1,1 -1,1 +1,1 @@@
--generated/Clock.cs: ./Clock.ice "$(SLICE2CS)" "$(SLICEPARSERLIB)"
++generated/Clock.cs: ./Clock.ice "$(SLICE2CS)" "$(SLICEPARSERLIB)"
diff --cc vb/demo/book/printer/.depend.mak
index e74a069,e74a069..b9cb7d9
--- a/vb/demo/book/printer/.depend.mak
+++ b/vb/demo/book/printer/.depend.mak
@@@ -1,1 -1,1 +1,1 @@@
--generated/Printer.cs: ./Printer.ice "$(SLICE2CS)" "$(SLICEPARSERLIB)"
++generated/Printer.cs: ./Printer.ice "$(SLICE2CS)" "$(SLICEPARSERLIB)"
diff --cc vb/demo/book/simple_filesystem/.depend.mak
index 562f3dd,562f3dd..3433606
--- a/vb/demo/book/simple_filesystem/.depend.mak
+++ b/vb/demo/book/simple_filesystem/.depend.mak
@@@ -1,1 -1,1 +1,1 @@@
--generated/Filesystem.cs: ./Filesystem.ice "$(SLICE2CS)" "$(SLICEPARSERLIB)"
++generated/Filesystem.cs: ./Filesystem.ice "$(SLICE2CS)" "$(SLICEPARSERLIB)"
commit 0860537db39fb7057e1b5bbeb5778ea448313afa
Merge: a7038ce 340a4be
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Mon Mar 28 15:54:28 2011 -0700
Merge branch 'slice2cpp-include-header-in-dependencies'
-----------------------------------------------------------------------
--
asterisk-scf/integration/ice.git
More information about the asterisk-scf-commits
mailing list