diff options
| author | Joe George <joe@zeroc.com> | 2015-12-10 17:05:16 -0500 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2015-12-10 17:05:16 -0500 |
| commit | de78127dba41abd9287980b8f87843d07aa7af9e (patch) | |
| tree | b02c5bcaaebe4298c4354fba85a91a02d68d5e03 /cpp/src/IceGridLib | |
| parent | Fix more deprecated compilation errors (diff) | |
| download | ice-de78127dba41abd9287980b8f87843d07aa7af9e.tar.bz2 ice-de78127dba41abd9287980b8f87843d07aa7af9e.tar.xz ice-de78127dba41abd9287980b8f87843d07aa7af9e.zip | |
Fix Windows build
Diffstat (limited to 'cpp/src/IceGridLib')
| -rwxr-xr-x | cpp/src/IceGridLib/.depend.mak | 115 |
1 files changed, 58 insertions, 57 deletions
diff --git a/cpp/src/IceGridLib/.depend.mak b/cpp/src/IceGridLib/.depend.mak index 990261a241e..1c2a33cb129 100755 --- a/cpp/src/IceGridLib/.depend.mak +++ b/cpp/src/IceGridLib/.depend.mak @@ -160,13 +160,15 @@ PluginFacadeI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -176,8 +178,7 @@ PluginFacadeI.obj: \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ @@ -256,13 +257,15 @@ Admin.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -272,8 +275,7 @@ Admin.obj: \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ @@ -283,7 +285,6 @@ Admin.obj: \ "$(includedir)\IceGrid\Exception.h" \ "$(includedir)\IceGrid\Config.h" \ "$(includedir)\IceGrid\Descriptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -350,13 +351,15 @@ Descriptor.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -365,10 +368,8 @@ Descriptor.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\IceGrid\Config.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -409,11 +410,11 @@ Exception.obj: \ "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\MutexProtocol.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ + "$(includedir)\Ice\ValueFactory.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\IceGrid\Config.h" \ @@ -426,7 +427,7 @@ Exception.obj: \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -492,13 +493,15 @@ FileParser.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -508,9 +511,8 @@ FileParser.obj: \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\IceGrid\Admin.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ @@ -520,7 +522,6 @@ FileParser.obj: \ "$(includedir)\IceGrid\Exception.h" \ "$(includedir)\IceGrid\Config.h" \ "$(includedir)\IceGrid\Descriptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -587,13 +588,15 @@ Locator.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -603,12 +606,10 @@ Locator.obj: \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Process.h" \ "$(includedir)\IceGrid\Config.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -675,13 +676,15 @@ Observer.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -691,9 +694,8 @@ Observer.obj: \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Glacier2\Session.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Glacier2\Config.h" \ "$(includedir)\IceGrid\Exception.h" \ @@ -703,7 +705,6 @@ Observer.obj: \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -770,13 +771,15 @@ PluginFacade.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -786,8 +789,7 @@ PluginFacade.obj: \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\IceGrid\Admin.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ @@ -798,7 +800,6 @@ PluginFacade.obj: \ "$(includedir)\IceGrid\Exception.h" \ "$(includedir)\IceGrid\Config.h" \ "$(includedir)\IceGrid\Descriptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -865,13 +866,15 @@ Query.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -880,11 +883,9 @@ Query.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\IceGrid\Exception.h" \ "$(includedir)\IceGrid\Config.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -951,13 +952,15 @@ Registry.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -967,9 +970,8 @@ Registry.obj: \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\IceGrid\Exception.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\IceGrid\Config.h" \ "$(includedir)\IceGrid\Session.h" \ "$(includedir)\Glacier2\Session.h" \ @@ -980,7 +982,6 @@ Registry.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\IceGrid\Descriptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -1047,13 +1048,15 @@ Session.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -1063,14 +1066,12 @@ Session.obj: \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Glacier2\Session.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Glacier2\Config.h" \ "$(includedir)\IceGrid\Exception.h" \ "$(includedir)\IceGrid\Config.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -1138,13 +1139,15 @@ UserAccountMapper.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -1153,10 +1156,8 @@ UserAccountMapper.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\IceGrid\Config.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ |