diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2007-06-13 14:04:24 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2007-06-13 14:04:24 -0230 |
| commit | b2031b8795606b6893cb3766cc3f18f5c6c0c252 (patch) | |
| tree | 79ad7a4f1c5e7866efc9547f1d4bb7354842579e | |
| parent | Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice (diff) | |
| download | ice-b2031b8795606b6893cb3766cc3f18f5c6c0c252.tar.bz2 ice-b2031b8795606b6893cb3766cc3f18f5c6c0c252.tar.xz ice-b2031b8795606b6893cb3766cc3f18f5c6c0c252.zip | |
Bug 1658 - fix collocation issue with endpoints listening on 0.0.0.0
166 files changed, 526 insertions, 571 deletions
diff --git a/cpp/bin/.gitignore b/cpp/bin/.gitignore index 1ab5c142112..2265b5d474a 100644 --- a/cpp/bin/.gitignore +++ b/cpp/bin/.gitignore @@ -1,28 +1,28 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! -transformdb -dumpdb -glacier2router -icebox -iceboxadmin -icecpp -icegridnode -icegridregistry -icegridadmin +slice2java +slice2cpp icepatch2server icepatch2client icepatch2calc -icestormadmin -slice2cpp +slice2py slice2cppe +icegridnode +icegridregistry +icegridadmin +slice2freezej slice2cs slice2docbook slice2freeze -slice2freezej -slice2html -slice2java -slice2javae -slice2py +icecpp slice2rb +icestormadmin +glacier2router +slice2javae slice2vb +icebox +iceboxadmin +transformdb +dumpdb +slice2html diff --git a/cpp/demo/Database/Oracle/occi/.gitignore b/cpp/demo/Database/Oracle/occi/.gitignore index e86e3d14d5a..3df5df34266 100644 --- a/cpp/demo/Database/Oracle/occi/.gitignore +++ b/cpp/demo/Database/Oracle/occi/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/demo/Database/Oracle/proc/.gitignore b/cpp/demo/Database/Oracle/proc/.gitignore index b1eb23da3b0..6277f76460c 100644 --- a/cpp/demo/Database/Oracle/proc/.gitignore +++ b/cpp/demo/Database/Oracle/proc/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/demo/Freeze/backup/.gitignore b/cpp/demo/Freeze/backup/.gitignore index 4feaf5184fe..b84e4d41ef7 100644 --- a/cpp/demo/Freeze/backup/.gitignore +++ b/cpp/demo/Freeze/backup/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/demo/Freeze/bench/.gitignore b/cpp/demo/Freeze/bench/.gitignore index c818ca2a724..b01a7bc5635 100644 --- a/cpp/demo/Freeze/bench/.gitignore +++ b/cpp/demo/Freeze/bench/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/demo/Freeze/customEvictor/.gitignore b/cpp/demo/Freeze/customEvictor/.gitignore index 2b0b9e5f2ff..0055c6a4c8f 100644 --- a/cpp/demo/Freeze/customEvictor/.gitignore +++ b/cpp/demo/Freeze/customEvictor/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/demo/Freeze/library/.gitignore b/cpp/demo/Freeze/library/.gitignore index a521beab73a..fe0da993317 100644 --- a/cpp/demo/Freeze/library/.gitignore +++ b/cpp/demo/Freeze/library/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/demo/Freeze/phonebook/.gitignore b/cpp/demo/Freeze/phonebook/.gitignore index 882b8733521..0f815d75f73 100644 --- a/cpp/demo/Freeze/phonebook/.gitignore +++ b/cpp/demo/Freeze/phonebook/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/demo/Glacier2/callback/.gitignore b/cpp/demo/Glacier2/callback/.gitignore index c63ad747af8..9e43bc69367 100644 --- a/cpp/demo/Glacier2/callback/.gitignore +++ b/cpp/demo/Glacier2/callback/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/demo/Glacier2/chat/.gitignore b/cpp/demo/Glacier2/chat/.gitignore index c35f13fa310..84f74dbc2fa 100644 --- a/cpp/demo/Glacier2/chat/.gitignore +++ b/cpp/demo/Glacier2/chat/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/demo/Ice/async/.gitignore b/cpp/demo/Ice/async/.gitignore index 1a7d6e43702..6eecccf4de5 100644 --- a/cpp/demo/Ice/async/.gitignore +++ b/cpp/demo/Ice/async/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/demo/Ice/bidir/.gitignore b/cpp/demo/Ice/bidir/.gitignore index a09de00ffba..94de15839da 100644 --- a/cpp/demo/Ice/bidir/.gitignore +++ b/cpp/demo/Ice/bidir/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/demo/Ice/callback/.gitignore b/cpp/demo/Ice/callback/.gitignore index a09de00ffba..94de15839da 100644 --- a/cpp/demo/Ice/callback/.gitignore +++ b/cpp/demo/Ice/callback/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/demo/Ice/converter/.gitignore b/cpp/demo/Ice/converter/.gitignore index acf194c4b11..21748977d20 100644 --- a/cpp/demo/Ice/converter/.gitignore +++ b/cpp/demo/Ice/converter/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/demo/Ice/hello/.gitignore b/cpp/demo/Ice/hello/.gitignore index 1a7d6e43702..6eecccf4de5 100644 --- a/cpp/demo/Ice/hello/.gitignore +++ b/cpp/demo/Ice/hello/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/demo/Ice/invoke/.gitignore b/cpp/demo/Ice/invoke/.gitignore index d0c9b8a3959..2501871ec60 100644 --- a/cpp/demo/Ice/invoke/.gitignore +++ b/cpp/demo/Ice/invoke/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/demo/Ice/latency/.gitignore b/cpp/demo/Ice/latency/.gitignore index 101fad5f278..eb1b0299699 100644 --- a/cpp/demo/Ice/latency/.gitignore +++ b/cpp/demo/Ice/latency/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/demo/Ice/minimal/.gitignore b/cpp/demo/Ice/minimal/.gitignore index 1a7d6e43702..6eecccf4de5 100644 --- a/cpp/demo/Ice/minimal/.gitignore +++ b/cpp/demo/Ice/minimal/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/demo/Ice/nested/.gitignore b/cpp/demo/Ice/nested/.gitignore index 51240f59922..a73d683647d 100644 --- a/cpp/demo/Ice/nested/.gitignore +++ b/cpp/demo/Ice/nested/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/demo/Ice/session/.gitignore b/cpp/demo/Ice/session/.gitignore index d1adb5ef661..1af2dfb46ea 100644 --- a/cpp/demo/Ice/session/.gitignore +++ b/cpp/demo/Ice/session/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/demo/Ice/throughput/.gitignore b/cpp/demo/Ice/throughput/.gitignore index de1a534a091..30599f6b511 100644 --- a/cpp/demo/Ice/throughput/.gitignore +++ b/cpp/demo/Ice/throughput/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/demo/Ice/value/.gitignore b/cpp/demo/Ice/value/.gitignore index 2a4c1b6c2cf..9521884c199 100644 --- a/cpp/demo/Ice/value/.gitignore +++ b/cpp/demo/Ice/value/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/demo/IceBox/hello/.gitignore b/cpp/demo/IceBox/hello/.gitignore index ca27c559714..8d2ece555f8 100644 --- a/cpp/demo/IceBox/hello/.gitignore +++ b/cpp/demo/IceBox/hello/.gitignore @@ -1,7 +1,7 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client -libHelloService.dylib +libHelloService.so Hello.cpp Hello.h diff --git a/cpp/demo/IceGrid/allocate/.gitignore b/cpp/demo/IceGrid/allocate/.gitignore index 1a7d6e43702..a577d0bb5a1 100644 --- a/cpp/demo/IceGrid/allocate/.gitignore +++ b/cpp/demo/IceGrid/allocate/.gitignore @@ -1,7 +1,9 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client server Hello.cpp Hello.h +db/node/* +db/registry/* diff --git a/cpp/demo/IceGrid/replication/.gitignore b/cpp/demo/IceGrid/replication/.gitignore index 1a7d6e43702..c65afd8d022 100644 --- a/cpp/demo/IceGrid/replication/.gitignore +++ b/cpp/demo/IceGrid/replication/.gitignore @@ -1,7 +1,12 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client server Hello.cpp Hello.h +db/master/* +db/node1/* +db/node2/* +db/replica1/* +db/replica2/* diff --git a/cpp/demo/IceGrid/sessionActivation/.gitignore b/cpp/demo/IceGrid/sessionActivation/.gitignore index 1a7d6e43702..a577d0bb5a1 100644 --- a/cpp/demo/IceGrid/sessionActivation/.gitignore +++ b/cpp/demo/IceGrid/sessionActivation/.gitignore @@ -1,7 +1,9 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client server Hello.cpp Hello.h +db/node/* +db/registry/* diff --git a/cpp/demo/IceGrid/simple/.gitignore b/cpp/demo/IceGrid/simple/.gitignore index 1a7d6e43702..a577d0bb5a1 100644 --- a/cpp/demo/IceGrid/simple/.gitignore +++ b/cpp/demo/IceGrid/simple/.gitignore @@ -1,7 +1,9 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client server Hello.cpp Hello.h +db/node/* +db/registry/* diff --git a/cpp/demo/IceStorm/clock/.gitignore b/cpp/demo/IceStorm/clock/.gitignore index e0d644ba7ce..6c58a070dbf 100644 --- a/cpp/demo/IceStorm/clock/.gitignore +++ b/cpp/demo/IceStorm/clock/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! publisher diff --git a/cpp/demo/IceStorm/counter/.gitignore b/cpp/demo/IceStorm/counter/.gitignore index cc366717d7d..fcbb9401ab2 100644 --- a/cpp/demo/IceStorm/counter/.gitignore +++ b/cpp/demo/IceStorm/counter/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/demo/IceStorm/replicated/.gitignore b/cpp/demo/IceStorm/replicated/.gitignore index e0d644ba7ce..6c58a070dbf 100644 --- a/cpp/demo/IceStorm/replicated/.gitignore +++ b/cpp/demo/IceStorm/replicated/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! publisher diff --git a/cpp/demo/IceUtil/workqueue/.gitignore b/cpp/demo/IceUtil/workqueue/.gitignore index 3343c3567d4..574ed4c875a 100644 --- a/cpp/demo/IceUtil/workqueue/.gitignore +++ b/cpp/demo/IceUtil/workqueue/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! workqueue diff --git a/cpp/demo/book/freeze_filesystem/.gitignore b/cpp/demo/book/freeze_filesystem/.gitignore index 48ee0a08ea5..84e231b5436 100644 --- a/cpp/demo/book/freeze_filesystem/.gitignore +++ b/cpp/demo/book/freeze_filesystem/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/demo/book/printer/.gitignore b/cpp/demo/book/printer/.gitignore index d0c9b8a3959..2501871ec60 100644 --- a/cpp/demo/book/printer/.gitignore +++ b/cpp/demo/book/printer/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/demo/book/simple_filesystem/.gitignore b/cpp/demo/book/simple_filesystem/.gitignore index 41c2065c055..9aa770b54e1 100644 --- a/cpp/demo/book/simple_filesystem/.gitignore +++ b/cpp/demo/book/simple_filesystem/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/doc/.gitignore b/cpp/doc/.gitignore index 1806088aa2c..fba22c9a63a 100644 --- a/cpp/doc/.gitignore +++ b/cpp/doc/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! reference/index.html diff --git a/cpp/include/Freeze/.gitignore b/cpp/include/Freeze/.gitignore index f7441ffd43c..e30c7a90536 100644 --- a/cpp/include/Freeze/.gitignore +++ b/cpp/include/Freeze/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! BackgroundSaveEvictor.h diff --git a/cpp/include/Glacier2/.gitignore b/cpp/include/Glacier2/.gitignore index 6c75fec146a..9c9e1bac37b 100644 --- a/cpp/include/Glacier2/.gitignore +++ b/cpp/include/Glacier2/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! PermissionsVerifierF.h diff --git a/cpp/include/Ice/.gitignore b/cpp/include/Ice/.gitignore index b5c02419d48..5fc23baf555 100644 --- a/cpp/include/Ice/.gitignore +++ b/cpp/include/Ice/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! BuiltinSequences.h diff --git a/cpp/include/IceBox/.gitignore b/cpp/include/IceBox/.gitignore index c5d09e62b4e..818bc6f9b1b 100644 --- a/cpp/include/IceBox/.gitignore +++ b/cpp/include/IceBox/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! IceBox.h diff --git a/cpp/include/IceGrid/.gitignore b/cpp/include/IceGrid/.gitignore index afdc09c2f33..54fea11d60d 100644 --- a/cpp/include/IceGrid/.gitignore +++ b/cpp/include/IceGrid/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! Admin.h diff --git a/cpp/include/IcePatch2/.gitignore b/cpp/include/IcePatch2/.gitignore index a6f3a98bcb5..a5b5185bbb8 100644 --- a/cpp/include/IcePatch2/.gitignore +++ b/cpp/include/IcePatch2/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! FileInfo.h diff --git a/cpp/include/IceStorm/.gitignore b/cpp/include/IceStorm/.gitignore index 76e2763f761..ca4d707e689 100644 --- a/cpp/include/IceStorm/.gitignore +++ b/cpp/include/IceStorm/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! IceStorm.h diff --git a/cpp/lib/.gitignore b/cpp/lib/.gitignore index 84016116e78..37e373d80e6 100644 --- a/cpp/lib/.gitignore +++ b/cpp/lib/.gitignore @@ -1,39 +1,39 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! -libFreeze.3.2.0.dylib -libFreeze.32.dylib -libFreeze.dylib -libGlacier2.3.2.0.dylib -libGlacier2.32.dylib -libGlacier2.dylib -libIce.3.2.0.dylib -libIce.32.dylib -libIce.dylib -libIceBox.3.2.0.dylib -libIceBox.32.dylib -libIceBox.dylib -libIceGrid.3.2.0.dylib -libIceGrid.32.dylib -libIceGrid.dylib -libIcePatch2.3.2.0.dylib -libIcePatch2.32.dylib -libIcePatch2.dylib -libIceSSL.3.2.0.dylib -libIceSSL.32.dylib -libIceSSL.dylib -libIceStorm.3.2.0.dylib -libIceStorm.32.dylib -libIceStorm.dylib -libIceStormService.3.2.0.dylib -libIceStormService.32.dylib -libIceStormService.dylib -libIceUtil.3.2.0.dylib -libIceUtil.32.dylib -libIceUtil.dylib -libIceXML.3.2.0.dylib -libIceXML.32.dylib -libIceXML.dylib -libSlice.3.2.0.dylib -libSlice.32.dylib -libSlice.dylib +libIcePatch2.so.3.2.0 +libIcePatch2.so.32 +libIcePatch2.so +libSlice.so.3.2.0 +libSlice.so.32 +libSlice.so +libIceGrid.so.3.2.0 +libIceGrid.so.32 +libIceGrid.so +libIce.so.3.2.0 +libIce.so.32 +libIce.so +libIceStorm.so.3.2.0 +libIceStorm.so.32 +libIceStorm.so +libIceStormService.so.3.2.0 +libIceStormService.so.32 +libIceStormService.so +libGlacier2.so.3.2.0 +libGlacier2.so.32 +libGlacier2.so +libIceXML.so.3.2.0 +libIceXML.so.32 +libIceXML.so +libFreeze.so.3.2.0 +libFreeze.so.32 +libFreeze.so +libIceUtil.so.3.2.0 +libIceUtil.so.32 +libIceUtil.so +libIceBox.so.3.2.0 +libIceBox.so.32 +libIceBox.so +libIceSSL.so.3.2.0 +libIceSSL.so.32 +libIceSSL.so diff --git a/cpp/src/Freeze/.gitignore b/cpp/src/Freeze/.gitignore index 3a53a532bb3..de411b31941 100644 --- a/cpp/src/Freeze/.gitignore +++ b/cpp/src/Freeze/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! BackgroundSaveEvictor.cpp diff --git a/cpp/src/FreezeScript/.gitignore b/cpp/src/FreezeScript/.gitignore index bae0bca0177..e17cdf99b14 100644 --- a/cpp/src/FreezeScript/.gitignore +++ b/cpp/src/FreezeScript/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! Grammar.cpp diff --git a/cpp/src/Glacier2/.gitignore b/cpp/src/Glacier2/.gitignore index 47517f709eb..a7adcdfdc48 100644 --- a/cpp/src/Glacier2/.gitignore +++ b/cpp/src/Glacier2/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! PermissionsVerifierF.cpp diff --git a/cpp/src/Ice/.depend b/cpp/src/Ice/.depend index 1809e59c0ca..f81fc3b4abe 100644 --- a/cpp/src/Ice/.depend +++ b/cpp/src/Ice/.depend @@ -3,16 +3,16 @@ Application$(OBJEXT): Application.cpp ../../include/Ice/Application.h ../../incl Buffer$(OBJEXT): Buffer.cpp ../../include/Ice/Buffer.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObjectF.h ../../include/IceUtil/Shared.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/BuiltinSequences.h BasicStream$(OBJEXT): BasicStream.cpp ../../include/IceUtil/DisableWarnings.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/Ice/StringConverter.h ../../include/IceUtil/Unicode.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/RecMutex.h ../../include/Ice/CommunicatorF.h ../../include/Ice/StatsF.h ../Ice/TraceLevelsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../../include/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/PluginF.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../../include/Ice/StreamF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../Ice/SharedContext.h ../Ice/ImplicitContextI.h ../../include/Ice/ImplicitContext.h ../../include/Ice/LocalException.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../Ice/ProxyFactory.h ../../include/Ice/ObjectFactory.h ../Ice/ObjectFactoryManager.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactoryF.h ../Ice/TraceUtil.h ../Ice/TraceLevels.h ../../include/Ice/LoggerUtil.h BuiltinSequences$(OBJEXT): BuiltinSequences.cpp ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalObjectF.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/Ice/StringConverter.h ../../include/IceUtil/Unicode.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/IceUtil/Iterator.h ../../include/IceUtil/ScopedArray.h ../../include/IceUtil/DisableWarnings.h -CommunicatorI$(OBJEXT): CommunicatorI.cpp ../../include/IceUtil/DisableWarnings.h ../Ice/CommunicatorI.h ../../include/IceUtil/RecMutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/DynamicLibraryF.h ../../include/IceUtil/Shared.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/LoggerF.h ../../include/Ice/StreamF.h ../../include/Ice/StatsF.h ../../include/Ice/StringConverter.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/Communicator.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ImplicitContextF.h ../Ice/Instance.h ../Ice/TraceLevelsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../../include/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../Ice/SharedContext.h ../Ice/ImplicitContextI.h ../../include/Ice/ImplicitContext.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../Ice/ReferenceFactory.h ../Ice/Reference.h ../Ice/ProxyFactory.h ../Ice/ObjectFactoryManager.h ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/FacetMap.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Process.h ../../include/Ice/Outgoing.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/IceUtil/Unicode.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/LoggerUtil.h ../Ice/DefaultsAndOverrides.h ../Ice/TraceLevels.h ../Ice/GC.h ../../include/IceUtil/Thread.h +CommunicatorI$(OBJEXT): CommunicatorI.cpp ../../include/IceUtil/DisableWarnings.h ../Ice/CommunicatorI.h ../../include/IceUtil/RecMutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/DynamicLibraryF.h ../../include/IceUtil/Shared.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/LoggerF.h ../../include/Ice/StreamF.h ../../include/Ice/StatsF.h ../../include/Ice/StringConverter.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/Communicator.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ImplicitContextF.h ../Ice/Instance.h ../Ice/TraceLevelsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../../include/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../Ice/SharedContext.h ../Ice/ImplicitContextI.h ../../include/Ice/ImplicitContext.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../Ice/ReferenceFactory.h ../Ice/Reference.h ../Ice/ProxyFactory.h ../Ice/ObjectFactoryManager.h ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/FacetMap.h ../../include/Ice/ServantManagerF.h ../Ice/ConnectorF.h ../../include/Ice/Process.h ../../include/Ice/Outgoing.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/IceUtil/Unicode.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/LoggerUtil.h ../Ice/DefaultsAndOverrides.h ../Ice/TraceLevels.h ../Ice/GC.h ../../include/IceUtil/Thread.h Communicator$(OBJEXT): Communicator.cpp ../../include/Ice/Communicator.h ../../include/Ice/LocalObjectF.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/LoggerF.h ../../include/Ice/StatsF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ImplicitContextF.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/Ice/StringConverter.h ../../include/IceUtil/Unicode.h ../../include/IceUtil/Iterator.h ../../include/IceUtil/ScopedArray.h ../../include/IceUtil/DisableWarnings.h ConnectionFactory$(OBJEXT): ConnectionFactory.cpp ../Ice/ConnectionFactory.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/IceUtil/Thread.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Handle.h ../../include/Ice/ConnectionFactoryF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ConnectionIF.h ../../include/Ice/LocalObject.h ../../include/Ice/LocalObjectF.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/TransceiverF.h ../Ice/RouterInfoF.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/ThreadPoolF.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/Ice/StringConverter.h ../../include/IceUtil/Unicode.h ../Ice/ConnectionI.h ../../include/Ice/Connection.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/Instance.h ../../include/IceUtil/RecMutex.h ../../include/Ice/StatsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/PluginF.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../../include/Ice/BuiltinSequences.h ../Ice/SharedContext.h ../Ice/ImplicitContextI.h ../../include/Ice/ImplicitContext.h ../../include/Ice/LocalException.h ../../include/Ice/LoggerUtil.h ../Ice/TraceLevels.h ../Ice/DefaultsAndOverrides.h ../../include/Ice/Properties.h ../Ice/Transceiver.h ../Ice/Connector.h ../Ice/Acceptor.h ../Ice/ThreadPool.h ../Ice/ObjectAdapterI.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/FacetMap.h ../../include/Ice/Process.h ../../include/Ice/Outgoing.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../Ice/Reference.h ../Ice/EndpointI.h ../Ice/RouterInfo.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h ../../include/IceUtil/Random.h -ConnectionI$(OBJEXT): ConnectionI.cpp ../../include/IceUtil/DisableWarnings.h ../Ice/ConnectionI.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/IceUtil/Thread.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Handle.h ../../include/Ice/Connection.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ConnectionFactoryF.h ../../include/Ice/InstanceF.h ../Ice/TransceiverF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/ThreadPoolF.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/Ice/StringConverter.h ../../include/IceUtil/Unicode.h ../Ice/Instance.h ../../include/IceUtil/RecMutex.h ../../include/Ice/StatsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/PluginF.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../../include/Ice/BuiltinSequences.h ../Ice/SharedContext.h ../Ice/ImplicitContextI.h ../../include/Ice/ImplicitContext.h ../../include/Ice/LocalException.h ../../include/Ice/LoggerUtil.h ../../include/Ice/Properties.h ../Ice/TraceUtil.h ../Ice/DefaultsAndOverrides.h ../Ice/Transceiver.h ../Ice/ThreadPool.h ../Ice/ConnectionMonitor.h ../Ice/ObjectAdapterI.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/FacetMap.h ../../include/Ice/Process.h ../../include/Ice/Outgoing.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../Ice/EndpointI.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/ReferenceFactory.h ../Ice/Reference.h ../Ice/ProxyFactory.h +ConnectionI$(OBJEXT): ConnectionI.cpp ../../include/IceUtil/DisableWarnings.h ../Ice/ConnectionI.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/IceUtil/Thread.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Handle.h ../../include/Ice/Connection.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ConnectionFactoryF.h ../../include/Ice/InstanceF.h ../Ice/TransceiverF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/ThreadPoolF.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/Ice/StringConverter.h ../../include/IceUtil/Unicode.h ../Ice/Instance.h ../../include/IceUtil/RecMutex.h ../../include/Ice/StatsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/PluginF.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../../include/Ice/BuiltinSequences.h ../Ice/SharedContext.h ../Ice/ImplicitContextI.h ../../include/Ice/ImplicitContext.h ../../include/Ice/LocalException.h ../../include/Ice/LoggerUtil.h ../../include/Ice/Properties.h ../Ice/TraceUtil.h ../Ice/DefaultsAndOverrides.h ../Ice/Transceiver.h ../Ice/ThreadPool.h ../Ice/ConnectionMonitor.h ../Ice/ObjectAdapterI.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/FacetMap.h ../Ice/ConnectorF.h ../../include/Ice/Process.h ../../include/Ice/Outgoing.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../Ice/EndpointI.h ../Ice/AcceptorF.h ../Ice/ReferenceFactory.h ../Ice/Reference.h ../Ice/ProxyFactory.h ConnectionMonitor$(OBJEXT): ConnectionMonitor.cpp ../Ice/ConnectionMonitor.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/IceUtil/Thread.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Handle.h ../../include/Ice/ConnectionMonitorF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ConnectionIF.h ../../include/Ice/LocalObject.h ../../include/Ice/LocalObjectF.h ../../include/Ice/InstanceF.h ../Ice/ConnectionI.h ../../include/Ice/Connection.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/TransceiverF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/ThreadPoolF.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/Ice/StringConverter.h ../../include/IceUtil/Unicode.h ../../include/Ice/LocalException.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LoggerUtil.h ../Ice/Instance.h ../../include/IceUtil/RecMutex.h ../../include/Ice/StatsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../Ice/ObjectFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/PluginF.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../Ice/SharedContext.h ../Ice/ImplicitContextI.h ../../include/Ice/ImplicitContext.h Connection$(OBJEXT): Connection.cpp ../../include/Ice/Connection.h ../../include/Ice/LocalObjectF.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/Ice/StringConverter.h ../../include/IceUtil/Unicode.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/IceUtil/Iterator.h ../../include/IceUtil/ScopedArray.h ../../include/IceUtil/DisableWarnings.h Connector$(OBJEXT): Connector.cpp ../Ice/Connector.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../Ice/ConnectorF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../Ice/TransceiverF.h Current$(OBJEXT): Current.cpp ../../include/Ice/Current.h ../../include/Ice/LocalObjectF.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/Ice/StringConverter.h ../../include/IceUtil/Unicode.h ../../include/Ice/Object.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/StreamF.h ../../include/IceUtil/Iterator.h ../../include/IceUtil/ScopedArray.h ../../include/IceUtil/DisableWarnings.h DefaultsAndOverrides$(OBJEXT): DefaultsAndOverrides.cpp ../Ice/DefaultsAndOverrides.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../Ice/DefaultsAndOverridesF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/PropertiesF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/Endpoint.h ../../include/Ice/Properties.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/BuiltinSequences.h ../Ice/Network.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalException.h -Direct$(OBJEXT): Direct.cpp ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/LocalObjectF.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../Ice/ObjectAdapterI.h ../../include/IceUtil/RecMutex.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/FacetMap.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/ConnectionFactoryF.h ../../include/Ice/ServantManagerF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ThreadPoolF.h ../../include/Ice/Process.h ../../include/Ice/Outgoing.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/Ice/StringConverter.h ../../include/IceUtil/Unicode.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/Incoming.h ../../include/Ice/BuiltinSequences.h ../Ice/ServantManager.h ../../include/Ice/ServantLocator.h ../Ice/Reference.h ../Ice/ReferenceFactoryF.h ../Ice/SharedContext.h ../../include/Ice/LocalException.h +Direct$(OBJEXT): Direct.cpp ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/LocalObjectF.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../Ice/ObjectAdapterI.h ../../include/IceUtil/RecMutex.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/FacetMap.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/ConnectionFactoryF.h ../../include/Ice/ServantManagerF.h ../Ice/RouterInfoF.h ../Ice/ConnectorF.h ../Ice/LocatorInfoF.h ../Ice/ThreadPoolF.h ../../include/Ice/Process.h ../../include/Ice/Outgoing.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/Ice/StringConverter.h ../../include/IceUtil/Unicode.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/Incoming.h ../../include/Ice/BuiltinSequences.h ../Ice/ServantManager.h ../../include/Ice/ServantLocator.h ../Ice/Reference.h ../Ice/ReferenceFactoryF.h ../Ice/SharedContext.h ../../include/Ice/LocalException.h DispatchInterceptor$(OBJEXT): DispatchInterceptor.cpp ../../include/Ice/DispatchInterceptor.h ../../include/Ice/Object.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Shared.h ../../include/Ice/GCShared.h ../../include/Ice/Config.h ../../include/Ice/GCCountMap.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ProxyF.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../Ice/IncomingRequest.h ../../include/Ice/Incoming.h ../../include/Ice/InstanceF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/Ice/StringConverter.h ../../include/IceUtil/Unicode.h ../../include/Ice/Direct.h ../../include/Ice/ReferenceF.h ../../include/Ice/LocalException.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/BuiltinSequences.h DynamicLibrary$(OBJEXT): DynamicLibrary.cpp ../../include/Ice/DynamicLibrary.h ../../include/Ice/DynamicLibraryF.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h EndpointFactoryManager$(OBJEXT): EndpointFactoryManager.cpp ../Ice/EndpointFactoryManager.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/EndpointIF.h ../../include/Ice/LocalObject.h ../../include/Ice/LocalObjectF.h ../../include/Ice/EndpointFactoryF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/Endpoint.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/UndefSysMacros.h ../Ice/UnknownEndpointI.h ../Ice/EndpointI.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../../include/Ice/EndpointFactory.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/Ice/StringConverter.h ../../include/IceUtil/Unicode.h ../../include/Ice/LocalException.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/BuiltinSequences.h ../Ice/Instance.h ../../include/IceUtil/RecMutex.h ../../include/Ice/StatsF.h ../Ice/TraceLevelsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../../include/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/PluginF.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/SharedContext.h ../Ice/ImplicitContextI.h ../../include/Ice/ImplicitContext.h ../../include/Ice/Properties.h ../Ice/DefaultsAndOverrides.h @@ -41,8 +41,8 @@ LoggerI$(OBJEXT): LoggerI.cpp ../../include/IceUtil/Time.h ../../include/IceUtil Logger$(OBJEXT): Logger.cpp ../../include/Ice/Logger.h ../../include/Ice/LocalObjectF.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/UndefSysMacros.h ../../include/IceUtil/Iterator.h ../../include/IceUtil/ScopedArray.h ../../include/IceUtil/DisableWarnings.h LoggerUtil$(OBJEXT): LoggerUtil.cpp ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/Logger.h Network$(OBJEXT): Network.cpp ../../include/IceUtil/StaticMutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../Ice/Network.h ../../include/Ice/Config.h ../../include/Ice/PropertiesF.h ../../include/Ice/LocalObjectF.h ../../include/IceUtil/Shared.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalException.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Properties.h ../../include/Ice/LoggerUtil.h -ObjectAdapterFactory$(OBJEXT): ObjectAdapterFactory.cpp ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/RecMutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/FacetMap.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/ConnectionFactoryF.h ../../include/Ice/ServantManagerF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ThreadPoolF.h ../../include/Ice/Process.h ../../include/Ice/Outgoing.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/Ice/StringConverter.h ../../include/IceUtil/Unicode.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h ../../include/IceUtil/UUID.h -ObjectAdapterI$(OBJEXT): ObjectAdapterI.cpp ../../include/IceUtil/UUID.h ../../include/IceUtil/Config.h ../Ice/ObjectAdapterI.h ../../include/IceUtil/Shared.h ../../include/IceUtil/RecMutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/FacetMap.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/ConnectionFactoryF.h ../../include/Ice/ServantManagerF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ThreadPoolF.h ../../include/Ice/Process.h ../../include/Ice/Outgoing.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/Ice/StringConverter.h ../../include/IceUtil/Unicode.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/BuiltinSequences.h ../Ice/ObjectAdapterFactory.h ../Ice/Instance.h ../../include/Ice/StatsF.h ../Ice/TraceLevelsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/PluginF.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/SharedContext.h ../Ice/ImplicitContextI.h ../../include/Ice/ImplicitContext.h ../../include/Ice/LocalException.h ../Ice/ProxyFactory.h ../Ice/ReferenceFactory.h ../Ice/Reference.h ../Ice/EndpointI.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/EndpointFactoryManager.h ../../include/Ice/EndpointFactoryF.h ../Ice/ConnectionFactory.h ../../include/IceUtil/Thread.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/ServantManager.h ../Ice/RouterInfo.h ../../include/Ice/Properties.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h ../Ice/LocatorInfo.h ../../include/Ice/Locator.h ../../include/Ice/IncomingAsync.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/ProcessF.h ../../include/Ice/LoggerUtil.h ../Ice/ThreadPool.h ../../include/Ice/Communicator.h ../../include/Ice/ImplicitContextF.h ../../include/Ice/Router.h ../Ice/DefaultsAndOverrides.h ../Ice/TraceLevels.h ../Ice/PropertyNames.h +ObjectAdapterFactory$(OBJEXT): ObjectAdapterFactory.cpp ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/RecMutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/FacetMap.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/ConnectionFactoryF.h ../../include/Ice/ServantManagerF.h ../Ice/RouterInfoF.h ../Ice/ConnectorF.h ../Ice/LocatorInfoF.h ../Ice/ThreadPoolF.h ../../include/Ice/Process.h ../../include/Ice/Outgoing.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/Ice/StringConverter.h ../../include/IceUtil/Unicode.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h ../../include/IceUtil/UUID.h +ObjectAdapterI$(OBJEXT): ObjectAdapterI.cpp ../../include/IceUtil/UUID.h ../../include/IceUtil/Config.h ../Ice/ObjectAdapterI.h ../../include/IceUtil/Shared.h ../../include/IceUtil/RecMutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/FacetMap.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/ConnectionFactoryF.h ../../include/Ice/ServantManagerF.h ../Ice/RouterInfoF.h ../Ice/ConnectorF.h ../Ice/LocatorInfoF.h ../Ice/ThreadPoolF.h ../../include/Ice/Process.h ../../include/Ice/Outgoing.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/Ice/StringConverter.h ../../include/IceUtil/Unicode.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/BuiltinSequences.h ../Ice/ObjectAdapterFactory.h ../Ice/Instance.h ../../include/Ice/StatsF.h ../Ice/TraceLevelsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/PluginF.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/SharedContext.h ../Ice/ImplicitContextI.h ../../include/Ice/ImplicitContext.h ../../include/Ice/LocalException.h ../Ice/ProxyFactory.h ../Ice/ReferenceFactory.h ../Ice/Reference.h ../Ice/EndpointI.h ../Ice/TransceiverF.h ../Ice/AcceptorF.h ../Ice/EndpointFactoryManager.h ../../include/Ice/EndpointFactoryF.h ../Ice/ConnectionFactory.h ../../include/IceUtil/Thread.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/ServantManager.h ../Ice/RouterInfo.h ../../include/Ice/Properties.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h ../Ice/LocatorInfo.h ../../include/Ice/Locator.h ../../include/Ice/IncomingAsync.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/ProcessF.h ../../include/Ice/LoggerUtil.h ../Ice/ThreadPool.h ../../include/Ice/Communicator.h ../../include/Ice/ImplicitContextF.h ../../include/Ice/Router.h ../Ice/DefaultsAndOverrides.h ../Ice/TraceLevels.h ../Ice/PropertyNames.h ObjectAdapter$(OBJEXT): ObjectAdapter.cpp ../../include/Ice/ObjectAdapter.h ../../include/Ice/LocalObjectF.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/FacetMap.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/Ice/StringConverter.h ../../include/IceUtil/Unicode.h ../../include/IceUtil/Iterator.h ../../include/IceUtil/ScopedArray.h ../../include/IceUtil/DisableWarnings.h ObjectFactoryManager$(OBJEXT): ObjectFactoryManager.cpp ../Ice/ObjectFactoryManager.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../Ice/ObjectFactoryManagerF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/ObjectFactory.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h ../../include/Ice/LocalException.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/BuiltinSequences.h ObjectFactory$(OBJEXT): ObjectFactory.cpp ../../include/Ice/ObjectFactory.h ../../include/Ice/LocalObjectF.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/Ice/StringConverter.h ../../include/IceUtil/Unicode.h ../../include/Ice/Object.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../../include/IceUtil/Iterator.h ../../include/IceUtil/ScopedArray.h ../../include/IceUtil/DisableWarnings.h @@ -58,7 +58,7 @@ PropertyNames$(OBJEXT): PropertyNames.cpp ../Ice/PropertyNames.h ../../include/I Protocol$(OBJEXT): Protocol.cpp ../../include/Ice/Protocol.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ProtocolPluginFacade$(OBJEXT): ProtocolPluginFacade.cpp ../../include/Ice/ProtocolPluginFacade.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/ProtocolPluginFacadeF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/EndpointFactoryF.h ../../include/Ice/InstanceF.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/RecMutex.h ../../include/Ice/StatsF.h ../Ice/TraceLevelsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../../include/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/PluginF.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../../include/Ice/StreamF.h ../../include/Ice/StringConverter.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../Ice/SharedContext.h ../Ice/ImplicitContextI.h ../../include/Ice/ImplicitContext.h ../../include/Ice/LocalException.h ../Ice/EndpointFactoryManager.h ../Ice/TraceLevels.h ../Ice/DefaultsAndOverrides.h ProxyFactory$(OBJEXT): ProxyFactory.cpp ../../include/IceUtil/Thread.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Time.h ../Ice/ProxyFactory.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/InstanceF.h ../../include/Ice/ReferenceF.h ../../include/Ice/ProxyF.h ../../include/Ice/Exception.h ../Ice/Instance.h ../../include/IceUtil/RecMutex.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/LocalObject.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/StatsF.h ../Ice/TraceLevelsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../../include/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/PluginF.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../../include/Ice/StreamF.h ../../include/Ice/StringConverter.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../Ice/SharedContext.h ../Ice/ImplicitContextI.h ../../include/Ice/ImplicitContext.h ../../include/Ice/LocalException.h ../Ice/ReferenceFactory.h ../Ice/Reference.h ../../include/Ice/RouterF.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/LocatorF.h ../Ice/LocatorInfo.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/IceUtil/Unicode.h ../../include/Ice/Properties.h ../../include/Ice/LoggerUtil.h ../Ice/TraceLevels.h -Proxy$(OBJEXT): Proxy.cpp ../../include/Ice/Proxy.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../../include/Ice/ProxyF.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/Ice/Handle.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/LocalObject.h ../../include/Ice/LocalObjectF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../../include/Ice/CommunicatorF.h ../Ice/ProxyFactory.h ../../include/Ice/InstanceF.h ../Ice/ReferenceFactory.h ../Ice/ReferenceFactoryF.h ../Ice/Reference.h ../../include/IceUtil/RecMutex.h ../../include/Ice/RouterF.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/LocatorF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/SharedContext.h ../../include/Ice/BuiltinSequences.h ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/FacetMap.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/ConnectionFactoryF.h ../../include/Ice/ServantManagerF.h ../Ice/ThreadPoolF.h ../../include/Ice/Process.h ../../include/Ice/Outgoing.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/Ice/StringConverter.h ../../include/IceUtil/Unicode.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../Ice/EndpointI.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/Instance.h ../../include/Ice/StatsF.h ../Ice/TraceLevelsF.h ../Ice/DefaultsAndOverridesF.h ../../include/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/PluginF.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/ImplicitContextI.h ../../include/Ice/ImplicitContext.h ../../include/Ice/LocalException.h ../Ice/RouterInfo.h ../Ice/LocatorInfo.h ../Ice/ConnectionI.h ../../include/IceUtil/Thread.h ../../include/Ice/Connection.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../../include/Ice/Stream.h +Proxy$(OBJEXT): Proxy.cpp ../../include/Ice/Proxy.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../../include/Ice/ProxyF.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/Ice/Handle.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/LocalObject.h ../../include/Ice/LocalObjectF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../../include/Ice/CommunicatorF.h ../Ice/ProxyFactory.h ../../include/Ice/InstanceF.h ../Ice/ReferenceFactory.h ../Ice/ReferenceFactoryF.h ../Ice/Reference.h ../../include/IceUtil/RecMutex.h ../../include/Ice/RouterF.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/LocatorF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/SharedContext.h ../../include/Ice/BuiltinSequences.h ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/FacetMap.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/ConnectionFactoryF.h ../../include/Ice/ServantManagerF.h ../Ice/ConnectorF.h ../Ice/ThreadPoolF.h ../../include/Ice/Process.h ../../include/Ice/Outgoing.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/Ice/StringConverter.h ../../include/IceUtil/Unicode.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../Ice/EndpointI.h ../Ice/TransceiverF.h ../Ice/AcceptorF.h ../Ice/Instance.h ../../include/Ice/StatsF.h ../Ice/TraceLevelsF.h ../Ice/DefaultsAndOverridesF.h ../../include/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/PluginF.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/ImplicitContextI.h ../../include/Ice/ImplicitContext.h ../../include/Ice/LocalException.h ../Ice/RouterInfo.h ../Ice/LocatorInfo.h ../Ice/ConnectionI.h ../../include/IceUtil/Thread.h ../../include/Ice/Connection.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../../include/Ice/Stream.h ReferenceFactory$(OBJEXT): ReferenceFactory.cpp ../../include/Ice/Communicator.h ../../include/Ice/LocalObjectF.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/LoggerF.h ../../include/Ice/StatsF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ImplicitContextF.h ../Ice/ReferenceFactory.h ../Ice/ReferenceFactoryF.h ../Ice/Reference.h ../../include/IceUtil/RecMutex.h ../../include/Ice/InstanceF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/SharedContext.h ../../include/Ice/BuiltinSequences.h ../Ice/ProxyFactory.h ../../include/Ice/LocalException.h ../Ice/Instance.h ../Ice/TraceLevelsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../../include/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/Initialize.h ../../include/Ice/StringConverter.h ../Ice/ImplicitContextI.h ../../include/Ice/ImplicitContext.h ../Ice/EndpointI.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/EndpointFactoryManager.h ../../include/Ice/EndpointFactoryF.h ../Ice/RouterInfo.h ../../include/Ice/Router.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/IceUtil/Unicode.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../Ice/LocatorInfo.h ../../include/Ice/Locator.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/ProcessF.h ../../include/Ice/LoggerUtil.h ../../include/Ice/Properties.h ../Ice/DefaultsAndOverrides.h ../Ice/PropertyNames.h ../../include/IceUtil/StringUtil.h Reference$(OBJEXT): Reference.cpp ../Ice/Reference.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/RecMutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../../include/Ice/ReferenceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../Ice/ReferenceFactoryF.h ../../include/Ice/EndpointIF.h ../../include/Ice/LocalObject.h ../../include/Ice/LocalObjectF.h ../../include/Ice/InstanceF.h ../../include/Ice/RouterF.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/Endpoint.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/LocatorF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/SharedContext.h ../Ice/ReferenceFactory.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../Ice/Instance.h ../../include/Ice/StatsF.h ../Ice/TraceLevelsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../../include/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/PluginF.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../../include/Ice/StringConverter.h ../Ice/ImplicitContextI.h ../../include/Ice/ImplicitContext.h ../Ice/EndpointI.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/IceUtil/Unicode.h ../Ice/RouterInfo.h ../../include/Ice/Router.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../Ice/LocatorInfo.h ../../include/Ice/Locator.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/ProcessF.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h ../Ice/ConnectionI.h ../../include/IceUtil/Thread.h ../../include/Ice/Connection.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/ConnectionFactory.h ../../include/Ice/LoggerUtil.h ../Ice/TraceLevels.h ../Ice/DefaultsAndOverrides.h ../../include/IceUtil/StringUtil.h ../../include/IceUtil/Random.h RouterInfo$(OBJEXT): RouterInfo.cpp ../Ice/RouterInfo.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../Ice/RouterInfoF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/RouterF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Router.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/Ice/StringConverter.h ../../include/IceUtil/Unicode.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Connection.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h ../Ice/Reference.h ../../include/IceUtil/RecMutex.h ../Ice/ReferenceFactoryF.h ../../include/Ice/LocatorF.h ../Ice/LocatorInfoF.h ../Ice/SharedContext.h @@ -77,7 +77,7 @@ TcpAcceptor$(OBJEXT): TcpAcceptor.cpp ../Ice/TcpAcceptor.h ../Ice/TransceiverF.h TcpConnector$(OBJEXT): TcpConnector.cpp ../Ice/TcpConnector.h ../Ice/TransceiverF.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/InstanceF.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/UndefSysMacros.h ../Ice/Connector.h ../Ice/ConnectorF.h ../Ice/TcpTransceiver.h ../../include/Ice/StatsF.h ../Ice/Transceiver.h ../Ice/TcpEndpointI.h ../Ice/EndpointI.h ../../include/Ice/Endpoint.h ../../include/Ice/EndpointIF.h ../Ice/AcceptorF.h ../../include/Ice/EndpointFactory.h ../../include/Ice/EndpointFactoryF.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/RecMutex.h ../../include/Ice/CommunicatorF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../../include/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/PluginF.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../../include/Ice/StreamF.h ../../include/Ice/StringConverter.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/Ice/ConnectionIF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../Ice/SharedContext.h ../Ice/ImplicitContextI.h ../../include/Ice/ImplicitContext.h ../../include/Ice/LocalException.h ../Ice/TraceLevels.h ../../include/Ice/LoggerUtil.h ../Ice/Network.h TcpEndpointI$(OBJEXT): TcpEndpointI.cpp ../Ice/TcpEndpointI.h ../Ice/EndpointI.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/Endpoint.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/EndpointIF.h ../../include/Ice/InstanceF.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../../include/Ice/EndpointFactory.h ../../include/Ice/EndpointFactoryF.h ../Ice/Network.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TcpAcceptor.h ../Ice/TraceLevelsF.h ../Ice/Acceptor.h ../Ice/TcpConnector.h ../Ice/Connector.h ../Ice/TcpTransceiver.h ../../include/Ice/StatsF.h ../Ice/Transceiver.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/Ice/StringConverter.h ../../include/IceUtil/Unicode.h ../../include/Ice/LocalException.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/BuiltinSequences.h ../Ice/Instance.h ../../include/IceUtil/RecMutex.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../../include/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/PluginF.h ../../include/Ice/Initialize.h ../Ice/SharedContext.h ../Ice/ImplicitContextI.h ../../include/Ice/ImplicitContext.h ../Ice/DefaultsAndOverrides.h TcpTransceiver$(OBJEXT): TcpTransceiver.cpp ../Ice/TcpTransceiver.h ../../include/Ice/InstanceF.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/StatsF.h ../Ice/Transceiver.h ../Ice/TransceiverF.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/RecMutex.h ../../include/Ice/CommunicatorF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../../include/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/PluginF.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../../include/Ice/StreamF.h ../../include/Ice/StringConverter.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../Ice/SharedContext.h ../Ice/ImplicitContextI.h ../../include/Ice/ImplicitContext.h ../../include/Ice/LocalException.h ../Ice/TraceLevels.h ../../include/Ice/LoggerUtil.h ../../include/Ice/Stats.h ../../include/Ice/Buffer.h ../Ice/Network.h -ThreadPool$(OBJEXT): ThreadPool.cpp ../../include/IceUtil/DisableWarnings.h ../Ice/ThreadPool.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/IceUtil/Thread.h ../../include/IceUtil/Handle.h ../Ice/ThreadPoolF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/InstanceF.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/PropertiesF.h ../Ice/EventHandlerF.h ../Ice/EventHandler.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/Ice/StringConverter.h ../../include/IceUtil/Unicode.h ../Ice/Network.h ../../include/Ice/LocalException.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/BuiltinSequences.h ../Ice/Instance.h ../../include/IceUtil/RecMutex.h ../../include/Ice/StatsF.h ../Ice/TraceLevelsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ConnectionFactoryF.h ../../include/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/PluginF.h ../../include/Ice/Initialize.h ../Ice/SharedContext.h ../Ice/ImplicitContextI.h ../../include/Ice/ImplicitContext.h ../../include/Ice/LoggerUtil.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/FacetMap.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Process.h ../../include/Ice/Outgoing.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/Properties.h +ThreadPool$(OBJEXT): ThreadPool.cpp ../../include/IceUtil/DisableWarnings.h ../Ice/ThreadPool.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/IceUtil/Thread.h ../../include/IceUtil/Handle.h ../Ice/ThreadPoolF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/InstanceF.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/PropertiesF.h ../Ice/EventHandlerF.h ../Ice/EventHandler.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/Ice/StringConverter.h ../../include/IceUtil/Unicode.h ../Ice/Network.h ../../include/Ice/LocalException.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/BuiltinSequences.h ../Ice/Instance.h ../../include/IceUtil/RecMutex.h ../../include/Ice/StatsF.h ../Ice/TraceLevelsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ConnectionFactoryF.h ../../include/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/PluginF.h ../../include/Ice/Initialize.h ../Ice/SharedContext.h ../Ice/ImplicitContextI.h ../../include/Ice/ImplicitContext.h ../../include/Ice/LoggerUtil.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/FacetMap.h ../../include/Ice/ServantManagerF.h ../Ice/ConnectorF.h ../../include/Ice/Process.h ../../include/Ice/Outgoing.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/Properties.h TraceLevels$(OBJEXT): TraceLevels.cpp ../Ice/TraceLevels.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../Ice/TraceLevelsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/PropertiesF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/Properties.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/BuiltinSequences.h TraceUtil$(OBJEXT): TraceUtil.cpp ../../include/IceUtil/StaticMutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../../include/IceUtil/StringUtil.h ../Ice/TraceUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/IceUtil/Shared.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/UndefSysMacros.h ../Ice/TraceLevelsF.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/RecMutex.h ../../include/Ice/InstanceF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/StatsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../../include/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/PluginF.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../../include/Ice/StreamF.h ../../include/Ice/StringConverter.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../Ice/SharedContext.h ../Ice/ImplicitContextI.h ../../include/Ice/ImplicitContext.h ../../include/Ice/LocalException.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../Ice/TraceLevels.h ../../include/Ice/Logger.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/IceUtil/Unicode.h ../Ice/ReplyStatus.h Transceiver$(OBJEXT): Transceiver.cpp ../Ice/Transceiver.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../Ice/TransceiverF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h diff --git a/cpp/src/Ice/.gitignore b/cpp/src/Ice/.gitignore index 91c23de8f5e..b4259a2a20d 100644 --- a/cpp/src/Ice/.gitignore +++ b/cpp/src/Ice/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! BuiltinSequences.cpp @@ -67,3 +67,4 @@ ServantLocator.h SliceChecksumDict.h StatsF.h Stats.h +EventLoggerMsg.h diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp index 9bba761af6d..bad13e36714 100644 --- a/cpp/src/Ice/ConnectionFactory.cpp +++ b/cpp/src/Ice/ConnectionFactory.cpp @@ -630,18 +630,6 @@ IceInternal::IncomingConnectionFactory::endpoint() const return _endpoint; } -bool -IceInternal::IncomingConnectionFactory::equivalent(const EndpointIPtr& endp) const -{ - if(_transceiver) - { - return endp->equivalent(_transceiver); - } - - assert(_acceptor); - return endp->equivalent(_acceptor); -} - list<ConnectionIPtr> IceInternal::IncomingConnectionFactory::connections() const { diff --git a/cpp/src/Ice/ConnectionFactory.h b/cpp/src/Ice/ConnectionFactory.h index 358f2b92487..e1351e976a7 100644 --- a/cpp/src/Ice/ConnectionFactory.h +++ b/cpp/src/Ice/ConnectionFactory.h @@ -75,7 +75,6 @@ public: void waitUntilFinished(); EndpointIPtr endpoint() const; - bool equivalent(const EndpointIPtr&) const; std::list<Ice::ConnectionIPtr> connections() const; void flushBatchRequests(); diff --git a/cpp/src/Ice/EndpointI.h b/cpp/src/Ice/EndpointI.h index 08f3bc05e38..75e91dfed3b 100644 --- a/cpp/src/Ice/EndpointI.h +++ b/cpp/src/Ice/EndpointI.h @@ -114,11 +114,9 @@ public: virtual std::vector<EndpointIPtr> expand(bool) const = 0; // - // Check whether the endpoint is equivalent to a specific - // Transceiver or Acceptor. + // Check whether the endpoint is equivalent to a specific Connector. // - virtual bool equivalent(const TransceiverPtr&) const = 0; - virtual bool equivalent(const AcceptorPtr&) const = 0; + virtual bool equivalent(const ConnectorPtr&) const = 0; // // Compare endpoints for sorting purposes. diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp index e2befaea7cb..036396b50df 100644 --- a/cpp/src/Ice/Network.cpp +++ b/cpp/src/Ice/Network.cpp @@ -1340,97 +1340,109 @@ IceInternal::getAddresses(const string& host, int port) { vector<struct sockaddr_in> result; - struct sockaddr_in addr; - memset(&addr, 0, sizeof(struct sockaddr_in)); - addr.sin_family = AF_INET; - addr.sin_port = htons(port); + if(host == "0.0.0.0") + { + vector<string> hosts = getLocalHosts(); + for(unsigned int i = 0; i < hosts.size(); ++i) + { + struct sockaddr_in addr; + getAddress(hosts[i], port, addr); + result.push_back(addr); + } + } + else + { + struct sockaddr_in addr; + memset(&addr, 0, sizeof(struct sockaddr_in)); + addr.sin_family = AF_INET; + addr.sin_port = htons(port); #ifdef _WIN32 - // - // Windows XP has getaddrinfo(), but we don't want to require XP to run Ice. - // + // + // Windows XP has getaddrinfo(), but we don't want to require XP to run Ice. + // - // - // gethostbyname() is thread safe on Windows, with a separate hostent per thread - // - struct hostent* entry = 0; - int retry = 5; + // + // gethostbyname() is thread safe on Windows, with a separate hostent per thread + // + struct hostent* entry = 0; + int retry = 5; - do - { - entry = gethostbyname(host.c_str()); - } - while(entry == 0 && h_errno == TRY_AGAIN && --retry >= 0); + do + { + entry = gethostbyname(host.c_str()); + } + while(entry == 0 && h_errno == TRY_AGAIN && --retry >= 0); - if(entry == 0) - { - DNSException ex(__FILE__, __LINE__); - ex.error = h_errno; - ex.host = host; - throw ex; - } + if(entry == 0) + { + DNSException ex(__FILE__, __LINE__); + ex.error = h_errno; + ex.host = host; + throw ex; + } - char** p = entry->h_addr_list; - while(*p) - { - memcpy(&addr.sin_addr, *p, entry->h_length); - result.push_back(addr); - p++; - } + char** p = entry->h_addr_list; + while(*p) + { + memcpy(&addr.sin_addr, *p, entry->h_length); + result.push_back(addr); + p++; + } #else - struct addrinfo* info = 0; - int retry = 5; + struct addrinfo* info = 0; + int retry = 5; - struct addrinfo hints = { 0 }; - hints.ai_family = PF_INET; + struct addrinfo hints = { 0 }; + hints.ai_family = PF_INET; - int rs = 0; - do - { - rs = getaddrinfo(host.c_str(), 0, &hints, &info); - } - while(info == 0 && rs == EAI_AGAIN && --retry >= 0); + int rs = 0; + do + { + rs = getaddrinfo(host.c_str(), 0, &hints, &info); + } + while(info == 0 && rs == EAI_AGAIN && --retry >= 0); - if(rs != 0) - { - DNSException ex(__FILE__, __LINE__); - ex.error = rs; - ex.host = host; - throw ex; - } - - struct addrinfo* p; - for(p = info; p != NULL; p = p->ai_next) - { - assert(p->ai_family == PF_INET); - struct sockaddr_in* sin = reinterpret_cast<sockaddr_in*>(p->ai_addr); - if(sin->sin_addr.s_addr != 0) + if(rs != 0) { - addr.sin_addr.s_addr = sin->sin_addr.s_addr; + DNSException ex(__FILE__, __LINE__); + ex.error = rs; + ex.host = host; + throw ex; + } - bool found = false; - for(unsigned int i = 0; i < result.size(); ++i) + struct addrinfo* p; + for(p = info; p != NULL; p = p->ai_next) + { + assert(p->ai_family == PF_INET); + struct sockaddr_in* sin = reinterpret_cast<sockaddr_in*>(p->ai_addr); + if(sin->sin_addr.s_addr != 0) { - if(compareAddress(result[i], addr) == 0) + addr.sin_addr.s_addr = sin->sin_addr.s_addr; + + bool found = false; + for(unsigned int i = 0; i < result.size(); ++i) { - found = true; - break; + if(compareAddress(result[i], addr) == 0) + { + found = true; + break; + } + } + if(!found) + { + result.push_back(addr); } - } - if(!found) - { - - result.push_back(addr); } } - } - freeaddrinfo(info); + freeaddrinfo(info); #endif + } return result; } diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp index a1f207f7282..e13c958935f 100644 --- a/cpp/src/Ice/ObjectAdapterI.cpp +++ b/cpp/src/Ice/ObjectAdapterI.cpp @@ -365,6 +365,7 @@ Ice::ObjectAdapterI::destroy() _routerInfo = 0; _publishedEndpoints.clear(); _locatorInfo = 0; + _connectors.clear(); objectAdapterFactory = _objectAdapterFactory; _objectAdapterFactory = 0; @@ -582,6 +583,14 @@ Ice::ObjectAdapterI::refreshPublishedEndpoints() oldPublishedEndpoints = _publishedEndpoints; _publishedEndpoints = parsePublishedEndpoints(); + _connectors.clear(); + vector<IncomingConnectionFactoryPtr>::const_iterator p; + for(p = _incomingConnectionFactories.begin(); p != _incomingConnectionFactories.end(); ++p) + { + vector<ConnectorPtr> cons = (*p)->endpoint()->connectors(); + _connectors.insert(_connectors.end(), cons.begin(), cons.end()); + } + locatorInfo = _locatorInfo; if(!_noConfig) { @@ -651,15 +660,14 @@ Ice::ObjectAdapterI::isLocal(const ObjectPrx& proxy) const // // Proxies which have at least one endpoint in common with the - // endpoints used by this object adapter's incoming connection - // factories are considered local. + // endpoints used by this object adapter are considered local. // for(p = endpoints.begin(); p != endpoints.end(); ++p) { - vector<IncomingConnectionFactoryPtr>::const_iterator q; - for(q = _incomingConnectionFactories.begin(); q != _incomingConnectionFactories.end(); ++q) + vector<ConnectorPtr>::const_iterator q; + for(q = _connectors.begin(); q != _connectors.end(); ++q) { - if((*q)->equivalent(*p)) + if((*p)->equivalent(*q)) { return true; } @@ -927,7 +935,11 @@ Ice::ObjectAdapterI::ObjectAdapterI(const InstancePtr& instance, const Communica } for(vector<EndpointIPtr>::iterator p = endpoints.begin(); p != endpoints.end(); ++p) { - _incomingConnectionFactories.push_back(new IncomingConnectionFactory(instance, *p, this, _name)); + IncomingConnectionFactoryPtr factory = new IncomingConnectionFactory(instance, *p, this, _name); + _incomingConnectionFactories.push_back(factory); + + vector<ConnectorPtr> cons = factory->endpoint()->connectors(); + _connectors.insert(_connectors.end(), cons.begin(), cons.end()); } if(endpoints.empty()) { diff --git a/cpp/src/Ice/ObjectAdapterI.h b/cpp/src/Ice/ObjectAdapterI.h index 13de0a9cd99..35b6d697a33 100644 --- a/cpp/src/Ice/ObjectAdapterI.h +++ b/cpp/src/Ice/ObjectAdapterI.h @@ -23,6 +23,7 @@ #include <Ice/ObjectF.h> #include <Ice/RouterInfoF.h> #include <Ice/EndpointIF.h> +#include <Ice/ConnectorF.h> #include <Ice/LocatorInfoF.h> #include <Ice/ThreadPoolF.h> #include <Ice/Exception.h> @@ -116,6 +117,7 @@ private: const std::string _id; const std::string _replicaGroupId; std::vector<IceInternal::IncomingConnectionFactoryPtr> _incomingConnectionFactories; + std::vector<IceInternal::ConnectorPtr> _connectors; std::vector<IceInternal::EndpointIPtr> _routerEndpoints; IceInternal::RouterInfoPtr _routerInfo; std::vector<IceInternal::EndpointIPtr> _publishedEndpoints; diff --git a/cpp/src/Ice/TcpAcceptor.cpp b/cpp/src/Ice/TcpAcceptor.cpp index 00e9798758f..fd233738286 100644 --- a/cpp/src/Ice/TcpAcceptor.cpp +++ b/cpp/src/Ice/TcpAcceptor.cpp @@ -90,14 +90,6 @@ IceInternal::TcpAcceptor::toString() const return addrToString(_addr); } -bool -IceInternal::TcpAcceptor::equivalent(const string& host, int port) const -{ - struct sockaddr_in addr; - getAddress(host, port, addr); - return compareAddress(addr, _addr) == 0; -} - int IceInternal::TcpAcceptor::effectivePort() { diff --git a/cpp/src/Ice/TcpAcceptor.h b/cpp/src/Ice/TcpAcceptor.h index 55b5413d8dc..ed2634a74ef 100644 --- a/cpp/src/Ice/TcpAcceptor.h +++ b/cpp/src/Ice/TcpAcceptor.h @@ -36,7 +36,6 @@ public: virtual void connectToSelf(); virtual std::string toString() const; - bool equivalent(const std::string&, int) const; int effectivePort(); private: diff --git a/cpp/src/Ice/TcpConnector.cpp b/cpp/src/Ice/TcpConnector.cpp index 312b6ed7e37..007824a952b 100644 --- a/cpp/src/Ice/TcpConnector.cpp +++ b/cpp/src/Ice/TcpConnector.cpp @@ -118,6 +118,14 @@ IceInternal::TcpConnector::operator<(const Connector& r) const return compareAddress(_addr, p->_addr) == -1; } +bool +IceInternal::TcpConnector::equivalent(const string& host, int port) const +{ + struct sockaddr_in addr; + getAddress(host, port, addr); + return compareAddress(addr, _addr) == 0; +} + IceInternal::TcpConnector::TcpConnector(const InstancePtr& instance, const struct sockaddr_in& addr, Ice::Int timeout, const string& connectionId) : _instance(instance), diff --git a/cpp/src/Ice/TcpConnector.h b/cpp/src/Ice/TcpConnector.h index 7e5c63b506f..ae0bc1a72a8 100644 --- a/cpp/src/Ice/TcpConnector.h +++ b/cpp/src/Ice/TcpConnector.h @@ -36,6 +36,8 @@ public: virtual bool operator==(const Connector&) const; virtual bool operator!=(const Connector&) const; virtual bool operator<(const Connector&) const; + + bool equivalent(const std::string&, int) const; private: diff --git a/cpp/src/Ice/TcpEndpointI.cpp b/cpp/src/Ice/TcpEndpointI.cpp index 1fe6ecfabf1..1be75d2fe2f 100644 --- a/cpp/src/Ice/TcpEndpointI.cpp +++ b/cpp/src/Ice/TcpEndpointI.cpp @@ -333,20 +333,14 @@ IceInternal::TcpEndpointI::expand(bool includeLoopback) const } bool -IceInternal::TcpEndpointI::equivalent(const TransceiverPtr&) const +IceInternal::TcpEndpointI::equivalent(const ConnectorPtr& connector) const { - return false; -} - -bool -IceInternal::TcpEndpointI::equivalent(const AcceptorPtr& acceptor) const -{ - const TcpAcceptor* tcpAcceptor = dynamic_cast<const TcpAcceptor*>(acceptor.get()); - if(!tcpAcceptor) + const TcpConnector* tcpConnector = dynamic_cast<const TcpConnector*>(connector.get()); + if(!tcpConnector) { return false; } - return tcpAcceptor->equivalent(_host, _port); + return tcpConnector->equivalent(_host, _port); } bool diff --git a/cpp/src/Ice/TcpEndpointI.h b/cpp/src/Ice/TcpEndpointI.h index eba4cf7208a..3b67b782995 100644 --- a/cpp/src/Ice/TcpEndpointI.h +++ b/cpp/src/Ice/TcpEndpointI.h @@ -41,8 +41,7 @@ public: virtual std::vector<ConnectorPtr> connectors() const; virtual AcceptorPtr acceptor(EndpointIPtr&, const std::string&) const; virtual std::vector<EndpointIPtr> expand(bool) const; - virtual bool equivalent(const TransceiverPtr&) const; - virtual bool equivalent(const AcceptorPtr&) const; + virtual bool equivalent(const ConnectorPtr&) const; virtual bool operator==(const EndpointI&) const; virtual bool operator!=(const EndpointI&) const; diff --git a/cpp/src/Ice/UdpConnector.cpp b/cpp/src/Ice/UdpConnector.cpp index f8607b5627a..3aa894b5914 100644 --- a/cpp/src/Ice/UdpConnector.cpp +++ b/cpp/src/Ice/UdpConnector.cpp @@ -167,6 +167,14 @@ IceInternal::UdpConnector::operator<(const Connector& r) const return compareAddress(_addr, p->_addr) == -1; } +bool +IceInternal::UdpConnector::equivalent(const string& host, int port) const +{ + struct sockaddr_in addr; + getAddress(host, port, addr); + return compareAddress(_addr, addr) == 0; +} + IceInternal::UdpConnector::UdpConnector(const InstancePtr& instance, const struct sockaddr_in& addr, const string& mcastInterface, int mcastTtl, Ice::Byte protocolMajor, Ice::Byte protocolMinor, Ice::Byte encodingMajor, Ice::Byte encodingMinor, diff --git a/cpp/src/Ice/UdpConnector.h b/cpp/src/Ice/UdpConnector.h index 95a1438ed89..fa33c3cb330 100644 --- a/cpp/src/Ice/UdpConnector.h +++ b/cpp/src/Ice/UdpConnector.h @@ -34,6 +34,8 @@ public: virtual bool operator==(const Connector&) const; virtual bool operator!=(const Connector&) const; virtual bool operator<(const Connector&) const; + + bool equivalent(const std::string&, int) const; private: diff --git a/cpp/src/Ice/UdpEndpointI.cpp b/cpp/src/Ice/UdpEndpointI.cpp index 7333a8ae6f8..8054240cc68 100644 --- a/cpp/src/Ice/UdpEndpointI.cpp +++ b/cpp/src/Ice/UdpEndpointI.cpp @@ -519,20 +519,14 @@ IceInternal::UdpEndpointI::expand(bool includeLoopback) const } bool -IceInternal::UdpEndpointI::equivalent(const TransceiverPtr& transceiver) const +IceInternal::UdpEndpointI::equivalent(const ConnectorPtr& connector) const { - const UdpTransceiver* udpTransceiver = dynamic_cast<const UdpTransceiver*>(transceiver.get()); - if(!udpTransceiver) + const UdpConnector* udpConnector = dynamic_cast<const UdpConnector*>(connector.get()); + if(!udpConnector) { return false; } - return udpTransceiver->equivalent(_host, _port); -} - -bool -IceInternal::UdpEndpointI::equivalent(const AcceptorPtr&) const -{ - return false; + return udpConnector->equivalent(_host, _port); } bool diff --git a/cpp/src/Ice/UdpEndpointI.h b/cpp/src/Ice/UdpEndpointI.h index 8a52f4d6d77..e05724bf00c 100644 --- a/cpp/src/Ice/UdpEndpointI.h +++ b/cpp/src/Ice/UdpEndpointI.h @@ -42,8 +42,7 @@ public: virtual std::vector<ConnectorPtr> connectors() const; virtual AcceptorPtr acceptor(EndpointIPtr&, const std::string&) const; virtual std::vector<EndpointIPtr> expand(bool) const; - virtual bool equivalent(const TransceiverPtr&) const; - virtual bool equivalent(const AcceptorPtr&) const; + virtual bool equivalent(const ConnectorPtr&) const; virtual bool operator==(const EndpointI&) const; virtual bool operator!=(const EndpointI&) const; diff --git a/cpp/src/Ice/UdpTransceiver.cpp b/cpp/src/Ice/UdpTransceiver.cpp index 2e1ecc5582c..4e1c8620085 100644 --- a/cpp/src/Ice/UdpTransceiver.cpp +++ b/cpp/src/Ice/UdpTransceiver.cpp @@ -370,14 +370,6 @@ IceInternal::UdpTransceiver::checkSendSize(const Buffer& buf, size_t messageSize } } -bool -IceInternal::UdpTransceiver::equivalent(const string& host, int port) const -{ - struct sockaddr_in addr; - getAddress(host, port, addr); - return compareAddress(addr, _addr) == 0; -} - int IceInternal::UdpTransceiver::effectivePort() const { diff --git a/cpp/src/Ice/UdpTransceiver.h b/cpp/src/Ice/UdpTransceiver.h index 231bbfa0b8c..8c4c3282e3d 100644 --- a/cpp/src/Ice/UdpTransceiver.h +++ b/cpp/src/Ice/UdpTransceiver.h @@ -43,7 +43,6 @@ public: virtual void initialize(int); virtual void checkSendSize(const Buffer&, size_t); - bool equivalent(const std::string&, int) const; int effectivePort() const; private: diff --git a/cpp/src/Ice/UnknownEndpointI.cpp b/cpp/src/Ice/UnknownEndpointI.cpp index c69d3f53861..324c587c8d2 100644 --- a/cpp/src/Ice/UnknownEndpointI.cpp +++ b/cpp/src/Ice/UnknownEndpointI.cpp @@ -229,13 +229,7 @@ IceInternal::UnknownEndpointI::expand(bool) const } bool -IceInternal::UnknownEndpointI::equivalent(const TransceiverPtr&) const -{ - return false; -} - -bool -IceInternal::UnknownEndpointI::equivalent(const AcceptorPtr&) const +IceInternal::UnknownEndpointI::equivalent(const ConnectorPtr&) const { return false; } diff --git a/cpp/src/Ice/UnknownEndpointI.h b/cpp/src/Ice/UnknownEndpointI.h index 5b99ffd1d31..e954cd4ceec 100644 --- a/cpp/src/Ice/UnknownEndpointI.h +++ b/cpp/src/Ice/UnknownEndpointI.h @@ -38,8 +38,7 @@ public: virtual std::vector<ConnectorPtr> connectors() const; virtual AcceptorPtr acceptor(EndpointIPtr&, const std::string&) const; virtual std::vector<EndpointIPtr> expand(bool) const; - virtual bool equivalent(const TransceiverPtr&) const; - virtual bool equivalent(const AcceptorPtr&) const; + virtual bool equivalent(const ConnectorPtr&) const; virtual bool operator==(const EndpointI&) const; virtual bool operator!=(const EndpointI&) const; diff --git a/cpp/src/IceBox/.gitignore b/cpp/src/IceBox/.gitignore index 7e66c45dc9c..957a8b448d2 100644 --- a/cpp/src/IceBox/.gitignore +++ b/cpp/src/IceBox/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! IceBox.cpp diff --git a/cpp/src/IceGrid/.gitignore b/cpp/src/IceGrid/.gitignore index 4459a0b2453..cd80f317982 100644 --- a/cpp/src/IceGrid/.gitignore +++ b/cpp/src/IceGrid/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! Admin.cpp diff --git a/cpp/src/IcePatch2/.gitignore b/cpp/src/IcePatch2/.gitignore index 143854ab2d3..d81aafab13b 100644 --- a/cpp/src/IcePatch2/.gitignore +++ b/cpp/src/IcePatch2/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! FileInfo.cpp diff --git a/cpp/src/IceSSL/AcceptorI.cpp b/cpp/src/IceSSL/AcceptorI.cpp index 0a534dceedf..39d9976f9cb 100644 --- a/cpp/src/IceSSL/AcceptorI.cpp +++ b/cpp/src/IceSSL/AcceptorI.cpp @@ -126,14 +126,6 @@ IceSSL::AcceptorI::toString() const return IceInternal::addrToString(_addr); } -bool -IceSSL::AcceptorI::equivalent(const string& host, int port) const -{ - struct sockaddr_in addr; - IceInternal::getAddress(host, port, addr); - return IceInternal::compareAddress(addr, _addr) == 0; -} - int IceSSL::AcceptorI::effectivePort() { diff --git a/cpp/src/IceSSL/AcceptorI.h b/cpp/src/IceSSL/AcceptorI.h index e791b983e62..183ff0abf24 100644 --- a/cpp/src/IceSSL/AcceptorI.h +++ b/cpp/src/IceSSL/AcceptorI.h @@ -35,7 +35,6 @@ public: virtual void connectToSelf(); virtual std::string toString() const; - bool equivalent(const std::string&, int) const; int effectivePort(); private: diff --git a/cpp/src/IceSSL/ConnectorI.cpp b/cpp/src/IceSSL/ConnectorI.cpp index 120081d1f0b..9948e6f9d15 100644 --- a/cpp/src/IceSSL/ConnectorI.cpp +++ b/cpp/src/IceSSL/ConnectorI.cpp @@ -248,6 +248,14 @@ IceSSL::ConnectorI::operator<(const IceInternal::Connector& r) const return IceInternal::compareAddress(_addr, p->_addr) == -1; } +bool +IceSSL::ConnectorI::equivalent(const string& host, int port) const +{ + struct sockaddr_in addr; + IceInternal::getAddress(host, port, addr); + return IceInternal::compareAddress(_addr, addr) == 0; +} + IceSSL::ConnectorI::ConnectorI(const InstancePtr& instance, const struct sockaddr_in& addr, Ice::Int timeout, const string& connectionId) : _instance(instance), diff --git a/cpp/src/IceSSL/ConnectorI.h b/cpp/src/IceSSL/ConnectorI.h index f2f94fc891d..d7ae8f88494 100644 --- a/cpp/src/IceSSL/ConnectorI.h +++ b/cpp/src/IceSSL/ConnectorI.h @@ -37,6 +37,8 @@ public: virtual bool operator==(const IceInternal::Connector&) const; virtual bool operator!=(const IceInternal::Connector&) const; virtual bool operator<(const IceInternal::Connector&) const; + + bool equivalent(const std::string&, int) const; private: diff --git a/cpp/src/IceSSL/EndpointI.cpp b/cpp/src/IceSSL/EndpointI.cpp index 2b9c4b16470..246f4761296 100644 --- a/cpp/src/IceSSL/EndpointI.cpp +++ b/cpp/src/IceSSL/EndpointI.cpp @@ -332,20 +332,14 @@ IceSSL::EndpointI::expand(bool includeLoopback) const } bool -IceSSL::EndpointI::equivalent(const IceInternal::TransceiverPtr&) const +IceSSL::EndpointI::equivalent(const IceInternal::ConnectorPtr& connector) const { - return false; -} - -bool -IceSSL::EndpointI::equivalent(const IceInternal::AcceptorPtr& acceptor) const -{ - const AcceptorI* sslAcceptor = dynamic_cast<const AcceptorI*>(acceptor.get()); - if(!sslAcceptor) + const ConnectorI* sslConnector = dynamic_cast<const ConnectorI*>(connector.get()); + if(!sslConnector) { return false; } - return sslAcceptor->equivalent(_host, _port); + return sslConnector->equivalent(_host, _port); } bool diff --git a/cpp/src/IceSSL/EndpointI.h b/cpp/src/IceSSL/EndpointI.h index c5a4db62e93..45441d52a48 100644 --- a/cpp/src/IceSSL/EndpointI.h +++ b/cpp/src/IceSSL/EndpointI.h @@ -42,8 +42,7 @@ public: virtual std::vector<IceInternal::ConnectorPtr> connectors() const; virtual IceInternal::AcceptorPtr acceptor(IceInternal::EndpointIPtr&, const std::string&) const; virtual std::vector<IceInternal::EndpointIPtr> expand(bool) const; - virtual bool equivalent(const IceInternal::TransceiverPtr&) const; - virtual bool equivalent(const IceInternal::AcceptorPtr&) const; + virtual bool equivalent(const IceInternal::ConnectorPtr&) const; virtual bool operator==(const IceInternal::EndpointI&) const; virtual bool operator!=(const IceInternal::EndpointI&) const; diff --git a/cpp/src/IceStorm/.gitignore b/cpp/src/IceStorm/.gitignore index 96eb5114cee..e34f5868a14 100644 --- a/cpp/src/IceStorm/.gitignore +++ b/cpp/src/IceStorm/.gitignore @@ -1,14 +1,12 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! IceStorm.cpp IceStormInternal.cpp LinkRecord.cpp -Event.cpp IceStorm.h IceStormInternal.h LinkRecord.h -Event.h PersistentTopicMap.h PersistentTopicMap.cpp Grammar.cpp diff --git a/cpp/src/Slice/.gitignore b/cpp/src/Slice/.gitignore index bae0bca0177..e17cdf99b14 100644 --- a/cpp/src/Slice/.gitignore +++ b/cpp/src/Slice/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! Grammar.cpp diff --git a/cpp/src/icecpp/.gitignore b/cpp/src/icecpp/.gitignore index 52fc6c66ffe..206826e8237 100644 --- a/cpp/src/icecpp/.gitignore +++ b/cpp/src/icecpp/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! cexp.c diff --git a/cpp/test/Freeze/complex/.gitignore b/cpp/test/Freeze/complex/.gitignore index f026c479692..d3342f1ba44 100644 --- a/cpp/test/Freeze/complex/.gitignore +++ b/cpp/test/Freeze/complex/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/Freeze/dbmap/.gitignore b/cpp/test/Freeze/dbmap/.gitignore index a1021bb83f6..57a83caf6bf 100644 --- a/cpp/test/Freeze/dbmap/.gitignore +++ b/cpp/test/Freeze/dbmap/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/Freeze/evictor/.gitignore b/cpp/test/Freeze/evictor/.gitignore index 8110e1b8303..9d3a9b2b4aa 100644 --- a/cpp/test/Freeze/evictor/.gitignore +++ b/cpp/test/Freeze/evictor/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/Freeze/oldevictor/.gitignore b/cpp/test/Freeze/oldevictor/.gitignore index 8110e1b8303..9d3a9b2b4aa 100644 --- a/cpp/test/Freeze/oldevictor/.gitignore +++ b/cpp/test/Freeze/oldevictor/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/FreezeScript/dbmap/.gitignore b/cpp/test/FreezeScript/dbmap/.gitignore index e8817f56a76..7dfd22213ce 100644 --- a/cpp/test/FreezeScript/dbmap/.gitignore +++ b/cpp/test/FreezeScript/dbmap/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! makedb diff --git a/cpp/test/FreezeScript/evictor/.gitignore b/cpp/test/FreezeScript/evictor/.gitignore index 15dbe51c687..cbb24e02e46 100644 --- a/cpp/test/FreezeScript/evictor/.gitignore +++ b/cpp/test/FreezeScript/evictor/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! makedb diff --git a/cpp/test/Glacier2/attack/.gitignore b/cpp/test/Glacier2/attack/.gitignore index 60cd74fd385..d4cf59f5648 100644 --- a/cpp/test/Glacier2/attack/.gitignore +++ b/cpp/test/Glacier2/attack/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/Glacier2/dynamicFiltering/.gitignore b/cpp/test/Glacier2/dynamicFiltering/.gitignore index 9cec5782caf..9a4e1fbc19a 100644 --- a/cpp/test/Glacier2/dynamicFiltering/.gitignore +++ b/cpp/test/Glacier2/dynamicFiltering/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/Glacier2/router/.gitignore b/cpp/test/Glacier2/router/.gitignore index a09de00ffba..94de15839da 100644 --- a/cpp/test/Glacier2/router/.gitignore +++ b/cpp/test/Glacier2/router/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/Glacier2/sessionControl/.gitignore b/cpp/test/Glacier2/sessionControl/.gitignore index d1adb5ef661..1af2dfb46ea 100644 --- a/cpp/test/Glacier2/sessionControl/.gitignore +++ b/cpp/test/Glacier2/sessionControl/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/Glacier2/ssl/.gitignore b/cpp/test/Glacier2/ssl/.gitignore index 0df2e3fcfbd..0e74755c967 100644 --- a/cpp/test/Glacier2/ssl/.gitignore +++ b/cpp/test/Glacier2/ssl/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/Glacier2/staticFiltering/.gitignore b/cpp/test/Glacier2/staticFiltering/.gitignore index 7f835503d97..1ec56ce434d 100644 --- a/cpp/test/Glacier2/staticFiltering/.gitignore +++ b/cpp/test/Glacier2/staticFiltering/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/Ice/adapterDeactivation/.gitignore b/cpp/test/Ice/adapterDeactivation/.gitignore index 2e420d4d3fb..17222d2ffea 100644 --- a/cpp/test/Ice/adapterDeactivation/.gitignore +++ b/cpp/test/Ice/adapterDeactivation/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/Ice/binding/.gitignore b/cpp/test/Ice/binding/.gitignore index 9cec5782caf..9a4e1fbc19a 100644 --- a/cpp/test/Ice/binding/.gitignore +++ b/cpp/test/Ice/binding/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/Ice/checksum/client/.gitignore b/cpp/test/Ice/checksum/client/.gitignore index 771a596d68d..036ac18e2b8 100644 --- a/cpp/test/Ice/checksum/client/.gitignore +++ b/cpp/test/Ice/checksum/client/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/Ice/checksum/server/.gitignore b/cpp/test/Ice/checksum/server/.gitignore index e70a07718f7..c4c116ec907 100644 --- a/cpp/test/Ice/checksum/server/.gitignore +++ b/cpp/test/Ice/checksum/server/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! server diff --git a/cpp/test/Ice/custom/.gitignore b/cpp/test/Ice/custom/.gitignore index 2674739be0f..6d5878b37d9 100644 --- a/cpp/test/Ice/custom/.gitignore +++ b/cpp/test/Ice/custom/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/Ice/exceptions/.gitignore b/cpp/test/Ice/exceptions/.gitignore index bf6818152ff..0169f0122ac 100644 --- a/cpp/test/Ice/exceptions/.gitignore +++ b/cpp/test/Ice/exceptions/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/Ice/facets/.gitignore b/cpp/test/Ice/facets/.gitignore index 2e420d4d3fb..17222d2ffea 100644 --- a/cpp/test/Ice/facets/.gitignore +++ b/cpp/test/Ice/facets/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/Ice/faultTolerance/.gitignore b/cpp/test/Ice/faultTolerance/.gitignore index 9cec5782caf..9a4e1fbc19a 100644 --- a/cpp/test/Ice/faultTolerance/.gitignore +++ b/cpp/test/Ice/faultTolerance/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/Ice/gc/.gitignore b/cpp/test/Ice/gc/.gitignore index 42155a4cad2..b03bfddceb5 100644 --- a/cpp/test/Ice/gc/.gitignore +++ b/cpp/test/Ice/gc/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/Ice/hold/.gitignore b/cpp/test/Ice/hold/.gitignore index 9cec5782caf..9a4e1fbc19a 100644 --- a/cpp/test/Ice/hold/.gitignore +++ b/cpp/test/Ice/hold/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/Ice/inheritance/.gitignore b/cpp/test/Ice/inheritance/.gitignore index 2e420d4d3fb..17222d2ffea 100644 --- a/cpp/test/Ice/inheritance/.gitignore +++ b/cpp/test/Ice/inheritance/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/Ice/interceptor/.gitignore b/cpp/test/Ice/interceptor/.gitignore index bc83ed933b0..ae384352509 100644 --- a/cpp/test/Ice/interceptor/.gitignore +++ b/cpp/test/Ice/interceptor/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/Ice/location/.gitignore b/cpp/test/Ice/location/.gitignore index 9cec5782caf..9a4e1fbc19a 100644 --- a/cpp/test/Ice/location/.gitignore +++ b/cpp/test/Ice/location/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/Ice/objects/.gitignore b/cpp/test/Ice/objects/.gitignore index 2e420d4d3fb..17222d2ffea 100644 --- a/cpp/test/Ice/objects/.gitignore +++ b/cpp/test/Ice/objects/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/Ice/operations/.gitignore b/cpp/test/Ice/operations/.gitignore index bf6818152ff..0169f0122ac 100644 --- a/cpp/test/Ice/operations/.gitignore +++ b/cpp/test/Ice/operations/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/Ice/proxy/.gitignore b/cpp/test/Ice/proxy/.gitignore index bf6818152ff..0169f0122ac 100644 --- a/cpp/test/Ice/proxy/.gitignore +++ b/cpp/test/Ice/proxy/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/Ice/retry/.gitignore b/cpp/test/Ice/retry/.gitignore index 9cec5782caf..9a4e1fbc19a 100644 --- a/cpp/test/Ice/retry/.gitignore +++ b/cpp/test/Ice/retry/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/Ice/servantLocator/.gitignore b/cpp/test/Ice/servantLocator/.gitignore index bf6818152ff..0169f0122ac 100644 --- a/cpp/test/Ice/servantLocator/.gitignore +++ b/cpp/test/Ice/servantLocator/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/Ice/slicing/exceptions/.gitignore b/cpp/test/Ice/slicing/exceptions/.gitignore index 989e50d7d24..62c1a9de8fc 100644 --- a/cpp/test/Ice/slicing/exceptions/.gitignore +++ b/cpp/test/Ice/slicing/exceptions/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/Ice/slicing/objects/.gitignore b/cpp/test/Ice/slicing/objects/.gitignore index 3a599735ff2..600c6de8c89 100644 --- a/cpp/test/Ice/slicing/objects/.gitignore +++ b/cpp/test/Ice/slicing/objects/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/Ice/stream/.gitignore b/cpp/test/Ice/stream/.gitignore index bc83ed933b0..ae384352509 100644 --- a/cpp/test/Ice/stream/.gitignore +++ b/cpp/test/Ice/stream/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/Ice/threads/.gitignore b/cpp/test/Ice/threads/.gitignore index 9cec5782caf..9a4e1fbc19a 100644 --- a/cpp/test/Ice/threads/.gitignore +++ b/cpp/test/Ice/threads/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/Ice/timeout/.gitignore b/cpp/test/Ice/timeout/.gitignore index 9cec5782caf..9a4e1fbc19a 100644 --- a/cpp/test/Ice/timeout/.gitignore +++ b/cpp/test/Ice/timeout/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/IceGrid/activation/.gitignore b/cpp/test/IceGrid/activation/.gitignore index 025e17c4a9e..2a49ee6d212 100644 --- a/cpp/test/IceGrid/activation/.gitignore +++ b/cpp/test/IceGrid/activation/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/IceGrid/allocation/.gitignore b/cpp/test/IceGrid/allocation/.gitignore index bdfab9f058b..0fcda33e8d8 100644 --- a/cpp/test/IceGrid/allocation/.gitignore +++ b/cpp/test/IceGrid/allocation/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/IceGrid/deployer/.gitignore b/cpp/test/IceGrid/deployer/.gitignore index d6eab37c96f..d873721864d 100644 --- a/cpp/test/IceGrid/deployer/.gitignore +++ b/cpp/test/IceGrid/deployer/.gitignore @@ -1,9 +1,9 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client server -libTestService.dylib +libTestService.so Test.cpp Test.h build.txt diff --git a/cpp/test/IceGrid/distribution/.gitignore b/cpp/test/IceGrid/distribution/.gitignore index d0bf5dffbdf..82c3bf36ff7 100644 --- a/cpp/test/IceGrid/distribution/.gitignore +++ b/cpp/test/IceGrid/distribution/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/IceGrid/replicaGroup/.gitignore b/cpp/test/IceGrid/replicaGroup/.gitignore index 6cf0ef56f3c..8732f914d10 100644 --- a/cpp/test/IceGrid/replicaGroup/.gitignore +++ b/cpp/test/IceGrid/replicaGroup/.gitignore @@ -1,9 +1,9 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client server -libTestService.dylib +libTestService.so Test.cpp Test.h build.txt diff --git a/cpp/test/IceGrid/replication/.gitignore b/cpp/test/IceGrid/replication/.gitignore index abd913c1c02..01c48e6c682 100644 --- a/cpp/test/IceGrid/replication/.gitignore +++ b/cpp/test/IceGrid/replication/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/IceGrid/session/.gitignore b/cpp/test/IceGrid/session/.gitignore index e9183caeeaf..c4e14905e34 100644 --- a/cpp/test/IceGrid/session/.gitignore +++ b/cpp/test/IceGrid/session/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/IceGrid/simple/.gitignore b/cpp/test/IceGrid/simple/.gitignore index 025e17c4a9e..2a49ee6d212 100644 --- a/cpp/test/IceGrid/simple/.gitignore +++ b/cpp/test/IceGrid/simple/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/IceGrid/update/.gitignore b/cpp/test/IceGrid/update/.gitignore index d0bf5dffbdf..82c3bf36ff7 100644 --- a/cpp/test/IceGrid/update/.gitignore +++ b/cpp/test/IceGrid/update/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/IceSSL/configuration/.gitignore b/cpp/test/IceSSL/configuration/.gitignore index 9cec5782caf..9a4e1fbc19a 100644 --- a/cpp/test/IceSSL/configuration/.gitignore +++ b/cpp/test/IceSSL/configuration/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/IceStorm/federation/.gitignore b/cpp/test/IceStorm/federation/.gitignore index 89af36bf358..847942e2f63 100644 --- a/cpp/test/IceStorm/federation/.gitignore +++ b/cpp/test/IceStorm/federation/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! publisher diff --git a/cpp/test/IceStorm/federation2/.gitignore b/cpp/test/IceStorm/federation2/.gitignore index b8ab5a4ed18..85f7a27d020 100644 --- a/cpp/test/IceStorm/federation2/.gitignore +++ b/cpp/test/IceStorm/federation2/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! publisher diff --git a/cpp/test/IceStorm/single/.gitignore b/cpp/test/IceStorm/single/.gitignore index 590ac05c211..23c1d194097 100644 --- a/cpp/test/IceStorm/single/.gitignore +++ b/cpp/test/IceStorm/single/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! publisher diff --git a/cpp/test/IceStorm/stress/.gitignore b/cpp/test/IceStorm/stress/.gitignore index b8ab5a4ed18..85f7a27d020 100644 --- a/cpp/test/IceStorm/stress/.gitignore +++ b/cpp/test/IceStorm/stress/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! publisher diff --git a/cpp/test/IceUtil/condvar/.gitignore b/cpp/test/IceUtil/condvar/.gitignore index 148b6f7bd63..fcdd39f5254 100644 --- a/cpp/test/IceUtil/condvar/.gitignore +++ b/cpp/test/IceUtil/condvar/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! workqueue diff --git a/cpp/test/IceUtil/ctrlCHandler/.gitignore b/cpp/test/IceUtil/ctrlCHandler/.gitignore index 25c0e03371c..eb880d3f1bf 100644 --- a/cpp/test/IceUtil/ctrlCHandler/.gitignore +++ b/cpp/test/IceUtil/ctrlCHandler/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/IceUtil/inputUtil/.gitignore b/cpp/test/IceUtil/inputUtil/.gitignore index 25c0e03371c..eb880d3f1bf 100644 --- a/cpp/test/IceUtil/inputUtil/.gitignore +++ b/cpp/test/IceUtil/inputUtil/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/IceUtil/thread/.gitignore b/cpp/test/IceUtil/thread/.gitignore index 25c0e03371c..eb880d3f1bf 100644 --- a/cpp/test/IceUtil/thread/.gitignore +++ b/cpp/test/IceUtil/thread/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/IceUtil/unicode/.gitignore b/cpp/test/IceUtil/unicode/.gitignore index 25c0e03371c..eb880d3f1bf 100644 --- a/cpp/test/IceUtil/unicode/.gitignore +++ b/cpp/test/IceUtil/unicode/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cpp/test/IceUtil/uuid/.gitignore b/cpp/test/IceUtil/uuid/.gitignore index 25c0e03371c..eb880d3f1bf 100644 --- a/cpp/test/IceUtil/uuid/.gitignore +++ b/cpp/test/IceUtil/uuid/.gitignore @@ -1,4 +1,4 @@ -// Generated by makegitignore.py, Mon Jun 11 14:39:36 2007 +// Generated by makegitignore.py, Wed Jun 13 11:09:32 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! client diff --git a/cs/src/Ice/ConnectionFactory.cs b/cs/src/Ice/ConnectionFactory.cs index 851f5a85217..ca7ec126cd2 100644 --- a/cs/src/Ice/ConnectionFactory.cs +++ b/cs/src/Ice/ConnectionFactory.cs @@ -677,17 +677,6 @@ namespace IceInternal return _endpoint; } - public bool equivalent(EndpointI endp) - { - if(_transceiver != null) - { - return endp.equivalent(_transceiver); - } - - Debug.Assert(_acceptor != null); - return endp.equivalent(_acceptor); - } - public Ice.ConnectionI[] connections() { lock(this) diff --git a/cs/src/Ice/EndpointI.cs b/cs/src/Ice/EndpointI.cs index cbb4b45a9b3..95a0f2cc7d3 100755 --- a/cs/src/Ice/EndpointI.cs +++ b/cs/src/Ice/EndpointI.cs @@ -109,11 +109,9 @@ namespace IceInternal public abstract ArrayList expand(bool includeLoopback); // - // Check whether the endpoint is equivalent to a specific - // Transceiver or Acceptor. + // Check whether the endpoint is equivalent to a specific Connector. // - public abstract bool equivalent(Transceiver transceiver); - public abstract bool equivalent(Acceptor acceptor); + public abstract bool equivalent(Connector connector); // // Returns true if the endpoint's transport requires thread-per-connection. diff --git a/cs/src/Ice/Network.cs b/cs/src/Ice/Network.cs index f6c2b1fd239..f77ba0d831b 100755 --- a/cs/src/Ice/Network.cs +++ b/cs/src/Ice/Network.cs @@ -893,45 +893,56 @@ namespace IceInternal { ArrayList addresses = new ArrayList(); - int retry = 5; - - repeatGetHostByName: - try + if(host.Equals("0.0.0.0")) { - // - // No need for lookup if host is ip address. - // - try + string[] hosts = getLocalHosts(); + for(int i = 0; i < hosts.Length; ++i) { - addresses.Add(new IPEndPoint(IPAddress.Parse(host), port)); + addresses.Add(getAddress(hosts[i], port)); } - catch (FormatException) + } + else + { + int retry = 5; + + repeatGetHostByName: + try { - IPHostEntry e = Dns.GetHostEntry(host); - for(int i = 0; i < e.AddressList.Length; ++i) + // + // No need for lookup if host is ip address. + // + try + { + addresses.Add(new IPEndPoint(IPAddress.Parse(host), port)); + } + catch (FormatException) { - if(e.AddressList[i].AddressFamily != AddressFamily.InterNetworkV6) + IPHostEntry e = Dns.GetHostEntry(host); + for(int i = 0; i < e.AddressList.Length; ++i) { - addresses.Add(new IPEndPoint(e.AddressList[i], port)); + if(e.AddressList[i].AddressFamily != AddressFamily.InterNetworkV6) + { + addresses.Add(new IPEndPoint(e.AddressList[i], port)); + } } } } - } - catch(Win32Exception ex) - { - if(ex.NativeErrorCode == WSATRY_AGAIN && --retry >= 0) + catch(Win32Exception ex) { - goto repeatGetHostByName; + if(ex.NativeErrorCode == WSATRY_AGAIN && --retry >= 0) + { + goto repeatGetHostByName; + } + Ice.DNSException e = new Ice.DNSException(ex); + e.host = host; + throw e; + } + catch(System.Exception ex) + { + Ice.DNSException e = new Ice.DNSException(ex); + e.host = host; + throw e; } - Ice.DNSException e = new Ice.DNSException(ex); - e.host = host; - throw e; - } - catch(System.Exception ex) - { - Ice.DNSException e = new Ice.DNSException(ex); - e.host = host; - throw e; } return (IPEndPoint[])addresses.ToArray(typeof(IPEndPoint)); diff --git a/cs/src/Ice/ObjectAdapterI.cs b/cs/src/Ice/ObjectAdapterI.cs index 49c4a4da0ea..d4c8f11e80f 100755 --- a/cs/src/Ice/ObjectAdapterI.cs +++ b/cs/src/Ice/ObjectAdapterI.cs @@ -348,11 +348,11 @@ namespace Ice instance_ = null; _threadPool = null; _communicator = null; - _incomingConnectionFactories = null; _routerEndpoints = null; _routerInfo = null; _publishedEndpoints = null; _locatorInfo = null; + _connectors = null; objectAdapterFactory = _objectAdapterFactory; _objectAdapterFactory = null; @@ -584,6 +584,12 @@ namespace Ice oldPublishedEndpoints = _publishedEndpoints; _publishedEndpoints = parsePublishedEndpoints(); + _connectors.Clear(); + foreach(IceInternal.IncomingConnectionFactory factory in _incomingConnectionFactories) + { + _connectors.AddRange(factory.endpoint().connectors()); + } + locatorInfo = _locatorInfo; if(!_noConfig) { @@ -654,12 +660,11 @@ namespace Ice // for(int i = 0; i < endpoints.Length; ++i) { - int sz = _incomingConnectionFactories.Count; + int sz = _connectors.Count; for(int j = 0; j < sz; j++) { - IceInternal.IncomingConnectionFactory factory - = (IceInternal.IncomingConnectionFactory)_incomingConnectionFactories[j]; - if(factory.equivalent(endpoints[i])) + IceInternal.Connector connector = (IceInternal.Connector)_connectors[j]; + if(endpoints[i].equivalent(connector)) { return true; } @@ -779,6 +784,7 @@ namespace Ice _activateOneOffDone = false; _name = name; _incomingConnectionFactories = new ArrayList(); + _connectors = new ArrayList(); _publishedEndpoints = new ArrayList(); _routerEndpoints = new ArrayList(); _routerInfo = null; @@ -942,8 +948,11 @@ namespace Ice ex.unsupportedFeature = "endpoint requires thread-per-connection:\n" + endp.ToString(); throw ex; } - _incomingConnectionFactories.Add( - new IceInternal.IncomingConnectionFactory(instance, endp, this, _name)); + IceInternal.IncomingConnectionFactory factory = + new IceInternal.IncomingConnectionFactory(instance, endp, this, _name); + _incomingConnectionFactories.Add(factory); + + _connectors.AddRange(factory.endpoint().connectors()); } if(endpoints.Count == 0) { @@ -1390,6 +1399,7 @@ namespace Ice private readonly string _id; private readonly string _replicaGroupId; private ArrayList _incomingConnectionFactories; + private ArrayList _connectors; private ArrayList _routerEndpoints; private IceInternal.RouterInfo _routerInfo; private ArrayList _publishedEndpoints; diff --git a/cs/src/Ice/TcpAcceptor.cs b/cs/src/Ice/TcpAcceptor.cs index f06dfd38045..2b0fa006646 100755 --- a/cs/src/Ice/TcpAcceptor.cs +++ b/cs/src/Ice/TcpAcceptor.cs @@ -88,12 +88,6 @@ namespace IceInternal return Network.addrToString(_addr); } - internal bool equivalent(string host, int port) - { - EndPoint addr = Network.getAddress(host, port); - return addr.Equals(_addr); - } - internal virtual int effectivePort() { return _addr.Port; diff --git a/cs/src/Ice/TcpConnector.cs b/cs/src/Ice/TcpConnector.cs index 856db6edb26..e2cf0163ba2 100755 --- a/cs/src/Ice/TcpConnector.cs +++ b/cs/src/Ice/TcpConnector.cs @@ -49,6 +49,12 @@ namespace IceInternal return Network.addrToString(_addr); } + internal bool equivalent(string host, int port) + { + IPEndPoint addr = Network.getAddress(host, port); + return addr.Equals(_addr); + } + // // Only for use by TcpEndpoint // diff --git a/cs/src/Ice/TcpEndpointI.cs b/cs/src/Ice/TcpEndpointI.cs index 65d3f0367b8..1302b4e6d7c 100755 --- a/cs/src/Ice/TcpEndpointI.cs +++ b/cs/src/Ice/TcpEndpointI.cs @@ -392,26 +392,20 @@ namespace IceInternal } // - // Check whether the endpoint is equivalent to a specific - // Transceiver or Acceptor + // Check whether the endpoint is equivalent to a specific Connector. // - public override bool equivalent(Transceiver transceiver) + public override bool equivalent(Connector connector) { - return false; - } - - public override bool equivalent(Acceptor acceptor) - { - TcpAcceptor tcpAcceptor = null; + TcpConnector tcpConnector = null; try { - tcpAcceptor = (TcpAcceptor)acceptor; + tcpConnector = (TcpConnector)connector; } catch(System.InvalidCastException) { return false; } - return tcpAcceptor.equivalent(_host, _port); + return tcpConnector.equivalent(_host, _port); } public override bool requiresThreadPerConnection() diff --git a/cs/src/Ice/UdpConnector.cs b/cs/src/Ice/UdpConnector.cs index 64b6184be53..494623414a0 100755 --- a/cs/src/Ice/UdpConnector.cs +++ b/cs/src/Ice/UdpConnector.cs @@ -31,6 +31,12 @@ namespace IceInternal return Network.addrToString(_addr); } + internal bool equivalent(string host, int port) + { + IPEndPoint addr = Network.getAddress(host, port); + return addr.Equals(_addr); + } + // // Only for use by TcpEndpoint // diff --git a/cs/src/Ice/UdpEndpointI.cs b/cs/src/Ice/UdpEndpointI.cs index d3053ee9c72..4ec3d5c9d16 100755 --- a/cs/src/Ice/UdpEndpointI.cs +++ b/cs/src/Ice/UdpEndpointI.cs @@ -579,26 +579,20 @@ namespace IceInternal } // - // Check whether the endpoint is equivalent to a specific - // Transceiver or Acceptor + // Check whether the endpoint is equivalent to a specific Connector. // - public override bool equivalent(Transceiver transceiver) + public override bool equivalent(Connector connector) { - UdpTransceiver udpTransceiver = null; + UdpConnector udpConnector = null; try { - udpTransceiver = (UdpTransceiver) transceiver; + udpConnector = (UdpConnector)connector; } catch(System.InvalidCastException) { return false; } - return udpTransceiver.equivalent(_host, _port); - } - - public override bool equivalent(Acceptor acceptor) - { - return false; + return udpConnector.equivalent(_host, _port); } public override bool requiresThreadPerConnection() diff --git a/cs/src/Ice/UdpTransceiver.cs b/cs/src/Ice/UdpTransceiver.cs index 233aa6a7664..a0e8a6ef089 100755 --- a/cs/src/Ice/UdpTransceiver.cs +++ b/cs/src/Ice/UdpTransceiver.cs @@ -451,12 +451,6 @@ namespace IceInternal } } - public bool equivalent(string host, int port) - { - IPEndPoint addr = ((IPEndPoint)Network.getAddress(host, port)); - return addr.Equals(_addr); - } - public int effectivePort() { return _addr.Port; diff --git a/cs/src/Ice/UnknownEndpointI.cs b/cs/src/Ice/UnknownEndpointI.cs index d23c7fce770..ce1e2bec1f1 100755 --- a/cs/src/Ice/UnknownEndpointI.cs +++ b/cs/src/Ice/UnknownEndpointI.cs @@ -261,15 +261,9 @@ namespace IceInternal } // - // Check whether the endpoint is equivalent to a specific - // Transceiver or Acceptor + // Check whether the endpoint is equivalent to a specific Connector. // - public override bool equivalent(Transceiver transceiver) - { - return false; - } - - public override bool equivalent(Acceptor acceptor) + public override bool equivalent(Connector connector) { return false; } diff --git a/cs/src/IceSSL/AcceptorI.cs b/cs/src/IceSSL/AcceptorI.cs index 6d221f32c0b..43db4a8182f 100755 --- a/cs/src/IceSSL/AcceptorI.cs +++ b/cs/src/IceSSL/AcceptorI.cs @@ -102,12 +102,6 @@ namespace IceSSL return IceInternal.Network.addrToString(addr_); } - internal bool equivalent(string host, int port) - { - EndPoint addr = IceInternal.Network.getAddress(host, port); - return addr.Equals(addr_); - } - internal virtual int effectivePort() { return addr_.Port; diff --git a/cs/src/IceSSL/ConnectorI.cs b/cs/src/IceSSL/ConnectorI.cs index c65acdeef5c..83db79892de 100755 --- a/cs/src/IceSSL/ConnectorI.cs +++ b/cs/src/IceSSL/ConnectorI.cs @@ -167,6 +167,12 @@ namespace IceSSL return IceInternal.Network.addrToString(addr_); } + internal bool equivalent(string host, int port) + { + IPEndPoint addr = Network.getAddress(host, port); + return addr.Equals(_addr); + } + // // Only for use by EndpointI. // diff --git a/cs/src/IceSSL/EndpointI.cs b/cs/src/IceSSL/EndpointI.cs index a889aace9ea..735506cf7cb 100755 --- a/cs/src/IceSSL/EndpointI.cs +++ b/cs/src/IceSSL/EndpointI.cs @@ -390,26 +390,20 @@ namespace IceSSL } // - // Check whether the endpoint is equivalent to a specific - // Transceiver or Acceptor + // Check whether the endpoint is equivalent to a specific Connector. // - public override bool equivalent(IceInternal.Transceiver transceiver) + public override bool equivalent(IceInternal.Connector Connector) { - return false; - } - - public override bool equivalent(IceInternal.Acceptor acceptor) - { - AcceptorI sslAcceptor = null; + ConnectorI sslConnector = null; try { - sslAcceptor = (AcceptorI)acceptor; + sslConnector = (ConnectorI)Connector; } catch(System.InvalidCastException) { return false; } - return sslAcceptor.equivalent(host_, port_); + return sslConnector.equivalent(host_, port_); } public override bool requiresThreadPerConnection() diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java index 641a1f4b171..03c2bce9d87 100644 --- a/java/src/Ice/ObjectAdapterI.java +++ b/java/src/Ice/ObjectAdapterI.java @@ -370,6 +370,7 @@ public final class ObjectAdapterI implements ObjectAdapter _routerInfo = null; _publishedEndpoints = null; _locatorInfo = null; + _connectors = null; objectAdapterFactory = _objectAdapterFactory; _objectAdapterFactory = null; @@ -579,6 +580,14 @@ public final class ObjectAdapterI implements ObjectAdapter oldPublishedEndpoints = _publishedEndpoints; _publishedEndpoints = parsePublishedEndpoints(); + _connectors.clear(); + java.util.Iterator p = _incomingConnectionFactories.iterator(); + while(p.hasNext()) + { + IceInternal.IncomingConnectionFactory factory = (IceInternal.IncomingConnectionFactory)p.next(); + _connectors.addAll(factory.endpoint().connectors()); + } + locatorInfo = _locatorInfo; if(!_noConfig) { @@ -650,12 +659,11 @@ public final class ObjectAdapterI implements ObjectAdapter // for(int i = 0; i < endpoints.length; ++i) { - final int sz = _incomingConnectionFactories.size(); + final int sz = _connectors.size(); for(int j = 0; j < sz; j++) { - IceInternal.IncomingConnectionFactory factory = - (IceInternal.IncomingConnectionFactory)_incomingConnectionFactories.get(j); - if(factory.equivalent(endpoints[i])) + IceInternal.Connector connector = (IceInternal.Connector)_connectors.get(j); + if(endpoints[i].equivalent(connector)) { return true; } @@ -942,8 +950,11 @@ public final class ObjectAdapterI implements ObjectAdapter ex.unsupportedFeature = "endpoint requires thread-per-connection:\n" + endp.toString(); throw ex; } - _incomingConnectionFactories.add( - new IceInternal.IncomingConnectionFactory(instance, endp, this, _name)); + IceInternal.IncomingConnectionFactory factory = + new IceInternal.IncomingConnectionFactory(instance, endp, this, _name); + _incomingConnectionFactories.add(factory); + + _connectors.addAll(factory.endpoint().connectors()); } if(endpoints.size() == 0) { @@ -1385,6 +1396,7 @@ public final class ObjectAdapterI implements ObjectAdapter final private String _id; final private String _replicaGroupId; private java.util.ArrayList _incomingConnectionFactories = new java.util.ArrayList(); + private java.util.ArrayList _connectors = new java.util.ArrayList(); private java.util.ArrayList _routerEndpoints = new java.util.ArrayList(); private IceInternal.RouterInfo _routerInfo = null; private java.util.ArrayList _publishedEndpoints = new java.util.ArrayList(); diff --git a/java/src/IceInternal/EndpointI.java b/java/src/IceInternal/EndpointI.java index 16f18d73ac6..c5857e7dff7 100644 --- a/java/src/IceInternal/EndpointI.java +++ b/java/src/IceInternal/EndpointI.java @@ -117,11 +117,9 @@ abstract public class EndpointI implements Ice.Endpoint, java.lang.Comparable public abstract java.util.ArrayList expand(boolean includeLoopback); // - // Check whether the endpoint is equivalent to a specific - // Transceiver or Acceptor. + // Check whether the endpoint is equivalent to a specific Connector. // - public abstract boolean equivalent(Transceiver transceiver); - public abstract boolean equivalent(Acceptor acceptor); + public abstract boolean equivalent(Connector connector); // // Compare endpoints for sorting purposes. diff --git a/java/src/IceInternal/IncomingConnectionFactory.java b/java/src/IceInternal/IncomingConnectionFactory.java index fb977f5d175..dbf85a7a88d 100644 --- a/java/src/IceInternal/IncomingConnectionFactory.java +++ b/java/src/IceInternal/IncomingConnectionFactory.java @@ -145,18 +145,6 @@ public final class IncomingConnectionFactory extends EventHandler return _endpoint; } - public boolean - equivalent(EndpointI endp) - { - if(_transceiver != null) - { - return endp.equivalent(_transceiver); - } - - assert(_acceptor != null); - return endp.equivalent(_acceptor); - } - public synchronized Ice.ConnectionI[] connections() { diff --git a/java/src/IceInternal/Network.java b/java/src/IceInternal/Network.java index 57e2b5b6867..3d929b13edd 100644 --- a/java/src/IceInternal/Network.java +++ b/java/src/IceInternal/Network.java @@ -791,32 +791,44 @@ public final class Network getAddresses(String host, int port) { java.util.ArrayList addresses = new java.util.ArrayList(); - try + if(host.equals("0.0.0.0")) { - java.net.InetAddress[] addrs = java.net.InetAddress.getAllByName(host); - for(int i = 0; i < addrs.length; ++i) + java.util.ArrayList hosts = getLocalHosts(); + java.util.Iterator p = hosts.iterator(); + while(p.hasNext()) { - if(addrs[i] instanceof java.net.Inet4Address) - { - addresses.add(new java.net.InetSocketAddress(addrs[i], port)); - } + addresses.add(getAddress((String)p.next(), port)); } } - catch(java.net.UnknownHostException ex) + else { - Ice.DNSException e = new Ice.DNSException(); - e.host = host; - throw e; - } + try + { + java.net.InetAddress[] addrs = java.net.InetAddress.getAllByName(host); + for(int i = 0; i < addrs.length; ++i) + { + if(addrs[i] instanceof java.net.Inet4Address) + { + addresses.add(new java.net.InetSocketAddress(addrs[i], port)); + } + } + } + catch(java.net.UnknownHostException ex) + { + Ice.DNSException e = new Ice.DNSException(); + e.host = host; + throw e; + } - // - // No Inet4Address available. - // - if(addresses.size() == 0) - { - Ice.DNSException e = new Ice.DNSException(); - e.host = host; - throw e; + // + // No Inet4Address available. + // + if(addresses.size() == 0) + { + Ice.DNSException e = new Ice.DNSException(); + e.host = host; + throw e; + } } return addresses; diff --git a/java/src/IceInternal/TcpAcceptor.java b/java/src/IceInternal/TcpAcceptor.java index c2b7e0751e5..21d56732fc6 100644 --- a/java/src/IceInternal/TcpAcceptor.java +++ b/java/src/IceInternal/TcpAcceptor.java @@ -178,13 +178,6 @@ class TcpAcceptor implements Acceptor return Network.addrToString(_addr); } - final boolean - equivalent(String host, int port) - { - java.net.InetSocketAddress addr = Network.getAddress(host, port); - return addr.equals(_addr); - } - int effectivePort() { diff --git a/java/src/IceInternal/TcpConnector.java b/java/src/IceInternal/TcpConnector.java index 82776427b96..71a20e4f37a 100644 --- a/java/src/IceInternal/TcpConnector.java +++ b/java/src/IceInternal/TcpConnector.java @@ -54,6 +54,13 @@ final class TcpConnector implements Connector, java.lang.Comparable return _hashCode; } + public final boolean + equivalent(String host, int port) + { + java.net.InetSocketAddress addr = Network.getAddress(host, port); + return addr.equals(_addr); + } + // // Only for use by TcpEndpoint // diff --git a/java/src/IceInternal/TcpEndpointI.java b/java/src/IceInternal/TcpEndpointI.java index 5ec1cba6a60..bc7a3b46a79 100644 --- a/java/src/IceInternal/TcpEndpointI.java +++ b/java/src/IceInternal/TcpEndpointI.java @@ -389,28 +389,21 @@ final class TcpEndpointI extends EndpointI } // - // Check whether the endpoint is equivalent to a specific - // Transceiver or Acceptor + // Check whether the endpoint is equivalent to a specific Connector // public boolean - equivalent(Transceiver transceiver) + equivalent(Connector connector) { - return false; - } - - public boolean - equivalent(Acceptor acceptor) - { - TcpAcceptor tcpAcceptor = null; + TcpConnector tcpConnector = null; try { - tcpAcceptor = (TcpAcceptor)acceptor; + tcpConnector = (TcpConnector)connector; } catch(ClassCastException ex) { return false; } - return tcpAcceptor.equivalent(_host, _port); + return tcpConnector.equivalent(_host, _port); } public int diff --git a/java/src/IceInternal/UdpConnector.java b/java/src/IceInternal/UdpConnector.java index 9f76949ad87..790d76dd94e 100644 --- a/java/src/IceInternal/UdpConnector.java +++ b/java/src/IceInternal/UdpConnector.java @@ -37,6 +37,13 @@ final class UdpConnector implements Connector, java.lang.Comparable return _hashCode; } + final public boolean + equivalent(String host, int port) + { + java.net.InetSocketAddress addr = Network.getAddress(host, port); + return addr.equals(_addr); + } + // // Only for use by TcpEndpoint // diff --git a/java/src/IceInternal/UdpEndpointI.java b/java/src/IceInternal/UdpEndpointI.java index 5e65053e752..976824b93d7 100644 --- a/java/src/IceInternal/UdpEndpointI.java +++ b/java/src/IceInternal/UdpEndpointI.java @@ -556,28 +556,21 @@ final class UdpEndpointI extends EndpointI } // - // Check whether the endpoint is equivalent to a specific - // Transceiver or Acceptor + // Check whether the endpoint is equivalent to a specific Conenctor. // public boolean - equivalent(Transceiver transceiver) + equivalent(Connector connector) { - UdpTransceiver udpTransceiver = null; + UdpConnector udpConnector = null; try { - udpTransceiver = (UdpTransceiver)transceiver; + udpConnector = (UdpConnector)connector; } catch(ClassCastException ex) { return false; } - return udpTransceiver.equivalent(_host, _port); - } - - public boolean - equivalent(Acceptor acceptor) - { - return false; + return udpConnector.equivalent(_host, _port); } public int diff --git a/java/src/IceInternal/UdpTransceiver.java b/java/src/IceInternal/UdpTransceiver.java index e9e90636545..408379547f6 100644 --- a/java/src/IceInternal/UdpTransceiver.java +++ b/java/src/IceInternal/UdpTransceiver.java @@ -312,13 +312,6 @@ final class UdpTransceiver implements Transceiver } } - public final boolean - equivalent(String host, int port) - { - java.net.InetSocketAddress addr = Network.getAddress(host, port); - return addr.equals(_addr); - } - public final int effectivePort() { diff --git a/java/src/IceInternal/UnknownEndpointI.java b/java/src/IceInternal/UnknownEndpointI.java index 9911f372110..75bffdd3163 100644 --- a/java/src/IceInternal/UnknownEndpointI.java +++ b/java/src/IceInternal/UnknownEndpointI.java @@ -271,17 +271,10 @@ final class UnknownEndpointI extends EndpointI } // - // Check whether the endpoint is equivalent to a specific - // Transceiver or Acceptor + // Check whether the endpoint is equivalent to a specific Conenctor. // public boolean - equivalent(Transceiver transceiver) - { - return false; - } - - public boolean - equivalent(Acceptor acceptor) + equivalent(Connector connector) { return false; } diff --git a/java/ssl/jdk1.4/IceSSL/AcceptorI.java b/java/ssl/jdk1.4/IceSSL/AcceptorI.java index a77b7dd32db..8bec44c40a3 100644 --- a/java/ssl/jdk1.4/IceSSL/AcceptorI.java +++ b/java/ssl/jdk1.4/IceSSL/AcceptorI.java @@ -258,13 +258,6 @@ class AcceptorI implements IceInternal.Acceptor return IceInternal.Network.addrToString(_addr); } - final boolean - equivalent(String host, int port) - { - java.net.InetSocketAddress addr = IceInternal.Network.getAddress(host, port); - return addr.equals(_addr); - } - int effectivePort() { diff --git a/java/ssl/jdk1.4/IceSSL/ConnectorI.java b/java/ssl/jdk1.4/IceSSL/ConnectorI.java index 8dd8c9ac9c9..f56150445e6 100644 --- a/java/ssl/jdk1.4/IceSSL/ConnectorI.java +++ b/java/ssl/jdk1.4/IceSSL/ConnectorI.java @@ -245,6 +245,13 @@ final class ConnectorI implements IceInternal.Connector, java.lang.Comparable return _hashCode; } + final boolean + equivalent(String host, int port) + { + java.net.InetSocketAddress addr = IceInternal.Network.getAddress(host, port); + return addr.equals(_addr); + } + // // Only for use by EndpointI // diff --git a/java/ssl/jdk1.4/IceSSL/EndpointI.java b/java/ssl/jdk1.4/IceSSL/EndpointI.java index 90b8e7b35a2..e5dfaf1073d 100644 --- a/java/ssl/jdk1.4/IceSSL/EndpointI.java +++ b/java/ssl/jdk1.4/IceSSL/EndpointI.java @@ -390,28 +390,21 @@ final class EndpointI extends IceInternal.EndpointI } // - // Check whether the endpoint is equivalent to a specific - // Transceiver or Acceptor + // Check whether the endpoint is equivalent to a specific Connector. // public boolean - equivalent(IceInternal.Transceiver transceiver) + equivalent(IceInternal.Connector connector) { - return false; - } - - public boolean - equivalent(IceInternal.Acceptor acceptor) - { - AcceptorI sslAcceptor = null; + ConnectorI sslConnector = null; try { - sslAcceptor = (AcceptorI)acceptor; + sslConnector = (ConnectorI)connector; } catch(ClassCastException ex) { return false; } - return sslAcceptor.equivalent(_host, _port); + return sslConnector.equivalent(_host, _port); } public int diff --git a/java/ssl/jdk1.5/IceSSL/AcceptorI.java b/java/ssl/jdk1.5/IceSSL/AcceptorI.java index cc4cf8064d1..04f2b3331ab 100644 --- a/java/ssl/jdk1.5/IceSSL/AcceptorI.java +++ b/java/ssl/jdk1.5/IceSSL/AcceptorI.java @@ -243,13 +243,6 @@ final class AcceptorI implements IceInternal.Acceptor return IceInternal.Network.addrToString(_addr); } - final boolean - equivalent(String host, int port) - { - java.net.InetSocketAddress addr = IceInternal.Network.getAddress(host, port); - return addr.equals(_addr); - } - int effectivePort() { diff --git a/java/ssl/jdk1.5/IceSSL/ConnectorI.java b/java/ssl/jdk1.5/IceSSL/ConnectorI.java index 6685a9c1dbc..502f5cba419 100644 --- a/java/ssl/jdk1.5/IceSSL/ConnectorI.java +++ b/java/ssl/jdk1.5/IceSSL/ConnectorI.java @@ -116,6 +116,13 @@ final class ConnectorI implements IceInternal.Connector, java.lang.Comparable return _hashCode; } + final boolean + equivalent(String host, int port) + { + java.net.InetSocketAddress addr = IceInternal.Network.getAddress(host, port); + return addr.equals(_addr); + } + // // Only for use by EndpointI. // diff --git a/java/ssl/jdk1.5/IceSSL/EndpointI.java b/java/ssl/jdk1.5/IceSSL/EndpointI.java index 3eb98331905..4af762a069d 100644 --- a/java/ssl/jdk1.5/IceSSL/EndpointI.java +++ b/java/ssl/jdk1.5/IceSSL/EndpointI.java @@ -390,28 +390,21 @@ final class EndpointI extends IceInternal.EndpointI } // - // Check whether the endpoint is equivalent to a specific - // Transceiver or Acceptor + // Check whether the endpoint is equivalent to a specific Connector. // public boolean - equivalent(IceInternal.Transceiver transceiver) + equivalent(IceInternal.Connector connector) { - return false; - } - - public boolean - equivalent(IceInternal.Acceptor acceptor) - { - AcceptorI sslAcceptor = null; + ConnectorI sslConnector = null; try { - sslAcceptor = (AcceptorI)acceptor; + sslConnector = (ConnectorI)connector; } catch(ClassCastException ex) { return false; } - return sslAcceptor.equivalent(_host, _port); + return sslConnector.equivalent(_host, _port); } public int |