From d14b06044dce123b23c52b3fc65d122ecd9378a7 Mon Sep 17 00:00:00 2001 From: Jose Date: Thu, 1 Feb 2024 10:30:44 +0100 Subject: [PATCH 01/17] C++98 removal --- cpp/config/Make.rules | 66 +- cpp/include/Glacier2/Application.h | 5 - cpp/include/Glacier2/SessionHelper.h | 19 +- cpp/include/Ice/Application.h | 15 - cpp/include/Ice/AsyncResult.h | 153 - cpp/include/Ice/AsyncResultF.h | 23 - cpp/include/Ice/BatchRequestInterceptor.h | 23 - cpp/include/Ice/Communicator.h | 447 --- cpp/include/Ice/CommunicatorAsync.h | 154 - cpp/include/Ice/CommunicatorF.h | 31 - cpp/include/Ice/Comparable.h | 4 - cpp/include/Ice/Config.h | 5 - cpp/include/Ice/Connection.h | 908 ----- cpp/include/Ice/ConnectionAsync.h | 302 -- cpp/include/Ice/ConnectionF.h | 39 - cpp/include/Ice/ConnectionIF.h | 5 - cpp/include/Ice/Current.h | 58 - cpp/include/Ice/Dispatcher.h | 2 +- cpp/include/Ice/Endpoint.h | 457 --- cpp/include/Ice/EndpointF.h | 65 - cpp/include/Ice/EndpointSelectionType.h | 43 - cpp/include/Ice/Exception.h | 13 +- cpp/include/Ice/ExceptionHelpers.h | 4 - cpp/include/Ice/FactoryTableInit.h | 4 - cpp/include/Ice/Format.h | 4 - cpp/include/Ice/Ice.h | 3 - cpp/include/Ice/IconvStringConverter.h | 8 - cpp/include/Ice/ImplicitContext.h | 117 - cpp/include/Ice/ImplicitContextF.h | 34 - cpp/include/Ice/Incoming.h | 16 - cpp/include/Ice/IncomingAsync.h | 104 +- cpp/include/Ice/IncomingAsyncF.h | 21 +- cpp/include/Ice/Initialize.h | 262 -- cpp/include/Ice/InputStream.h | 139 +- cpp/include/Ice/LocalException.h | 3208 --------------- cpp/include/Ice/LocalObject.h | 2 +- cpp/include/Ice/LocatorF.h | 50 - cpp/include/Ice/Logger.h | 102 - cpp/include/Ice/LoggerF.h | 34 - cpp/include/Ice/LoggerUtil.h | 6 - cpp/include/Ice/MetricsAdminI.h | 10 - cpp/include/Ice/MetricsFunctional.h | 50 - cpp/include/Ice/Object.h | 70 - cpp/include/Ice/ObjectAdapter.h | 128 +- cpp/include/Ice/ObjectF.h | 7 +- cpp/include/Ice/OutgoingAsync.h | 298 +- cpp/include/Ice/OutgoingAsyncF.h | 17 +- cpp/include/Ice/OutputStream.h | 31 - cpp/include/Ice/Plugin.h | 149 - cpp/include/Ice/PluginF.h | 31 - cpp/include/Ice/Properties.h | 189 - cpp/include/Ice/PropertiesF.h | 18 - cpp/include/Ice/Proxy.h | 3477 ----------------- cpp/include/Ice/ProxyF.h | 29 +- cpp/include/Ice/ProxyHandle.h | 287 -- cpp/include/Ice/RequestHandlerF.h | 12 +- cpp/include/Ice/ResponseHandlerF.h | 10 +- cpp/include/Ice/RouterF.h | 38 - cpp/include/Ice/SHA1.h | 6 +- cpp/include/Ice/SharedPtr.h | 138 - cpp/include/Ice/SlicedData.h | 4 - cpp/include/Ice/SlicedDataF.h | 11 +- cpp/include/Ice/StreamHelpers.h | 236 -- cpp/include/Ice/StringConverter.h | 2 - cpp/include/Ice/UniquePtr.h | 95 - cpp/include/Ice/UserExceptionFactory.h | 51 - cpp/include/Ice/Value.h | 14 - cpp/include/Ice/ValueF.h | 10 - cpp/include/IceBT/ConnectionInfo.h | 134 - cpp/include/IceBT/EndpointInfo.h | 95 - cpp/include/IceBT/Plugin.h | 23 - cpp/include/IceBT/Types.h | 80 - cpp/include/IceBox/Service.h | 125 - cpp/include/IceGrid/PluginFacade.h | 297 -- cpp/include/IceIAP/ConnectionInfo.h | 120 - cpp/include/IceIAP/EndpointInfo.h | 110 - cpp/include/IcePatch2/ClientUtil.h | 19 +- cpp/include/IceSSL/ConnectionInfo.h | 93 - cpp/include/IceSSL/ConnectionInfoF.h | 27 - cpp/include/IceSSL/EndpointInfo.h | 82 - cpp/include/IceSSL/Plugin.h | 119 +- cpp/include/IceUtil/Config.h | 43 +- cpp/include/IceUtil/ConsoleUtil.h | 3 - cpp/include/IceUtil/CtrlCHandler.h | 8 - cpp/include/IceUtil/Exception.h | 93 - cpp/include/IceUtil/IceUtil.h | 1 - cpp/include/IceUtil/Options.h | 8 - cpp/include/IceUtil/ResourceConfig.h | 14 +- cpp/include/IceUtil/ScopedArray.h | 97 - cpp/include/IceUtil/StringConverter.h | 3 - cpp/include/IceUtil/StringUtil.h | 7 +- cpp/include/IceUtil/ThreadException.h | 25 - cpp/include/IceUtil/Timer.h | 3 - cpp/src/Glacier2/Instrumentation.cpp | 49 - cpp/src/Glacier2/Instrumentation.h | 194 - .../CryptPermissionsVerifierI.cpp | 526 --- cpp/src/Glacier2Lib/Application.cpp | 36 - .../Glacier2Lib/NullPermissionsVerifier.cpp | 9 - cpp/src/Glacier2Lib/SessionHelper.cpp | 68 +- cpp/src/Ice/ACM.cpp | 5 - cpp/src/Ice/ACM.h | 13 +- cpp/src/Ice/ACMF.h | 8 - cpp/src/Ice/Application.cpp | 47 +- cpp/src/Ice/AsyncResult.cpp | 70 - cpp/src/Ice/BatchRequestQueue.cpp | 12 - cpp/src/Ice/BatchRequestQueue.h | 7 +- cpp/src/Ice/CollocatedRequestHandler.h | 2 - cpp/src/Ice/Communicator.cpp | 47 - cpp/src/Ice/CommunicatorF.cpp | 38 - cpp/src/Ice/CommunicatorI.cpp | 83 - cpp/src/Ice/CommunicatorI.h | 31 +- cpp/src/Ice/ConnectRequestHandler.cpp | 12 - cpp/src/Ice/ConnectRequestHandler.h | 9 +- cpp/src/Ice/ConnectRequestHandlerF.h | 5 - cpp/src/Ice/Connection.cpp | 88 - cpp/src/Ice/ConnectionF.cpp | 38 - cpp/src/Ice/ConnectionFactory.cpp | 13 +- cpp/src/Ice/ConnectionFactory.h | 13 +- cpp/src/Ice/ConnectionFactoryF.h | 5 - cpp/src/Ice/ConnectionI.cpp | 171 - cpp/src/Ice/ConnectionI.h | 43 +- cpp/src/Ice/ConnectionRequestHandler.h | 7 +- cpp/src/Ice/Current.cpp | 39 - cpp/src/Ice/DynamicLibrary.cpp | 14 - cpp/src/Ice/Endpoint.cpp | 76 - cpp/src/Ice/EndpointF.cpp | 38 - cpp/src/Ice/EndpointI.cpp | 5 - cpp/src/Ice/EndpointI.h | 23 - cpp/src/Ice/EndpointIF.h | 21 - cpp/src/Ice/EventHandler.cpp | 4 - cpp/src/Ice/EventHandler.h | 7 +- cpp/src/Ice/EventHandlerF.h | 6 +- cpp/src/Ice/Exception.cpp | 6 - cpp/src/Ice/FactoryTable.cpp | 9 - cpp/src/Ice/IPEndpointI.cpp | 11 - cpp/src/Ice/IPEndpointI.h | 22 +- cpp/src/Ice/IPEndpointIF.h | 5 - cpp/src/Ice/IconvStringConverter.cpp | 8 - cpp/src/Ice/ImplicitContext.cpp | 28 - cpp/src/Ice/ImplicitContextF.cpp | 38 - cpp/src/Ice/Incoming.cpp | 16 - cpp/src/Ice/IncomingAsync.cpp | 100 - cpp/src/Ice/Initialize.cpp | 104 - cpp/src/Ice/InputStream.cpp | 197 - cpp/src/Ice/Instance.cpp | 20 - cpp/src/Ice/Instance.h | 8 - cpp/src/Ice/InstrumentationI.cpp | 6 +- cpp/src/Ice/LocalException.cpp | 2097 ---------- cpp/src/Ice/LocatorInfo.cpp | 16 - cpp/src/Ice/LocatorInfo.h | 8 +- cpp/src/Ice/Logger.cpp | 41 - cpp/src/Ice/LoggerAdminI.cpp | 120 +- cpp/src/Ice/LoggerF.cpp | 38 - cpp/src/Ice/MetricsAdminI.cpp | 20 - cpp/src/Ice/Object.cpp | 31 - cpp/src/Ice/ObjectAdapterFactory.cpp | 4 - cpp/src/Ice/ObjectAdapterFactory.h | 4 - cpp/src/Ice/ObjectAdapterFactoryF.h | 5 - cpp/src/Ice/ObjectAdapterI.cpp | 4 - cpp/src/Ice/OpaqueEndpointI.cpp | 8 - cpp/src/Ice/OpaqueEndpointI.h | 10 +- cpp/src/Ice/OutgoingAsync.cpp | 296 +- cpp/src/Ice/OutputStream.cpp | 4 - cpp/src/Ice/Plugin.cpp | 36 - cpp/src/Ice/PluginF.cpp | 38 - cpp/src/Ice/Properties.cpp | 45 - cpp/src/Ice/PropertiesAdminI.cpp | 12 - cpp/src/Ice/PropertiesAdminI.h | 9 - cpp/src/Ice/PropertiesF.cpp | 40 - cpp/src/Ice/Proxy.cpp | 498 +-- cpp/src/Ice/ProxyFactory.cpp | 4 - cpp/src/Ice/Reference.cpp | 11 +- cpp/src/Ice/Reference.h | 3 - cpp/src/Ice/RequestHandler.cpp | 5 - cpp/src/Ice/RequestHandler.h | 6 +- cpp/src/Ice/RequestHandlerFactory.cpp | 4 - cpp/src/Ice/ResponseHandler.cpp | 12 - cpp/src/Ice/ResponseHandler.h | 7 +- cpp/src/Ice/RetryQueue.h | 6 +- cpp/src/Ice/RouterInfo.cpp | 15 - cpp/src/Ice/RouterInfo.h | 7 - cpp/src/Ice/TcpEndpointI.cpp | 12 - cpp/src/Ice/TcpEndpointI.h | 5 - cpp/src/Ice/ThreadPool.cpp | 20 - cpp/src/Ice/ThreadPool.h | 4 - cpp/src/Ice/UdpEndpointI.cpp | 12 - cpp/src/Ice/UdpEndpointI.h | 5 - cpp/src/Ice/VirtualShared.h | 3 - cpp/src/Ice/WSEndpoint.cpp | 12 - cpp/src/Ice/WSEndpoint.h | 10 +- cpp/src/Ice/ios/StreamAcceptor.h | 4 - cpp/src/Ice/ios/StreamEndpointI.cpp | 8 - cpp/src/Ice/ios/StreamEndpointI.h | 6 - cpp/src/IceBT/ConnectionInfo.cpp | 28 - cpp/src/IceBT/DBus.h | 9 - cpp/src/IceBT/EndpointI.cpp | 12 - cpp/src/IceBT/EndpointI.h | 10 +- cpp/src/IceBT/EndpointInfo.cpp | 28 - cpp/src/IceBT/Engine.cpp | 66 +- cpp/src/IceBT/Engine.h | 10 - cpp/src/IceBT/EngineF.h | 5 - cpp/src/IceBT/InstanceF.h | 5 - cpp/src/IceBT/PluginI.cpp | 4 - cpp/src/IceBT/PluginI.h | 4 - cpp/src/IceBT/Types.cpp | 43 - cpp/src/IceBox/Service.cpp | 47 - cpp/src/IceBox/ServiceManagerI.cpp | 117 +- cpp/src/IceBox/ServiceManagerI.h | 12 - cpp/src/IceDiscovery/LocatorI.cpp | 55 - cpp/src/IceDiscovery/LocatorI.h | 24 - cpp/src/IceDiscovery/LookupI.cpp | 95 - cpp/src/IceDiscovery/LookupI.h | 28 +- cpp/src/IceGrid/SynchronizationException.cpp | 33 - cpp/src/IceGrid/SynchronizationException.h | 41 - cpp/src/IceGridLib/PluginFacade.cpp | 44 - cpp/src/IceGridLib/PluginFacadeI.cpp | 16 - cpp/src/IceIAP/ConnectionInfo.cpp | 28 - cpp/src/IceIAP/EndpointI.h | 14 +- cpp/src/IceIAP/EndpointI.mm | 8 - cpp/src/IceIAP/EndpointInfo.cpp | 28 - cpp/src/IceLocatorDiscovery/PluginI.cpp | 175 +- cpp/src/IcePatch2Lib/ClientUtil.cpp | 65 +- cpp/src/IcePatch2Lib/Util.cpp | 8 - cpp/src/IceSSL/CertificateI.cpp | 32 - cpp/src/IceSSL/CertificateI.h | 5 - cpp/src/IceSSL/ConnectionInfo.cpp | 28 - cpp/src/IceSSL/ConnectionInfoF.cpp | 38 - cpp/src/IceSSL/EndpointI.cpp | 12 - cpp/src/IceSSL/EndpointI.h | 10 +- cpp/src/IceSSL/EndpointInfo.cpp | 14 - cpp/src/IceSSL/InstanceF.h | 5 - cpp/src/IceSSL/OpenSSLCertificateI.cpp | 25 - cpp/src/IceSSL/PluginI.cpp | 28 - cpp/src/IceSSL/PluginI.h | 5 - cpp/src/IceSSL/SChannelCertificateI.cpp | 25 - .../IceSSL/SecureTransportCertificateI.cpp | 25 - cpp/src/IceSSL/Util.cpp | 2 - cpp/src/IceSSL/Util.h | 2 - cpp/src/IceStorm/Instrumentation.cpp | 57 - cpp/src/IceStorm/Instrumentation.h | 281 -- cpp/src/IceStorm/SendQueueSizeMaxReached.cpp | 33 - cpp/src/IceStorm/SendQueueSizeMaxReached.h | 41 - cpp/src/IceUtil/CtrlCHandler.cpp | 8 - cpp/src/IceUtil/Options.cpp | 16 - cpp/src/IceUtil/ThreadException.cpp | 48 - cpp/src/IceUtil/UtilException.cpp | 59 - .../IceUtil/msbuild/iceutil/iceutil.vcxproj | 1 - .../msbuild/iceutil/iceutil.vcxproj.filters | 3 - cpp/src/Slice/FileTracker.cpp | 5 - cpp/src/Slice/FileTracker.h | 4 - cpp/src/Slice/Parser.cpp | 5 - cpp/src/Slice/Parser.h | 4 - cpp/src/Slice/Preprocessor.cpp | 8 +- cpp/src/slice2cpp/Gen.cpp | 98 - cpp/test/IceBox/admin/AllTests.cpp | 19 - cpp/test/IceBox/admin/Service.cpp | 4 - cpp/test/IceSSL/configuration/AllTests.cpp | 41 +- 257 files changed, 128 insertions(+), 21952 deletions(-) delete mode 100644 cpp/include/Ice/AsyncResult.h delete mode 100644 cpp/include/Ice/AsyncResultF.h delete mode 100644 cpp/include/Ice/CommunicatorAsync.h delete mode 100644 cpp/include/Ice/ConnectionAsync.h delete mode 100644 cpp/include/Ice/ProxyHandle.h delete mode 100644 cpp/include/Ice/SharedPtr.h delete mode 100644 cpp/include/Ice/UniquePtr.h delete mode 100644 cpp/include/IceUtil/ScopedArray.h delete mode 100644 cpp/src/Ice/AsyncResult.cpp delete mode 100644 cpp/src/Ice/CommunicatorF.cpp delete mode 100644 cpp/src/Ice/ConnectionF.cpp delete mode 100644 cpp/src/Ice/Current.cpp delete mode 100644 cpp/src/Ice/EndpointF.cpp delete mode 100644 cpp/src/Ice/ImplicitContextF.cpp delete mode 100644 cpp/src/Ice/LoggerF.cpp delete mode 100644 cpp/src/Ice/PluginF.cpp delete mode 100644 cpp/src/Ice/PropertiesF.cpp delete mode 100644 cpp/src/Ice/ResponseHandler.cpp delete mode 100644 cpp/src/IceSSL/ConnectionInfoF.cpp diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules index df9cecb3fbe..018bff9dbee 100644 --- a/cpp/config/Make.rules +++ b/cpp/config/Make.rules @@ -9,8 +9,8 @@ # # Supported configurations # -supported-configs = cpp98-shared cpp98-static cpp11-shared cpp11-static -default-configs = cpp11-shared cpp98-shared +supported-configs = shared static +default-configs = shared -include $(lang_srcdir)/config/Make.rules.$(os) ifeq ($(os),Darwin) @@ -62,73 +62,15 @@ static_projects = test/Common \ static_excludes = test/Ice/library test/Ice/plugin -# -# Components and projects which are built with C++98 -# -cpp98_cppflags = -std=c++17 -cpp98_projects = % -cpp98_excludes = glacier2router \ - icebridge \ - icepatch2server icepatch2client icepatch2calc \ - icegridnode icegridregistry icegridadmin icegriddb \ - IceStormService icestormadmin icestormdb \ - IceXML \ - IceDB \ - test/Glacier2/% \ - test/IceBridge/% \ - test/IceGrid/% \ - test/IceStorm/% - -# -# Components and projects which are built with C++11 -# -cpp11_components = $(coreandstub_components) \ - glacier2router Glacier2CryptPermissionsVerifier \ - icebox icebridge \ - icepatch2server icepatch2client icepatch2calc \ - IceDB \ - IceXML \ - icegridnode icegridregistry icegridadmin icegriddb \ - IceStormService icestormadmin icestormdb \ - -cpp11_projects = test/Common \ - test/IceUtil/% \ - test/Slice/% \ - test/Ice/% \ - test/IceSSL/% \ - test/IceDiscovery/% \ - test/IceBox/% \ - test/IceGrid/% \ - test/IceStorm/% \ - test/Glacier2/% \ - test/IceGrid/% \ - test/IceBridge/simple - # # If building on a Linux multilib platform, we restrict what we build for -# the 32-bits architecture. We basically, build the same set of components -# as C++11 (libraries and icebox executable). +# the 32-bits architecture. # ifeq ($(multilib-platform),yes) x86_components = $(coreandstub_components) IceDB IceStormService icebox x86_projects = test/% endif -# -# C++11 configuration to build the C++11 mapping. -# -# Appends cpp11 to the configuration directory name. If we are building the -# target outside the component build directory, we also append the ++11 -# suffix to the targetname. This is for example how icebox is compiled as -# icebox++11 when compiled with the C++11 configuration. We also don't add -# the cpp11 name to the target directory if building outside the build -# directory. -# -cpp11_cppflags = -DICE_CPP11_MAPPING -cpp11_ldflags = $(cpp11_cppflags) -cpp11_targetname = $(if $(or $(filter-out $($1_target),program),$(filter $(bindir)%,$($4_targetdir))),++11) -cpp11_targetdir = $(if $(filter %/build,$5),cpp11) - # # $(call make-cpp-src-project,$1=project) # @@ -168,8 +110,6 @@ $1[static]_dependencies := IceSSL $(if $(IceBT_system_libs),IceBT) $1[xcodesdk]_dependencies := IceSSL $1[iphoneos-xcodesdk]_targetdir := test/ios/bundles/Bundles-iphoneos/$(subst /,_,$1) $1[iphonesimulator-xcodesdk]_targetdir := test/ios/bundles/Bundles-iphonesimulator/$(subst /,_,$1) -$1[iphoneos-cpp11-xcodesdk]_targetdir := test/ios/bundles/Bundles++11-iphoneos/$(subst /,_,$1) -$1[iphonesimulator-cpp11-xcodesdk]_targetdir := test/ios/bundles/Bundles++11-iphonesimulator/$(subst /,_,$1) $(create-test-project) endef diff --git a/cpp/include/Glacier2/Application.h b/cpp/include/Glacier2/Application.h index bd4927fc4c5..a9f9057bce0 100644 --- a/cpp/include/Glacier2/Application.h +++ b/cpp/include/Glacier2/Application.h @@ -24,9 +24,6 @@ class GLACIER2_API RestartSessionException : public IceUtil::ExceptionHelper -#else - : public virtual IceUtil::Shared -#endif +class GLACIER2_API SessionFactoryHelper : public std::enable_shared_from_this { /// \cond INTERNAL friend class SessionThreadCallback; // To access thread functions diff --git a/cpp/include/Ice/Application.h b/cpp/include/Ice/Application.h index 973b8728413..d195a834617 100644 --- a/cpp/include/Ice/Application.h +++ b/cpp/include/Ice/Application.h @@ -16,14 +16,10 @@ namespace Ice using IceUtil::CtrlCHandler; using IceUtil::CtrlCHandlerCallback; -#ifdef ICE_CPP11_MAPPING /** * Determines how the Application class handles signals. */ enum class SignalPolicy : unsigned char -#else -enum SignalPolicy -#endif { /** Enables signal handling. */ HandleSignals, @@ -47,12 +43,10 @@ class ICE_API Application */ Application(SignalPolicy policy = ICE_ENUM(SignalPolicy, HandleSignals)); -#ifdef ICE_CPP11_MAPPING /// \cond IGNORE Application(const Application&) = delete; Application& operator=(const Application&) = delete; /// \endcond -#endif virtual ~Application(); @@ -310,15 +304,6 @@ class ICE_API Application static void destroyOnInterruptCallback(int); static void shutdownOnInterruptCallback(int); static void callbackOnInterruptCallback(int); - -#ifndef ICE_CPP11_MAPPING - // - // Not defined, make Application non-copyable - // - Application(const Application&); - Application& operator=(const Application&); -#endif - }; } diff --git a/cpp/include/Ice/AsyncResult.h b/cpp/include/Ice/AsyncResult.h deleted file mode 100644 index 00c8de73588..00000000000 --- a/cpp/include/Ice/AsyncResult.h +++ /dev/null @@ -1,153 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#ifndef ICE_ASYNC_RESULT_H -#define ICE_ASYNC_RESULT_H - -#ifndef ICE_CPP11_MAPPING - -#include -#include -#include -#include -#include -#include -#include - -namespace Ice -{ - -/** - * Represents the result of an asynchronous invocation using the C++98 mapping. - * \headerfile Ice/Ice.h - */ -class ICE_API AsyncResult : private IceUtil::noncopyable, public Ice::LocalObject -{ -public: - - virtual ~AsyncResult(); - - /** - * Prevents a queued invocation from being sent or, if the invocation has already been sent, - * ignores a reply if the server sends one. cancel is a local operation and has no effect - * on the server. A canceled invocation is considered to be completed, meaning isCompleted - * returns true, and the result of the invocation is an InvocationCanceledException. - */ - virtual void cancel() = 0; - - /** - * Allows you to create ordered or hashed collections of pending asynchronous invocations. - * @return A unique hash code for this object. - */ - virtual Int getHash() const = 0; - - /** - * Obtains the communicator that sent the invocation. - * @return A reference to the communicator. - */ - virtual CommunicatorPtr getCommunicator() const = 0; - - /** - * Obtains the connection that was used for the invocation. Note that, for typical asynchronous - * proxy invocations, this method returns a nil value because the possibility of automatic retries - * means the connection that is currently in use could change unexpectedly. The getConnection - * method only returns a non-nil value when the AsyncResult object is obtained by calling - * Connection::begin_flushBatchRequests. - * @return A reference to the connection. - */ - virtual ConnectionPtr getConnection() const = 0; - - /** - * Obtains the proxy that was used to call the begin_ method, or nil if the AsyncResult object was - * not obtained via an asynchronous proxy invocation. - * @return A reference to the proxy. - */ - virtual ObjectPrxPtr getProxy() const = 0; - - /** - * Obtains the completion status of the invocation. - * @return True if, at the time it is called, the result of an invocation is available, indicating - * that a call to the end_ method will not block the caller. Otherwise, if the result is not yet - * available, the method returns false. - */ - virtual bool isCompleted() const = 0; - - /** - * Blocks the caller until the result of an invocation becomes available. - */ - virtual void waitForCompleted() = 0; - - /** - * Obtains the sent status of the invocation. - * @return True if, at the time it is called, the request has been written to the local transport - * (whether it was initially queued or not). Otherwise, if the request is still queued or an - * exception occurred before the request could be sent, this method returns false. - */ - virtual bool isSent() const = 0; - - /** - * Blocks the calling thread until a request has been written to the client-side transport, - * or an exception occurs. - */ - virtual void waitForSent() = 0; - - /** - * Throws the local exception that caused the invocation to fail. If no exception has occurred yet, - * this method does nothing. - */ - virtual void throwLocalException() const = 0; - - /** - * Determines whether the request was sent synchronously. - * @return True if a request was written to the client-side transport without first being queued. - * If the request was initially queued, sentSynchronously returns false (independent of whether - * the request is still in the queue or has since been written to the client-side transport). - */ - virtual bool sentSynchronously() const = 0; - - /** - * Obtains the cookie that was passed to the begin_ method. - * @return The cookie, or nil if you did not pass a cookie to the begin_ method. - */ - virtual LocalObjectPtr getCookie() const = 0; - - /** - * Obtains the name of the operation. - * @return The operation name. - */ - virtual const std::string& getOperation() const = 0; - - /// \cond INTERNAL - virtual bool _waitForResponse() = 0; - virtual Ice::InputStream* _startReadParams() = 0; - virtual void _endReadParams() = 0; - virtual void _readEmptyParams() = 0; - virtual void _readParamEncaps(const ::Ice::Byte*&, ::Ice::Int&) = 0; - virtual void _throwUserException() = 0; - - static void _check(const AsyncResultPtr&, const ::IceProxy::Ice::Object*, const ::std::string&); - static void _check(const AsyncResultPtr&, const Connection*, const ::std::string&); - static void _check(const AsyncResultPtr&, const Communicator*, const ::std::string&); - - class Callback : public IceUtil::Shared - { - public: - - virtual void run() = 0; - }; - typedef IceUtil::Handle CallbackPtr; - /// \endcond - -protected: - - /// \cond INTERNAL - static void check(const AsyncResultPtr&, const ::std::string&); - /// \endcond -}; - -} - -#endif - -#endif diff --git a/cpp/include/Ice/AsyncResultF.h b/cpp/include/Ice/AsyncResultF.h deleted file mode 100644 index 79feb963464..00000000000 --- a/cpp/include/Ice/AsyncResultF.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#ifndef ICE_ASYNC_RESULT_F_H -#define ICE_ASYNC_RESULT_F_H - -#ifndef ICE_CPP11_MAPPING - -#include -#include - -namespace Ice -{ - -class AsyncResult; -ICE_API IceUtil::Shared* upCast(::Ice::AsyncResult*); -typedef IceInternal::Handle AsyncResultPtr; - -} - -#endif -#endif diff --git a/cpp/include/Ice/BatchRequestInterceptor.h b/cpp/include/Ice/BatchRequestInterceptor.h index a65fbef8424..efc6ebda426 100644 --- a/cpp/include/Ice/BatchRequestInterceptor.h +++ b/cpp/include/Ice/BatchRequestInterceptor.h @@ -47,29 +47,6 @@ class BatchRequest virtual const Ice::ObjectPrxPtr& getProxy() const = 0; }; -#ifndef ICE_CPP11_MAPPING - -/** - * The base class for a batch request interceptor. Subclasses must implement enqueue. - * The interceptor can be installed via InitializationData. - * \headerfile Ice/Ice.h - */ -class BatchRequestInterceptor : public IceUtil::Shared -{ -public: - - /** - * Called by the Ice run time to enqueue a batch request. - * @param req An object representing the batch request. - * @param count The number of requests currently in the queue. - * @param size The number of bytes consumed by the requests currently in the queue. - */ - virtual void enqueue(const BatchRequest& req, int count, int size) = 0; -}; -typedef IceUtil::Handle BatchRequestInterceptorPtr; - -#endif - } #endif diff --git a/cpp/include/Ice/Communicator.h b/cpp/include/Ice/Communicator.h index 14551dc8665..85ad8550893 100644 --- a/cpp/include/Ice/Communicator.h +++ b/cpp/include/Ice/Communicator.h @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include @@ -44,8 +43,6 @@ # endif #endif -#ifdef ICE_CPP11_MAPPING // C++11 mapping - namespace Ice { @@ -458,449 +455,5 @@ using CommunicatorPtr = ::std::shared_ptr; } /// \endcond -#else // C++98 mapping - -namespace IceProxy -{ - -} - -namespace Ice -{ - -class Communicator; -/// \cond INTERNAL -ICE_API LocalObject* upCast(Communicator*); -/// \endcond -typedef ::IceInternal::Handle< Communicator> CommunicatorPtr; - -} - -namespace Ice -{ - -/** - * The output mode for xxxToString method such as identityToString and proxyToString. The actual encoding format for - * the string is the same for all modes: you don't need to specify an encoding format or mode when reading such a - * string. - */ -enum ToStringMode -{ - /** - * Characters with ordinal values greater than 127 are kept as-is in the resulting string. Non-printable ASCII - * characters with ordinal values 127 and below are encoded as \\t, \\n (etc.) or \\unnnn. - */ - Unicode, - /** - * Characters with ordinal values greater than 127 are encoded as universal character names in the resulting - * string: \\unnnn for BMP characters and \\Unnnnnnnn for non-BMP characters. Non-printable ASCII characters - * with ordinal values 127 and below are encoded as \\t, \\n (etc.) or \\unnnn. - */ - ASCII, - /** - * Characters with ordinal values greater than 127 are encoded as a sequence of UTF-8 bytes using octal escapes. - * Characters with ordinal values 127 and below are encoded as \\t, \\n (etc.) or an octal escape. Use this mode - * to generate strings compatible with Ice 3.6 and earlier. - */ - Compat -}; - -} - -/// \cond INTERNAL -namespace IceAsync -{ - -} -/// \endcond - -namespace Ice -{ - -/** - * Base class for asynchronous callback wrapper classes used for calls to - * IceProxy::Ice::Communicator::begin_flushBatchRequests. - * Create a wrapper instance by calling ::Ice::newCallback_Communicator_flushBatchRequests. - */ -class Callback_Communicator_flushBatchRequests_Base : public virtual ::IceInternal::CallbackBase { }; -typedef ::IceUtil::Handle< Callback_Communicator_flushBatchRequests_Base> Callback_Communicator_flushBatchRequestsPtr; - -} - -namespace IceProxy -{ - -} - -namespace Ice -{ - -/** - * The central object in Ice. One or more communicators can be instantiated for an Ice application. Communicator - * instantiation is language-specific, and not specified in Slice code. - * @see Logger - * @see ObjectAdapter - * @see Properties - * @see ValueFactory - * \headerfile Ice/Ice.h - */ -class ICE_API Communicator : public virtual LocalObject -{ -public: - - typedef CommunicatorPtr PointerType; - - virtual ~Communicator(); - - Communicator() = default; - Communicator(const Communicator&) = default; - Communicator& operator=(const Communicator&) = default; - - /** - * Destroy the communicator. This operation calls {@link #shutdown} implicitly. Calling {@link #destroy} cleans up - * memory, and shuts down this communicator's client functionality and destroys all object adapters. Subsequent - * calls to {@link #destroy} are ignored. - * @see #shutdown - * @see ObjectAdapter#destroy - */ - virtual void destroy() noexcept = 0; - - /** - * Shuts down this communicator's server functionality, which includes the deactivation of all object adapters. - * Attempts to use a deactivated object adapter raise ObjectAdapterDeactivatedException. Subsequent calls to - * shutdown are ignored. - * After shutdown returns, no new requests are processed. However, requests that have been started before shutdown - * was called might still be active. You can use {@link #waitForShutdown} to wait for the completion of all - * requests. - * @see #destroy - * @see #waitForShutdown - * @see ObjectAdapter#deactivate - */ - virtual void shutdown() noexcept = 0; - - /** - * Wait until the application has called {@link #shutdown} (or {@link #destroy}). On the server side, this - * operation blocks the calling thread until all currently-executing operations have completed. On the client - * side, the operation simply blocks until another thread has called {@link #shutdown} or {@link #destroy}. - * A typical use of this operation is to call it from the main thread, which then waits until some other thread - * calls {@link #shutdown}. After shut-down is complete, the main thread returns and can do some cleanup work - * before it finally calls {@link #destroy} to shut down the client functionality, and then exits the application. - * @see #shutdown - * @see #destroy - * @see ObjectAdapter#waitForDeactivate - */ - virtual void waitForShutdown() noexcept = 0; - - /** - * Check whether communicator has been shut down. - * @return True if the communicator has been shut down; false otherwise. - * @see #shutdown - */ - virtual bool isShutdown() const noexcept = 0; - - /** - * Convert a stringified proxy into a proxy. - * For example, MyCategory/MyObject:tcp -h some_host -p 10000 creates a proxy that refers to the Ice - * object having an identity with a name "MyObject" and a category "MyCategory", with the server running on host - * "some_host", port 10000. If the stringified proxy does not parse correctly, the operation throws one of - * ProxyParseException, EndpointParseException, or IdentityParseException. Refer to the Ice manual for a detailed - * description of the syntax supported by stringified proxies. - * @param str The stringified proxy to convert into a proxy. - * @return The proxy, or nil if str is an empty string. - * @see #proxyToString - */ - virtual ObjectPrx stringToProxy(const ::std::string& str) const = 0; - - /** - * Convert a proxy into a string. - * @param obj The proxy to convert into a stringified proxy. - * @return The stringified proxy, or an empty string if - * obj is nil. - * @see #stringToProxy - */ - virtual ::std::string proxyToString(const ObjectPrx& obj) const = 0; - - /** - * Convert a set of proxy properties into a proxy. The "base" name supplied in the property argument - * refers to a property containing a stringified proxy, such as MyProxy=id:tcp -h localhost -p 10000. - * Additional properties configure local settings for the proxy, such as MyProxy.PreferSecure=1. The - * "Properties" appendix in the Ice manual describes each of the supported proxy properties. - * @param property The base property name. - * @return The proxy. - */ - virtual ObjectPrx propertyToProxy(const ::std::string& property) const = 0; - - /** - * Convert a proxy to a set of proxy properties. - * @param proxy The proxy. - * @param property The base property name. - * @return The property set. - */ - virtual PropertyDict proxyToProperty(const ObjectPrx& proxy, const ::std::string& property) const = 0; - - /** - * Convert an identity into a string. - * @param ident The identity to convert into a string. - * @return The "stringified" identity. - */ - virtual ::std::string identityToString(const Identity& ident) const = 0; - - /** - * Create a new object adapter. The endpoints for the object adapter are taken from the property - * name.Endpoints. - * It is legal to create an object adapter with the empty string as its name. Such an object adapter is accessible - * via bidirectional connections or by collocated invocations that originate from the same communicator as is used - * by the adapter. Attempts to create a named object adapter for which no configuration can be found raise - * InitializationException. - * @param name The object adapter name. - * @return The new object adapter. - * @see #createObjectAdapterWithEndpoints - * @see ObjectAdapter - * @see Properties - */ - virtual ObjectAdapterPtr createObjectAdapter(const ::std::string& name) = 0; - - /** - * Create a new object adapter with endpoints. This operation sets the property - * name.Endpoints, and then calls {@link #createObjectAdapter}. It is provided as a - * convenience function. Calling this operation with an empty name will result in a UUID being generated for the - * name. - * @param name The object adapter name. - * @param endpoints The endpoints for the object adapter. - * @return The new object adapter. - * @see #createObjectAdapter - * @see ObjectAdapter - * @see Properties - */ - virtual ObjectAdapterPtr createObjectAdapterWithEndpoints(const ::std::string& name, const ::std::string& endpoints) = 0; - - /** - * Create a new object adapter with a router. This operation creates a routed object adapter. - * Calling this operation with an empty name will result in a UUID being generated for the name. - * @param name The object adapter name. - * @param rtr The router. - * @return The new object adapter. - * @see #createObjectAdapter - * @see ObjectAdapter - * @see Properties - */ - virtual ObjectAdapterPtr createObjectAdapterWithRouter(const ::std::string& name, const RouterPrx& rtr) = 0; - - /** - * Get the implicit context associated with this communicator. - * @return The implicit context associated with this communicator; returns null when the property Ice.ImplicitContext - * is not set or is set to None. - */ - virtual ImplicitContextPtr getImplicitContext() const noexcept = 0; - - /** - * Get the properties for this communicator. - * @return This communicator's properties. - * @see Properties - */ - virtual PropertiesPtr getProperties() const noexcept = 0; - - /** - * Get the logger for this communicator. - * @return This communicator's logger. - * @see Logger - */ - virtual LoggerPtr getLogger() const noexcept = 0; - - /** - * Get the observer resolver object for this communicator. - * @return This communicator's observer resolver object. - */ - virtual ::Ice::Instrumentation::CommunicatorObserverPtr getObserver() const noexcept = 0; - - /** - * Get the default router for this communicator. - * @return The default router for this communicator. - * @see #setDefaultRouter - * @see Router - */ - virtual RouterPrx getDefaultRouter() const = 0; - - /** - * Set a default router for this communicator. All newly created proxies will use this default router. To disable - * the default router, null can be used. Note that this operation has no effect on existing proxies. - * You can also set a router for an individual proxy by calling the operation ice_router on the - * proxy. - * @param rtr The default router to use for this communicator. - * @see #getDefaultRouter - * @see #createObjectAdapterWithRouter - * @see Router - */ - virtual void setDefaultRouter(const RouterPrx& rtr) = 0; - - /** - * Get the default locator for this communicator. - * @return The default locator for this communicator. - * @see #setDefaultLocator - * @see Locator - */ - virtual LocatorPrx getDefaultLocator() const = 0; - - /** - * Set a default Ice locator for this communicator. All newly created proxy and object adapters will use this - * default locator. To disable the default locator, null can be used. Note that this operation has no effect on - * existing proxies or object adapters. - * You can also set a locator for an individual proxy by calling the operation ice_locator on the - * proxy, or for an object adapter by calling {@link ObjectAdapter#setLocator} on the object adapter. - * @param loc The default locator to use for this communicator. - * @see #getDefaultLocator - * @see Locator - * @see ObjectAdapter#setLocator - */ - virtual void setDefaultLocator(const LocatorPrx& loc) = 0; - - /** - * Get the plug-in manager for this communicator. - * @return This communicator's plug-in manager. - * @see PluginManager - */ - virtual PluginManagerPtr getPluginManager() const = 0; - - /** - * Get the value factory manager for this communicator. - * @return This communicator's value factory manager. - * @see ValueFactoryManager - */ - virtual ValueFactoryManagerPtr getValueFactoryManager() const noexcept = 0; - - /** - * Flush any pending batch requests for this communicator. This means all batch requests invoked on fixed proxies - * for all connections associated with the communicator. Any errors that occur while flushing a connection are - * ignored. - * @param compress Specifies whether or not the queued batch requests should be compressed before being sent over - * the wire. - */ - virtual void flushBatchRequests(CompressBatch compress) = 0; - - /** - * Flush any pending batch requests for this communicator. This means all batch requests invoked on fixed proxies - * for all connections associated with the communicator. Any errors that occur while flushing a connection are - * ignored. - * @param compress Specifies whether or not the queued batch requests should be compressed before being sent over - * the wire. - * @return The asynchronous result object for the invocation. - */ - virtual AsyncResultPtr begin_flushBatchRequests(CompressBatch compress) = 0; - - /** - * Flush any pending batch requests for this communicator. This means all batch requests invoked on fixed proxies - * for all connections associated with the communicator. Any errors that occur while flushing a connection are - * ignored. - * @param compress Specifies whether or not the queued batch requests should be compressed before being sent over - * the wire. - * @param cb Callback to be invoked when the invocation completes - * @param cookie Extra data to associate with the invocation. - * @return The asynchronous result object for the invocation. - */ - virtual AsyncResultPtr begin_flushBatchRequests(CompressBatch compress, const CallbackPtr& cb, const LocalObjectPtr& cookie = 0) = 0; - - /** - * Flush any pending batch requests for this communicator. This means all batch requests invoked on fixed proxies - * for all connections associated with the communicator. Any errors that occur while flushing a connection are - * ignored. - * @param compress Specifies whether or not the queued batch requests should be compressed before being sent over - * the wire. - * @param cb Callback to be invoked when the invocation completes - * @param cookie Extra data to associate with the invocation. - * @return The asynchronous result object for the invocation. - */ - virtual AsyncResultPtr begin_flushBatchRequests(CompressBatch compress, const Callback_Communicator_flushBatchRequestsPtr& cb, const LocalObjectPtr& cookie = 0) = 0; - - /** - * Flush any pending batch requests for this communicator. This means all batch requests invoked on fixed proxies - * for all connections associated with the communicator. Any errors that occur while flushing a connection are - * ignored. - * @param result The asynchronous result object returned by the begin_ method. - */ - virtual void end_flushBatchRequests(const AsyncResultPtr& result) = 0; - - /** - * Add the Admin object with all its facets to the provided object adapter. If Ice.Admin.ServerId is - * set and the provided object adapter has a {@link Locator}, createAdmin registers the Admin's Process facet with - * the {@link Locator}'s {@link LocatorRegistry}. createAdmin must only be called once; subsequent calls raise - * InitializationException. - * @param adminAdapter The object adapter used to host the Admin object; if null and Ice.Admin.Endpoints is set, - * create, activate and use the Ice.Admin object adapter. - * @param adminId The identity of the Admin object. - * @return A proxy to the main ("") facet of the Admin object. Never returns a null proxy. - * @see #getAdmin - */ - virtual ObjectPrx createAdmin(const ObjectAdapterPtr& adminAdapter, const Identity& adminId) = 0; - - /** - * Get a proxy to the main facet of the Admin object. getAdmin also creates the Admin object and creates and - * activates the Ice.Admin object adapter to host this Admin object if Ice.Admin.Enpoints is set. The identity of - * the Admin object created by getAdmin is {value of Ice.Admin.InstanceName}/admin, or {UUID}/admin when - * Ice.Admin.InstanceName is not set. If Ice.Admin.DelayCreation is 0 or not set, getAdmin is called - * by the communicator initialization, after initialization of all plugins. - * @return A proxy to the main ("") facet of the Admin object, or a null proxy if no Admin object is configured. - * @see #createAdmin - */ - virtual ObjectPrx getAdmin() const = 0; - - /** - * Add a new facet to the Admin object. Adding a servant with a facet that is already registered throws - * AlreadyRegisteredException. - * @param servant The servant that implements the new Admin facet. - * @param facet The name of the new Admin facet. - */ - virtual void addAdminFacet(const std::shared_ptr& servant, const ::std::string& facet) = 0; - - inline void addAdminFacet(const SharedPtr& servant, const ::std::string& facet) - { - addAdminFacet(servant.underlying(), facet); - } - - /** - * Remove the following facet to the Admin object. Removing a facet that was not previously registered throws - * NotRegisteredException. - * @param facet The name of the Admin facet. - * @return The servant associated with this Admin facet. - */ - virtual std::shared_ptr removeAdminFacet(const ::std::string& facet) = 0; - - /** - * Returns a facet of the Admin object. - * @param facet The name of the Admin facet. - * @return The servant associated with this Admin facet, or null if no facet is registered with the given name. - */ - virtual std::shared_ptr findAdminFacet(const ::std::string& facet) = 0; - - /** - * Returns a map of all facets of the Admin object. - * @return A collection containing all the facet names and servants of the Admin object. - * @see #findAdminFacet - */ - virtual FacetMap findAllAdminFacets() = 0; -}; - -/// \cond INTERNAL -inline bool operator==(const Communicator& lhs, const Communicator& rhs) -{ - return static_cast(lhs) == static_cast(rhs); -} - -inline bool operator<(const Communicator& lhs, const Communicator& rhs) -{ - return static_cast(lhs) < static_cast(rhs); -} -/// \endcond - -} - -/// \cond STREAM -namespace Ice -{ - -} -/// \endcond - -#endif - #include #endif diff --git a/cpp/include/Ice/CommunicatorAsync.h b/cpp/include/Ice/CommunicatorAsync.h deleted file mode 100644 index 85cc9e78056..00000000000 --- a/cpp/include/Ice/CommunicatorAsync.h +++ /dev/null @@ -1,154 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#ifndef ICE_COMMUNICATOR_ASYNC_H -#define ICE_COMMUNICATOR_ASYNC_H - -#ifndef ICE_CPP11_MAPPING - -#include - -namespace Ice -{ - -/** - * Type-safe asynchronous callback wrapper class used for calls to - * Ice::Communicator::begin_flushBatchRequests. - * Create a wrapper instance by calling ::Ice::newCallback_Communicator_flushBatchRequests. - * \headerfile Ice/Ice.h - */ -template -class CallbackNC_Communicator_flushBatchRequests : public Callback_Communicator_flushBatchRequests_Base, - public ::IceInternal::OnewayCallbackNC -{ -public: - - typedef IceUtil::Handle TPtr; - - typedef void (T::*Exception)(const ::Ice::Exception&); - typedef void (T::*Sent)(bool); - - CallbackNC_Communicator_flushBatchRequests(const TPtr& obj, Exception excb, Sent sentcb) - : ::IceInternal::OnewayCallbackNC(obj, 0, excb, sentcb) - { - } - - /// \cond INTERNAL - virtual void completed(const ::Ice::AsyncResultPtr& result) const - { - ::Ice::CommunicatorPtr communicator = result->getCommunicator(); - assert(communicator); - try - { - communicator->end_flushBatchRequests(result); - assert(false); - } - catch(const ::Ice::Exception& ex) - { - ::IceInternal::CallbackNC::exception(result, ex); - } - } - /// \endcond -}; - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of - * Ice::Communicator::begin_flushBatchRequests. - */ -template Callback_Communicator_flushBatchRequestsPtr -newCallback_Communicator_flushBatchRequests(const IceUtil::Handle& instance, - void (T::*excb)(const ::Ice::Exception&), - void (T::*sentcb)(bool) = 0) -{ - return new CallbackNC_Communicator_flushBatchRequests(instance, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of - * Ice::Communicator::begin_flushBatchRequests. - */ -template Callback_Communicator_flushBatchRequestsPtr -newCallback_Communicator_flushBatchRequests(T* instance, void (T::*excb)(const ::Ice::Exception&), - void (T::*sentcb)(bool) = 0) -{ - return new CallbackNC_Communicator_flushBatchRequests(instance, excb, sentcb); -} - -/** - * Type-safe asynchronous callback wrapper class used for calls to - * Ice::Communicator::begin_flushBatchRequests. - * Create a wrapper instance by calling ::Ice::newCallback_Communicator_flushBatchRequests. - * \headerfile Ice/Ice.h - */ -template -class Callback_Communicator_flushBatchRequests : public Callback_Communicator_flushBatchRequests_Base, - public ::IceInternal::OnewayCallback -{ -public: - - typedef IceUtil::Handle TPtr; - - typedef void (T::*Exception)(const ::Ice::Exception& , const CT&); - typedef void (T::*Sent)(bool , const CT&); - - Callback_Communicator_flushBatchRequests(const TPtr& obj, Exception excb, Sent sentcb) - : ::IceInternal::OnewayCallback(obj, 0, excb, sentcb) - { - } - - /// \cond INTERNAL - virtual void completed(const ::Ice::AsyncResultPtr& result) const - { - ::Ice::CommunicatorPtr communicator = result->getCommunicator(); - assert(communicator); - try - { - communicator->end_flushBatchRequests(result); - assert(false); - } - catch(const ::Ice::Exception& ex) - { - ::IceInternal::Callback::exception(result, ex); - } - } - /// \endcond -}; - -/** - * Type-safe asynchronous callback wrapper class used for calls to - * Ice::Communicator::begin_flushBatchRequests. - * Create a wrapper instance by calling ::Ice::newCallback_Communicator_flushBatchRequests. - */ -template Callback_Communicator_flushBatchRequestsPtr -newCallback_Communicator_flushBatchRequests(const IceUtil::Handle& instance, - void (T::*excb)(const ::Ice::Exception&, const CT&), - void (T::*sentcb)(bool, const CT&) = 0) -{ - return new Callback_Communicator_flushBatchRequests(instance, excb, sentcb); -} - -/** - * Type-safe asynchronous callback wrapper class used for calls to - * Ice::Communicator::begin_flushBatchRequests. - * Create a wrapper instance by calling ::Ice::newCallback_Communicator_flushBatchRequests. - */ -template Callback_Communicator_flushBatchRequestsPtr -newCallback_Communicator_flushBatchRequests(T* instance, void (T::*excb)(const ::Ice::Exception&, const CT&), - void (T::*sentcb)(bool, const CT&) = 0) -{ - return new Callback_Communicator_flushBatchRequests(instance, excb, sentcb); -} - -} -#endif - -#endif diff --git a/cpp/include/Ice/CommunicatorF.h b/cpp/include/Ice/CommunicatorF.h index bf9840d8d96..ef20e0ec590 100644 --- a/cpp/include/Ice/CommunicatorF.h +++ b/cpp/include/Ice/CommunicatorF.h @@ -13,7 +13,6 @@ #include #include #include -#include #include #include @@ -27,8 +26,6 @@ # endif #endif -#ifdef ICE_CPP11_MAPPING // C++11 mapping - namespace Ice { @@ -36,12 +33,6 @@ class Communicator; } -/// \cond STREAM -namespace Ice -{ - -} -/// \endcond /// \cond INTERNAL namespace Ice @@ -52,27 +43,5 @@ using CommunicatorPtr = ::std::shared_ptr; } /// \endcond -#else // C++98 mapping - -namespace Ice -{ - -class Communicator; -/// \cond INTERNAL -ICE_API LocalObject* upCast(Communicator*); -/// \endcond -typedef ::IceInternal::Handle< Communicator> CommunicatorPtr; - -} - -/// \cond STREAM -namespace Ice -{ - -} -/// \endcond - -#endif - #include #endif diff --git a/cpp/include/Ice/Comparable.h b/cpp/include/Ice/Comparable.h index de93991f346..3b018eddc86 100644 --- a/cpp/include/Ice/Comparable.h +++ b/cpp/include/Ice/Comparable.h @@ -96,8 +96,6 @@ inline bool targetNotEqualTo(const T& lhs, const U& rhs) return !targetEqualTo(lhs, rhs); } -#ifdef ICE_CPP11_MAPPING - /** * Functor class that compares the contents of two smart pointers of the given type using the given comparator. * \headerfile Ice/Ice.h @@ -198,8 +196,6 @@ bool operator!=(const C& lhs, const C& rhs) return lhs.ice_tuple() != rhs.ice_tuple(); } -#endif - } #endif diff --git a/cpp/include/Ice/Config.h b/cpp/include/Ice/Config.h index 00c1acda103..f83a586677e 100644 --- a/cpp/include/Ice/Config.h +++ b/cpp/include/Ice/Config.h @@ -52,13 +52,8 @@ typedef unsigned char Byte; typedef short Short; /** The mapping for the Slice int type. */ typedef int Int; -#ifdef ICE_CPP11_MAPPING /** The mapping for the Slice long type. */ typedef long long int Long; -#else -/** The mapping for the Slice long type. */ -typedef IceUtil::Int64 Long; -#endif /** The mapping for the Slice float type. */ typedef float Float; /** The mapping for the Slice double type. */ diff --git a/cpp/include/Ice/Connection.h b/cpp/include/Ice/Connection.h index d0b0e7cf582..953a05023ba 100644 --- a/cpp/include/Ice/Connection.h +++ b/cpp/include/Ice/Connection.h @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include @@ -31,8 +30,6 @@ # endif #endif -#ifdef ICE_CPP11_MAPPING // C++11 mapping - namespace Ice { @@ -701,910 +698,5 @@ using WSConnectionInfoPtr = ::std::shared_ptr; } /// \endcond -#else // C++98 mapping - -namespace Ice -{ - -class ConnectionInfo; -/// \cond INTERNAL -ICE_API LocalObject* upCast(ConnectionInfo*); -/// \endcond -typedef ::IceInternal::Handle< ConnectionInfo> ConnectionInfoPtr; - -class Connection; -/// \cond INTERNAL -ICE_API LocalObject* upCast(Connection*); -/// \endcond -typedef ::IceInternal::Handle< Connection> ConnectionPtr; - -class CloseCallback; -/// \cond INTERNAL -ICE_API LocalObject* upCast(CloseCallback*); -/// \endcond -typedef ::IceInternal::Handle< CloseCallback> CloseCallbackPtr; - -class HeartbeatCallback; -/// \cond INTERNAL -ICE_API LocalObject* upCast(HeartbeatCallback*); -/// \endcond -typedef ::IceInternal::Handle< HeartbeatCallback> HeartbeatCallbackPtr; - -class IPConnectionInfo; -/// \cond INTERNAL -ICE_API LocalObject* upCast(IPConnectionInfo*); -/// \endcond -typedef ::IceInternal::Handle< IPConnectionInfo> IPConnectionInfoPtr; - -class TCPConnectionInfo; -/// \cond INTERNAL -ICE_API LocalObject* upCast(TCPConnectionInfo*); -/// \endcond -typedef ::IceInternal::Handle< TCPConnectionInfo> TCPConnectionInfoPtr; - -class UDPConnectionInfo; -/// \cond INTERNAL -ICE_API LocalObject* upCast(UDPConnectionInfo*); -/// \endcond -typedef ::IceInternal::Handle< UDPConnectionInfo> UDPConnectionInfoPtr; - -class WSConnectionInfo; -/// \cond INTERNAL -ICE_API LocalObject* upCast(WSConnectionInfo*); -/// \endcond -typedef ::IceInternal::Handle< WSConnectionInfo> WSConnectionInfoPtr; - -} - -namespace Ice -{ - -/** - * The batch compression option when flushing queued batch requests. - */ -enum CompressBatch -{ - /** - * Compress the batch requests. - */ - CompressBatchYes, - /** - * Don't compress the batch requests. - */ - CompressBatchNo, - /** - * Compress the batch requests if at least one request was made on a compressed proxy. - */ - CompressBatchBasedOnProxy -}; - -/** - * Specifies the close semantics for Active Connection Management. - */ -enum ACMClose -{ - /** - * Disables automatic connection closure. - */ - CloseOff, - /** - * Gracefully closes a connection that has been idle for the configured timeout period. - */ - CloseOnIdle, - /** - * Forcefully closes a connection that has been idle for the configured timeout period, but only if the connection - * has pending invocations. - */ - CloseOnInvocation, - /** - * Combines the behaviors of CloseOnIdle and CloseOnInvocation. - */ - CloseOnInvocationAndIdle, - /** - * Forcefully closes a connection that has been idle for the configured timeout period, regardless of whether the - * connection has pending invocations or dispatch. - */ - CloseOnIdleForceful -}; - -/** - * Specifies the heartbeat semantics for Active Connection Management. - */ -enum ACMHeartbeat -{ - /** - * Disables heartbeats. - */ - HeartbeatOff, - /** - * Send a heartbeat at regular intervals if the connection is idle and only if there are pending dispatch. - */ - HeartbeatOnDispatch, - /** - * Send a heartbeat at regular intervals when the connection is idle. - */ - HeartbeatOnIdle, - /** - * Send a heartbeat at regular intervals until the connection is closed. - */ - HeartbeatAlways -}; - -/** - * A collection of Active Connection Management configuration settings. - * \headerfile Ice/Ice.h - */ -struct ACM -{ - /** - * A timeout value in seconds. - */ - ::Ice::Int timeout; - /** - * The close semantics. - */ - ::Ice::ACMClose close; - /** - * The heartbeat semantics. - */ - ::Ice::ACMHeartbeat heartbeat; - - bool operator==(const ACM& rhs_) const - { - if(this == &rhs_) - { - return true; - } - if(timeout != rhs_.timeout) - { - return false; - } - if(close != rhs_.close) - { - return false; - } - if(heartbeat != rhs_.heartbeat) - { - return false; - } - return true; - } - - bool operator<(const ACM& rhs_) const - { - if(this == &rhs_) - { - return false; - } - if(timeout < rhs_.timeout) - { - return true; - } - else if(rhs_.timeout < timeout) - { - return false; - } - if(close < rhs_.close) - { - return true; - } - else if(rhs_.close < close) - { - return false; - } - if(heartbeat < rhs_.heartbeat) - { - return true; - } - else if(rhs_.heartbeat < heartbeat) - { - return false; - } - return false; - } - - bool operator!=(const ACM& rhs_) const - { - return !operator==(rhs_); - } - bool operator<=(const ACM& rhs_) const - { - return operator<(rhs_) || operator==(rhs_); - } - bool operator>(const ACM& rhs_) const - { - return !operator<(rhs_) && !operator==(rhs_); - } - bool operator>=(const ACM& rhs_) const - { - return !operator<(rhs_); - } -}; - -/** - * Determines the behavior when manually closing a connection. - */ -enum ConnectionClose -{ - /** - * Close the connection immediately without sending a close connection protocol message to the peer and waiting - * for the peer to acknowledge it. - */ - ConnectionCloseForcefully, - /** - * Close the connection by notifying the peer but do not wait for pending outgoing invocations to complete. On the - * server side, the connection will not be closed until all incoming invocations have completed. - */ - ConnectionCloseGracefully, - /** - * Wait for all pending invocations to complete before closing the connection. - */ - ConnectionCloseGracefullyWithWait -}; - -/** - * A collection of HTTP headers. - */ -typedef ::std::map< ::std::string, ::std::string> HeaderDict; - -} - -namespace Ice -{ - -/** - * Base class for asynchronous callback wrapper classes used for calls to - * IceProxy::Ice::Connection::begin_flushBatchRequests. - * Create a wrapper instance by calling ::Ice::newCallback_Connection_flushBatchRequests. - */ -class Callback_Connection_flushBatchRequests_Base : public virtual ::IceInternal::CallbackBase { }; -typedef ::IceUtil::Handle< Callback_Connection_flushBatchRequests_Base> Callback_Connection_flushBatchRequestsPtr; - -/** - * Base class for asynchronous callback wrapper classes used for calls to - * IceProxy::Ice::Connection::begin_heartbeat. - * Create a wrapper instance by calling ::Ice::newCallback_Connection_heartbeat. - */ -class Callback_Connection_heartbeat_Base : public virtual ::IceInternal::CallbackBase { }; -typedef ::IceUtil::Handle< Callback_Connection_heartbeat_Base> Callback_Connection_heartbeatPtr; - -} - -namespace Ice -{ - -/** - * Base class providing access to the connection details. - * \headerfile Ice/Ice.h - */ -class ICE_API ConnectionInfo : public virtual LocalObject -{ -public: - - typedef ConnectionInfoPtr PointerType; - - virtual ~ConnectionInfo(); - - ConnectionInfo() - { - } - - /** - * One-shot constructor to initialize all data members. - * @param underlying The information of the underyling transport or null if there's no underlying transport. - * @param incoming Whether or not the connection is an incoming or outgoing connection. - * @param adapterName The name of the adapter associated with the connection. - * @param connectionId The connection id. - */ - ConnectionInfo(const ::Ice::ConnectionInfoPtr& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId) : - underlying(underlying), - incoming(incoming), - adapterName(adapterName), - connectionId(connectionId) - { - } - - ConnectionInfo(const ConnectionInfo&) = default; - ConnectionInfo& operator=(const ConnectionInfo&) = default; - - /** - * The information of the underyling transport or null if there's no underlying transport. - */ - ::Ice::ConnectionInfoPtr underlying; - /** - * Whether or not the connection is an incoming or outgoing connection. - */ - bool incoming; - /** - * The name of the adapter associated with the connection. - */ - ::std::string adapterName; - /** - * The connection id. - */ - ::std::string connectionId; -}; - -/// \cond INTERNAL -inline bool operator==(const ConnectionInfo& lhs, const ConnectionInfo& rhs) -{ - return static_cast(lhs) == static_cast(rhs); -} - -inline bool operator<(const ConnectionInfo& lhs, const ConnectionInfo& rhs) -{ - return static_cast(lhs) < static_cast(rhs); -} -/// \endcond - -/** - * An application can implement this interface to receive notifications when a connection closes. - * @see Connection#setCloseCallback - * \headerfile Ice/Ice.h - */ -class ICE_API CloseCallback : public virtual LocalObject -{ -public: - - typedef CloseCallbackPtr PointerType; - - virtual ~CloseCallback(); - - CloseCallback() = default; - CloseCallback(const CloseCallback&) = default; - CloseCallback& operator=(const CloseCallback&) = default; - - /** - * This method is called by the connection when the connection is closed. If the callback needs more information - * about the closure, it can call {@link Connection#throwException}. - * @param con The connection that closed. - */ - virtual void closed(const ConnectionPtr& con) = 0; -}; - -/// \cond INTERNAL -inline bool operator==(const CloseCallback& lhs, const CloseCallback& rhs) -{ - return static_cast(lhs) == static_cast(rhs); -} - -inline bool operator<(const CloseCallback& lhs, const CloseCallback& rhs) -{ - return static_cast(lhs) < static_cast(rhs); -} -/// \endcond - -/** - * An application can implement this interface to receive notifications when a connection receives a heartbeat - * message. - * @see Connection#setHeartbeatCallback - * \headerfile Ice/Ice.h - */ -class ICE_API HeartbeatCallback : public virtual LocalObject -{ -public: - - typedef HeartbeatCallbackPtr PointerType; - - virtual ~HeartbeatCallback(); - - HeartbeatCallback() = default; - HeartbeatCallback(const HeartbeatCallback&) = default; - HeartbeatCallback& operator=(const HeartbeatCallback&) = default; - - /** - * This method is called by the connection when a heartbeat is received from the peer. - * @param con The connection on which a heartbeat was received. - */ - virtual void heartbeat(const ConnectionPtr& con) = 0; -}; - -/// \cond INTERNAL -inline bool operator==(const HeartbeatCallback& lhs, const HeartbeatCallback& rhs) -{ - return static_cast(lhs) == static_cast(rhs); -} - -inline bool operator<(const HeartbeatCallback& lhs, const HeartbeatCallback& rhs) -{ - return static_cast(lhs) < static_cast(rhs); -} -/// \endcond - -/** - * The user-level interface to a connection. - * \headerfile Ice/Ice.h - */ -class ICE_API Connection : public virtual LocalObject -{ -public: - - typedef ConnectionPtr PointerType; - - virtual ~Connection(); - Connection() = default; - Connection(const Connection&) = default; - Connection& operator=(const Connection&) = default; - - /** - * Manually close the connection using the specified closure mode. - * @param mode Determines how the connection will be closed. - * @see ConnectionClose - */ - virtual void close(ConnectionClose mode) noexcept = 0; - - /** - * Create a special proxy that always uses this connection. This can be used for callbacks from a server to a - * client if the server cannot directly establish a connection to the client, for example because of firewalls. In - * this case, the server would create a proxy using an already established connection from the client. - * @param id The identity for which a proxy is to be created. - * @return A proxy that matches the given identity and uses this connection. - * @see #setAdapter - */ - virtual ObjectPrx createProxy(const Identity& id) const = 0; - - /** - * Explicitly set an object adapter that dispatches requests that are received over this connection. A client can - * invoke an operation on a server using a proxy, and then set an object adapter for the outgoing connection that - * is used by the proxy in order to receive callbacks. This is useful if the server cannot establish a connection - * back to the client, for example because of firewalls. - * @param adapter The object adapter that should be used by this connection to dispatch requests. The object - * adapter must be activated. When the object adapter is deactivated, it is automatically removed from the - * connection. Attempts to use a deactivated object adapter raise {@link ObjectAdapterDeactivatedException} - * @see #createProxy - * @see #getAdapter - */ - virtual void setAdapter(const ObjectAdapterPtr& adapter) = 0; - - /** - * Get the object adapter that dispatches requests for this connection. - * @return The object adapter that dispatches requests for the connection, or null if no adapter is set. - * @see #setAdapter - */ - virtual ObjectAdapterPtr getAdapter() const noexcept = 0; - - /** - * Get the endpoint from which the connection was created. - * @return The endpoint from which the connection was created. - */ - virtual EndpointPtr getEndpoint() const noexcept = 0; - - /** - * Flush any pending batch requests for this connection. This means all batch requests invoked on fixed proxies - * associated with the connection. - * @param compress Specifies whether or not the queued batch requests should be compressed before being sent over - * the wire. - */ - virtual void flushBatchRequests(CompressBatch compress) = 0; - - /** - * Flush any pending batch requests for this connection. This means all batch requests invoked on fixed proxies - * associated with the connection. - * @param compress Specifies whether or not the queued batch requests should be compressed before being sent over - * the wire. - * @return The asynchronous result object for the invocation. - */ - virtual AsyncResultPtr begin_flushBatchRequests(CompressBatch compress) = 0; - - /** - * Flush any pending batch requests for this connection. This means all batch requests invoked on fixed proxies - * associated with the connection. - * @param compress Specifies whether or not the queued batch requests should be compressed before being sent over - * the wire. - * @param cb Callback to be invoked when the invocation completes - * @param cookie Extra data to associate with the invocation. - * @return The asynchronous result object for the invocation. - */ - virtual AsyncResultPtr begin_flushBatchRequests(CompressBatch compress, const CallbackPtr& cb, const LocalObjectPtr& cookie = 0) = 0; - - /** - * Flush any pending batch requests for this connection. This means all batch requests invoked on fixed proxies - * associated with the connection. - * @param compress Specifies whether or not the queued batch requests should be compressed before being sent over - * the wire. - * @param cb Callback to be invoked when the invocation completes - * @param cookie Extra data to associate with the invocation. - * @return The asynchronous result object for the invocation. - */ - virtual AsyncResultPtr begin_flushBatchRequests(CompressBatch compress, const Callback_Connection_flushBatchRequestsPtr& cb, const LocalObjectPtr& cookie = 0) = 0; - - /** - * Flush any pending batch requests for this connection. This means all batch requests invoked on fixed proxies - * associated with the connection. - * @param result The asynchronous result object returned by the begin_ method. - */ - virtual void end_flushBatchRequests(const AsyncResultPtr& result) = 0; - - /** - * Set a close callback on the connection. The callback is called by the connection when it's closed. The callback - * is called from the Ice thread pool associated with the connection. If the callback needs more information about - * the closure, it can call {@link Connection#throwException}. - * @param callback The close callback object. - */ - virtual void setCloseCallback(const CloseCallbackPtr& callback) = 0; - - /** - * Set a heartbeat callback on the connection. The callback is called by the connection when a heartbeat is - * received. The callback is called from the Ice thread pool associated with the connection. - * @param callback The heartbeat callback object. - */ - virtual void setHeartbeatCallback(const HeartbeatCallbackPtr& callback) = 0; - - /** - * Send a heartbeat message. - */ - virtual void heartbeat() = 0; - - /** - * Send a heartbeat message. - * @return The asynchronous result object for the invocation. - */ - virtual AsyncResultPtr begin_heartbeat() = 0; - - /** - * Send a heartbeat message. - * @param cb Callback to be invoked when the invocation completes - * @param cookie Extra data to associate with the invocation. - * @return The asynchronous result object for the invocation. - */ - virtual AsyncResultPtr begin_heartbeat(const CallbackPtr& cb, const LocalObjectPtr& cookie = 0) = 0; - - /** - * Send a heartbeat message. - * @param cb Callback to be invoked when the invocation completes - * @param cookie Extra data to associate with the invocation. - * @return The asynchronous result object for the invocation. - */ - virtual AsyncResultPtr begin_heartbeat(const Callback_Connection_heartbeatPtr& cb, const LocalObjectPtr& cookie = 0) = 0; - - /** - * Send a heartbeat message. - * @param result The asynchronous result object returned by the begin_ method. - */ - virtual void end_heartbeat(const AsyncResultPtr& result) = 0; - - /** - * Set the active connection management parameters. - * @param timeout The timeout value in seconds, must be >= 0. - * @param close The close condition - * @param heartbeat The hertbeat condition - */ - virtual void setACM(const IceUtil::Optional& timeout, const IceUtil::Optional& close, const IceUtil::Optional& heartbeat) = 0; - - /** - * Get the ACM parameters. - * @return The ACM parameters. - */ - virtual ACM getACM() noexcept = 0; - - /** - * Return the connection type. This corresponds to the endpoint type, i.e., "tcp", "udp", etc. - * @return The type of the connection. - */ - virtual ::std::string type() const noexcept = 0; - - /** - * Get the timeout for the connection. - * @return The connection's timeout. - */ - virtual Int timeout() const noexcept = 0; - - /** - * Return a description of the connection as human readable text, suitable for logging or error messages. - * @return The description of the connection as human readable text. - */ - virtual ::std::string toString() const noexcept = 0; - - /** - * Returns the connection information. - * @return The connection information. - */ - virtual ConnectionInfoPtr getInfo() const = 0; - - /** - * Set the connection buffer receive/send size. - * @param rcvSize The connection receive buffer size. - * @param sndSize The connection send buffer size. - */ - virtual void setBufferSize(Int rcvSize, Int sndSize) = 0; - - /** - * Throw an exception indicating the reason for connection closure. For example, - * {@link CloseConnectionException} is raised if the connection was closed gracefully, whereas - * {@link ConnectionManuallyClosedException} is raised if the connection was manually closed by - * the application. This operation does nothing if the connection is not yet closed. - */ - virtual void throwException() const = 0; -}; - -/// \cond INTERNAL -inline bool operator==(const Connection& lhs, const Connection& rhs) -{ - return static_cast(lhs) == static_cast(rhs); -} - -inline bool operator<(const Connection& lhs, const Connection& rhs) -{ - return static_cast(lhs) < static_cast(rhs); -} -/// \endcond - -/** - * Provides access to the connection details of an IP connection - * \headerfile Ice/Ice.h - */ -class ICE_API IPConnectionInfo : public ConnectionInfo -{ -public: - - typedef IPConnectionInfoPtr PointerType; - - virtual ~IPConnectionInfo(); - - /** Default constructor that assigns default values to members as specified in the Slice definition. */ - IPConnectionInfo() : - localAddress(""), - localPort(-1), - remoteAddress(""), - remotePort(-1) - { - } - - /** - * One-shot constructor to initialize all data members. - * @param underlying The information of the underyling transport or null if there's no underlying transport. - * @param incoming Whether or not the connection is an incoming or outgoing connection. - * @param adapterName The name of the adapter associated with the connection. - * @param connectionId The connection id. - * @param localAddress The local address. - * @param localPort The local port. - * @param remoteAddress The remote address. - * @param remotePort The remote port. - */ - IPConnectionInfo(const ::Ice::ConnectionInfoPtr& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const ::std::string& localAddress, ::Ice::Int localPort, const ::std::string& remoteAddress, ::Ice::Int remotePort) : - ::Ice::ConnectionInfo(underlying, incoming, adapterName, connectionId), - localAddress(localAddress), - localPort(localPort), - remoteAddress(remoteAddress), - remotePort(remotePort) - { - } - - IPConnectionInfo(const IPConnectionInfo&) = default; - IPConnectionInfo& operator=(const IPConnectionInfo&) = default; - - /** - * The local address. - */ - ::std::string localAddress; - /** - * The local port. - */ - ::Ice::Int localPort; - /** - * The remote address. - */ - ::std::string remoteAddress; - /** - * The remote port. - */ - ::Ice::Int remotePort; -}; - -/// \cond INTERNAL -inline bool operator==(const IPConnectionInfo& lhs, const IPConnectionInfo& rhs) -{ - return static_cast(lhs) == static_cast(rhs); -} - -inline bool operator<(const IPConnectionInfo& lhs, const IPConnectionInfo& rhs) -{ - return static_cast(lhs) < static_cast(rhs); -} -/// \endcond - -/** - * Provides access to the connection details of a TCP connection - * \headerfile Ice/Ice.h - */ -class ICE_API TCPConnectionInfo : public IPConnectionInfo -{ -public: - - typedef TCPConnectionInfoPtr PointerType; - - virtual ~TCPConnectionInfo(); - - /** Default constructor that assigns default values to members as specified in the Slice definition. */ - TCPConnectionInfo() : - rcvSize(0), - sndSize(0) - { - } - - /** - * One-shot constructor to initialize all data members. - * @param underlying The information of the underyling transport or null if there's no underlying transport. - * @param incoming Whether or not the connection is an incoming or outgoing connection. - * @param adapterName The name of the adapter associated with the connection. - * @param connectionId The connection id. - * @param localAddress The local address. - * @param localPort The local port. - * @param remoteAddress The remote address. - * @param remotePort The remote port. - * @param rcvSize The connection buffer receive size. - * @param sndSize The connection buffer send size. - */ - TCPConnectionInfo(const ::Ice::ConnectionInfoPtr& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const ::std::string& localAddress, ::Ice::Int localPort, const ::std::string& remoteAddress, ::Ice::Int remotePort, ::Ice::Int rcvSize, ::Ice::Int sndSize) : - ::Ice::IPConnectionInfo(underlying, incoming, adapterName, connectionId, localAddress, localPort, remoteAddress, remotePort), - rcvSize(rcvSize), - sndSize(sndSize) - { - } - - TCPConnectionInfo(const TCPConnectionInfo&) = default; - TCPConnectionInfo& operator=(const TCPConnectionInfo&) = default; - - /** - * The connection buffer receive size. - */ - ::Ice::Int rcvSize; - /** - * The connection buffer send size. - */ - ::Ice::Int sndSize; -}; - -/// \cond INTERNAL -inline bool operator==(const TCPConnectionInfo& lhs, const TCPConnectionInfo& rhs) -{ - return static_cast(lhs) == static_cast(rhs); -} - -inline bool operator<(const TCPConnectionInfo& lhs, const TCPConnectionInfo& rhs) -{ - return static_cast(lhs) < static_cast(rhs); -} -/// \endcond - -/** - * Provides access to the connection details of a UDP connection - * \headerfile Ice/Ice.h - */ -class ICE_API UDPConnectionInfo : public IPConnectionInfo -{ -public: - - typedef UDPConnectionInfoPtr PointerType; - - virtual ~UDPConnectionInfo(); - - /** Default constructor that assigns default values to members as specified in the Slice definition. */ - UDPConnectionInfo() : - mcastPort(-1), - rcvSize(0), - sndSize(0) - { - } - - /** - * One-shot constructor to initialize all data members. - * @param underlying The information of the underyling transport or null if there's no underlying transport. - * @param incoming Whether or not the connection is an incoming or outgoing connection. - * @param adapterName The name of the adapter associated with the connection. - * @param connectionId The connection id. - * @param localAddress The local address. - * @param localPort The local port. - * @param remoteAddress The remote address. - * @param remotePort The remote port. - * @param mcastAddress The multicast address. - * @param mcastPort The multicast port. - * @param rcvSize The connection buffer receive size. - * @param sndSize The connection buffer send size. - */ - UDPConnectionInfo(const ::Ice::ConnectionInfoPtr& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const ::std::string& localAddress, ::Ice::Int localPort, const ::std::string& remoteAddress, ::Ice::Int remotePort, const ::std::string& mcastAddress, ::Ice::Int mcastPort, ::Ice::Int rcvSize, ::Ice::Int sndSize) : - ::Ice::IPConnectionInfo(underlying, incoming, adapterName, connectionId, localAddress, localPort, remoteAddress, remotePort), - mcastAddress(mcastAddress), - mcastPort(mcastPort), - rcvSize(rcvSize), - sndSize(sndSize) - { - } - - UDPConnectionInfo(const UDPConnectionInfo&) = default; - UDPConnectionInfo& operator=(const UDPConnectionInfo&) = default; - - /** - * The multicast address. - */ - ::std::string mcastAddress; - /** - * The multicast port. - */ - ::Ice::Int mcastPort; - /** - * The connection buffer receive size. - */ - ::Ice::Int rcvSize; - /** - * The connection buffer send size. - */ - ::Ice::Int sndSize; -}; - -/// \cond INTERNAL -inline bool operator==(const UDPConnectionInfo& lhs, const UDPConnectionInfo& rhs) -{ - return static_cast(lhs) == static_cast(rhs); -} - -inline bool operator<(const UDPConnectionInfo& lhs, const UDPConnectionInfo& rhs) -{ - return static_cast(lhs) < static_cast(rhs); -} -/// \endcond - -/** - * Provides access to the connection details of a WebSocket connection - * \headerfile Ice/Ice.h - */ -class ICE_API WSConnectionInfo : public ConnectionInfo -{ -public: - - typedef WSConnectionInfoPtr PointerType; - - virtual ~WSConnectionInfo(); - - WSConnectionInfo() - { - } - - /** - * One-shot constructor to initialize all data members. - * @param underlying The information of the underyling transport or null if there's no underlying transport. - * @param incoming Whether or not the connection is an incoming or outgoing connection. - * @param adapterName The name of the adapter associated with the connection. - * @param connectionId The connection id. - * @param headers The headers from the HTTP upgrade request. - */ - WSConnectionInfo(const ::Ice::ConnectionInfoPtr& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const ::Ice::HeaderDict& headers) : - ::Ice::ConnectionInfo(underlying, incoming, adapterName, connectionId), - headers(headers) - { - } - - WSConnectionInfo(const WSConnectionInfo&) = default; - WSConnectionInfo& operator=(const WSConnectionInfo&) = default; - - /** - * The headers from the HTTP upgrade request. - */ - ::Ice::HeaderDict headers; -}; - -/// \cond INTERNAL -inline bool operator==(const WSConnectionInfo& lhs, const WSConnectionInfo& rhs) -{ - return static_cast(lhs) == static_cast(rhs); -} - -inline bool operator<(const WSConnectionInfo& lhs, const WSConnectionInfo& rhs) -{ - return static_cast(lhs) < static_cast(rhs); -} -/// \endcond - -} - -/// \cond STREAM -namespace Ice -{ - -} -/// \endcond - -#endif - #include #endif diff --git a/cpp/include/Ice/ConnectionAsync.h b/cpp/include/Ice/ConnectionAsync.h deleted file mode 100644 index 7a62256f6ff..00000000000 --- a/cpp/include/Ice/ConnectionAsync.h +++ /dev/null @@ -1,302 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#ifndef ICE_CONNECTION_ASYNC_H -#define ICE_CONNECTION_ASYNC_H - -#ifndef ICE_CPP11_MAPPING - -#include -#include - -namespace Ice -{ - -/** - * Type-safe asynchronous callback wrapper class used for calls to - * Ice::Connection::begin_flushBatchRequests. - * Create a wrapper instance by calling ::Ice::newCallback_Connection_flushBatchRequests. - * \headerfile Ice/Ice.h - */ -template -class CallbackNC_Connection_flushBatchRequests : public Callback_Connection_flushBatchRequests_Base, - public ::IceInternal::OnewayCallbackNC -{ -public: - - typedef IceUtil::Handle TPtr; - - typedef void (T::*Exception)(const ::Ice::Exception&); - typedef void (T::*Sent)(bool); - - CallbackNC_Connection_flushBatchRequests(const TPtr& obj, Exception excb, Sent sentcb) - : ::IceInternal::OnewayCallbackNC(obj, 0, excb, sentcb) - { - } - - /// \cond INTERNAL - virtual void completed(const ::Ice::AsyncResultPtr& result) const - { - ::Ice::ConnectionPtr connection = result->getConnection(); - assert(connection); - try - { - connection->end_flushBatchRequests(result); - assert(false); - } - catch(const ::Ice::Exception& ex) - { - ::IceInternal::CallbackNC::exception(result, ex); - } - } - /// \endcond -}; - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of - * Ice::Connection::begin_flushBatchRequests. - */ -template Callback_Connection_flushBatchRequestsPtr -newCallback_Connection_flushBatchRequests(const IceUtil::Handle& instance, - void (T::*excb)(const ::Ice::Exception&), - void (T::*sentcb)(bool) = 0) -{ - return new CallbackNC_Connection_flushBatchRequests(instance, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of - * Ice::Connection::begin_flushBatchRequests. - */ -template Callback_Connection_flushBatchRequestsPtr -newCallback_Connection_flushBatchRequests(T* instance, void (T::*excb)(const ::Ice::Exception&), - void (T::*sentcb)(bool) = 0) -{ - return new CallbackNC_Connection_flushBatchRequests(instance, excb, sentcb); -} - -/** - * Type-safe asynchronous callback wrapper class used for calls to - * Ice::Connection::begin_flushBatchRequests. - * Create a wrapper instance by calling ::Ice::newCallback_Connection_flushBatchRequests. - * \headerfile Ice/Ice.h - */ -template -class Callback_Connection_flushBatchRequests : public Callback_Connection_flushBatchRequests_Base, - public ::IceInternal::OnewayCallback -{ -public: - - typedef IceUtil::Handle TPtr; - - typedef void (T::*Exception)(const ::Ice::Exception& , const CT&); - typedef void (T::*Sent)(bool , const CT&); - - Callback_Connection_flushBatchRequests(const TPtr& obj, Exception excb, Sent sentcb) - : ::IceInternal::OnewayCallback(obj, 0, excb, sentcb) - { - } - - /// \cond INTERNAL - virtual void completed(const ::Ice::AsyncResultPtr& result) const - { - ::Ice::ConnectionPtr connection = result->getConnection(); - assert(connection); - try - { - connection->end_flushBatchRequests(result); - assert(false); - } - catch(const ::Ice::Exception& ex) - { - ::IceInternal::Callback::exception(result, ex); - } - } - /// \endcond -}; - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of - * Ice::Connection::begin_flushBatchRequests. - */ -template Callback_Connection_flushBatchRequestsPtr -newCallback_Connection_flushBatchRequests(const IceUtil::Handle& instance, - void (T::*excb)(const ::Ice::Exception&, const CT&), - void (T::*sentcb)(bool, const CT&) = 0) -{ - return new Callback_Connection_flushBatchRequests(instance, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of - * Ice::Connection::begin_flushBatchRequests. - */ -template Callback_Connection_flushBatchRequestsPtr -newCallback_Connection_flushBatchRequests(T* instance, void (T::*excb)(const ::Ice::Exception&, const CT&), - void (T::*sentcb)(bool, const CT&) = 0) -{ - return new Callback_Connection_flushBatchRequests(instance, excb, sentcb); -} - -/** - * Type-safe asynchronous callback wrapper class used for calls to - * Ice::Connection::begin_heartbeat. - * Create a wrapper instance by calling ::Ice::newCallback_Connection_heartbeat. - * \headerfile Ice/Ice.h - */ -template -class CallbackNC_Connection_heartbeat : public Callback_Connection_heartbeat_Base, - public ::IceInternal::OnewayCallbackNC -{ -public: - - typedef IceUtil::Handle TPtr; - - typedef void (T::*Exception)(const ::Ice::Exception&); - typedef void (T::*Sent)(bool); - - CallbackNC_Connection_heartbeat(const TPtr& obj, Exception excb, Sent sentcb) - : ::IceInternal::OnewayCallbackNC(obj, 0, excb, sentcb) - { - } - - /// \cond INTERNAL - virtual void completed(const ::Ice::AsyncResultPtr& __result) const - { - ::Ice::ConnectionPtr __con = __result->getConnection(); - assert(__con); - try - { - __con->end_heartbeat(__result); - assert(false); - } - catch(const ::Ice::Exception& ex) - { - ::IceInternal::CallbackNC::exception(__result, ex); - } - } - /// \endcond -}; - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of - * Ice::Connection::begin_heartbeat. - */ -template Callback_Connection_heartbeatPtr -newCallback_Connection_heartbeat(const IceUtil::Handle& instance, - void (T::*excb)(const ::Ice::Exception&), - void (T::*sentcb)(bool) = 0) -{ - return new CallbackNC_Connection_heartbeat(instance, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of - * Ice::Connection::begin_heartbeat. - */ -template Callback_Connection_heartbeatPtr -newCallback_Connection_heartbeat(T* instance, void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0) -{ - return new CallbackNC_Connection_heartbeat(instance, excb, sentcb); -} - -/** - * Type-safe asynchronous callback wrapper class used for calls to - * Ice::Connection::begin_heartbeat. - * Create a wrapper instance by calling ::Ice::newCallback_Connection_heartbeat. - * \headerfile Ice/Ice.h - */ -template -class Callback_Connection_heartbeat : public Callback_Connection_heartbeat_Base, - public ::IceInternal::OnewayCallback -{ -public: - - typedef IceUtil::Handle TPtr; - - typedef void (T::*Exception)(const ::Ice::Exception& , const CT&); - typedef void (T::*Sent)(bool , const CT&); - - Callback_Connection_heartbeat(const TPtr& obj, Exception excb, Sent sentcb) - : ::IceInternal::OnewayCallback(obj, 0, excb, sentcb) - { - } - - /// \cond INTERNAL - virtual void completed(const ::Ice::AsyncResultPtr& __result) const - { - ::Ice::ConnectionPtr __con = __result->getConnection(); - assert(__con); - try - { - __con->end_heartbeat(__result); - assert(false); - } - catch(const ::Ice::Exception& ex) - { - ::IceInternal::Callback::exception(__result, ex); - } - } - /// \endcond -}; - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of - * Ice::Connection::begin_heartbeat. - */ -template Callback_Connection_heartbeatPtr -newCallback_Connection_heartbeat(const IceUtil::Handle& instance, - void (T::*excb)(const ::Ice::Exception&, const CT&), - void (T::*sentcb)(bool, const CT&) = 0) -{ - return new Callback_Connection_heartbeat(instance, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of - * Ice::Connection::begin_heartbeat. - */ -template Callback_Connection_heartbeatPtr -newCallback_Connection_heartbeat(T* instance, void (T::*excb)(const ::Ice::Exception&, const CT&), - void (T::*sentcb)(bool, const CT&) = 0) -{ - return new Callback_Connection_heartbeat(instance, excb, sentcb); -} - -} - -#endif -#endif diff --git a/cpp/include/Ice/ConnectionF.h b/cpp/include/Ice/ConnectionF.h index fe0db843c42..842d8450636 100644 --- a/cpp/include/Ice/ConnectionF.h +++ b/cpp/include/Ice/ConnectionF.h @@ -13,7 +13,6 @@ #include #include #include -#include #include #include @@ -27,8 +26,6 @@ # endif #endif -#ifdef ICE_CPP11_MAPPING // C++11 mapping - namespace Ice { @@ -50,47 +47,11 @@ namespace Ice { using ConnectionInfoPtr = ::std::shared_ptr; - using WSConnectionInfoPtr = ::std::shared_ptr; - using ConnectionPtr = ::std::shared_ptr; } /// \endcond -#else // C++98 mapping - -namespace Ice -{ - -class ConnectionInfo; -/// \cond INTERNAL -ICE_API LocalObject* upCast(ConnectionInfo*); -/// \endcond -typedef ::IceInternal::Handle< ConnectionInfo> ConnectionInfoPtr; - -class WSConnectionInfo; -/// \cond INTERNAL -ICE_API LocalObject* upCast(WSConnectionInfo*); -/// \endcond -typedef ::IceInternal::Handle< WSConnectionInfo> WSConnectionInfoPtr; - -class Connection; -/// \cond INTERNAL -ICE_API LocalObject* upCast(Connection*); -/// \endcond -typedef ::IceInternal::Handle< Connection> ConnectionPtr; - -} - -/// \cond STREAM -namespace Ice -{ - -} -/// \endcond - -#endif - #include #endif diff --git a/cpp/include/Ice/ConnectionIF.h b/cpp/include/Ice/ConnectionIF.h index ae1dd9c1a56..4e97b80721d 100644 --- a/cpp/include/Ice/ConnectionIF.h +++ b/cpp/include/Ice/ConnectionIF.h @@ -13,12 +13,7 @@ namespace Ice /// \cond INTERNAL class ConnectionI; -#ifdef ICE_CPP11_MAPPING // C++11 mapping using ConnectionIPtr = ::std::shared_ptr; -#else // C++98 mapping -ICE_API Ice::LocalObject* upCast(Ice::ConnectionI*); -typedef IceInternal::Handle ConnectionIPtr; -#endif /// \endcond } diff --git a/cpp/include/Ice/Current.h b/cpp/include/Ice/Current.h index cdca588f277..82f6b7133f7 100644 --- a/cpp/include/Ice/Current.h +++ b/cpp/include/Ice/Current.h @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include @@ -33,8 +32,6 @@ # endif #endif -#ifdef ICE_CPP11_MAPPING // C++11 mapping - namespace Ice { @@ -103,60 +100,5 @@ using Ice::operator!=; } -#else // C++98 mapping - -namespace Ice -{ - -/** - * Information about the current method invocation for servers. Each operation on the server has a - * Current as its implicit final parameter. Current is mostly used for Ice services. Most - * applications ignore this parameter. - * \headerfile Ice/Ice.h - */ -struct Current -{ - /** - * The object adapter. - */ - ::Ice::ObjectAdapterPtr adapter; - /** - * Information about the connection over which the current method invocation was received. If the invocation is - * direct due to collocation optimization, this value is set to null. - */ - ::Ice::ConnectionPtr con; - /** - * The Ice object identity. - */ - ::Ice::Identity id; - /** - * The facet. - */ - ::std::string facet; - /** - * The operation name. - */ - ::std::string operation; - /** - * The mode of the operation. - */ - ::Ice::OperationMode mode; - /** - * The request context, as received from the client. - */ - ::Ice::Context ctx; - /** - * The request id unless oneway (0). - */ - ::Ice::Int requestId; - /** - * The encoding version used to encode the input and output parameters. - */ - ::Ice::EncodingVersion encoding; -}; - -} -#endif - #include #endif diff --git a/cpp/include/Ice/Dispatcher.h b/cpp/include/Ice/Dispatcher.h index 46939d85532..c06cae113a7 100644 --- a/cpp/include/Ice/Dispatcher.h +++ b/cpp/include/Ice/Dispatcher.h @@ -5,7 +5,7 @@ #ifndef ICE_DISPATCHER_H #define ICE_DISPATCHER_H -#if !defined(ICE_CPP11_MAPPING) || defined(ICE_BUILDING_SRC) +#if defined(ICE_BUILDING_SRC) // // Part of the C++98 mapping, and "internal" definitions when building Ice // with the C++11 mapping diff --git a/cpp/include/Ice/Endpoint.h b/cpp/include/Ice/Endpoint.h index 0cb34425e2d..55fb6e0ec2d 100644 --- a/cpp/include/Ice/Endpoint.h +++ b/cpp/include/Ice/Endpoint.h @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include @@ -30,8 +29,6 @@ # endif #endif -#ifdef ICE_CPP11_MAPPING // C++11 mapping - namespace Ice { @@ -372,459 +369,5 @@ using OpaqueEndpointInfoPtr = ::std::shared_ptr; } /// \endcond -#else // C++98 mapping - -namespace Ice -{ - -class EndpointInfo; -/// \cond INTERNAL -ICE_API LocalObject* upCast(EndpointInfo*); -/// \endcond -typedef ::IceInternal::Handle< EndpointInfo> EndpointInfoPtr; - -class Endpoint; -/// \cond INTERNAL -ICE_API LocalObject* upCast(Endpoint*); -/// \endcond -typedef ::IceInternal::Handle< Endpoint> EndpointPtr; - -class IPEndpointInfo; -/// \cond INTERNAL -ICE_API LocalObject* upCast(IPEndpointInfo*); -/// \endcond -typedef ::IceInternal::Handle< IPEndpointInfo> IPEndpointInfoPtr; - -class TCPEndpointInfo; -/// \cond INTERNAL -ICE_API LocalObject* upCast(TCPEndpointInfo*); -/// \endcond -typedef ::IceInternal::Handle< TCPEndpointInfo> TCPEndpointInfoPtr; - -class UDPEndpointInfo; -/// \cond INTERNAL -ICE_API LocalObject* upCast(UDPEndpointInfo*); -/// \endcond -typedef ::IceInternal::Handle< UDPEndpointInfo> UDPEndpointInfoPtr; - -class WSEndpointInfo; -/// \cond INTERNAL -ICE_API LocalObject* upCast(WSEndpointInfo*); -/// \endcond -typedef ::IceInternal::Handle< WSEndpointInfo> WSEndpointInfoPtr; - -class OpaqueEndpointInfo; -/// \cond INTERNAL -ICE_API LocalObject* upCast(OpaqueEndpointInfo*); -/// \endcond -typedef ::IceInternal::Handle< OpaqueEndpointInfo> OpaqueEndpointInfoPtr; - -} - -namespace Ice -{ - -/** - * Base class providing access to the endpoint details. - * \headerfile Ice/Ice.h - */ -class ICE_API EndpointInfo : public virtual LocalObject -{ -public: - - typedef EndpointInfoPtr PointerType; - - virtual ~EndpointInfo(); - - EndpointInfo() - { - } - - /** - * One-shot constructor to initialize all data members. - * @param underlying The information of the underyling endpoint or null if there's no underlying endpoint. - * @param timeout The timeout for the endpoint in milliseconds. - * @param compress Specifies whether or not compression should be used if available when using this endpoint. - */ - EndpointInfo(const ::Ice::EndpointInfoPtr& underlying, ::Ice::Int timeout, bool compress) : - underlying(underlying), - timeout(timeout), - compress(compress) - { - } - - EndpointInfo(const EndpointInfo&) = default; - EndpointInfo& operator=(const EndpointInfo&) = default; - - /** - * Returns the type of the endpoint. - * @return The endpoint type. - */ - virtual Short type() const noexcept = 0; - - /** - * Returns true if this endpoint is a datagram endpoint. - * @return True for a datagram endpoint. - */ - virtual bool datagram() const noexcept = 0; - - /** - * @return True for a secure endpoint. - */ - virtual bool secure() const noexcept = 0; - - /** - * The information of the underyling endpoint or null if there's no underlying endpoint. - */ - ::Ice::EndpointInfoPtr underlying; - /** - * The timeout for the endpoint in milliseconds. 0 means non-blocking, -1 means no timeout. - */ - ::Ice::Int timeout; - /** - * Specifies whether or not compression should be used if available when using this endpoint. - */ - bool compress; -}; - -/// \cond INTERNAL -inline bool operator==(const EndpointInfo& lhs, const EndpointInfo& rhs) -{ - return static_cast(lhs) == static_cast(rhs); -} - -inline bool operator<(const EndpointInfo& lhs, const EndpointInfo& rhs) -{ - return static_cast(lhs) < static_cast(rhs); -} -/// \endcond - -/** - * The user-level interface to an endpoint. - * \headerfile Ice/Ice.h - */ -class ICE_API Endpoint : public virtual LocalObject -{ -public: - - typedef EndpointPtr PointerType; - - virtual ~Endpoint(); - Endpoint() = default; - Endpoint(const Endpoint&) = default; - Endpoint& operator=(const Endpoint&) = default; - - /** - * Return a string representation of the endpoint. - * @return The string representation of the endpoint. - */ - virtual ::std::string toString() const noexcept = 0; - - /** - * Returns the endpoint information. - * @return The endpoint information class. - */ - virtual EndpointInfoPtr getInfo() const noexcept = 0; -}; - -/// \cond INTERNAL -inline bool operator==(const Endpoint& lhs, const Endpoint& rhs) -{ - return static_cast(lhs) == static_cast(rhs); -} - -inline bool operator<(const Endpoint& lhs, const Endpoint& rhs) -{ - return static_cast(lhs) < static_cast(rhs); -} -/// \endcond - -/** - * Provides access to the address details of a IP endpoint. - * @see Endpoint - * \headerfile Ice/Ice.h - */ -class ICE_API IPEndpointInfo : public EndpointInfo -{ -public: - - typedef IPEndpointInfoPtr PointerType; - - virtual ~IPEndpointInfo(); - - IPEndpointInfo() - { - } - - /** - * One-shot constructor to initialize all data members. - * @param underlying The information of the underyling endpoint or null if there's no underlying endpoint. - * @param timeout The timeout for the endpoint in milliseconds. - * @param compress Specifies whether or not compression should be used if available when using this endpoint. - * @param host The host or address configured with the endpoint. - * @param port The port number. - * @param sourceAddress The source IP address. - */ - IPEndpointInfo(const ::Ice::EndpointInfoPtr& underlying, ::Ice::Int timeout, bool compress, const ::std::string& host, ::Ice::Int port, const ::std::string& sourceAddress) : - ::Ice::EndpointInfo(underlying, timeout, compress), - host(host), - port(port), - sourceAddress(sourceAddress) - { - } - IPEndpointInfo(const IPEndpointInfo&) = default; - IPEndpointInfo& operator=(const IPEndpointInfo&) = default; - - /** - * The host or address configured with the endpoint. - */ - ::std::string host; - /** - * The port number. - */ - ::Ice::Int port; - /** - * The source IP address. - */ - ::std::string sourceAddress; -}; - -/// \cond INTERNAL -inline bool operator==(const IPEndpointInfo& lhs, const IPEndpointInfo& rhs) -{ - return static_cast(lhs) == static_cast(rhs); -} - -inline bool operator<(const IPEndpointInfo& lhs, const IPEndpointInfo& rhs) -{ - return static_cast(lhs) < static_cast(rhs); -} -/// \endcond - -/** - * Provides access to a TCP endpoint information. - * @see Endpoint - * \headerfile Ice/Ice.h - */ -class ICE_API TCPEndpointInfo : public IPEndpointInfo -{ -public: - - typedef TCPEndpointInfoPtr PointerType; - - virtual ~TCPEndpointInfo(); - - TCPEndpointInfo() - { - } - - /** - * One-shot constructor to initialize all data members. - * @param underlying The information of the underyling endpoint or null if there's no underlying endpoint. - * @param timeout The timeout for the endpoint in milliseconds. - * @param compress Specifies whether or not compression should be used if available when using this endpoint. - * @param host The host or address configured with the endpoint. - * @param port The port number. - * @param sourceAddress The source IP address. - */ - TCPEndpointInfo(const ::Ice::EndpointInfoPtr& underlying, ::Ice::Int timeout, bool compress, const ::std::string& host, ::Ice::Int port, const ::std::string& sourceAddress) : - ::Ice::IPEndpointInfo(underlying, timeout, compress, host, port, sourceAddress) - { - } - - TCPEndpointInfo(const TCPEndpointInfo&) = default; - TCPEndpointInfo& operator=(const TCPEndpointInfo&) = default; -}; - -/// \cond INTERNAL -inline bool operator==(const TCPEndpointInfo& lhs, const TCPEndpointInfo& rhs) -{ - return static_cast(lhs) == static_cast(rhs); -} - -inline bool operator<(const TCPEndpointInfo& lhs, const TCPEndpointInfo& rhs) -{ - return static_cast(lhs) < static_cast(rhs); -} -/// \endcond - -/** - * Provides access to an UDP endpoint information. - * @see Endpoint - * \headerfile Ice/Ice.h - */ -class ICE_API UDPEndpointInfo : public IPEndpointInfo -{ -public: - - typedef UDPEndpointInfoPtr PointerType; - - virtual ~UDPEndpointInfo(); - - UDPEndpointInfo() - { - } - - /** - * One-shot constructor to initialize all data members. - * @param underlying The information of the underyling endpoint or null if there's no underlying endpoint. - * @param timeout The timeout for the endpoint in milliseconds. - * @param compress Specifies whether or not compression should be used if available when using this endpoint. - * @param host The host or address configured with the endpoint. - * @param port The port number. - * @param sourceAddress The source IP address. - * @param mcastInterface The multicast interface. - * @param mcastTtl The multicast time-to-live (or hops). - */ - UDPEndpointInfo(const ::Ice::EndpointInfoPtr& underlying, ::Ice::Int timeout, bool compress, const ::std::string& host, ::Ice::Int port, const ::std::string& sourceAddress, const ::std::string& mcastInterface, ::Ice::Int mcastTtl) : - ::Ice::IPEndpointInfo(underlying, timeout, compress, host, port, sourceAddress), - mcastInterface(mcastInterface), - mcastTtl(mcastTtl) - { - } - - UDPEndpointInfo(const UDPEndpointInfo&) = default; - UDPEndpointInfo& operator=(const UDPEndpointInfo&) = default; - - /** - * The multicast interface. - */ - ::std::string mcastInterface; - /** - * The multicast time-to-live (or hops). - */ - ::Ice::Int mcastTtl; -}; - -/// \cond INTERNAL -inline bool operator==(const UDPEndpointInfo& lhs, const UDPEndpointInfo& rhs) -{ - return static_cast(lhs) == static_cast(rhs); -} - -inline bool operator<(const UDPEndpointInfo& lhs, const UDPEndpointInfo& rhs) -{ - return static_cast(lhs) < static_cast(rhs); -} -/// \endcond - -/** - * Provides access to a WebSocket endpoint information. - * \headerfile Ice/Ice.h - */ -class ICE_API WSEndpointInfo : public EndpointInfo -{ -public: - - typedef WSEndpointInfoPtr PointerType; - - virtual ~WSEndpointInfo(); - - WSEndpointInfo() - { - } - - /** - * One-shot constructor to initialize all data members. - * @param underlying The information of the underyling endpoint or null if there's no underlying endpoint. - * @param timeout The timeout for the endpoint in milliseconds. - * @param compress Specifies whether or not compression should be used if available when using this endpoint. - * @param resource The URI configured with the endpoint. - */ - WSEndpointInfo(const ::Ice::EndpointInfoPtr& underlying, ::Ice::Int timeout, bool compress, const ::std::string& resource) : - ::Ice::EndpointInfo(underlying, timeout, compress), - resource(resource) - { - } - - WSEndpointInfo(const WSEndpointInfo&) = default; - WSEndpointInfo& operator=(const WSEndpointInfo&) = default; - - /** - * The URI configured with the endpoint. - */ - ::std::string resource; -}; - -/// \cond INTERNAL -inline bool operator==(const WSEndpointInfo& lhs, const WSEndpointInfo& rhs) -{ - return static_cast(lhs) == static_cast(rhs); -} - -inline bool operator<(const WSEndpointInfo& lhs, const WSEndpointInfo& rhs) -{ - return static_cast(lhs) < static_cast(rhs); -} -/// \endcond - -/** - * Provides access to the details of an opaque endpoint. - * @see Endpoint - * \headerfile Ice/Ice.h - */ -class ICE_API OpaqueEndpointInfo : public EndpointInfo -{ -public: - - typedef OpaqueEndpointInfoPtr PointerType; - - virtual ~OpaqueEndpointInfo(); - - OpaqueEndpointInfo() - { - } - - /** - * One-shot constructor to initialize all data members. - * @param underlying The information of the underyling endpoint or null if there's no underlying endpoint. - * @param timeout The timeout for the endpoint in milliseconds. - * @param compress Specifies whether or not compression should be used if available when using this endpoint. - * @param rawEncoding The encoding version of the opaque endpoint (to decode or encode the rawBytes). - * @param rawBytes The raw encoding of the opaque endpoint. - */ - OpaqueEndpointInfo(const ::Ice::EndpointInfoPtr& underlying, ::Ice::Int timeout, bool compress, const ::Ice::EncodingVersion& rawEncoding, const ::Ice::ByteSeq& rawBytes) : - ::Ice::EndpointInfo(underlying, timeout, compress), - rawEncoding(rawEncoding), - rawBytes(rawBytes) - { - } - - OpaqueEndpointInfo(const OpaqueEndpointInfo&) = default; - OpaqueEndpointInfo& operator=(const OpaqueEndpointInfo&) = default; - - /** - * The encoding version of the opaque endpoint (to decode or encode the rawBytes). - */ - ::Ice::EncodingVersion rawEncoding; - /** - * The raw encoding of the opaque endpoint. - */ - ::Ice::ByteSeq rawBytes; -}; - -/// \cond INTERNAL -inline bool operator==(const OpaqueEndpointInfo& lhs, const OpaqueEndpointInfo& rhs) -{ - return static_cast(lhs) == static_cast(rhs); -} - -inline bool operator<(const OpaqueEndpointInfo& lhs, const OpaqueEndpointInfo& rhs) -{ - return static_cast(lhs) < static_cast(rhs); -} -/// \endcond - -} - -/// \cond STREAM -namespace Ice -{ - -} -/// \endcond - -#endif - #include #endif diff --git a/cpp/include/Ice/EndpointF.h b/cpp/include/Ice/EndpointF.h index 531e60e5291..ad67050e98a 100644 --- a/cpp/include/Ice/EndpointF.h +++ b/cpp/include/Ice/EndpointF.h @@ -13,7 +13,6 @@ #include #include #include -#include #include #include @@ -27,8 +26,6 @@ # endif #endif -#ifdef ICE_CPP11_MAPPING // C++11 mapping - namespace Ice { @@ -77,67 +74,5 @@ using EndpointPtr = ::std::shared_ptr; } /// \endcond -#else // C++98 mapping - -namespace Ice -{ - -class EndpointInfo; -/// \cond INTERNAL -ICE_API LocalObject* upCast(EndpointInfo*); -/// \endcond -typedef ::IceInternal::Handle< EndpointInfo> EndpointInfoPtr; - -class IPEndpointInfo; -/// \cond INTERNAL -ICE_API LocalObject* upCast(IPEndpointInfo*); -/// \endcond -typedef ::IceInternal::Handle< IPEndpointInfo> IPEndpointInfoPtr; - -class TCPEndpointInfo; -/// \cond INTERNAL -ICE_API LocalObject* upCast(TCPEndpointInfo*); -/// \endcond -typedef ::IceInternal::Handle< TCPEndpointInfo> TCPEndpointInfoPtr; - -class UDPEndpointInfo; -/// \cond INTERNAL -ICE_API LocalObject* upCast(UDPEndpointInfo*); -/// \endcond -typedef ::IceInternal::Handle< UDPEndpointInfo> UDPEndpointInfoPtr; - -class WSEndpointInfo; -/// \cond INTERNAL -ICE_API LocalObject* upCast(WSEndpointInfo*); -/// \endcond -typedef ::IceInternal::Handle< WSEndpointInfo> WSEndpointInfoPtr; - -class Endpoint; -/// \cond INTERNAL -ICE_API LocalObject* upCast(Endpoint*); -/// \endcond -typedef ::IceInternal::Handle< Endpoint> EndpointPtr; - -} - -namespace Ice -{ - -/** - * A sequence of endpoints. - */ -typedef ::std::vector EndpointSeq; - -} - -/// \cond STREAM -namespace Ice -{ - -} -/// \endcond - -#endif - #include #endif diff --git a/cpp/include/Ice/EndpointSelectionType.h b/cpp/include/Ice/EndpointSelectionType.h index b51dea15fb7..e3560bf23d6 100644 --- a/cpp/include/Ice/EndpointSelectionType.h +++ b/cpp/include/Ice/EndpointSelectionType.h @@ -5,7 +5,6 @@ #ifndef __Ice_EndpointSelectionType_h__ #define __Ice_EndpointSelectionType_h__ -#include #include #include #include @@ -13,7 +12,6 @@ #include #include #include -#include #include #include @@ -27,8 +25,6 @@ # endif #endif -#ifdef ICE_CPP11_MAPPING // C++11 mapping - namespace Ice { @@ -49,43 +45,4 @@ enum class EndpointSelectionType : unsigned char } -/// \cond STREAM -namespace Ice -{ - -} -/// \endcond - -#else // C++98 mapping - -namespace Ice -{ - -/** - * Determines the order in which the Ice run time uses the endpoints in a proxy when establishing a connection. - */ -enum EndpointSelectionType -{ - /** - * Random causes the endpoints to be arranged in a random order. - */ - Random, - /** - * Ordered forces the Ice run time to use the endpoints in the order they appeared in the proxy. - */ - Ordered -}; - -} - -/// \cond STREAM -namespace Ice -{ - -} -/// \endcond - -#endif - -#include #endif diff --git a/cpp/include/Ice/Exception.h b/cpp/include/Ice/Exception.h index 7814132eb2b..4512be9efd4 100644 --- a/cpp/include/Ice/Exception.h +++ b/cpp/include/Ice/Exception.h @@ -42,11 +42,7 @@ class ICE_API LocalException : public IceUtil::Exception * Polymorphically clones this exception. * @return A shallow copy of this exception. */ -#ifdef ICE_CPP11_MAPPING std::unique_ptr ice_clone() const; -#else - virtual LocalException* ice_clone() const = 0; -#endif /** * Obtains the Slice type ID of this exception. @@ -67,11 +63,8 @@ class ICE_API UserException : public IceUtil::Exception * Polymorphically clones this exception. * @return A shallow copy of this exception. */ -#ifdef ICE_CPP11_MAPPING std::unique_ptr ice_clone() const; -#else - virtual UserException* ice_clone() const = 0; -#endif + virtual Ice::SlicedDataPtr ice_getSlicedData() const; /** @@ -119,11 +112,7 @@ class ICE_API SystemException : public IceUtil::Exception * Polymorphically clones this exception. * @return A shallow copy of this exception. */ -#ifdef ICE_CPP11_MAPPING std::unique_ptr ice_clone() const; -#else - virtual SystemException* ice_clone() const = 0; -#endif /** * Obtains the Slice type ID of this exception. diff --git a/cpp/include/Ice/ExceptionHelpers.h b/cpp/include/Ice/ExceptionHelpers.h index eb799ff298b..14e64ade028 100644 --- a/cpp/include/Ice/ExceptionHelpers.h +++ b/cpp/include/Ice/ExceptionHelpers.h @@ -5,8 +5,6 @@ #ifndef ICE_EXCEPTION_HELPERS_H #define ICE_EXCEPTION_HELPERS_H -#ifdef ICE_CPP11_MAPPING // C++11 mapping - #include #include @@ -69,6 +67,4 @@ template class UserExceptionHelper : public IceUtil::Exc } -#endif // C++11 mapping end - #endif diff --git a/cpp/include/Ice/FactoryTableInit.h b/cpp/include/Ice/FactoryTableInit.h index 5bb094cd32f..3c7ca4f4ab9 100644 --- a/cpp/include/Ice/FactoryTableInit.h +++ b/cpp/include/Ice/FactoryTableInit.h @@ -42,11 +42,7 @@ class DefaultUserExceptionFactoryInit DefaultUserExceptionFactoryInit(const char* tId) : typeId(tId) { -#ifdef ICE_CPP11_MAPPING factoryTable->addExceptionFactory(typeId, defaultUserExceptionFactory); -#else - factoryTable->addExceptionFactory(typeId, new DefaultUserExceptionFactory(typeId)); -#endif } ~DefaultUserExceptionFactoryInit() diff --git a/cpp/include/Ice/Format.h b/cpp/include/Ice/Format.h index 5cb76ec5345..c01ecfb0fe5 100644 --- a/cpp/include/Ice/Format.h +++ b/cpp/include/Ice/Format.h @@ -13,11 +13,7 @@ namespace Ice /** * Describes the possible formats for classes and exceptions. */ -#ifdef ICE_CPP11_MAPPING enum class FormatType : unsigned char -#else -enum FormatType -#endif { /** * Indicates that no preference was specified. diff --git a/cpp/include/Ice/Ice.h b/cpp/include/Ice/Ice.h index acb23ad75f9..d0965523875 100644 --- a/cpp/include/Ice/Ice.h +++ b/cpp/include/Ice/Ice.h @@ -9,7 +9,6 @@ #include #include #include -#include #include #include #include @@ -31,7 +30,6 @@ # include # include # include -# include # include # include # if !defined(__APPLE__) || TARGET_OS_IPHONE == 0 @@ -39,7 +37,6 @@ # include # endif # include -# include # include # include # include diff --git a/cpp/include/Ice/IconvStringConverter.h b/cpp/include/Ice/IconvStringConverter.h index 158ce7e867d..e70665b3249 100644 --- a/cpp/include/Ice/IconvStringConverter.h +++ b/cpp/include/Ice/IconvStringConverter.h @@ -59,14 +59,6 @@ class ICE_API IconvInitializationException : public IceUtil::ExceptionHelper #include #include -#include #include #include #include @@ -30,8 +29,6 @@ # endif #endif -#ifdef ICE_CPP11_MAPPING // C++11 mapping - namespace Ice { @@ -130,119 +127,5 @@ using ImplicitContextPtr = ::std::shared_ptr; } /// \endcond -#else // C++98 mapping - -namespace Ice -{ - -class ImplicitContext; -/// \cond INTERNAL -ICE_API LocalObject* upCast(ImplicitContext*); -/// \endcond -typedef ::IceInternal::Handle< ImplicitContext> ImplicitContextPtr; - -} - -namespace Ice -{ - -/** - * An interface to associate implict contexts with communicators. When you make a remote invocation without an - * explicit context parameter, Ice uses the per-proxy context (if any) combined with the ImplicitContext - * associated with the communicator. - * Ice provides several implementations of ImplicitContext. The implementation used depends on the value - * of the Ice.ImplicitContext property. - *
- *
None (default)
- *
No implicit context at all.
- *
PerThread
- *
The implementation maintains a context per thread.
- *
Shared
- *
The implementation maintains a single context shared by all threads.
- *
- * ImplicitContext also provides a number of operations to create, update or retrieve an entry in the - * underlying context without first retrieving a copy of the entire context. These operations correspond to a subset - * of the java.util.Map methods, with java.lang.Object replaced by string and - * null replaced by the empty-string. - * \headerfile Ice/Ice.h - */ -class ICE_API ImplicitContext : public virtual LocalObject -{ -public: - - typedef ImplicitContextPtr PointerType; - - virtual ~ImplicitContext(); - ImplicitContext() = default; - ImplicitContext(const ImplicitContext&) = default; - ImplicitContext& operator=(const ImplicitContext&) = default; - - /** - * Get a copy of the underlying context. - * @return A copy of the underlying context. - */ - virtual Context getContext() const = 0; - - /** - * Set the underlying context. - * @param newContext The new context. - */ - virtual void setContext(const Context& newContext) = 0; - - /** - * Check if this key has an associated value in the underlying context. - * @param key The key. - * @return True if the key has an associated value, False otherwise. - */ - virtual bool containsKey(const ::std::string& key) const = 0; - - /** - * Get the value associated with the given key in the underlying context. Returns an empty string if no value is - * associated with the key. {@link #containsKey} allows you to distinguish between an empty-string value and no - * value at all. - * @param key The key. - * @return The value associated with the key. - */ - virtual ::std::string get(const ::std::string& key) const = 0; - - /** - * Create or update a key/value entry in the underlying context. - * @param key The key. - * @param value The value. - * @return The previous value associated with the key, if any. - */ - virtual ::std::string put(const ::std::string& key, const ::std::string& value) = 0; - - /** - * Remove the entry for the given key in the underlying context. - * @param key The key. - * @return The value associated with the key, if any. - */ - virtual ::std::string remove(const ::std::string& key) = 0; -}; - -/// \cond INTERNAL -inline bool operator==(const ImplicitContext& lhs, const ImplicitContext& rhs) -{ - return static_cast(lhs) == static_cast(rhs); -} - -inline bool operator<(const ImplicitContext& lhs, const ImplicitContext& rhs) -{ - return static_cast(lhs) < static_cast(rhs); -} -/// \endcond - -} - -/// \cond STREAM -namespace Ice -{ - -} -/// \endcond - -#endif - #include #endif diff --git a/cpp/include/Ice/ImplicitContextF.h b/cpp/include/Ice/ImplicitContextF.h index b39be27ba0c..21e0eb3e235 100644 --- a/cpp/include/Ice/ImplicitContextF.h +++ b/cpp/include/Ice/ImplicitContextF.h @@ -5,7 +5,6 @@ #ifndef __Ice_ImplicitContextF_h__ #define __Ice_ImplicitContextF_h__ -#include #include #include #include @@ -13,12 +12,9 @@ #include #include #include -#include #include #include -#ifdef ICE_CPP11_MAPPING // C++11 mapping - namespace Ice { @@ -26,13 +22,6 @@ class ImplicitContext; } -/// \cond STREAM -namespace Ice -{ - -} -/// \endcond - /// \cond INTERNAL namespace Ice { @@ -42,27 +31,4 @@ using ImplicitContextPtr = ::std::shared_ptr; } /// \endcond -#else // C++98 mapping - -namespace Ice -{ - -class ImplicitContext; -/// \cond INTERNAL -ICE_API LocalObject* upCast(ImplicitContext*); -/// \endcond -typedef ::IceInternal::Handle< ImplicitContext> ImplicitContextPtr; - -} - -/// \cond STREAM -namespace Ice -{ - -} -/// \endcond - -#endif - -#include #endif diff --git a/cpp/include/Ice/Incoming.h b/cpp/include/Ice/Incoming.h index 67a11ad74a0..68436b2ca31 100644 --- a/cpp/include/Ice/Incoming.h +++ b/cpp/include/Ice/Incoming.h @@ -18,8 +18,6 @@ #include -#ifdef ICE_CPP11_MAPPING - namespace Ice { @@ -54,8 +52,6 @@ class ICE_API MarshaledResult } -#endif - namespace Ice { class ServantLocator; @@ -72,10 +68,7 @@ class ICE_API IncomingBase : private IceUtil::noncopyable void endWriteParams(); void writeEmptyParams(); void writeParamEncaps(const Ice::Byte*, Ice::Int, bool); - -#ifdef ICE_CPP11_MAPPING void setMarshaledResult(const Ice::MarshaledResult&); -#endif void response(bool); void exception(const std::exception&, bool); @@ -109,13 +102,8 @@ class ICE_API IncomingBase : private IceUtil::noncopyable // stack-allocated Incoming still holds it. // ResponseHandler* _responseHandler; - -#ifdef ICE_CPP11_MAPPING using DispatchInterceptorCallbacks = std::deque, std::function>>; -#else - typedef std::deque DispatchInterceptorCallbacks; -#endif DispatchInterceptorCallbacks _interceptorCBs; }; @@ -136,11 +124,7 @@ class ICE_API Incoming : public IncomingBase return _current; } -#ifdef ICE_CPP11_MAPPING void push(std::function, std::function); -#else - void push(const Ice::DispatchInterceptorAsyncCallbackPtr&); -#endif void pop(); void setAsync(const IncomingAsyncPtr& in) diff --git a/cpp/include/Ice/IncomingAsync.h b/cpp/include/Ice/IncomingAsync.h index 269f31a1696..280e6464968 100644 --- a/cpp/include/Ice/IncomingAsync.h +++ b/cpp/include/Ice/IncomingAsync.h @@ -8,34 +8,6 @@ #include #include -#ifndef ICE_CPP11_MAPPING -namespace Ice -{ - -/** - * Base class for generated AMD callback classes. - * \headerfile Ice/Ice.h - */ -class ICE_API AMDCallback : public Ice::LocalObject -{ -public: - - virtual ~AMDCallback(); - - /** - * Completes the asynchronous request with the given exception. - * @param ex The exception that completed the request. - */ - virtual void ice_exception(const ::std::exception& ex) = 0; - - /** - * Completes the asynchronous request with an UnknownException. - */ - virtual void ice_exception() = 0; -}; - -} -#endif namespace IceInternal { @@ -50,19 +22,12 @@ namespace IceInternal // We need virtual inheritance from AMDCallback, because we use multiple // inheritance from Ice::AMDCallback for generated AMD code. // -class ICE_API IncomingAsync : public IncomingBase, -#ifdef ICE_CPP11_MAPPING - public ::std::enable_shared_from_this -#else - public virtual Ice::AMDCallback -#endif +class ICE_API IncomingAsync : public IncomingBase, public ::std::enable_shared_from_this { public: IncomingAsync(Incoming&); -#ifdef ICE_CPP11_MAPPING - static std::shared_ptr create(Incoming&); std::function response() @@ -92,20 +57,11 @@ class ICE_API IncomingAsync : public IncomingBase, return [self](std::exception_ptr ex) { self->completed(ex); }; } -#else - - virtual void ice_exception(const ::std::exception&); - virtual void ice_exception(); - -#endif - void kill(Incoming&); void completed(); -#ifdef ICE_CPP11_MAPPING void completed(std::exception_ptr); -#endif private: @@ -125,62 +81,4 @@ class ICE_API IncomingAsync : public IncomingBase, } -#ifndef ICE_CPP11_MAPPING -namespace Ice -{ - -/** - * Base class for the AMD callback for BlobjectAsync::ice_invoke_async. - * \headerfile Ice/Ice.h - */ -class ICE_API AMD_Object_ice_invoke : public virtual Ice::AMDCallback -{ -public: - - virtual ~AMD_Object_ice_invoke(); - - /** - * Completes the request. - * @param ok True if the request completed successfully, in which case bytes contains an encapsulation - * of the marshaled results. False if the request completed with a user exception, in which case bytes - * contains an encapsulation of the marshaled user exception. - * @param bytes An encapsulation of the results or user exception. - */ - virtual void ice_response(bool ok, const std::vector& bytes) = 0; - - /** - * Completes the request. - * @param ok True if the request completed successfully, in which case bytes contains an encapsulation - * of the marshaled results. False if the request completed with a user exception, in which case bytes - * contains an encapsulation of the marshaled user exception. - * @param bytes An encapsulation of the results or user exception. - */ - virtual void ice_response(bool ok, const std::pair& bytes) = 0; -}; - -} - -/// \cond INTERNAL -namespace IceAsync -{ - -namespace Ice -{ - -class ICE_API AMD_Object_ice_invoke : public ::Ice::AMD_Object_ice_invoke, public IceInternal::IncomingAsync -{ -public: - - AMD_Object_ice_invoke(IceInternal::Incoming&); - - virtual void ice_response(bool, const std::vector< ::Ice::Byte>&); - virtual void ice_response(bool, const std::pair&); -}; - -} - -} -/// \endcond -#endif - #endif diff --git a/cpp/include/Ice/IncomingAsyncF.h b/cpp/include/Ice/IncomingAsyncF.h index 269ab7728d1..97c6885daf3 100644 --- a/cpp/include/Ice/IncomingAsyncF.h +++ b/cpp/include/Ice/IncomingAsyncF.h @@ -5,32 +5,15 @@ #ifndef ICE_INCOMING_ASYNC_F_H #define ICE_INCOMING_ASYNC_F_H -#include - -#include +#include "Config.h" +#include namespace IceInternal { class IncomingAsync; -#ifdef ICE_CPP11_MAPPING using IncomingAsyncPtr = ::std::shared_ptr; -#else -ICE_API IceUtil::Shared* upCast(IncomingAsync*); -typedef IceInternal::Handle IncomingAsyncPtr; -#endif - -} - -#ifndef ICE_CPP11_MAPPING -namespace Ice -{ - -class AMD_Object_ice_invoke; -ICE_API IceUtil::Shared* upCast(::Ice::AMD_Object_ice_invoke*); -typedef IceInternal::Handle AMD_Object_ice_invokePtr; } -#endif #endif diff --git a/cpp/include/Ice/Initialize.h b/cpp/include/Ice/Initialize.h index 70ad7fe0e04..66c7fe4836a 100644 --- a/cpp/include/Ice/Initialize.h +++ b/cpp/include/Ice/Initialize.h @@ -18,11 +18,7 @@ #include #include -#ifdef ICE_CPP11_MAPPING # define ICE_CONFIG_FILE_STRING const std::string& -#else -# define ICE_CONFIG_FILE_STRING const char* -#endif namespace Ice { @@ -246,8 +242,6 @@ typedef IceUtil::Handle ThreadNotificationPtr; class ICE_API ThreadHookPlugin : public Ice::Plugin { public: - -#ifdef ICE_CPP11_MAPPING /** * Installs the thread hooks. * @param communicator The communicator in which to install the thread hooks. @@ -255,14 +249,6 @@ class ICE_API ThreadHookPlugin : public Ice::Plugin * @param stop The stop callback. */ ThreadHookPlugin(const CommunicatorPtr& communicator, std::function start, std::function stop); -#else - /** - * Installs the thread hooks. - * @param communicator The communicator in which to install the thread hooks. - * @param hook The thread notification callback object. - */ - ThreadHookPlugin(const CommunicatorPtr& communicator, const ThreadNotificationPtr& hook); -#endif /** Not used. */ virtual void initialize(); @@ -292,8 +278,6 @@ struct InitializationData */ Instrumentation::CommunicatorObserverPtr observer; -#ifdef ICE_CPP11_MAPPING - #if defined(__clang__) # pragma clang diagnostic push # pragma clang diagnostic ignored "-Wdocumentation" // param/return is not recognized for std::function data members @@ -349,41 +333,6 @@ struct InitializationData # pragma clang diagnostic pop #endif -#else - /** - * The thread hook for the communicator. - */ - ThreadNotificationPtr threadHook; - - /** - * You can control which thread receives operation invocations and AMI - * callbacks by supplying a dispatcher. - * - * For example, you can use this dispatching facility to ensure that - * all invocations and callbacks are dispatched in a GUI event loop - * thread so that it is safe to invoke directly on GUI objects. - * - * The dispatcher is responsible for running (dispatching) the - * invocation or AMI callback on its favorite thread. It must eventually - * execute the provided call. - */ - DispatcherPtr dispatcher; - - /** - * Applications that make use of compact type IDs to conserve space - * when marshaling class instances, and also use the streaming API to - * extract such classes, can intercept the translation between compact - * type IDs and their corresponding string type IDs by installing a - * compact ID resolver. - */ - CompactIdResolverPtr compactIdResolver; - - /** - * The batch request interceptor. - */ - BatchRequestInterceptorPtr batchRequestInterceptor; -#endif - /** * The value factory manager. */ @@ -648,8 +597,6 @@ class ICE_API CommunicatorHolder */ CommunicatorHolder(); -#ifdef ICE_CPP11_MAPPING - /** * Calls initialize to create a communicator with the provided arguments. * This constructor accepts all of the same overloaded argument styles as @@ -690,215 +637,6 @@ class ICE_API CommunicatorHolder */ explicit operator bool() const; -#else // C++98 mapping - - /** - * Initializes a new communicator. - * @param argc The number of arguments in argv. Upon return, this argument - * is updated to reflect the arguments still remaining in argv. - * @param argv Command-line arguments, possibly containing - * options to set properties. If the arguments include - * a --Ice.Config option, the corresponding configuration - * files are parsed. If the same property is set in a configuration - * file and in the arguments, the arguments take precedence. - * Recognized options are removed from this vector upon return. - * @param initData Configuration data for the new Communicator. - * @param version Indicates the Ice version with which the application is compatible. If not - * specified, the version of the Ice installation is used. - */ - CommunicatorHolder(int& argc, const char* argv[], const InitializationData& initData = InitializationData(), - int version = ICE_INT_VERSION); - - /** - * Initializes a new communicator. - * @param argc The number of arguments in argv. Upon return, this argument - * is updated to reflect the arguments still remaining in argv. - * @param argv Command-line arguments, possibly containing - * options to set properties. If the arguments include - * a --Ice.Config option, the corresponding configuration - * files are parsed. If the same property is set in a configuration - * file and in the arguments, the arguments take precedence. - * Recognized options are removed from this vector upon return. - * @param initData Configuration data for the new Communicator. - * @param version Indicates the Ice version with which the application is compatible. If not - * specified, the version of the Ice installation is used. - */ - CommunicatorHolder(int& argc, char* argv[], const InitializationData& initData = InitializationData(), - int version = ICE_INT_VERSION); - - /** - * Initializes a new communicator. - * @param argc The number of arguments in argv. Upon return, this argument - * is updated to reflect the arguments still remaining in argv. - * @param argv Command-line arguments, possibly containing - * options to set properties. If the arguments include - * a --Ice.Config option, the corresponding configuration - * files are parsed. If the same property is set in a configuration - * file and in the arguments, the arguments take precedence. - * Recognized options are removed from this vector upon return. - * @param configFile The name of an Ice configuration file. - * @param version Indicates the Ice version with which the application is compatible. If not - * specified, the version of the Ice installation is used. - */ - CommunicatorHolder(int& argc, const char* argv[], const char* configFile, int version = ICE_INT_VERSION); - - /** - * Initializes a new communicator. - * @param argc The number of arguments in argv. Upon return, this argument - * is updated to reflect the arguments still remaining in argv. - * @param argv Command-line arguments, possibly containing - * options to set properties. If the arguments include - * a --Ice.Config option, the corresponding configuration - * files are parsed. If the same property is set in a configuration - * file and in the arguments, the arguments take precedence. - * Recognized options are removed from this vector upon return. - * @param configFile The name of an Ice configuration file. - * @param version Indicates the Ice version with which the application is compatible. If not - * specified, the version of the Ice installation is used. - */ - CommunicatorHolder(int& argc, char* argv[], const char* configFile, int version = ICE_INT_VERSION); - -# ifdef _WIN32 - /** - * Initializes a new communicator. - * @param argc The number of arguments in argv. Upon return, this argument - * is updated to reflect the arguments still remaining in argv. - * @param argv Command-line arguments, possibly containing - * options to set properties. If the arguments include - * a --Ice.Config option, the corresponding configuration - * files are parsed. If the same property is set in a configuration - * file and in the arguments, the arguments take precedence. - * Recognized options are removed from this vector upon return. - * @param initData Configuration data for the new Communicator. - * @param version Indicates the Ice version with which the application is compatible. If not - * specified, the version of the Ice installation is used. - */ - CommunicatorHolder(int& argc, const wchar_t* argv[], const InitializationData& initData = InitializationData(), - int version = ICE_INT_VERSION); - - /** - * Initializes a new communicator. - * @param argc The number of arguments in argv. Upon return, this argument - * is updated to reflect the arguments still remaining in argv. - * @param argv Command-line arguments, possibly containing - * options to set properties. If the arguments include - * a --Ice.Config option, the corresponding configuration - * files are parsed. If the same property is set in a configuration - * file and in the arguments, the arguments take precedence. - * Recognized options are removed from this vector upon return. - * @param initData Configuration data for the new Communicator. - * @param version Indicates the Ice version with which the application is compatible. If not - * specified, the version of the Ice installation is used. - */ - CommunicatorHolder(int& argc, wchar_t* argv[], const InitializationData& initData = InitializationData(), - int version = ICE_INT_VERSION); - - /** - * Initializes a new communicator. - * @param argc The number of arguments in argv. Upon return, this argument - * is updated to reflect the arguments still remaining in argv. - * @param argv Command-line arguments, possibly containing - * options to set properties. If the arguments include - * a --Ice.Config option, the corresponding configuration - * files are parsed. If the same property is set in a configuration - * file and in the arguments, the arguments take precedence. - * Recognized options are removed from this vector upon return. - * @param configFile The name of an Ice configuration file. - * @param version Indicates the Ice version with which the application is compatible. If not - * specified, the version of the Ice installation is used. - */ - CommunicatorHolder(int& argc, const wchar_t* argv[], const char* configFile, int version = ICE_INT_VERSION); - - /** - * Initializes a new communicator. - * @param argc The number of arguments in argv. Upon return, this argument - * is updated to reflect the arguments still remaining in argv. - * @param argv Command-line arguments, possibly containing - * options to set properties. If the arguments include - * a --Ice.Config option, the corresponding configuration - * files are parsed. If the same property is set in a configuration - * file and in the arguments, the arguments take precedence. - * Recognized options are removed from this vector upon return. - * @param configFile The name of an Ice configuration file. - * @param version Indicates the Ice version with which the application is compatible. If not - * specified, the version of the Ice installation is used. - */ - CommunicatorHolder(int& argc, wchar_t* argv[], const char* configFile, int version = ICE_INT_VERSION); -# endif - - /** - * Initializes a new communicator. - * @param seq Command-line arguments, possibly containing - * options to set properties. If the arguments include - * a --Ice.Config option, the corresponding configuration - * files are parsed. If the same property is set in a configuration - * file and in the arguments, the arguments take precedence. - * Recognized options are removed from this container upon return. - * @param initData Configuration data for the new Communicator. - * @param version Indicates the Ice version with which the application is compatible. If not - * specified, the version of the Ice installation is used. - */ - explicit CommunicatorHolder(StringSeq& seq, const InitializationData& initData = InitializationData(), - int version = ICE_INT_VERSION); - - /** - * Initializes a new communicator. - * @param seq Command-line arguments, possibly containing - * options to set properties. If the arguments include - * a --Ice.Config option, the corresponding configuration - * files are parsed. If the same property is set in a configuration - * file and in the arguments, the arguments take precedence. - * Recognized options are removed from this container upon return. - * @param configFile The name of an Ice configuration file. - * @param version Indicates the Ice version with which the application is compatible. If not - * specified, the version of the Ice installation is used. - */ - CommunicatorHolder(StringSeq& seq, const char* configFile, int version = ICE_INT_VERSION); - - /** - * Initializes a new communicator. - * @param initData Configuration data for the new Communicator. - * @param version Indicates the Ice version with which the application is compatible. If not - * specified, the version of the Ice installation is used. - */ - explicit CommunicatorHolder(const InitializationData& initData, int version = ICE_INT_VERSION); - - /** - * Initializes a new communicator. - * @param configFile The name of an Ice configuration file. - * @param version Indicates the Ice version with which the application is compatible. If not - * specified, the version of the Ice installation is used. - */ - explicit CommunicatorHolder(const char* configFile, int version = ICE_INT_VERSION); - - /** - * Adopts the given communicator. - * @param communicator The new communicator instance to hold. - */ - CommunicatorHolder(const CommunicatorPtr& communicator); - - /** - * Adopts the given communicator. If this holder currently holds a communicator, - * it will be destroyed. - * @param communicator The new communicator instance to hold. - */ - CommunicatorHolder& operator=(const CommunicatorPtr& communicator); - - /** - * Determines whether the holder contains an instance. - * @return True if the holder currently holds an instance, false otherwise. - */ - operator bool() const; - - /// \cond INTERNAL - // - // Required for successful copy-initialization, but not - // defined as it should always be elided by the compiler. - CommunicatorHolder(const CommunicatorHolder&); - /// \endcond - -#endif - ~CommunicatorHolder(); /** diff --git a/cpp/include/Ice/InputStream.h b/cpp/include/Ice/InputStream.h index 28e5b6d2863..3beb13455e3 100644 --- a/cpp/include/Ice/InputStream.h +++ b/cpp/include/Ice/InputStream.h @@ -178,13 +178,10 @@ class ICE_API InputStream : public IceInternal::Buffer clear(); // Not inlined. } -#ifdef ICE_CPP11_MAPPING - - for(auto d: _deleters) + for(auto d : _deleters) { d(); } -#endif } /** @@ -240,11 +237,7 @@ class ICE_API InputStream : public IceInternal::Buffer * * @param r The compact ID resolver. */ -#ifdef ICE_CPP11_MAPPING void setCompactIdResolver(std::function r); -#else - void setCompactIdResolver(const CompactIdResolverPtr& r); -#endif /** * Indicates whether to slice instances of Slice classes to a known Slice type when a more @@ -656,8 +649,6 @@ class ICE_API InputStream : public IceInternal::Buffer } } -#ifdef ICE_CPP11_MAPPING - /** * Extracts a sequence of data values from the stream. * @param v A pair of pointers representing the beginning and end of the sequence elements. @@ -716,8 +707,6 @@ class ICE_API InputStream : public IceInternal::Buffer readAll(tags, ve...); } -#endif - /** * Determine if an optional value is available for reading. * @@ -764,20 +753,6 @@ class ICE_API InputStream : public IceInternal::Buffer */ void read(std::pair& v); -#ifndef ICE_CPP11_MAPPING - /** - * Reads a sequence of bytes from the stream. - * @param v A pair of pointers into the internal marshaling buffer representing the start and end of the - * sequence elements. - * @param arr A scoped array. - */ - void read(std::pair& v, ::IceUtil::ScopedArray& arr) - { - arr.reset(); - read(v); - } -#endif - /** * Reads a bool from the stream. * @param v The extracted bool. @@ -797,22 +772,12 @@ class ICE_API InputStream : public IceInternal::Buffer */ void read(std::vector& v); -#ifdef ICE_CPP11_MAPPING /** * Reads a sequence of boolean values from the stream. * @param v A pair of pointers into the internal marshaling buffer representing the start and end of the * sequence elements. */ void read(std::pair& v); -#else - /** - * Reads a sequence of boolean values from the stream. - * @param v A pair of pointers into the internal marshaling buffer representing the start and end of the - * sequence elements. - * @param arr A scoped array. - */ - void read(std::pair& v, ::IceUtil::ScopedArray& arr); -#endif /** * Reads a short from the stream. @@ -826,20 +791,11 @@ class ICE_API InputStream : public IceInternal::Buffer */ void read(std::vector& v); -#ifdef ICE_CPP11_MAPPING /** * Reads a sequence of boolean values from the stream. * @param v A pair of pointers representing the start and end of the sequence elements. */ void read(std::pair& v); -#else - /** - * Reads a sequence of shorts from the stream. - * @param v A pair of pointers representing the start and end of the sequence elements. - * @param arr A scoped array. - */ - void read(std::pair& v, ::IceUtil::ScopedArray& arr); -#endif /** * Reads an int from the stream. @@ -874,20 +830,11 @@ class ICE_API InputStream : public IceInternal::Buffer */ void read(std::vector& v); -#ifdef ICE_CPP11_MAPPING /** * Reads a sequence of ints from the stream. * @param v A pair of pointers representing the start and end of the sequence elements. */ void read(std::pair& v); -#else - /** - * Reads a sequence of ints from the stream. - * @param v A pair of pointers representing the start and end of the sequence elements. - * @param arr A scoped array. - */ - void read(std::pair& v, ::IceUtil::ScopedArray& arr); -#endif /** * Reads a long from the stream. @@ -901,20 +848,11 @@ class ICE_API InputStream : public IceInternal::Buffer */ void read(std::vector& v); -#ifdef ICE_CPP11_MAPPING /** * Reads a sequence of longs from the stream. * @param v A pair of pointers representing the start and end of the sequence elements. */ void read(std::pair& v); -#else - /** - * Reads a sequence of longs from the stream. - * @param v A pair of pointers representing the start and end of the sequence elements. - * @param arr A scoped array. - */ - void read(std::pair& v, ::IceUtil::ScopedArray& arr); -#endif /** * Reads a float from the stream. @@ -928,20 +866,11 @@ class ICE_API InputStream : public IceInternal::Buffer */ void read(std::vector& v); -#ifdef ICE_CPP11_MAPPING /** * Reads a sequence of floats from the stream. * @param v A pair of pointers representing the start and end of the sequence elements. */ void read(std::pair& v); -#else - /** - * Reads a sequence of floats from the stream. - * @param v A pair of pointers representing the start and end of the sequence elements. - * @param arr A scoped array. - */ - void read(std::pair& v, ::IceUtil::ScopedArray& arr); -#endif /** * Reads a double from the stream. @@ -955,20 +884,11 @@ class ICE_API InputStream : public IceInternal::Buffer */ void read(std::vector& v); -#ifdef ICE_CPP11_MAPPING /** * Reads a sequence of doubles from the stream. * @param v A pair of pointers representing the start and end of the sequence elements. */ void read(std::pair& v); -#else - /** - * Reads a sequence of doubles from the stream. - * @param v A pair of pointers representing the start and end of the sequence elements. - * @param arr A scoped array. - */ - void read(std::pair& v, ::IceUtil::ScopedArray& arr); -#endif /** * Reads a string from the stream. @@ -978,7 +898,6 @@ class ICE_API InputStream : public IceInternal::Buffer */ void read(std::string& v, bool convert = true); -#ifdef ICE_CPP11_MAPPING /** * Reads a string from the stream. * @param vdata A pointer to the beginning of the string. @@ -987,24 +906,6 @@ class ICE_API InputStream : public IceInternal::Buffer * is installed. The default behavior is to convert strings. */ void read(const char*& vdata, size_t& vsize, bool convert = true); -#else - // For custom strings, convert = false - /** - * Reads a string from the stream. String conversion is disabled. - * @param vdata A pointer to the beginning of the string. - * @param vsize The number of bytes in the string. - */ - void read(const char*& vdata, size_t& vsize); - - // For custom strings, convert = true - /** - * Reads a string from the stream. String conversion is enabled. - * @param vdata A pointer to the beginning of the string. - * @param vsize The number of bytes in the string. - * @param holder Holds the string contents. - */ - void read(const char*& vdata, size_t& vsize, std::string& holder); -#endif /** * Reads a sequence of strings from the stream. @@ -1026,7 +927,6 @@ class ICE_API InputStream : public IceInternal::Buffer */ void read(std::vector& v); -#ifdef ICE_CPP11_MAPPING /** * Reads a proxy from the stream. * @return The proxy as the base ObjectPrx type. @@ -1051,22 +951,6 @@ class ICE_API InputStream : public IceInternal::Buffer v->_copyFrom(proxy); } } -#else - /** - * Reads a proxy from the stream. - * @param v The proxy as the base ObjectPrx type. - */ - void read(ObjectPrx& v); - - /** - * Reads a typed proxy from the stream. - * @param v The proxy as a user-defined type. - */ - template void read(IceInternal::ProxyHandle& v) - { - _readProxy(this, v); // Generated _readProxy method, necessary for forward declarations. - } -#endif /** * Reads a value (instance of a Slice class) from the stream (New mapping). @@ -1078,16 +962,6 @@ class ICE_API InputStream : public IceInternal::Buffer read(patchValue, &v); } - /** - * Reads a value (instance of a Slice class) from the stream (Original mapping). - * @param v The instance. - */ - template::value>::type* = nullptr> - void read(Ice::SharedPtr& v) - { - read(v.underlying()); - } - /** * Reads a value (instance of a Slice class) from the stream. * @param patchFunc The patch callback function. @@ -1210,11 +1084,7 @@ class ICE_API InputStream : public IceInternal::Buffer LoggerPtr logger() const; -#ifdef ICE_CPP11_MAPPING std::function compactIdResolver() const; -#else - CompactIdResolverPtr compactIdResolver() const; -#endif using ValueList = std::vector>; @@ -1477,15 +1347,8 @@ class ICE_API InputStream : public IceInternal::Buffer ValueFactoryManagerPtr _valueFactoryManager; LoggerPtr _logger; -#ifdef ICE_CPP11_MAPPING std::function _compactIdResolver; -#else - CompactIdResolverPtr _compactIdResolver; -#endif - -#ifdef ICE_CPP11_MAPPING std::vector> _deleters; -#endif }; diff --git a/cpp/include/Ice/LocalException.h b/cpp/include/Ice/LocalException.h index 53428850e75..a4e35984f56 100644 --- a/cpp/include/Ice/LocalException.h +++ b/cpp/include/Ice/LocalException.h @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include @@ -31,8 +30,6 @@ # endif #endif -#ifdef ICE_CPP11_MAPPING // C++11 mapping - namespace Ice { @@ -3725,3210 +3722,5 @@ namespace Ice } /// \endcond -#else // C++98 mapping - -namespace Ice -{ - -/** - * This exception is raised when a failure occurs during initialization. - * \headerfile Ice/Ice.h - */ -class ICE_API InitializationException : public LocalException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - InitializationException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param reason The reason for the failure. - */ - InitializationException(const char* file, int line, const ::std::string& reason); - InitializationException(const InitializationException&) = default; - virtual ~InitializationException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual InitializationException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; - - /** - * The reason for the failure. - */ - ::std::string reason; -}; - -/** - * This exception indicates that a failure occurred while initializing a plug-in. - * \headerfile Ice/Ice.h - */ -class ICE_API PluginInitializationException : public LocalException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - PluginInitializationException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param reason The reason for the failure. - */ - PluginInitializationException(const char* file, int line, const ::std::string& reason); - PluginInitializationException(const PluginInitializationException&) = default; - virtual ~PluginInitializationException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual PluginInitializationException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; - - /** - * The reason for the failure. - */ - ::std::string reason; -}; - -/** - * This exception is raised if a feature is requested that is not supported with collocation optimization. - * - * @deprecated This exception is no longer used by the Ice run time - * \headerfile Ice/Ice.h - */ -class ICE_API CollocationOptimizationException : public LocalException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - CollocationOptimizationException(const char* file, int line); - CollocationOptimizationException(const CollocationOptimizationException&) = default; - virtual ~CollocationOptimizationException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual CollocationOptimizationException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; -}; - -/** - * An attempt was made to register something more than once with the Ice run time. This exception is raised if an - * attempt is made to register a servant, servant locator, facet, value factory, plug-in, object adapter, object, or - * user exception factory more than once for the same ID. - * \headerfile Ice/Ice.h - */ -class ICE_API AlreadyRegisteredException : public LocalException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - AlreadyRegisteredException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param kindOfObject The kind of object that could not be removed: "servant", "facet", "object", "default servant", "servant locator", "value factory", "plugin", "object adapter", "object adapter with router", "replica group". - * @param id The ID (or name) of the object that is registered already. - */ - AlreadyRegisteredException(const char* file, int line, const ::std::string& kindOfObject, const ::std::string& id); - AlreadyRegisteredException(const AlreadyRegisteredException&) = default; - virtual ~AlreadyRegisteredException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual AlreadyRegisteredException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; - - /** - * The kind of object that could not be removed: "servant", "facet", "object", "default servant", - * "servant locator", "value factory", "plugin", "object adapter", "object adapter with router", "replica group". - */ - ::std::string kindOfObject; - /** - * The ID (or name) of the object that is registered already. - */ - ::std::string id; -}; - -/** - * An attempt was made to find or deregister something that is not registered with the Ice run time or Ice locator. - * This exception is raised if an attempt is made to remove a servant, servant locator, facet, value factory, plug-in, - * object adapter, object, or user exception factory that is not currently registered. It's also raised if the Ice - * locator can't find an object or object adapter when resolving an indirect proxy or when an object adapter is - * activated. - * \headerfile Ice/Ice.h - */ -class ICE_API NotRegisteredException : public LocalException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - NotRegisteredException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param kindOfObject The kind of object that could not be removed: "servant", "facet", "object", "default servant", "servant locator", "value factory", "plugin", "object adapter", "object adapter with router", "replica group". - * @param id The ID (or name) of the object that could not be removed. - */ - NotRegisteredException(const char* file, int line, const ::std::string& kindOfObject, const ::std::string& id); - NotRegisteredException(const NotRegisteredException&) = default; - virtual ~NotRegisteredException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual NotRegisteredException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; - - /** - * The kind of object that could not be removed: "servant", "facet", "object", "default servant", - * "servant locator", "value factory", "plugin", "object adapter", "object adapter with router", "replica group". - */ - ::std::string kindOfObject; - /** - * The ID (or name) of the object that could not be removed. - */ - ::std::string id; -}; - -/** - * The operation can only be invoked with a twoway request. This exception is raised if an attempt is made to invoke - * an operation with ice_oneway, ice_batchOneway, ice_datagram, or - * ice_batchDatagram and the operation has a return value, out-parameters, or an exception specification. - * \headerfile Ice/Ice.h - */ -class ICE_API TwowayOnlyException : public LocalException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - TwowayOnlyException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param operation The name of the operation that was invoked. - */ - TwowayOnlyException(const char* file, int line, const ::std::string& operation); - TwowayOnlyException(const TwowayOnlyException&) = default; - virtual ~TwowayOnlyException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual TwowayOnlyException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; - - /** - * The name of the operation that was invoked. - */ - ::std::string operation; -}; - -/** - * An attempt was made to clone a class that does not support cloning. This exception is raised if - * ice_clone is called on a class that is derived from an abstract Slice class (that is, a class - * containing operations), and the derived class does not provide an implementation of the ice_clone - * operation (C++ only). - * \headerfile Ice/Ice.h - */ -class ICE_API CloneNotImplementedException : public LocalException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - CloneNotImplementedException(const char* file, int line); - CloneNotImplementedException(const CloneNotImplementedException&) = default; - virtual ~CloneNotImplementedException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual CloneNotImplementedException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; -}; - -/** - * This exception is raised if an operation call on a server raises an unknown exception. For example, for C++, this - * exception is raised if the server throws a C++ exception that is not directly or indirectly derived from - * Ice::LocalException or Ice::UserException. - * \headerfile Ice/Ice.h - */ -class ICE_API UnknownException : public LocalException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - UnknownException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param unknown This field is set to the textual representation of the unknown exception if available. - */ - UnknownException(const char* file, int line, const ::std::string& unknown); - UnknownException(const UnknownException&) = default; - virtual ~UnknownException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual UnknownException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; - - /** - * This field is set to the textual representation of the unknown exception if available. - */ - ::std::string unknown; -}; - -/** - * This exception is raised if an operation call on a server raises a local exception. Because local exceptions are - * not transmitted by the Ice protocol, the client receives all local exceptions raised by the server as - * {@link UnknownLocalException}. The only exception to this rule are all exceptions derived from - * {@link RequestFailedException}, which are transmitted by the Ice protocol even though they are declared - * local. - * \headerfile Ice/Ice.h - */ -class ICE_API UnknownLocalException : public UnknownException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - UnknownLocalException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param unknown This field is set to the textual representation of the unknown exception if available. - */ - UnknownLocalException(const char* file, int line, const ::std::string& unknown); - UnknownLocalException(const UnknownLocalException&) = default; - virtual ~UnknownLocalException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual UnknownLocalException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; -}; - -/** - * An operation raised an incorrect user exception. This exception is raised if an operation raises a user exception - * that is not declared in the exception's throws clause. Such undeclared exceptions are not transmitted - * from the server to the client by the Ice protocol, but instead the client just gets an {@link UnknownUserException}. - * This is necessary in order to not violate the contract established by an operation's signature: Only local - * exceptions and user exceptions declared in the throws clause can be raised. - * \headerfile Ice/Ice.h - */ -class ICE_API UnknownUserException : public UnknownException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - UnknownUserException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param unknown This field is set to the textual representation of the unknown exception if available. - */ - UnknownUserException(const char* file, int line, const ::std::string& unknown); - UnknownUserException(const UnknownUserException&) = default; - virtual ~UnknownUserException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual UnknownUserException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; -}; - -/** - * This exception is raised if the Ice library version does not match the version in the Ice header files. - * \headerfile Ice/Ice.h - */ -class ICE_API VersionMismatchException : public LocalException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - VersionMismatchException(const char* file, int line); - VersionMismatchException(const VersionMismatchException&) = default; - virtual ~VersionMismatchException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual VersionMismatchException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; -}; - -/** - * This exception is raised if the {@link Communicator} has been destroyed. - * @see Communicator#destroy - * \headerfile Ice/Ice.h - */ -class ICE_API CommunicatorDestroyedException : public LocalException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - CommunicatorDestroyedException(const char* file, int line); - CommunicatorDestroyedException(const CommunicatorDestroyedException&) = default; - virtual ~CommunicatorDestroyedException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual CommunicatorDestroyedException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; -}; - -/** - * This exception is raised if an attempt is made to use a deactivated {@link ObjectAdapter}. - * @see ObjectAdapter#deactivate - * @see Communicator#shutdown - * \headerfile Ice/Ice.h - */ -class ICE_API ObjectAdapterDeactivatedException : public LocalException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - ObjectAdapterDeactivatedException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param name Name of the adapter. - */ - ObjectAdapterDeactivatedException(const char* file, int line, const ::std::string& name); - ObjectAdapterDeactivatedException(const ObjectAdapterDeactivatedException&) = default; - virtual ~ObjectAdapterDeactivatedException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual ObjectAdapterDeactivatedException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; - - /** - * Name of the adapter. - */ - ::std::string name; -}; - -/** - * This exception is raised if an {@link ObjectAdapter} cannot be activated. This happens if the {@link Locator} - * detects another active {@link ObjectAdapter} with the same adapter id. - * \headerfile Ice/Ice.h - */ -class ICE_API ObjectAdapterIdInUseException : public LocalException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - ObjectAdapterIdInUseException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param id Adapter ID. - */ - ObjectAdapterIdInUseException(const char* file, int line, const ::std::string& id); - ObjectAdapterIdInUseException(const ObjectAdapterIdInUseException&) = default; - virtual ~ObjectAdapterIdInUseException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual ObjectAdapterIdInUseException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; - - /** - * Adapter ID. - */ - ::std::string id; -}; - -/** - * This exception is raised if no suitable endpoint is available. - * \headerfile Ice/Ice.h - */ -class ICE_API NoEndpointException : public LocalException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - NoEndpointException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param proxy The stringified proxy for which no suitable endpoint is available. - */ - NoEndpointException(const char* file, int line, const ::std::string& proxy); - NoEndpointException(const NoEndpointException&) = default; - virtual ~NoEndpointException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual NoEndpointException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; - - /** - * The stringified proxy for which no suitable endpoint is available. - */ - ::std::string proxy; -}; - -/** - * This exception is raised if there was an error while parsing an endpoint. - * \headerfile Ice/Ice.h - */ -class ICE_API EndpointParseException : public LocalException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - EndpointParseException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param str Describes the failure and includes the string that could not be parsed. - */ - EndpointParseException(const char* file, int line, const ::std::string& str); - EndpointParseException(const EndpointParseException&) = default; - virtual ~EndpointParseException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual EndpointParseException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; - - /** - * Describes the failure and includes the string that could not be parsed. - */ - ::std::string str; -}; - -/** - * This exception is raised if there was an error while parsing an endpoint selection type. - * \headerfile Ice/Ice.h - */ -class ICE_API EndpointSelectionTypeParseException : public LocalException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - EndpointSelectionTypeParseException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param str Describes the failure and includes the string that could not be parsed. - */ - EndpointSelectionTypeParseException(const char* file, int line, const ::std::string& str); - EndpointSelectionTypeParseException(const EndpointSelectionTypeParseException&) = default; - virtual ~EndpointSelectionTypeParseException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual EndpointSelectionTypeParseException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; - - /** - * Describes the failure and includes the string that could not be parsed. - */ - ::std::string str; -}; - -/** - * This exception is raised if there was an error while parsing a version. - * \headerfile Ice/Ice.h - */ -class ICE_API VersionParseException : public LocalException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - VersionParseException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param str Describes the failure and includes the string that could not be parsed. - */ - VersionParseException(const char* file, int line, const ::std::string& str); - VersionParseException(const VersionParseException&) = default; - virtual ~VersionParseException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual VersionParseException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; - - /** - * Describes the failure and includes the string that could not be parsed. - */ - ::std::string str; -}; - -/** - * This exception is raised if there was an error while parsing a stringified identity. - * \headerfile Ice/Ice.h - */ -class ICE_API IdentityParseException : public LocalException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - IdentityParseException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param str Describes the failure and includes the string that could not be parsed. - */ - IdentityParseException(const char* file, int line, const ::std::string& str); - IdentityParseException(const IdentityParseException&) = default; - virtual ~IdentityParseException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual IdentityParseException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; - - /** - * Describes the failure and includes the string that could not be parsed. - */ - ::std::string str; -}; - -/** - * This exception is raised if there was an error while parsing a stringified proxy. - * \headerfile Ice/Ice.h - */ -class ICE_API ProxyParseException : public LocalException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - ProxyParseException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param str Describes the failure and includes the string that could not be parsed. - */ - ProxyParseException(const char* file, int line, const ::std::string& str); - ProxyParseException(const ProxyParseException&) = default; - virtual ~ProxyParseException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual ProxyParseException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; - - /** - * Describes the failure and includes the string that could not be parsed. - */ - ::std::string str; -}; - -/** - * This exception is raised if an illegal identity is encountered. - * \headerfile Ice/Ice.h - */ -class ICE_API IllegalIdentityException : public LocalException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - IllegalIdentityException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param id The illegal identity. - */ - IllegalIdentityException(const char* file, int line, const Identity& id); - IllegalIdentityException(const IllegalIdentityException&) = default; - virtual ~IllegalIdentityException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual IllegalIdentityException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; - - /** - * The illegal identity. - */ - ::Ice::Identity id; -}; - -/** - * This exception is raised to reject an illegal servant (typically a null servant). - * \headerfile Ice/Ice.h - */ -class ICE_API IllegalServantException : public LocalException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - IllegalServantException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param reason Describes why this servant is illegal. - */ - IllegalServantException(const char* file, int line, const ::std::string& reason); - IllegalServantException(const IllegalServantException&) = default; - virtual ~IllegalServantException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual IllegalServantException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; - - /** - * Describes why this servant is illegal. - */ - ::std::string reason; -}; - -/** - * This exception is raised if a request failed. This exception, and all exceptions derived from - * {@link RequestFailedException}, are transmitted by the Ice protocol, even though they are declared - * local. - * \headerfile Ice/Ice.h - */ -class ICE_API RequestFailedException : public LocalException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - RequestFailedException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param id The identity of the Ice Object to which the request was sent. - * @param facet The facet to which the request was sent. - * @param operation The operation name of the request. - */ - RequestFailedException(const char* file, int line, const Identity& id, const ::std::string& facet, const ::std::string& operation); - RequestFailedException(const RequestFailedException&) = default; - virtual ~RequestFailedException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual RequestFailedException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; - - /** - * The identity of the Ice Object to which the request was sent. - */ - ::Ice::Identity id; - /** - * The facet to which the request was sent. - */ - ::std::string facet; - /** - * The operation name of the request. - */ - ::std::string operation; -}; - -/** - * This exception is raised if an object does not exist on the server, that is, if no facets with the given identity - * exist. - * \headerfile Ice/Ice.h - */ -class ICE_API ObjectNotExistException : public RequestFailedException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - ObjectNotExistException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param id The identity of the Ice Object to which the request was sent. - * @param facet The facet to which the request was sent. - * @param operation The operation name of the request. - */ - ObjectNotExistException(const char* file, int line, const Identity& id, const ::std::string& facet, const ::std::string& operation); - ObjectNotExistException(const ObjectNotExistException&) = default; - virtual ~ObjectNotExistException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual ObjectNotExistException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; -}; - -/** - * This exception is raised if no facet with the given name exists, but at least one facet with the given identity - * exists. - * \headerfile Ice/Ice.h - */ -class ICE_API FacetNotExistException : public RequestFailedException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - FacetNotExistException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param id The identity of the Ice Object to which the request was sent. - * @param facet The facet to which the request was sent. - * @param operation The operation name of the request. - */ - FacetNotExistException(const char* file, int line, const Identity& id, const ::std::string& facet, const ::std::string& operation); - FacetNotExistException(const FacetNotExistException&) = default; - virtual ~FacetNotExistException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual FacetNotExistException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; -}; - -/** - * This exception is raised if an operation for a given object does not exist on the server. Typically this is caused - * by either the client or the server using an outdated Slice specification. - * \headerfile Ice/Ice.h - */ -class ICE_API OperationNotExistException : public RequestFailedException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - OperationNotExistException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param id The identity of the Ice Object to which the request was sent. - * @param facet The facet to which the request was sent. - * @param operation The operation name of the request. - */ - OperationNotExistException(const char* file, int line, const Identity& id, const ::std::string& facet, const ::std::string& operation); - OperationNotExistException(const OperationNotExistException&) = default; - virtual ~OperationNotExistException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual OperationNotExistException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; -}; - -/** - * This exception is raised if a system error occurred in the server or client process. There are many possible causes - * for such a system exception. For details on the cause, {@link SyscallException#error} should be inspected. - * \headerfile Ice/Ice.h - */ -class ICE_API SyscallException : public LocalException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - SyscallException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param error The error number describing the system exception. - */ - SyscallException(const char* file, int line, Int error); - SyscallException(const SyscallException&) = default; - virtual ~SyscallException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual SyscallException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; - - /** - * The error number describing the system exception. For C++ and Unix, this is equivalent to errno. - * For C++ and Windows, this is the value returned by GetLastError() or - * WSAGetLastError(). - */ - ::Ice::Int error; -}; - -/** - * This exception indicates socket errors. - * \headerfile Ice/Ice.h - */ -class ICE_API SocketException : public SyscallException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - SocketException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param error The error number describing the system exception. - */ - SocketException(const char* file, int line, Int error); - SocketException(const SocketException&) = default; - virtual ~SocketException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual SocketException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; -}; - -/** - * This exception indicates CFNetwork errors. - * \headerfile Ice/Ice.h - */ -class ICE_API CFNetworkException : public SocketException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - CFNetworkException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param error The error number describing the system exception. - * @param domain The domain of the error. - */ - CFNetworkException(const char* file, int line, Int error, const ::std::string& domain); - CFNetworkException(const CFNetworkException&) = default; - virtual ~CFNetworkException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual CFNetworkException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; - - /** - * The domain of the error. - */ - ::std::string domain; -}; - -/** - * This exception indicates file errors. - * \headerfile Ice/Ice.h - */ -class ICE_API FileException : public SyscallException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - FileException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param error The error number describing the system exception. - * @param path The path of the file responsible for the error. - */ - FileException(const char* file, int line, Int error, const ::std::string& path); - FileException(const FileException&) = default; - virtual ~FileException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual FileException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; - - /** - * The path of the file responsible for the error. - */ - ::std::string path; -}; - -/** - * This exception indicates connection failures. - * \headerfile Ice/Ice.h - */ -class ICE_API ConnectFailedException : public SocketException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - ConnectFailedException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param error The error number describing the system exception. - */ - ConnectFailedException(const char* file, int line, Int error); - ConnectFailedException(const ConnectFailedException&) = default; - virtual ~ConnectFailedException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual ConnectFailedException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; -}; - -/** - * This exception indicates a connection failure for which the server host actively refuses a connection. - * \headerfile Ice/Ice.h - */ -class ICE_API ConnectionRefusedException : public ConnectFailedException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - ConnectionRefusedException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param error The error number describing the system exception. - */ - ConnectionRefusedException(const char* file, int line, Int error); - ConnectionRefusedException(const ConnectionRefusedException&) = default; - virtual ~ConnectionRefusedException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual ConnectionRefusedException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; -}; - -/** - * This exception indicates a lost connection. - * \headerfile Ice/Ice.h - */ -class ICE_API ConnectionLostException : public SocketException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - ConnectionLostException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param error The error number describing the system exception. - */ - ConnectionLostException(const char* file, int line, Int error); - ConnectionLostException(const ConnectionLostException&) = default; - virtual ~ConnectionLostException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual ConnectionLostException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; -}; - -/** - * This exception indicates a DNS problem. For details on the cause, {@link DNSException#error} should be inspected. - * \headerfile Ice/Ice.h - */ -class ICE_API DNSException : public LocalException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - DNSException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param error The error number describing the DNS problem. - * @param host The host name that could not be resolved. - */ - DNSException(const char* file, int line, Int error, const ::std::string& host); - DNSException(const DNSException&) = default; - virtual ~DNSException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual DNSException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; - - /** - * The error number describing the DNS problem. For C++ and Unix, this is equivalent to h_errno. For - * C++ and Windows, this is the value returned by WSAGetLastError(). - */ - ::Ice::Int error; - /** - * The host name that could not be resolved. - */ - ::std::string host; -}; - -/** - * This exception indicates a request was interrupted. - * \headerfile Ice/Ice.h - */ -class ICE_API OperationInterruptedException : public LocalException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - OperationInterruptedException(const char* file, int line); - OperationInterruptedException(const OperationInterruptedException&) = default; - virtual ~OperationInterruptedException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual OperationInterruptedException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; -}; - -/** - * This exception indicates a timeout condition. - * \headerfile Ice/Ice.h - */ -class ICE_API TimeoutException : public LocalException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - TimeoutException(const char* file, int line); - TimeoutException(const TimeoutException&) = default; - virtual ~TimeoutException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual TimeoutException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; -}; - -/** - * This exception indicates a connection establishment timeout condition. - * \headerfile Ice/Ice.h - */ -class ICE_API ConnectTimeoutException : public TimeoutException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - ConnectTimeoutException(const char* file, int line); - ConnectTimeoutException(const ConnectTimeoutException&) = default; - virtual ~ConnectTimeoutException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual ConnectTimeoutException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; -}; - -/** - * This exception indicates a connection closure timeout condition. - * \headerfile Ice/Ice.h - */ -class ICE_API CloseTimeoutException : public TimeoutException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - CloseTimeoutException(const char* file, int line); - CloseTimeoutException(const CloseTimeoutException&) = default; - virtual ~CloseTimeoutException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual CloseTimeoutException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; -}; - -/** - * This exception indicates that a connection has been shut down because it has been idle for some time. - * \headerfile Ice/Ice.h - */ -class ICE_API ConnectionTimeoutException : public TimeoutException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - ConnectionTimeoutException(const char* file, int line); - ConnectionTimeoutException(const ConnectionTimeoutException&) = default; - virtual ~ConnectionTimeoutException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual ConnectionTimeoutException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; -}; - -/** - * This exception indicates that an invocation failed because it timed out. - * \headerfile Ice/Ice.h - */ -class ICE_API InvocationTimeoutException : public TimeoutException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - InvocationTimeoutException(const char* file, int line); - InvocationTimeoutException(const InvocationTimeoutException&) = default; - virtual ~InvocationTimeoutException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual InvocationTimeoutException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; -}; - -/** - * This exception indicates that an asynchronous invocation failed because it was canceled explicitly by the user. - * \headerfile Ice/Ice.h - */ -class ICE_API InvocationCanceledException : public LocalException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - InvocationCanceledException(const char* file, int line); - InvocationCanceledException(const InvocationCanceledException&) = default; - virtual ~InvocationCanceledException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual InvocationCanceledException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; -}; - -/** - * A generic exception base for all kinds of protocol error conditions. - * \headerfile Ice/Ice.h - */ -class ICE_API ProtocolException : public LocalException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - ProtocolException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param reason The reason for the failure. - */ - ProtocolException(const char* file, int line, const ::std::string& reason); - ProtocolException(const ProtocolException&) = default; - virtual ~ProtocolException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual ProtocolException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; - - /** - * The reason for the failure. - */ - ::std::string reason; -}; - -/** - * This exception indicates that a message did not start with the expected magic number ('I', 'c', 'e', 'P'). - * \headerfile Ice/Ice.h - */ -class ICE_API BadMagicException : public ProtocolException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - BadMagicException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param reason The reason for the failure. - * @param badMagic A sequence containing the first four bytes of the incorrect message. - */ - BadMagicException(const char* file, int line, const ::std::string& reason, const ByteSeq& badMagic); - BadMagicException(const BadMagicException&) = default; - virtual ~BadMagicException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual BadMagicException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; - - /** - * A sequence containing the first four bytes of the incorrect message. - */ - ::Ice::ByteSeq badMagic; -}; - -/** - * This exception indicates an unsupported protocol version. - * \headerfile Ice/Ice.h - */ -class ICE_API UnsupportedProtocolException : public ProtocolException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - UnsupportedProtocolException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param reason The reason for the failure. - * @param bad The version of the unsupported protocol. - * @param supported The version of the protocol that is supported. - */ - UnsupportedProtocolException(const char* file, int line, const ::std::string& reason, const ProtocolVersion& bad, const ProtocolVersion& supported); - UnsupportedProtocolException(const UnsupportedProtocolException&) = default; - virtual ~UnsupportedProtocolException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual UnsupportedProtocolException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; - - /** - * The version of the unsupported protocol. - */ - ::Ice::ProtocolVersion bad; - /** - * The version of the protocol that is supported. - */ - ::Ice::ProtocolVersion supported; -}; - -/** - * This exception indicates an unsupported data encoding version. - * \headerfile Ice/Ice.h - */ -class ICE_API UnsupportedEncodingException : public ProtocolException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - UnsupportedEncodingException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param reason The reason for the failure. - * @param bad The version of the unsupported encoding. - * @param supported The version of the encoding that is supported. - */ - UnsupportedEncodingException(const char* file, int line, const ::std::string& reason, const EncodingVersion& bad, const EncodingVersion& supported); - UnsupportedEncodingException(const UnsupportedEncodingException&) = default; - virtual ~UnsupportedEncodingException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual UnsupportedEncodingException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; - - /** - * The version of the unsupported encoding. - */ - ::Ice::EncodingVersion bad; - /** - * The version of the encoding that is supported. - */ - ::Ice::EncodingVersion supported; -}; - -/** - * This exception indicates that an unknown protocol message has been received. - * \headerfile Ice/Ice.h - */ -class ICE_API UnknownMessageException : public ProtocolException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - UnknownMessageException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param reason The reason for the failure. - */ - UnknownMessageException(const char* file, int line, const ::std::string& reason); - UnknownMessageException(const UnknownMessageException&) = default; - virtual ~UnknownMessageException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual UnknownMessageException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; -}; - -/** - * This exception is raised if a message is received over a connection that is not yet validated. - * \headerfile Ice/Ice.h - */ -class ICE_API ConnectionNotValidatedException : public ProtocolException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - ConnectionNotValidatedException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param reason The reason for the failure. - */ - ConnectionNotValidatedException(const char* file, int line, const ::std::string& reason); - ConnectionNotValidatedException(const ConnectionNotValidatedException&) = default; - virtual ~ConnectionNotValidatedException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual ConnectionNotValidatedException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; -}; - -/** - * This exception indicates that a response for an unknown request ID has been received. - * \headerfile Ice/Ice.h - */ -class ICE_API UnknownRequestIdException : public ProtocolException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - UnknownRequestIdException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param reason The reason for the failure. - */ - UnknownRequestIdException(const char* file, int line, const ::std::string& reason); - UnknownRequestIdException(const UnknownRequestIdException&) = default; - virtual ~UnknownRequestIdException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual UnknownRequestIdException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; -}; - -/** - * This exception indicates that an unknown reply status has been received. - * \headerfile Ice/Ice.h - */ -class ICE_API UnknownReplyStatusException : public ProtocolException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - UnknownReplyStatusException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param reason The reason for the failure. - */ - UnknownReplyStatusException(const char* file, int line, const ::std::string& reason); - UnknownReplyStatusException(const UnknownReplyStatusException&) = default; - virtual ~UnknownReplyStatusException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual UnknownReplyStatusException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; -}; - -/** - * This exception indicates that the connection has been gracefully shut down by the server. The operation call that - * caused this exception has not been executed by the server. In most cases you will not get this exception, because - * the client will automatically retry the operation call in case the server shut down the connection. However, if - * upon retry the server shuts down the connection again, and the retry limit has been reached, then this exception is - * propagated to the application code. - * \headerfile Ice/Ice.h - */ -class ICE_API CloseConnectionException : public ProtocolException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - CloseConnectionException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param reason The reason for the failure. - */ - CloseConnectionException(const char* file, int line, const ::std::string& reason); - CloseConnectionException(const CloseConnectionException&) = default; - virtual ~CloseConnectionException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual CloseConnectionException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; -}; - -/** - * This exception is raised by an operation call if the application closes the connection locally using - * {@link Connection#close}. - * @see Connection#close - * \headerfile Ice/Ice.h - */ -class ICE_API ConnectionManuallyClosedException : public LocalException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - ConnectionManuallyClosedException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param graceful True if the connection was closed gracefully, false otherwise. - */ - ConnectionManuallyClosedException(const char* file, int line, bool graceful); - ConnectionManuallyClosedException(const ConnectionManuallyClosedException&) = default; - virtual ~ConnectionManuallyClosedException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual ConnectionManuallyClosedException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; - - /** - * True if the connection was closed gracefully, false otherwise. - */ - bool graceful; -}; - -/** - * This exception indicates that a message size is less than the minimum required size. - * \headerfile Ice/Ice.h - */ -class ICE_API IllegalMessageSizeException : public ProtocolException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - IllegalMessageSizeException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param reason The reason for the failure. - */ - IllegalMessageSizeException(const char* file, int line, const ::std::string& reason); - IllegalMessageSizeException(const IllegalMessageSizeException&) = default; - virtual ~IllegalMessageSizeException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual IllegalMessageSizeException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; -}; - -/** - * This exception indicates a problem with compressing or uncompressing data. - * \headerfile Ice/Ice.h - */ -class ICE_API CompressionException : public ProtocolException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - CompressionException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param reason The reason for the failure. - */ - CompressionException(const char* file, int line, const ::std::string& reason); - CompressionException(const CompressionException&) = default; - virtual ~CompressionException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual CompressionException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; -}; - -/** - * A datagram exceeds the configured size. This exception is raised if a datagram exceeds the configured send or - * receive buffer size, or exceeds the maximum payload size of a UDP packet (65507 bytes). - * \headerfile Ice/Ice.h - */ -class ICE_API DatagramLimitException : public ProtocolException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - DatagramLimitException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param reason The reason for the failure. - */ - DatagramLimitException(const char* file, int line, const ::std::string& reason); - DatagramLimitException(const DatagramLimitException&) = default; - virtual ~DatagramLimitException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual DatagramLimitException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; -}; - -/** - * This exception is raised for errors during marshaling or unmarshaling data. - * \headerfile Ice/Ice.h - */ -class ICE_API MarshalException : public ProtocolException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - MarshalException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param reason The reason for the failure. - */ - MarshalException(const char* file, int line, const ::std::string& reason); - MarshalException(const MarshalException&) = default; - virtual ~MarshalException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual MarshalException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; -}; - -/** - * This exception is raised if inconsistent data is received while unmarshaling a proxy. - * \headerfile Ice/Ice.h - */ -class ICE_API ProxyUnmarshalException : public MarshalException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - ProxyUnmarshalException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param reason The reason for the failure. - */ - ProxyUnmarshalException(const char* file, int line, const ::std::string& reason); - ProxyUnmarshalException(const ProxyUnmarshalException&) = default; - virtual ~ProxyUnmarshalException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual ProxyUnmarshalException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; -}; - -/** - * This exception is raised if an out-of-bounds condition occurs during unmarshaling. - * \headerfile Ice/Ice.h - */ -class ICE_API UnmarshalOutOfBoundsException : public MarshalException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - UnmarshalOutOfBoundsException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param reason The reason for the failure. - */ - UnmarshalOutOfBoundsException(const char* file, int line, const ::std::string& reason); - UnmarshalOutOfBoundsException(const UnmarshalOutOfBoundsException&) = default; - virtual ~UnmarshalOutOfBoundsException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual UnmarshalOutOfBoundsException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; -}; - -/** - * This exception is raised if no suitable value factory was found during unmarshaling of a Slice class instance. - * @see ValueFactory - * @see Communicator#getValueFactoryManager - * @see ValueFactoryManager#add - * @see ValueFactoryManager#find - * \headerfile Ice/Ice.h - */ -class ICE_API NoValueFactoryException : public MarshalException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - NoValueFactoryException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param reason The reason for the failure. - * @param type The Slice type ID of the class instance for which no factory could be found. - */ - NoValueFactoryException(const char* file, int line, const ::std::string& reason, const ::std::string& type); - NoValueFactoryException(const NoValueFactoryException&) = default; - virtual ~NoValueFactoryException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual NoValueFactoryException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; - - /** - * The Slice type ID of the class instance for which no factory could be found. - */ - ::std::string type; -}; - -/** - * This exception is raised if the type of an unmarshaled Slice class instance does not match its expected type. This - * can happen if client and server are compiled with mismatched Slice definitions or if a class of the wrong type is - * passed as a parameter or return value using dynamic invocation. This exception can also be raised if IceStorm is - * used to send Slice class instances and an operation is subscribed to the wrong topic. - * \headerfile Ice/Ice.h - */ -class ICE_API UnexpectedObjectException : public MarshalException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - UnexpectedObjectException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param reason The reason for the failure. - * @param type The Slice type ID of the class instance that was unmarshaled. - * @param expectedType The Slice type ID that was expected by the receiving operation. - */ - UnexpectedObjectException(const char* file, int line, const ::std::string& reason, const ::std::string& type, const ::std::string& expectedType); - UnexpectedObjectException(const UnexpectedObjectException&) = default; - virtual ~UnexpectedObjectException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual UnexpectedObjectException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; - - /** - * The Slice type ID of the class instance that was unmarshaled. - */ - ::std::string type; - /** - * The Slice type ID that was expected by the receiving operation. - */ - ::std::string expectedType; -}; - -/** - * This exception is raised when Ice receives a request or reply message whose size exceeds the limit specified by the - * Ice.MessageSizeMax property. - * \headerfile Ice/Ice.h - */ -class ICE_API MemoryLimitException : public MarshalException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - MemoryLimitException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param reason The reason for the failure. - */ - MemoryLimitException(const char* file, int line, const ::std::string& reason); - MemoryLimitException(const MemoryLimitException&) = default; - virtual ~MemoryLimitException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual MemoryLimitException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; -}; - -/** - * This exception is raised when a string conversion to or from UTF-8 fails during marshaling or unmarshaling. - * \headerfile Ice/Ice.h - */ -class ICE_API StringConversionException : public MarshalException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - StringConversionException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param reason The reason for the failure. - */ - StringConversionException(const char* file, int line, const ::std::string& reason); - StringConversionException(const StringConversionException&) = default; - virtual ~StringConversionException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual StringConversionException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; -}; - -/** - * This exception indicates a malformed data encapsulation. - * \headerfile Ice/Ice.h - */ -class ICE_API EncapsulationException : public MarshalException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - EncapsulationException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param reason The reason for the failure. - */ - EncapsulationException(const char* file, int line, const ::std::string& reason); - EncapsulationException(const EncapsulationException&) = default; - virtual ~EncapsulationException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual EncapsulationException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; -}; - -/** - * This exception is raised if an unsupported feature is used. The unsupported feature string contains the name of the - * unsupported feature. - * \headerfile Ice/Ice.h - */ -class ICE_API FeatureNotSupportedException : public LocalException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - FeatureNotSupportedException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param unsupportedFeature The name of the unsupported feature. - */ - FeatureNotSupportedException(const char* file, int line, const ::std::string& unsupportedFeature); - FeatureNotSupportedException(const FeatureNotSupportedException&) = default; - virtual ~FeatureNotSupportedException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual FeatureNotSupportedException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; - - /** - * The name of the unsupported feature. - */ - ::std::string unsupportedFeature; -}; - -/** - * This exception indicates a failure in a security subsystem, such as the IceSSL plug-in. - * \headerfile Ice/Ice.h - */ -class ICE_API SecurityException : public LocalException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - SecurityException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param reason The reason for the failure. - */ - SecurityException(const char* file, int line, const ::std::string& reason); - SecurityException(const SecurityException&) = default; - virtual ~SecurityException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual SecurityException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; - - /** - * The reason for the failure. - */ - ::std::string reason; -}; - -/** - * This exception indicates that an attempt has been made to change the connection properties of a fixed proxy. - * \headerfile Ice/Ice.h - */ -class ICE_API FixedProxyException : public LocalException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - FixedProxyException(const char* file, int line); - FixedProxyException(const FixedProxyException&) = default; - virtual ~FixedProxyException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual FixedProxyException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; -}; - -/** - * Indicates that the response to a request has already been sent; re-dispatching such a request is not possible. - * \headerfile Ice/Ice.h - */ -class ICE_API ResponseSentException : public LocalException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - ResponseSentException(const char* file, int line); - ResponseSentException(const ResponseSentException&) = default; - virtual ~ResponseSentException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual ResponseSentException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; -}; - -} - -/// \cond STREAM -namespace Ice -{ - -} -/// \endcond - -#endif - #include #endif diff --git a/cpp/include/Ice/LocalObject.h b/cpp/include/Ice/LocalObject.h index 75d03dabe07..cd204bd6b0e 100644 --- a/cpp/include/Ice/LocalObject.h +++ b/cpp/include/Ice/LocalObject.h @@ -5,7 +5,7 @@ #ifndef ICE_LOCAL_OBJECT_H #define ICE_LOCAL_OBJECT_H -#if !defined(ICE_CPP11_MAPPING) || defined(ICE_BUILDING_SRC) +#if defined(ICE_BUILDING_SRC) // // Part of the C++98 mapping, and "internal" definitions when building Ice // with the C++11 mapping diff --git a/cpp/include/Ice/LocatorF.h b/cpp/include/Ice/LocatorF.h index c8c5627730f..86b1a336815 100644 --- a/cpp/include/Ice/LocatorF.h +++ b/cpp/include/Ice/LocatorF.h @@ -5,15 +5,9 @@ #ifndef ICE_LOCATOR_F_H #define ICE_LOCATOR_F_H -// TODO: remove this include when we remove the C++98 mapping. -#include - #include "Config.h" #include #include "ProxyF.h" -#include "SharedPtr.h" - -#ifdef ICE_CPP11_MAPPING // C++11 mapping namespace Ice { @@ -31,48 +25,4 @@ using LocatorRegistryPrxPtr = ::std::shared_ptr; } -#else // C++98 mapping - -namespace Ice -{ - class InputStream; -} - -namespace IceProxy::Ice -{ - -class Locator; -/// \cond INTERNAL -ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< Locator>&); -ICE_API ::IceProxy::Ice::Object* upCast(Locator*); -/// \endcond - -class LocatorRegistry; -/// \cond INTERNAL -ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< LocatorRegistry>&); -ICE_API ::IceProxy::Ice::Object* upCast(LocatorRegistry*); -/// \endcond - -} - -namespace Ice -{ - -typedef ::IceInternal::ProxyHandle< ::IceProxy::Ice::Locator> LocatorPrx; -typedef LocatorPrx LocatorPrxPtr; - -class Locator; -using LocatorPtr = ::Ice::SharedPtr< Locator>; -typedef ::IceInternal::ProxyHandle< ::IceProxy::Ice::LocatorRegistry> LocatorRegistryPrx; -typedef LocatorRegistryPrx LocatorRegistryPrxPtr; - -class LocatorRegistry; -using LocatorRegistryPtr = ::Ice::SharedPtr< LocatorRegistry>; - -} - -#endif - -// TODO: remove this include when we remove the C++98 mapping. -#include #endif diff --git a/cpp/include/Ice/Logger.h b/cpp/include/Ice/Logger.h index d6dbd886f04..5e8bfea67a8 100644 --- a/cpp/include/Ice/Logger.h +++ b/cpp/include/Ice/Logger.h @@ -5,7 +5,6 @@ #ifndef __Ice_Logger_h__ #define __Ice_Logger_h__ -#include #include #include #include @@ -13,7 +12,6 @@ #include #include #include -#include #include #include @@ -27,8 +25,6 @@ # endif #endif -#ifdef ICE_CPP11_MAPPING // C++11 mapping - namespace Ice { @@ -110,102 +106,4 @@ using LoggerPtr = ::std::shared_ptr; } /// \endcond -#else // C++98 mapping - -namespace Ice -{ - -class Logger; -/// \cond INTERNAL -ICE_API LocalObject* upCast(Logger*); -/// \endcond -typedef ::IceInternal::Handle< Logger> LoggerPtr; - -} - -namespace Ice -{ - -/** - * The Ice message logger. Applications can provide their own logger by implementing this interface and installing it - * in a communicator. - * \headerfile Ice/Ice.h - */ -class ICE_API Logger : public virtual LocalObject -{ -public: - - typedef LoggerPtr PointerType; - - virtual ~Logger(); - Logger() = default; - Logger(const Logger&) = default; - Logger& operator=(const Logger&) = default; - - /** - * Print a message. The message is printed literally, without any decorations such as executable name or time - * stamp. - * @param message The message to log. - */ - virtual void print(const ::std::string& message) = 0; - - /** - * Log a trace message. - * @param category The trace category. - * @param message The trace message to log. - */ - virtual void trace(const ::std::string& category, const ::std::string& message) = 0; - - /** - * Log a warning message. - * @param message The warning message to log. - * @see #error - */ - virtual void warning(const ::std::string& message) = 0; - - /** - * Log an error message. - * @param message The error message to log. - * @see #warning - */ - virtual void error(const ::std::string& message) = 0; - - /** - * Returns this logger's prefix. - * @return The prefix. - */ - virtual ::std::string getPrefix() = 0; - - /** - * Returns a clone of the logger with a new prefix. - * @param prefix The new prefix for the logger. - * @return A logger instance. - */ - virtual LoggerPtr cloneWithPrefix(const ::std::string& prefix) = 0; -}; - -/// \cond INTERNAL -inline bool operator==(const Logger& lhs, const Logger& rhs) -{ - return static_cast(lhs) == static_cast(rhs); -} - -inline bool operator<(const Logger& lhs, const Logger& rhs) -{ - return static_cast(lhs) < static_cast(rhs); -} -/// \endcond - -} - -/// \cond STREAM -namespace Ice -{ - -} -/// \endcond - -#endif - -#include #endif diff --git a/cpp/include/Ice/LoggerF.h b/cpp/include/Ice/LoggerF.h index 54bf0cb669e..bf25269db6b 100644 --- a/cpp/include/Ice/LoggerF.h +++ b/cpp/include/Ice/LoggerF.h @@ -5,7 +5,6 @@ #ifndef __Ice_LoggerF_h__ #define __Ice_LoggerF_h__ -#include #include #include #include @@ -13,7 +12,6 @@ #include #include #include -#include #include #include @@ -27,8 +25,6 @@ # endif #endif -#ifdef ICE_CPP11_MAPPING // C++11 mapping - namespace Ice { @@ -36,13 +32,6 @@ class Logger; } -/// \cond STREAM -namespace Ice -{ - -} -/// \endcond - /// \cond INTERNAL namespace Ice { @@ -52,27 +41,4 @@ using LoggerPtr = ::std::shared_ptr; } /// \endcond -#else // C++98 mapping - -namespace Ice -{ - -class Logger; -/// \cond INTERNAL -ICE_API LocalObject* upCast(Logger*); -/// \endcond -typedef ::IceInternal::Handle< Logger> LoggerPtr; - -} - -/// \cond STREAM -namespace Ice -{ - -} -/// \endcond - -#endif - -#include #endif diff --git a/cpp/include/Ice/LoggerUtil.h b/cpp/include/Ice/LoggerUtil.h index 8696a75562a..8f47028e8dd 100644 --- a/cpp/include/Ice/LoggerUtil.h +++ b/cpp/include/Ice/LoggerUtil.h @@ -74,15 +74,9 @@ operator<<(LoggerOutputBase& out, const T& val) return LoggerOutputInserter::value>::insert(out, val); } -#ifdef ICE_CPP11_MAPPING template::value>::type* = nullptr> inline LoggerOutputBase& operator<<(LoggerOutputBase& os, const ::std::shared_ptr& p) -#else -template -inline LoggerOutputBase& -operator<<(LoggerOutputBase& os, const ::IceInternal::ProxyHandle& p) -#endif { return os << (p ? p->ice_toString() : ""); } diff --git a/cpp/include/Ice/MetricsAdminI.h b/cpp/include/Ice/MetricsAdminI.h index d99dfc293e9..f6bf48c5ba9 100644 --- a/cpp/include/Ice/MetricsAdminI.h +++ b/cpp/include/Ice/MetricsAdminI.h @@ -614,21 +614,11 @@ class ICE_API MetricsAdminI : public IceMX::MetricsAdmin, void updated(const Ice::PropertyDict&); -#ifdef ICE_CPP11_MAPPING virtual void enableMetricsView(std::string, const ::Ice::Current&); virtual void disableMetricsView(std::string, const ::Ice::Current&); virtual IceMX::MetricsView getMetricsView(std::string, Ice::Long&, const ::Ice::Current&); virtual IceMX::MetricsFailuresSeq getMapMetricsFailures(std::string, std::string, const ::Ice::Current&); virtual IceMX::MetricsFailures getMetricsFailures(std::string, std::string, std::string, const ::Ice::Current&); -#else - virtual void enableMetricsView(const std::string&, const ::Ice::Current&); - virtual void disableMetricsView(const std::string&, const ::Ice::Current&); - virtual IceMX::MetricsView getMetricsView(const std::string&, Ice::Long&, const ::Ice::Current&); - virtual IceMX::MetricsFailuresSeq getMapMetricsFailures(const std::string&, const std::string&, - const ::Ice::Current&); - virtual IceMX::MetricsFailures getMetricsFailures(const std::string&, const std::string&, const std::string&, - const ::Ice::Current&); -#endif std::vector getMaps(const std::string&) const; const Ice::LoggerPtr& getLogger() const; diff --git a/cpp/include/Ice/MetricsFunctional.h b/cpp/include/Ice/MetricsFunctional.h index c0f04534167..4addc7dfa35 100644 --- a/cpp/include/Ice/MetricsFunctional.h +++ b/cpp/include/Ice/MetricsFunctional.h @@ -16,7 +16,6 @@ template struct ReferenceWrapper } }; -#ifdef ICE_CPP11_MAPPING // C++11 mapping template struct ReferenceWrapper<::std::shared_ptr > { static R* get(const ::std::shared_ptr& v) @@ -32,55 +31,6 @@ template struct ReferenceWrapper& > return v.get(); } }; -#else // C++98 mapping -template struct ReferenceWrapper > -{ - static R* get(const IceInternal::ProxyHandle& v) - { - return v.get(); - } -}; - -template struct ReferenceWrapper& > -{ - static R* get(const IceInternal::ProxyHandle& v) - { - return v.get(); - } -}; - -template struct ReferenceWrapper > -{ - static R* get(const IceInternal::Handle& v) - { - return v.get(); - } -}; - -template struct ReferenceWrapper& > -{ - static R* get(const IceInternal::Handle& v) - { - return v.get(); - } -}; - -template struct ReferenceWrapper > -{ - static R* get(const Ice::SharedPtr& v) - { - return v.get(); - } -}; - -template struct ReferenceWrapper& > -{ - static R* get(const Ice::SharedPtr& v) - { - return v.get(); - } -}; -#endif template struct ReferenceWrapper { diff --git a/cpp/include/Ice/Object.h b/cpp/include/Ice/Object.h index e860e7bc530..093b1ef112b 100644 --- a/cpp/include/Ice/Object.h +++ b/cpp/include/Ice/Object.h @@ -28,34 +28,6 @@ namespace Ice /** A default-initialized Current instance. */ ICE_API extern const Current emptyCurrent; -#ifndef ICE_CPP11_MAPPING -/** - * Abstract callback class for an asynchronous dispatch interceptor. - * \headerfile Ice/Ice.h - */ -class ICE_API DispatchInterceptorAsyncCallback : public virtual IceUtil::Shared -{ -public: - - virtual ~DispatchInterceptorAsyncCallback(); - - /** Called when the dispatch completes successfully. */ - virtual bool response() = 0; - - /** - * Called when the dispatch fails with an exception. - * @param ex The exception that caused the failure. - */ - virtual bool exception(const std::exception& ex) = 0; - - /** - * Called when the dispatch fails with an unknown exception. - */ - virtual bool exception() = 0; -}; -ICE_DEFINE_PTR(DispatchInterceptorAsyncCallbackPtr, DispatchInterceptorAsyncCallback); -#endif - /** * Encapsulates details about a dispatch request. * \headerfile Ice/Ice.h @@ -133,7 +105,6 @@ class ICE_API Object static const std::string& ice_staticId(); // TODO: temporary. To remove it, we need to refactor IncomingAsync that is the base class for generated AMD callbacks. -#ifdef ICE_CPP11_MAPPING /** * Dispatches an invocation to a servant. This method is used by dispatch interceptors to forward an invocation * to a servant (or to another interceptor). @@ -148,17 +119,6 @@ class ICE_API Object virtual bool ice_dispatch(Ice::Request& request, std::function response = nullptr, std::function error = nullptr); -#else - /** - * Dispatches an invocation to a servant. This method is used by dispatch interceptors to forward an invocation - * to a servant (or to another interceptor). - * @param request The details of the invocation. - * @param cb The asynchronous callback object. - * @return True if the request completed synchronously, false if the request will be completed asynchronously. - * @throws UserException A user exception that propagates out of this method will be marshaled as the result. - */ - virtual bool ice_dispatch(Ice::Request& request, const DispatchInterceptorAsyncCallbackPtr& cb = 0); -#endif /// \cond INTERNAL virtual bool _iceDispatch(IceInternal::Incoming&, const Current&); @@ -255,7 +215,6 @@ class ICE_API BlobjectAsync : public virtual Object { public: -#ifdef ICE_CPP11_MAPPING /** * Dispatch an incoming request asynchronously. * @@ -273,19 +232,6 @@ class ICE_API BlobjectAsync : public virtual Object std::function&)> response, std::function error, const Current& current) = 0; -#else - /** - * Dispatch an incoming request asynchronously. - * - * @param cb The callback to invoke when the invocation completes. - * @param inEncaps An encapsulation containing the encoded in-parameters for the operation. - * @param current The Current object for the invocation. - * @throws UserException A user exception can be raised directly and the - * run time will marshal it. - */ - virtual void ice_invoke_async(const AMD_Object_ice_invokePtr& cb, const std::vector& inEncaps, - const Current& current) = 0; -#endif /// \cond INTERNAL virtual bool _iceDispatch(IceInternal::Incoming&, const Current&); @@ -301,7 +247,6 @@ class ICE_API BlobjectArrayAsync : public virtual Object { public: -#ifdef ICE_CPP11_MAPPING /** * Dispatch an incoming request asynchronously. * @@ -319,21 +264,6 @@ class ICE_API BlobjectArrayAsync : public virtual Object std::function&)> response, std::function error, const Current& current) = 0; -#else - /** - * Dispatch an incoming request asynchronously. - * - * @param cb The callback to invoke when the invocation completes. - * @param inEncaps An encapsulation containing the encoded in-parameters for the operation. - * @param current The Current object for the invocation. - * @throws UserException A user exception can be raised directly and the - * run time will marshal it. - */ - virtual void ice_invoke_async(const AMD_Object_ice_invokePtr& cb, - const std::pair& inEncaps, - const Current& current) = 0; -#endif - /// \cond INTERNAL virtual bool _iceDispatch(IceInternal::Incoming&, const Current&); /// \endcond diff --git a/cpp/include/Ice/ObjectAdapter.h b/cpp/include/Ice/ObjectAdapter.h index e25f8facce8..778a6a122a8 100644 --- a/cpp/include/Ice/ObjectAdapter.h +++ b/cpp/include/Ice/ObjectAdapter.h @@ -10,10 +10,11 @@ #include "Ice/LocatorF.h" #include "Endpoint.h" #include "FacetMap.h" -#include "SharedPtr.h" #include "ServantLocator.h" #include "Proxy.h" +#include + namespace Ice { @@ -131,24 +132,6 @@ class ICE_CLASS(ICE_API) ObjectAdapter */ virtual ObjectPrxPtr add(const ::std::shared_ptr& servant, const Identity& id) = 0; - /** - * Add a servant to this object adapter's Active Servant Map. Note that one servant can implement several Ice - * objects by registering the servant with multiple identities. Adding a servant with an identity that is in the - * map already throws {@link AlreadyRegisteredException}. - * @param servant The servant to add. - * @param id The identity of the Ice object that is implemented by the servant. - * @return A proxy that matches the given identity and this object adapter. - * @see Identity - * @see #addFacet - * @see #addWithUUID - * @see #remove - * @see #find - */ - ObjectPrxPtr add(const SharedPtr& servant, const Identity& id) - { - return add(servant.underlying(), id); - } - /** * Like {@link #add}, but with a facet. Calling add(servant, id) is equivalent to calling * {@link #addFacet} with an empty facet. @@ -164,24 +147,6 @@ class ICE_CLASS(ICE_API) ObjectAdapter */ virtual ObjectPrxPtr addFacet(const ::std::shared_ptr& servant, const Identity& id, const ::std::string& facet) = 0; - /** - * Like {@link #add}, but with a facet. Calling add(servant, id) is equivalent to calling - * {@link #addFacet} with an empty facet. - * @param servant The servant to add. - * @param id The identity of the Ice object that is implemented by the servant. - * @param facet The facet. An empty facet means the default facet. - * @return A proxy that matches the given identity, facet, and this object adapter. - * @see Identity - * @see #add - * @see #addFacetWithUUID - * @see #removeFacet - * @see #findFacet - */ - ObjectPrxPtr addFacet(const SharedPtr& servant, const Identity& id, const ::std::string& facet) - { - return addFacet(servant.underlying(), id, facet); - } - /** * Add a servant to this object adapter's Active Servant Map, using an automatically generated UUID as its * identity. Note that the generated UUID identity can be accessed using the proxy's ice_getIdentity @@ -196,23 +161,6 @@ class ICE_CLASS(ICE_API) ObjectAdapter */ virtual ObjectPrxPtr addWithUUID(const ::std::shared_ptr& servant) = 0; - /** - * Add a servant to this object adapter's Active Servant Map, using an automatically generated UUID as its - * identity. Note that the generated UUID identity can be accessed using the proxy's ice_getIdentity - * operation. - * @param servant The servant to add. - * @return A proxy that matches the generated UUID identity and this object adapter. - * @see Identity - * @see #add - * @see #addFacetWithUUID - * @see #remove - * @see #find - */ - ObjectPrxPtr addWithUUID(const SharedPtr& servant) - { - return addWithUUID(servant.underlying()); - } - /** * Like {@link #addWithUUID}, but with a facet. Calling addWithUUID(servant) is equivalent to calling * {@link #addFacetWithUUID} with an empty facet. @@ -227,23 +175,6 @@ class ICE_CLASS(ICE_API) ObjectAdapter */ virtual ObjectPrxPtr addFacetWithUUID(const ::std::shared_ptr& servant, const ::std::string& facet) = 0; - /** - * Like {@link #addWithUUID}, but with a facet. Calling addWithUUID(servant) is equivalent to calling - * {@link #addFacetWithUUID} with an empty facet. - * @param servant The servant to add. - * @param facet The facet. An empty facet means the default facet. - * @return A proxy that matches the generated UUID identity, facet, and this object adapter. - * @see Identity - * @see #addFacet - * @see #addWithUUID - * @see #removeFacet - * @see #findFacet - */ - ObjectPrxPtr addFacetWithUUID(const SharedPtr& servant, const ::std::string& facet) - { - return addFacetWithUUID(servant.underlying(), facet); - } - /** * Add a default servant to handle requests for a specific category. Adding a default servant for a category for * which a default servant is already registered throws {@link AlreadyRegisteredException}. To dispatch operation @@ -266,31 +197,6 @@ class ICE_CLASS(ICE_API) ObjectAdapter */ virtual void addDefaultServant(const ::std::shared_ptr& servant, const ::std::string& category) = 0; - /** - * Add a default servant to handle requests for a specific category. Adding a default servant for a category for - * which a default servant is already registered throws {@link AlreadyRegisteredException}. To dispatch operation - * calls on servants, the object adapter tries to find a servant for a given Ice object identity and facet in the - * following order: - *
    - *
  1. The object adapter tries to find a servant for the identity and facet in the Active Servant Map.
    2. - *
  2. If no servant has been found in the Active Servant Map, the object adapter tries to find a default servant - * for the category component of the identity.
    3. - *
  3. If no servant has been found by any of the preceding steps, the object adapter tries to find a default - * servant for an empty category, regardless of the category contained in the identity.
    4. - *
  4. If no servant has been found by any of the preceding steps, the object adapter gives up and the caller - * receives {@link ObjectNotExistException} or {@link FacetNotExistException}.
    5. - *
- * @param servant The default servant. - * @param category The category for which the default servant is registered. An empty category means it will - * handle all categories. - * @see #removeDefaultServant - * @see #findDefaultServant - */ - void addDefaultServant(const SharedPtr& servant, const ::std::string& category) - { - return addDefaultServant(servant.underlying(), category); - } - /** * Remove a servant (that is, the default facet) from the object adapter's Active Servant Map. * @param id The identity of the Ice object that is implemented by the servant. If the servant implements multiple @@ -410,36 +316,6 @@ class ICE_CLASS(ICE_API) ObjectAdapter */ virtual void addServantLocator(const ::std::shared_ptr& locator, const ::std::string& category) = 0; - /** - * Add a Servant Locator to this object adapter. Adding a servant locator for a category for which a servant - * locator is already registered throws {@link AlreadyRegisteredException}. To dispatch operation calls on - * servants, the object adapter tries to find a servant for a given Ice object identity and facet in the following - * order: - *
    - *
  1. The object adapter tries to find a servant for the identity and facet in the Active Servant Map.
    2. - *
  2. If no servant has been found in the Active Servant Map, the object adapter tries to find a servant locator - * for the category component of the identity. If a locator is found, the object adapter tries to find a servant - * using this locator.
    3. - *
  3. If no servant has been found by any of the preceding steps, the object adapter tries to find a locator for - * an empty category, regardless of the category contained in the identity. If a locator is found, the object - * adapter tries to find a servant using this locator.
    4. - *
  4. If no servant has been found by any of the preceding steps, the object adapter gives up and the caller - * receives {@link ObjectNotExistException} or {@link FacetNotExistException}.
    5. - *
- *

Only one locator for the empty category can be installed. - * @param locator The locator to add. - * @param category The category for which the Servant Locator can locate servants, or an empty string if the - * Servant Locator does not belong to any specific category. - * @see Identity - * @see #removeServantLocator - * @see #findServantLocator - * @see ServantLocator - */ - void addServantLocator(const SharedPtr& locator, const ::std::string& category) - { - return addServantLocator(locator.underlying(), category); - } - /** * Remove a Servant Locator from this object adapter. * @param category The category for which the Servant Locator can locate servants, or an empty string if the diff --git a/cpp/include/Ice/ObjectF.h b/cpp/include/Ice/ObjectF.h index d9b11775725..a60cb043c71 100644 --- a/cpp/include/Ice/ObjectF.h +++ b/cpp/include/Ice/ObjectF.h @@ -6,20 +6,15 @@ #define ICE_OBJECT_F_H #include -#include +#include namespace Ice { class Object; - -#ifdef ICE_CPP11_MAPPING /// \cond INTERNAL using ObjectPtr = ::std::shared_ptr; /// \endcond -#else -using ObjectPtr = SharedPtr; -#endif } diff --git a/cpp/include/Ice/OutgoingAsync.h b/cpp/include/Ice/OutgoingAsync.h index a85a97635b0..cf8d5347b07 100644 --- a/cpp/include/Ice/OutgoingAsync.h +++ b/cpp/include/Ice/OutgoingAsync.h @@ -17,11 +17,6 @@ #include #include #include -#include - -#ifndef ICE_CPP11_MAPPING -# include -#endif #include @@ -53,11 +48,7 @@ class ICE_API OutgoingAsyncCompletionCallback // invocation observer. // class ICE_API OutgoingAsyncBase : public virtual OutgoingAsyncCompletionCallback, -#ifdef ICE_CPP11_MAPPING public std::enable_shared_from_this -#else - public Ice::AsyncResult -#endif { public: @@ -76,34 +67,6 @@ class ICE_API OutgoingAsyncBase : public virtual OutgoingAsyncCompletionCallback virtual void cancelable(const IceInternal::CancellationHandlerPtr&); void cancel(); -#ifndef ICE_CPP11_MAPPING - virtual Ice::Int getHash() const; - - virtual Ice::CommunicatorPtr getCommunicator() const; - virtual Ice::ConnectionPtr getConnection() const; - virtual Ice::ObjectPrx getProxy() const; - - virtual Ice::LocalObjectPtr getCookie() const; - virtual const std::string& getOperation() const; - - virtual bool isCompleted() const; - virtual void waitForCompleted(); - - virtual bool isSent() const; - virtual void waitForSent(); - - virtual bool sentSynchronously() const; - - virtual void throwLocalException() const; - - virtual bool _waitForResponse(); - virtual Ice::InputStream* _startReadParams(); - virtual void _endReadParams(); - virtual void _readEmptyParams(); - virtual void _readParamEncaps(const ::Ice::Byte*&, ::Ice::Int&); - virtual void _throwUserException(); -#endif - void attachRemoteObserver(const Ice::ConnectionInfoPtr& c, const Ice::EndpointPtr& endpt, Ice::Int requestId) { const Ice::Int size = static_cast(_os.b.size() - headerSize - 4); @@ -155,17 +118,11 @@ class ICE_API OutgoingAsyncBase : public virtual OutgoingAsyncCompletionCallback bool _doneInSent; unsigned char _state; -#ifdef ICE_CPP11_MAPPING std::mutex _m; using Lock = std::lock_guard; -#else - IceUtil::Monitor _m; - typedef IceUtil::Monitor::Lock Lock; - Ice::LocalObjectPtr _cookie; -#endif - IceInternal::UniquePtr _ex; - IceInternal::UniquePtr _cancellationException; + std::unique_ptr _ex; + std::unique_ptr _cancellationException; InvocationObserver _observer; ObserverHelperT _childObserver; @@ -177,10 +134,6 @@ class ICE_API OutgoingAsyncBase : public virtual OutgoingAsyncCompletionCallback static const unsigned char OK; static const unsigned char Sent; -#ifndef ICE_CPP11_MAPPING - static const unsigned char Done; - static const unsigned char EndCalled; -#endif }; // @@ -204,15 +157,10 @@ class ICE_API ProxyOutgoingAsyncBase : public OutgoingAsyncBase, void retry(); void abort(const Ice::Exception&); -#ifdef ICE_CPP11_MAPPING std::shared_ptr shared_from_this() { return std::static_pointer_cast(OutgoingAsyncBase::shared_from_this()); } -#else - virtual Ice::ObjectPrx getProxy() const; - virtual Ice::CommunicatorPtr getCommunicator() const; -#endif protected: @@ -255,11 +203,9 @@ class ICE_API OutgoingAsync : public ProxyOutgoingAsyncBase void abort(const Ice::Exception&); void invoke(const std::string&); -#ifdef ICE_CPP11_MAPPING void invoke(const std::string&, Ice::OperationMode, Ice::FormatType, const Ice::Context&, std::function); void throwUserException(); -#endif Ice::OutputStream* startWriteParams(Ice::FormatType format) { @@ -289,11 +235,7 @@ class ICE_API OutgoingAsync : public ProxyOutgoingAsyncBase protected: const Ice::EncodingVersion _encoding; - -#ifdef ICE_CPP11_MAPPING std::function _userException; -#endif - bool _synchronous; }; @@ -302,8 +244,6 @@ class ICE_API OutgoingAsync : public ProxyOutgoingAsyncBase namespace IceInternal { -#ifdef ICE_CPP11_MAPPING - class ICE_API LambdaInvoke : public virtual OutgoingAsyncCompletionCallback { public: @@ -629,240 +569,6 @@ class PromiseOutgoing : public OutgoingAsyncT, public PromiseInvo } }; -#else - -// -// Base class for all callbacks. -// -class ICE_API CallbackBase : public IceUtil::Shared -{ -public: - - virtual ~CallbackBase(); - - void checkCallback(bool, bool); - - virtual void completed(const ::Ice::AsyncResultPtr&) const = 0; - virtual IceUtil::Handle verify(const ::Ice::LocalObjectPtr&) = 0; - virtual void sent(const ::Ice::AsyncResultPtr&) const = 0; - virtual bool hasSentCallback() const = 0; -}; -typedef IceUtil::Handle CallbackBasePtr; - -// -// Base class for generic callbacks. -// -class ICE_API GenericCallbackBase : public virtual CallbackBase -{ -public: - - virtual ~GenericCallbackBase(); -}; - -// -// See comments in OutgoingAsync.cpp -// -extern ICE_API CallbackBasePtr dummyCallback; - -// -// Generic callback template that requires the caller to down-cast the -// proxy and the cookie that are obtained from the AsyncResult. -// -template -class AsyncCallback : public GenericCallbackBase -{ -public: - - typedef T callback_type; - - typedef void (T::*Callback)(const ::Ice::AsyncResultPtr&); - - AsyncCallback(const TPtr& instance, Callback cb, Callback sentcb = 0) : - _callback(instance), _completed(cb), _sent(sentcb) - { - checkCallback(instance != 0, cb != 0); - } - - virtual void completed(const ::Ice::AsyncResultPtr& result) const - { - (_callback.get()->*_completed)(result); - } - - virtual CallbackBasePtr verify(const ::Ice::LocalObjectPtr&) - { - return this; // Nothing to do, the cookie is not type-safe. - } - - virtual void sent(const ::Ice::AsyncResultPtr& result) const - { - if(_sent) - { - (_callback.get()->*_sent)(result); - } - } - - virtual bool hasSentCallback() const - { - return _sent != 0; - } - -private: - - TPtr _callback; - Callback _completed; - Callback _sent; -}; - -class CallbackCompletion : public virtual OutgoingAsyncCompletionCallback -{ -public: - - CallbackCompletion(const CallbackBasePtr& cb, const Ice::LocalObjectPtr& cookie) : _callback(cb) - { - if(!_callback) - { - throw IceUtil::IllegalArgumentException(__FILE__, __LINE__); - } - const_cast(_callback) = _callback->verify(cookie); - } - - virtual bool handleSent(bool, bool alreadySent) - { - return _callback && _callback->hasSentCallback() && !alreadySent; - } - - virtual bool handleException(const Ice::Exception&) - { - return _callback; - } - - virtual bool handleResponse(bool) - { - return _callback; - } - - virtual void handleInvokeSent(bool, OutgoingAsyncBase* outAsync) const - { - _callback->sent(outAsync); - } - - virtual void handleInvokeException(const Ice::Exception&, OutgoingAsyncBase* outAsync) const - { - _callback->completed(outAsync); - } - - virtual void handleInvokeResponse(bool, OutgoingAsyncBase* outAsync) const - { - _callback->completed(outAsync); - } - -private: - - const CallbackBasePtr _callback; -}; - -class CallbackOutgoing : public OutgoingAsync, public CallbackCompletion -{ -public: - - CallbackOutgoing(const Ice::ObjectPrx& proxy, - const std::string& operation, - const CallbackBasePtr& cb, - const Ice::LocalObjectPtr& cookie, - bool sync) : - OutgoingAsync(proxy, sync), CallbackCompletion(cb, cookie), _operation(operation) - { - _cookie = cookie; - } - - virtual const std::string& - getOperation() const - { - return _operation; - } - -private: - - const std::string& _operation; -}; - -#endif - -} - -#ifndef ICE_CPP11_MAPPING - -namespace Ice -{ - -typedef IceUtil::Handle< ::IceInternal::GenericCallbackBase> CallbackPtr; - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param cb The completion callback. - * @param sentcb The sent callback. - * @return A callback object that can be passed to an asynchronous invocation. - */ -template CallbackPtr -newCallback(const IceUtil::Handle& instance, - void (T::*cb)(const AsyncResultPtr&), - void (T::*sentcb)(const AsyncResultPtr&) = 0) -{ - return new ::IceInternal::AsyncCallback>(instance, cb, sentcb); } -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param cb The completion callback. - * @param sentcb The sent callback. - * @return A callback object that can be passed to an asynchronous invocation. - */ -template CallbackPtr -newCallback(T* instance, - void (T::*cb)(const AsyncResultPtr&), - void (T::*sentcb)(const AsyncResultPtr&) = 0) -{ - return new ::IceInternal::AsyncCallback>(instance, cb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param cb The completion callback. - * @param sentcb The sent callback. - * @return A callback object that can be passed to an asynchronous invocation. - */ -template CallbackPtr -newCallback(const Ice::SharedPtr& instance, - void (T::*cb)(const AsyncResultPtr&), - void (T::*sentcb)(const AsyncResultPtr&) = 0) -{ - return new ::IceInternal::AsyncCallback>(instance, cb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param cb The completion callback. - * @param sentcb The sent callback. - * @return A callback object that can be passed to an asynchronous invocation. - */ -template CallbackPtr -newCallback(const std::shared_ptr& instance, - void (T::*cb)(const AsyncResultPtr&), - void (T::*sentcb)(const AsyncResultPtr&) = 0) -{ - return new ::IceInternal::AsyncCallback>(instance, cb, sentcb); -} - -} - -// -// Operation callbacks are specified in Proxy.h -// - -#endif - #endif diff --git a/cpp/include/Ice/OutgoingAsyncF.h b/cpp/include/Ice/OutgoingAsyncF.h index 86885db1214..f5ae73c9e33 100644 --- a/cpp/include/Ice/OutgoingAsyncF.h +++ b/cpp/include/Ice/OutgoingAsyncF.h @@ -5,8 +5,8 @@ #ifndef ICE_OUTGOING_ASYNC_F_H #define ICE_OUTGOING_ASYNC_F_H -#include -#include +#include +#include namespace IceInternal { @@ -16,24 +16,11 @@ class OutgoingAsync; class ProxyOutgoingAsyncBase; class CommunicatorFlushBatchAsync; -#ifdef ICE_CPP11_MAPPING using OutgoingAsyncBasePtr = ::std::shared_ptr; using OutgoingAsyncPtr = ::std::shared_ptr; using ProxyOutgoingAsyncBasePtr = ::std::shared_ptr; using CommunicatorFlushBatchAsyncPtr = ::std::shared_ptr; -#else -ICE_API IceUtil::Shared* upCast(OutgoingAsyncBase*); -typedef IceInternal::Handle OutgoingAsyncBasePtr; -ICE_API IceUtil::Shared* upCast(OutgoingAsync*); -typedef IceInternal::Handle OutgoingAsyncPtr; - -ICE_API IceUtil::Shared* upCast(ProxyOutgoingAsyncBase*); -typedef IceInternal::Handle ProxyOutgoingAsyncBasePtr; - -ICE_API IceUtil::Shared* upCast(CommunicatorFlushBatchAsync*); -typedef IceInternal::Handle CommunicatorFlushBatchAsyncPtr; -#endif } #endif diff --git a/cpp/include/Ice/OutputStream.h b/cpp/include/Ice/OutputStream.h index 3d6020c6643..985cc4dabe6 100644 --- a/cpp/include/Ice/OutputStream.h +++ b/cpp/include/Ice/OutputStream.h @@ -447,8 +447,6 @@ class ICE_API OutputStream : public IceInternal::Buffer } } -#ifdef ICE_CPP11_MAPPING - /** * Writes a list of mandatory data values. */ @@ -507,8 +505,6 @@ class ICE_API OutputStream : public IceInternal::Buffer writeAll(tags, ve...); } -#endif - /** * Writes the tag and format of an optional value. * @param tag The optional tag ID. @@ -744,7 +740,6 @@ class ICE_API OutputStream : public IceInternal::Buffer */ void write(const std::wstring* begin, const std::wstring* end); -#ifdef ICE_CPP11_MAPPING /** * Writes a proxy to the stream. * @param v The proxy to be written. @@ -760,22 +755,6 @@ class ICE_API OutputStream : public IceInternal::Buffer { writeProxy(::std::static_pointer_cast(v)); } -#else - /** - * Writes a proxy to the stream. - * @param v The proxy to be written. - */ - void write(const ObjectPrx& v); - - /** - * Writes a proxy to the stream. - * @param v The proxy to be written. - */ - template void write(const IceInternal::ProxyHandle& v) - { - write(ObjectPrx(upCast(v.get()))); - } -#endif /** * Writes a value instance to the stream. @@ -788,16 +767,6 @@ class ICE_API OutputStream : public IceInternal::Buffer _currentEncaps->encoder->write(v); } - /** - * Writes a value instance to the stream. - * @param v The value to be written. - */ - template::value>::type* = nullptr> - void write(const Ice::SharedPtr& v) - { - write(v.underlying()); - } - /** * Writes an enumerator to the stream. * @param v The enumerator to be written. diff --git a/cpp/include/Ice/Plugin.h b/cpp/include/Ice/Plugin.h index 16e9f80cb2d..b8a8a953aac 100644 --- a/cpp/include/Ice/Plugin.h +++ b/cpp/include/Ice/Plugin.h @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include @@ -29,8 +28,6 @@ # endif #endif -#ifdef ICE_CPP11_MAPPING // C++11 mapping - namespace Ice { @@ -116,13 +113,6 @@ class ICE_CLASS(ICE_API) PluginManager } -/// \cond STREAM -namespace Ice -{ - -} -/// \endcond - /// \cond INTERNAL namespace Ice { @@ -134,144 +124,5 @@ using PluginManagerPtr = ::std::shared_ptr; } /// \endcond -#else // C++98 mapping - -namespace Ice -{ - -class Plugin; -/// \cond INTERNAL -ICE_API LocalObject* upCast(Plugin*); -/// \endcond -typedef ::IceInternal::Handle< Plugin> PluginPtr; - -class PluginManager; -/// \cond INTERNAL -ICE_API LocalObject* upCast(PluginManager*); -/// \endcond -typedef ::IceInternal::Handle< PluginManager> PluginManagerPtr; - -} - -namespace Ice -{ - -/** - * A communicator plug-in. A plug-in generally adds a feature to a communicator, such as support for a protocol. - * The communicator loads its plug-ins in two stages: the first stage creates the plug-ins, and the second stage - * invokes {@link Plugin#initialize} on each one. - * \headerfile Ice/Ice.h - */ -class ICE_API Plugin : public virtual LocalObject -{ -public: - - typedef PluginPtr PointerType; - - virtual ~Plugin(); - Plugin() = default; - Plugin(const Plugin&) = default; - Plugin& operator=(const Plugin&) = default; - - /** - * Perform any necessary initialization steps. - */ - virtual void initialize() = 0; - - /** - * Called when the communicator is being destroyed. - */ - virtual void destroy() = 0; -}; - -/// \cond INTERNAL -inline bool operator==(const Plugin& lhs, const Plugin& rhs) -{ - return static_cast(lhs) == static_cast(rhs); -} - -inline bool operator<(const Plugin& lhs, const Plugin& rhs) -{ - return static_cast(lhs) < static_cast(rhs); -} -/// \endcond - -/** - * Each communicator has a plug-in manager to administer the set of plug-ins. - * \headerfile Ice/Ice.h - */ -class ICE_API PluginManager : public virtual LocalObject -{ -public: - - typedef PluginManagerPtr PointerType; - - virtual ~PluginManager(); - PluginManager() = default; - PluginManager(const PluginManager&) = default; - PluginManager& operator=(const PluginManager&) = default; - - /** - * Initialize the configured plug-ins. The communicator automatically initializes the plug-ins by default, but an - * application may need to interact directly with a plug-in prior to initialization. In this case, the application - * must set Ice.InitPlugins=0 and then invoke {@link #initializePlugins} manually. The plug-ins are - * initialized in the order in which they are loaded. If a plug-in raises an exception during initialization, the - * communicator invokes destroy on the plug-ins that have already been initialized. - * @throws InitializationException Raised if the plug-ins have already been initialized. - */ - virtual void initializePlugins() = 0; - - /** - * Get a list of plugins installed. - * @return The names of the plugins installed. - * @see #getPlugin - */ - virtual StringSeq getPlugins() noexcept = 0; - - /** - * Obtain a plug-in by name. - * @param name The plug-in's name. - * @return The plug-in. - * @throws NotRegisteredException Raised if no plug-in is found with the given name. - */ - virtual PluginPtr getPlugin(const ::std::string& name) = 0; - - /** - * Install a new plug-in. - * @param name The plug-in's name. - * @param pi The plug-in. - * @throws AlreadyRegisteredException Raised if a plug-in already exists with the given name. - */ - virtual void addPlugin(const ::std::string& name, const PluginPtr& pi) = 0; - - /** - * Called when the communicator is being destroyed. - */ - virtual void destroy() noexcept = 0; -}; - -/// \cond INTERNAL -inline bool operator==(const PluginManager& lhs, const PluginManager& rhs) -{ - return static_cast(lhs) == static_cast(rhs); -} - -inline bool operator<(const PluginManager& lhs, const PluginManager& rhs) -{ - return static_cast(lhs) < static_cast(rhs); -} -/// \endcond - -} - -/// \cond STREAM -namespace Ice -{ - -} -/// \endcond - -#endif - #include #endif diff --git a/cpp/include/Ice/PluginF.h b/cpp/include/Ice/PluginF.h index 54262aece7f..ff907b65938 100644 --- a/cpp/include/Ice/PluginF.h +++ b/cpp/include/Ice/PluginF.h @@ -13,7 +13,6 @@ #include #include #include -#include #include #include @@ -27,8 +26,6 @@ # endif #endif -#ifdef ICE_CPP11_MAPPING // C++11 mapping - namespace Ice { @@ -55,33 +52,5 @@ using PluginManagerPtr = ::std::shared_ptr; } /// \endcond -#else // C++98 mapping - -namespace Ice -{ - -class Plugin; -/// \cond INTERNAL -ICE_API LocalObject* upCast(Plugin*); -/// \endcond -typedef ::IceInternal::Handle< Plugin> PluginPtr; - -class PluginManager; -/// \cond INTERNAL -ICE_API LocalObject* upCast(PluginManager*); -/// \endcond -typedef ::IceInternal::Handle< PluginManager> PluginManagerPtr; - -} - -/// \cond STREAM -namespace Ice -{ - -} -/// \endcond - -#endif - #include #endif diff --git a/cpp/include/Ice/Properties.h b/cpp/include/Ice/Properties.h index e77b08ead66..6e8e5616f48 100644 --- a/cpp/include/Ice/Properties.h +++ b/cpp/include/Ice/Properties.h @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include @@ -33,8 +32,6 @@ # endif #endif -#ifdef ICE_CPP11_MAPPING // C++11 mapping - namespace Ice { @@ -171,12 +168,6 @@ class ICE_CLASS(ICE_API) Properties virtual ::std::shared_ptr<::Ice::Properties> clone() noexcept = 0; }; -} - -/// \cond STREAM -namespace Ice -{ - } /// \endcond @@ -189,185 +180,5 @@ using PropertiesPtr = ::std::shared_ptr; } /// \endcond -#else // C++98 mapping - -namespace IceProxy -{ - -} - -namespace Ice -{ - -class Properties; -/// \cond INTERNAL -ICE_API LocalObject* upCast(Properties*); -/// \endcond -typedef ::IceInternal::Handle< Properties> PropertiesPtr; - -} - -namespace IceProxy -{ - -} - -namespace Ice -{ - -/** - * A property set used to configure Ice and Ice applications. Properties are key/value pairs, with both keys and - * values being strings. By convention, property keys should have the form - * application-name[.category[.sub-category]].name. - * \headerfile Ice/Ice.h - */ -class ICE_API Properties : public virtual LocalObject -{ -public: - - typedef PropertiesPtr PointerType; - - virtual ~Properties(); - Properties() = default; - Properties(const Properties&) = default; - Properties& operator=(const Properties&) = default; - - /** - * Get a property by key. If the property is not set, an empty string is returned. - * @param key The property key. - * @return The property value. - * @see #setProperty - */ - virtual ::std::string getProperty(const ::std::string& key) noexcept = 0; - - /** - * Get a property by key. If the property is not set, the given default value is returned. - * @param key The property key. - * @param value The default value to use if the property does not exist. - * @return The property value or the default value. - * @see #setProperty - */ - virtual ::std::string getPropertyWithDefault(const ::std::string& key, const ::std::string& value) noexcept = 0; - - /** - * Get a property as an integer. If the property is not set, 0 is returned. - * @param key The property key. - * @return The property value interpreted as an integer. - * @see #setProperty - */ - virtual Int getPropertyAsInt(const ::std::string& key) noexcept = 0; - - /** - * Get a property as an integer. If the property is not set, the given default value is returned. - * @param key The property key. - * @param value The default value to use if the property does not exist. - * @return The property value interpreted as an integer, or the default value. - * @see #setProperty - */ - virtual Int getPropertyAsIntWithDefault(const ::std::string& key, Int value) noexcept = 0; - - /** - * Get a property as a list of strings. The strings must be separated by whitespace or comma. If the property is - * not set, an empty list is returned. The strings in the list can contain whitespace and commas if they are - * enclosed in single or double quotes. If quotes are mismatched, an empty list is returned. Within single quotes - * or double quotes, you can escape the quote in question with a backslash, e.g. O'Reilly can be written as - * O'Reilly, "O'Reilly" or 'O\'Reilly'. - * @param key The property key. - * @return The property value interpreted as a list of strings. - * @see #setProperty - */ - virtual StringSeq getPropertyAsList(const ::std::string& key) noexcept = 0; - - /** - * Get a property as a list of strings. The strings must be separated by whitespace or comma. If the property is - * not set, the default list is returned. The strings in the list can contain whitespace and commas if they are - * enclosed in single or double quotes. If quotes are mismatched, the default list is returned. Within single - * quotes or double quotes, you can escape the quote in question with a backslash, e.g. O'Reilly can be written as - * O'Reilly, "O'Reilly" or 'O\'Reilly'. - * @param key The property key. - * @param value The default value to use if the property is not set. - * @return The property value interpreted as list of strings, or the default value. - * @see #setProperty - */ - virtual StringSeq getPropertyAsListWithDefault(const ::std::string& key, const StringSeq& value) noexcept = 0; - - /** - * Get all properties whose keys begins with prefix. If prefix is an empty string, then all - * properties are returned. - * @param prefix The prefix to search for (empty string if none). - * @return The matching property set. - */ - virtual PropertyDict getPropertiesForPrefix(const ::std::string& prefix) noexcept = 0; - - /** - * Set a property. To unset a property, set it to the empty string. - * @param key The property key. - * @param value The property value. - * @see #getProperty - */ - virtual void setProperty(const ::std::string& key, const ::std::string& value) = 0; - - /** - * Get a sequence of command-line options that is equivalent to this property set. Each element of the returned - * sequence is a command-line option of the form --key=value. - * @return The command line options for this property set. - */ - virtual StringSeq getCommandLineOptions() noexcept = 0; - - /** - * Convert a sequence of command-line options into properties. All options that begin with - * --prefix. are converted into properties. If the prefix is empty, all options that begin with - * -- are converted to properties. - * @param prefix The property prefix, or an empty string to convert all options starting with --. - * @param options The command-line options. - * @return The command-line options that do not start with the specified prefix, in their original order. - */ - virtual StringSeq parseCommandLineOptions(const ::std::string& prefix, const StringSeq& options) = 0; - - /** - * Convert a sequence of command-line options into properties. All options that begin with one of the following - * prefixes are converted into properties: --Ice, --IceBox, --IceGrid, - * --IcePatch2, --IceSSL, --IceStorm, --Freeze, and --Glacier2. - * @param options The command-line options. - * @return The command-line options that do not start with one of the listed prefixes, in their original order. - */ - virtual StringSeq parseIceCommandLineOptions(const StringSeq& options) = 0; - - /** - * Load properties from a file. - * @param file The property file. - */ - virtual void load(const ::std::string& file) = 0; - - /** - * Create a copy of this property set. - * @return A copy of this property set. - */ - virtual PropertiesPtr clone() noexcept = 0; -}; - -/// \cond INTERNAL -inline bool operator==(const Properties& lhs, const Properties& rhs) -{ - return static_cast(lhs) == static_cast(rhs); -} - -inline bool operator<(const Properties& lhs, const Properties& rhs) -{ - return static_cast(lhs) < static_cast(rhs); -} -/// \endcond - -} - -/// \cond STREAM -namespace Ice -{ - -} -/// \endcond - -#endif - #include #endif diff --git a/cpp/include/Ice/PropertiesF.h b/cpp/include/Ice/PropertiesF.h index e439f5ed903..89b28385ea7 100644 --- a/cpp/include/Ice/PropertiesF.h +++ b/cpp/include/Ice/PropertiesF.h @@ -14,7 +14,6 @@ #include #include #include -#include #include #include @@ -28,8 +27,6 @@ # endif #endif -#ifdef ICE_CPP11_MAPPING // C++11 mapping - namespace Ice { @@ -55,20 +52,5 @@ using PropertiesPtr = ::std::shared_ptr; } /// \endcond -#else // C++98 mapping - -namespace Ice -{ - -class Properties; -/// \cond INTERNAL -ICE_API LocalObject* upCast(Properties*); -/// \endcond -typedef ::IceInternal::Handle< Properties> PropertiesPtr; - -} - -#endif - #include #endif diff --git a/cpp/include/Ice/Proxy.h b/cpp/include/Ice/Proxy.h index 4e50063e533..05a0df2eb0d 100644 --- a/cpp/include/Ice/Proxy.h +++ b/cpp/include/Ice/Proxy.h @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include @@ -77,8 +76,6 @@ typedef IceUtil::Handle ProxyGetConnectionPtr; } -#ifdef ICE_CPP11_MAPPING // C++11 mapping - namespace IceInternal { @@ -1586,3478 +1583,4 @@ checkedCast(const ::std::shared_ptr& b, const std::string& f, const ::Ice::Co } -#else // C++98 mapping - -namespace Ice -{ - -class LocalException; -class OutputStream; - -/** - * Base class for asynchronous callback wrapper classes used for calls to - * IceProxy::Ice::Object::begin_ice_isA. - * Create a wrapper instance by calling ::Ice::newCallback_Object_ice_isA. - * \headerfile Ice/Ice.h - */ -class Callback_Object_ice_isA_Base : public virtual ::IceInternal::CallbackBase { }; -typedef ::IceUtil::Handle< Callback_Object_ice_isA_Base> Callback_Object_ice_isAPtr; - -/** - * Base class for asynchronous callback wrapper classes used for calls to - * IceProxy::Ice::Object::begin_ice_ping. - * Create a wrapper instance by calling ::Ice::newCallback_Object_ice_ping. - * \headerfile Ice/Ice.h - */ -class Callback_Object_ice_ping_Base : public virtual ::IceInternal::CallbackBase { }; -typedef ::IceUtil::Handle< Callback_Object_ice_ping_Base> Callback_Object_ice_pingPtr; - -/** - * Base class for asynchronous callback wrapper classes used for calls to - * IceProxy::Ice::Object::begin_ice_ids. - * Create a wrapper instance by calling ::Ice::newCallback_Object_ice_ids. - * \headerfile Ice/Ice.h - */ -class Callback_Object_ice_ids_Base : public virtual ::IceInternal::CallbackBase { }; -typedef ::IceUtil::Handle< Callback_Object_ice_ids_Base> Callback_Object_ice_idsPtr; - -/** - * Base class for asynchronous callback wrapper classes used for calls to - * IceProxy::Ice::Object::begin_ice_id. - * Create a wrapper instance by calling ::Ice::newCallback_Object_ice_id. - * \headerfile Ice/Ice.h - */ -class Callback_Object_ice_id_Base : public virtual ::IceInternal::CallbackBase { }; -typedef ::IceUtil::Handle< Callback_Object_ice_id_Base> Callback_Object_ice_idPtr; - -/** - * Base class for asynchronous callback wrapper classes used for calls to - * IceProxy::Ice::Object::begin_ice_invoke. - * Create a wrapper instance by calling ::Ice::newCallback_Object_ice_invoke. - * \headerfile Ice/Ice.h - */ -class Callback_Object_ice_invoke_Base : public virtual ::IceInternal::CallbackBase { }; -typedef ::IceUtil::Handle< Callback_Object_ice_invoke_Base> Callback_Object_ice_invokePtr; - -/** - * Base class for asynchronous callback wrapper classes used for calls to - * IceProxy::Ice::Object::begin_ice_flushBatchRequests. - * Create a wrapper instance by calling ::Ice::newCallback_Object_ice_flushBatchRequests. - * \headerfile Ice/Ice.h - */ -class Callback_Object_ice_flushBatchRequests_Base : public virtual ::IceInternal::CallbackBase { }; -typedef ::IceUtil::Handle< Callback_Object_ice_flushBatchRequests_Base> Callback_Object_ice_flushBatchRequestsPtr; - -/** - * Base class for asynchronous callback wrapper classes used for calls to - * IceProxy::Ice::Object::begin_ice_getConnection. - * Create a wrapper instance by calling ::Ice::newCallback_Object_ice_getConnection. - * \headerfile Ice/Ice.h - */ -class Callback_Object_ice_getConnection_Base : public virtual ::IceInternal::CallbackBase { }; -typedef ::IceUtil::Handle< Callback_Object_ice_getConnection_Base> Callback_Object_ice_getConnectionPtr; - -} - -namespace IceProxy { namespace Ice -{ - -/** - * Base class of all object proxies. - * \headerfile Ice/Ice.h - */ -class ICE_API Object : public ::IceUtil::Shared -{ -public: - - bool operator==(const Object&) const; - bool operator<(const Object&) const; - - /** - * Obtains the communicator that created this proxy. - * @return The communicator that created this proxy. - */ - ::Ice::CommunicatorPtr ice_getCommunicator() const; - - /** - * Obtains a stringified version of this proxy. - * @return A stringified proxy. - */ - ::std::string ice_toString() const; - - /** - * Tests whether this object supports a specific Slice interface. - * @param typeId The type ID of the Slice interface to test against. - * @param context The context map for the invocation. - * @return True if the target object has the interface - * specified by id or derives from the interface specified by id. - */ - bool ice_isA(const ::std::string& typeId, const ::Ice::Context& context = ::Ice::noExplicitContext) - { - return end_ice_isA(_iceI_begin_ice_isA(typeId, context, ::IceInternal::dummyCallback, 0, true)); - } - - /** - * Tests whether this object supports a specific Slice interface. - * @param typeId The type ID of the Slice interface to test against. - * @param context The context map for the invocation. - * @return The asynchronous result object for the invocation. - */ - ::Ice::AsyncResultPtr begin_ice_isA(const ::std::string& typeId, - const ::Ice::Context& context = ::Ice::noExplicitContext) - { - return _iceI_begin_ice_isA(typeId, context, ::IceInternal::dummyCallback, 0); - } - - /** - * Tests whether this object supports a specific Slice interface. - * @param typeId The type ID of the Slice interface to test against. - * @param cb Asynchronous callback object. - * @param cookie User-defined data to associate with the invocation. - * @return The asynchronous result object for the invocation. - */ - ::Ice::AsyncResultPtr begin_ice_isA(const ::std::string& typeId, - const ::Ice::CallbackPtr& cb, - const ::Ice::LocalObjectPtr& cookie = 0) - { - return _iceI_begin_ice_isA(typeId, ::Ice::noExplicitContext, cb, cookie); - } - - /** - * Tests whether this object supports a specific Slice interface. - * @param typeId The type ID of the Slice interface to test against. - * @param context The context map for the invocation. - * @param cb Asynchronous callback object. - * @param cookie User-defined data to associate with the invocation. - * @return The asynchronous result object for the invocation. - */ - ::Ice::AsyncResultPtr begin_ice_isA(const ::std::string& typeId, - const ::Ice::Context& context, - const ::Ice::CallbackPtr& cb, - const ::Ice::LocalObjectPtr& cookie = 0) - { - return _iceI_begin_ice_isA(typeId, context, cb, cookie); - } - - /** - * Tests whether this object supports a specific Slice interface. - * @param typeId The type ID of the Slice interface to test against. - * @param cb Asynchronous callback object. - * @param cookie User-defined data to associate with the invocation. - * @return The asynchronous result object for the invocation. - */ - ::Ice::AsyncResultPtr begin_ice_isA(const ::std::string& typeId, - const ::Ice::Callback_Object_ice_isAPtr& cb, - const ::Ice::LocalObjectPtr& cookie = 0) - { - return _iceI_begin_ice_isA(typeId, ::Ice::noExplicitContext, cb, cookie); - } - - /** - * Tests whether this object supports a specific Slice interface. - * @param typeId The type ID of the Slice interface to test against. - * @param context The context map for the invocation. - * @param cb Asynchronous callback object. - * @param cookie User-defined data to associate with the invocation. - * @return The asynchronous result object for the invocation. - */ - ::Ice::AsyncResultPtr begin_ice_isA(const ::std::string& typeId, - const ::Ice::Context& context, - const ::Ice::Callback_Object_ice_isAPtr& cb, - const ::Ice::LocalObjectPtr& cookie = 0) - { - return _iceI_begin_ice_isA(typeId, context, cb, cookie); - } - - /** - * Completes an invocation of begin_ice_isA. - * @param result The asynchronous result object for the invocation. - * @return True if the target object has the interface - * specified by id or derives from the interface specified by id. - */ - bool end_ice_isA(const ::Ice::AsyncResultPtr& result); - - /** - * Tests whether the target object of this proxy can be reached. - * @param context The context map for the invocation. - */ - void ice_ping(const ::Ice::Context& context = ::Ice::noExplicitContext) - { - end_ice_ping(_iceI_begin_ice_ping(context, ::IceInternal::dummyCallback, 0, true)); - } - - /** - * Tests whether the target object of this proxy can be reached. - * @param context The context map for the invocation. - * @return The asynchronous result object for the invocation. - */ - ::Ice::AsyncResultPtr begin_ice_ping(const ::Ice::Context& context = ::Ice::noExplicitContext) - { - return _iceI_begin_ice_ping(context, ::IceInternal::dummyCallback, 0); - } - - /** - * Tests whether the target object of this proxy can be reached. - * @param cb Asynchronous callback object. - * @param cookie User-defined data to associate with the invocation. - * @return The asynchronous result object for the invocation. - */ - ::Ice::AsyncResultPtr begin_ice_ping(const ::Ice::CallbackPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0) - { - return _iceI_begin_ice_ping(::Ice::noExplicitContext, cb, cookie); - } - - /** - * Tests whether the target object of this proxy can be reached. - * @param context The context map for the invocation. - * @param cb Asynchronous callback object. - * @param cookie User-defined data to associate with the invocation. - * @return The asynchronous result object for the invocation. - */ - ::Ice::AsyncResultPtr begin_ice_ping(const ::Ice::Context& context, const ::Ice::CallbackPtr& cb, - const ::Ice::LocalObjectPtr& cookie = 0) - { - return _iceI_begin_ice_ping(context, cb, cookie); - } - - /** - * Tests whether the target object of this proxy can be reached. - * @param cb Asynchronous callback object. - * @param cookie User-defined data to associate with the invocation. - * @return The asynchronous result object for the invocation. - */ - ::Ice::AsyncResultPtr begin_ice_ping(const ::Ice::Callback_Object_ice_pingPtr& cb, - const ::Ice::LocalObjectPtr& cookie = 0) - { - return _iceI_begin_ice_ping(::Ice::noExplicitContext, cb, cookie); - } - - /** - * Tests whether the target object of this proxy can be reached. - * @param context The context map for the invocation. - * @param cb Asynchronous callback object. - * @param cookie User-defined data to associate with the invocation. - * @return The asynchronous result object for the invocation. - */ - ::Ice::AsyncResultPtr begin_ice_ping(const ::Ice::Context& context, const ::Ice::Callback_Object_ice_pingPtr& cb, - const ::Ice::LocalObjectPtr& cookie = 0) - { - return _iceI_begin_ice_ping(context, cb, cookie); - } - - /** - * Completes an invocation of begin_ice_ping. - * @param result The asynchronous result object for the invocation. - */ - void end_ice_ping(const ::Ice::AsyncResultPtr& result); - - /** - * Returns the Slice type IDs of the interfaces supported by the target object of this proxy. - * @param context The context map for the invocation. - * @return The Slice type IDs of the interfaces supported by the target object, in base-to-derived - * order. The first element of the returned array is always "::Ice::Object". - */ - ::std::vector< ::std::string> ice_ids(const ::Ice::Context& context = ::Ice::noExplicitContext) - { - return end_ice_ids(_iceI_begin_ice_ids(context, ::IceInternal::dummyCallback, 0, true)); - } - - /** - * Returns the Slice type IDs of the interfaces supported by the target object of this proxy. - * @param context The context map for the invocation. - * @return The asynchronous result object for the invocation. - */ - ::Ice::AsyncResultPtr begin_ice_ids(const ::Ice::Context& context = ::Ice::noExplicitContext) - { - return _iceI_begin_ice_ids(context, ::IceInternal::dummyCallback, 0); - } - - /** - * Returns the Slice type IDs of the interfaces supported by the target object of this proxy. - * @param cb Asynchronous callback object. - * @param cookie User-defined data to associate with the invocation. - * @return The asynchronous result object for the invocation. - */ - ::Ice::AsyncResultPtr begin_ice_ids(const ::Ice::CallbackPtr& cb, - const ::Ice::LocalObjectPtr& cookie = 0) - { - return _iceI_begin_ice_ids(::Ice::noExplicitContext, cb, cookie); - } - - /** - * Returns the Slice type IDs of the interfaces supported by the target object of this proxy. - * @param context The context map for the invocation. - * @param cb Asynchronous callback object. - * @param cookie User-defined data to associate with the invocation. - * @return The asynchronous result object for the invocation. - */ - ::Ice::AsyncResultPtr begin_ice_ids(const ::Ice::Context& context, - const ::Ice::CallbackPtr& cb, - const ::Ice::LocalObjectPtr& cookie = 0) - { - return _iceI_begin_ice_ids(context, cb, cookie); - } - - /** - * Returns the Slice type IDs of the interfaces supported by the target object of this proxy. - * @param cb Asynchronous callback object. - * @param cookie User-defined data to associate with the invocation. - * @return The asynchronous result object for the invocation. - */ - ::Ice::AsyncResultPtr begin_ice_ids(const ::Ice::Callback_Object_ice_idsPtr& cb, - const ::Ice::LocalObjectPtr& cookie = 0) - { - return _iceI_begin_ice_ids(::Ice::noExplicitContext, cb, cookie); - } - - /** - * Returns the Slice type IDs of the interfaces supported by the target object of this proxy. - * @param context The context map for the invocation. - * @param cb Asynchronous callback object. - * @param cookie User-defined data to associate with the invocation. - * @return The asynchronous result object for the invocation. - */ - ::Ice::AsyncResultPtr begin_ice_ids(const ::Ice::Context& context, - const ::Ice::Callback_Object_ice_idsPtr& cb, - const ::Ice::LocalObjectPtr& cookie = 0) - { - return _iceI_begin_ice_ids(context, cb, cookie); - } - - /** - * Completes an invocation of begin_ice_ids. - * @param result The asynchronous result object for the invocation. - * @return The Slice type IDs of the interfaces supported by the target object, in base-to-derived - * order. The first element of the returned array is always "::Ice::Object". - */ - ::std::vector< ::std::string> end_ice_ids(const ::Ice::AsyncResultPtr& result); - - /** - * Returns the Slice type ID of the most-derived interface supported by the target object of this proxy. - * @param context The context map for the invocation. - * @return The Slice type ID of the most-derived interface. - */ - ::std::string ice_id(const ::Ice::Context& context = ::Ice::noExplicitContext) - { - return end_ice_id(_iceI_begin_ice_id(context, ::IceInternal::dummyCallback, 0, true)); - } - - /** - * Returns the Slice type ID of the most-derived interface supported by the target object of this proxy. - * @param context The context map for the invocation. - * @return The asynchronous result object for the invocation. - */ - ::Ice::AsyncResultPtr begin_ice_id(const ::Ice::Context& context = ::Ice::noExplicitContext) - { - return _iceI_begin_ice_id(context, ::IceInternal::dummyCallback, 0); - } - - /** - * Returns the Slice type ID of the most-derived interface supported by the target object of this proxy. - * @param cb Asynchronous callback object. - * @param cookie User-defined data to associate with the invocation. - * @return The asynchronous result object for the invocation. - */ - ::Ice::AsyncResultPtr begin_ice_id(const ::Ice::CallbackPtr& cb, - const ::Ice::LocalObjectPtr& cookie = 0) - { - return _iceI_begin_ice_id(::Ice::noExplicitContext, cb, cookie); - } - - /** - * Returns the Slice type ID of the most-derived interface supported by the target object of this proxy. - * @param context The context map for the invocation. - * @param cb Asynchronous callback object. - * @param cookie User-defined data to associate with the invocation. - * @return The asynchronous result object for the invocation. - */ - ::Ice::AsyncResultPtr begin_ice_id(const ::Ice::Context& context, - const ::Ice::CallbackPtr& cb, - const ::Ice::LocalObjectPtr& cookie = 0) - { - return _iceI_begin_ice_id(context, cb, cookie); - } - - /** - * Returns the Slice type ID of the most-derived interface supported by the target object of this proxy. - * @param cb Asynchronous callback object. - * @param cookie User-defined data to associate with the invocation. - * @return The asynchronous result object for the invocation. - */ - ::Ice::AsyncResultPtr begin_ice_id(const ::Ice::Callback_Object_ice_idPtr& cb, - const ::Ice::LocalObjectPtr& cookie = 0) - { - return _iceI_begin_ice_id(::Ice::noExplicitContext, cb, cookie); - } - - /** - * Returns the Slice type ID of the most-derived interface supported by the target object of this proxy. - * @param context The context map for the invocation. - * @param cb Asynchronous callback object. - * @param cookie User-defined data to associate with the invocation. - * @return The asynchronous result object for the invocation. - */ - ::Ice::AsyncResultPtr begin_ice_id(const ::Ice::Context& context, - const ::Ice::Callback_Object_ice_idPtr& cb, - const ::Ice::LocalObjectPtr& cookie = 0) - { - return _iceI_begin_ice_id(context, cb, cookie); - } - - /** - * Completes an invocation of begin_ice_id. - * @param result The asynchronous result object for the invocation. - * @return The Slice type ID of the most-derived interface. - */ - ::std::string end_ice_id(const ::Ice::AsyncResultPtr& result); - - /** - * Returns the Slice type ID associated with this type. - * @return The Slice type ID. - */ - static const ::std::string& ice_staticId() - { - return ::Ice::Object::ice_staticId(); - } - - /** - * Invokes an operation dynamically. - * @param operation The name of the operation to invoke. - * @param mode The operation mode (normal or idempotent). - * @param inParams An encapsulation containing the encoded in-parameters for the operation. - * @param outParams An encapsulation containing the encoded results. - * @param context The context map for the invocation. - * @return True if the operation completed successfully, in which case outParams contains - * the encoded out parameters. False if the operation raised a user exception, in which - * case outParams contains the encoded user exception. If the operation raises a run-time - * exception, it throws it directly. - */ - bool ice_invoke(const ::std::string& operation, - ::Ice::OperationMode mode, - const ::std::vector< ::Ice::Byte>& inParams, - ::std::vector< ::Ice::Byte>& outParams, - const ::Ice::Context& context = ::Ice::noExplicitContext); - - /** - * Invokes an operation dynamically. - * @param operation The name of the operation to invoke. - * @param mode The operation mode (normal or idempotent). - * @param inParams An encapsulation containing the encoded in-parameters for the operation. - * @return The asynchronous result object for the invocation. - */ - ::Ice::AsyncResultPtr begin_ice_invoke(const ::std::string& operation, - ::Ice::OperationMode mode, - const ::std::vector< ::Ice::Byte>& inParams) - { - return _iceI_begin_ice_invoke(operation, mode, inParams, ::Ice::noExplicitContext, - ::IceInternal::dummyCallback, 0); - } - - /** - * Invokes an operation dynamically. - * @param operation The name of the operation to invoke. - * @param mode The operation mode (normal or idempotent). - * @param inParams An encapsulation containing the encoded in-parameters for the operation. - * @param context The context map for the invocation. - * @return The asynchronous result object for the invocation. - */ - ::Ice::AsyncResultPtr begin_ice_invoke(const ::std::string& operation, - ::Ice::OperationMode mode, - const ::std::vector< ::Ice::Byte>& inParams, - const ::Ice::Context& context) - { - return _iceI_begin_ice_invoke(operation, mode, inParams, context, ::IceInternal::dummyCallback, 0); - } - - /** - * Invokes an operation dynamically. - * @param operation The name of the operation to invoke. - * @param mode The operation mode (normal or idempotent). - * @param inParams An encapsulation containing the encoded in-parameters for the operation. - * @param cb Asynchronous callback object. - * @param cookie User-defined data to associate with the invocation. - * @return The asynchronous result object for the invocation. - */ - ::Ice::AsyncResultPtr begin_ice_invoke(const ::std::string& operation, - ::Ice::OperationMode mode, - const ::std::vector< ::Ice::Byte>& inParams, - const ::Ice::CallbackPtr& cb, - const ::Ice::LocalObjectPtr& cookie = 0) - { - return _iceI_begin_ice_invoke(operation, mode, inParams, ::Ice::noExplicitContext, cb, cookie); - } - - /** - * Invokes an operation dynamically. - * @param operation The name of the operation to invoke. - * @param mode The operation mode (normal or idempotent). - * @param inParams An encapsulation containing the encoded in-parameters for the operation. - * @param context The context map for the invocation. - * @param cb Asynchronous callback object. - * @param cookie User-defined data to associate with the invocation. - * @return The asynchronous result object for the invocation. - */ - ::Ice::AsyncResultPtr begin_ice_invoke(const ::std::string& operation, - ::Ice::OperationMode mode, - const ::std::vector< ::Ice::Byte>& inParams, - const ::Ice::Context& context, - const ::Ice::CallbackPtr& cb, - const ::Ice::LocalObjectPtr& cookie = 0) - { - return _iceI_begin_ice_invoke(operation, mode, inParams, context, cb, cookie); - } - - /** - * Invokes an operation dynamically. - * @param operation The name of the operation to invoke. - * @param mode The operation mode (normal or idempotent). - * @param inParams An encapsulation containing the encoded in-parameters for the operation. - * @param cb Asynchronous callback object. - * @param cookie User-defined data to associate with the invocation. - * @return The asynchronous result object for the invocation. - */ - ::Ice::AsyncResultPtr begin_ice_invoke(const ::std::string& operation, - ::Ice::OperationMode mode, - const ::std::vector< ::Ice::Byte>& inParams, - const ::Ice::Callback_Object_ice_invokePtr& cb, - const ::Ice::LocalObjectPtr& cookie = 0) - { - return _iceI_begin_ice_invoke(operation, mode, inParams, ::Ice::noExplicitContext, cb, cookie); - } - - /** - * Invokes an operation dynamically. - * @param operation The name of the operation to invoke. - * @param mode The operation mode (normal or idempotent). - * @param inParams An encapsulation containing the encoded in-parameters for the operation. - * @param context The context map for the invocation. - * @param cb Asynchronous callback object. - * @param cookie User-defined data to associate with the invocation. - * @return The asynchronous result object for the invocation. - */ - ::Ice::AsyncResultPtr begin_ice_invoke(const ::std::string& operation, - ::Ice::OperationMode mode, - const ::std::vector< ::Ice::Byte>& inParams, - const ::Ice::Context& context, - const ::Ice::Callback_Object_ice_invokePtr& cb, - const ::Ice::LocalObjectPtr& cookie = 0) - { - return _iceI_begin_ice_invoke(operation, mode, inParams, context, cb, cookie); - } - - /** - * Invokes an operation dynamically. - * @param outParams An encapsulation containing the encoded results. - * @param result The asynchronous result object for the invocation. - * @return True if the operation completed successfully, in which case outParams contains - * the encoded out parameters. False if the operation raised a user exception, in which - * case outParams contains the encoded user exception. If the operation raises a run-time - * exception, it throws it directly. - */ - bool end_ice_invoke(::std::vector< ::Ice::Byte>& outParams, const ::Ice::AsyncResultPtr& result); - - /** - * Invokes an operation dynamically. - * @param operation The name of the operation to invoke. - * @param mode The operation mode (normal or idempotent). - * @param inParams An encapsulation containing the encoded in-parameters for the operation. - * @param outParams An encapsulation containing the encoded results. - * @param context The context map for the invocation. - * @return True if the operation completed successfully, in which case outParams contains - * the encoded out parameters. False if the operation raised a user exception, in which - * case outParams contains the encoded user exception. If the operation raises a run-time - * exception, it throws it directly. - */ - bool ice_invoke(const ::std::string& operation, - ::Ice::OperationMode mode, - const ::std::pair& inParams, - ::std::vector< ::Ice::Byte>& outParams, - const ::Ice::Context& context = ::Ice::noExplicitContext) - { - return end_ice_invoke(outParams, _iceI_begin_ice_invoke(operation, mode, inParams, context, - ::IceInternal::dummyCallback, 0, true)); - } - - /** - * Invokes an operation dynamically. - * @param operation The name of the operation to invoke. - * @param mode The operation mode (normal or idempotent). - * @param inParams An encapsulation containing the encoded in-parameters for the operation. - * @return The asynchronous result object for the invocation. - */ - ::Ice::AsyncResultPtr begin_ice_invoke(const ::std::string& operation, - ::Ice::OperationMode mode, - const ::std::pair& inParams) - { - return _iceI_begin_ice_invoke(operation, mode, inParams, ::Ice::noExplicitContext, - ::IceInternal::dummyCallback, 0); - } - - /** - * Invokes an operation dynamically. - * @param operation The name of the operation to invoke. - * @param mode The operation mode (normal or idempotent). - * @param inParams An encapsulation containing the encoded in-parameters for the operation. - * @param context The context map for the invocation. - * @param cookie User-defined data to associate with the invocation. - * @return The asynchronous result object for the invocation. - */ - ::Ice::AsyncResultPtr begin_ice_invoke(const ::std::string& operation, - ::Ice::OperationMode mode, - const ::std::pair& inParams, - const ::Ice::Context& context, - const ::Ice::LocalObjectPtr& cookie = 0) - { - return _iceI_begin_ice_invoke(operation, mode, inParams, context, ::IceInternal::dummyCallback, cookie); - } - - /** - * Invokes an operation dynamically. - * @param operation The name of the operation to invoke. - * @param mode The operation mode (normal or idempotent). - * @param inParams An encapsulation containing the encoded in-parameters for the operation. - * @param cb Asynchronous callback object. - * @param cookie User-defined data to associate with the invocation. - * @return The asynchronous result object for the invocation. - */ - ::Ice::AsyncResultPtr begin_ice_invoke(const ::std::string& operation, - ::Ice::OperationMode mode, - const ::std::pair& inParams, - const ::Ice::CallbackPtr& cb, - const ::Ice::LocalObjectPtr& cookie = 0) - { - return _iceI_begin_ice_invoke(operation, mode, inParams, ::Ice::noExplicitContext, cb, cookie); - } - - /** - * Invokes an operation dynamically. - * @param operation The name of the operation to invoke. - * @param mode The operation mode (normal or idempotent). - * @param inParams An encapsulation containing the encoded in-parameters for the operation. - * @param context The context map for the invocation. - * @param cb Asynchronous callback object. - * @param cookie User-defined data to associate with the invocation. - * @return The asynchronous result object for the invocation. - */ - ::Ice::AsyncResultPtr begin_ice_invoke(const ::std::string& operation, - ::Ice::OperationMode mode, - const ::std::pair& inParams, - const ::Ice::Context& context, - const ::Ice::CallbackPtr& cb, - const ::Ice::LocalObjectPtr& cookie = 0) - { - return _iceI_begin_ice_invoke(operation, mode, inParams, context, cb, cookie); - } - - /** - * Invokes an operation dynamically. - * @param operation The name of the operation to invoke. - * @param mode The operation mode (normal or idempotent). - * @param inParams An encapsulation containing the encoded in-parameters for the operation. - * @param cb Asynchronous callback object. - * @param cookie User-defined data to associate with the invocation. - * @return The asynchronous result object for the invocation. - */ - ::Ice::AsyncResultPtr begin_ice_invoke(const ::std::string& operation, - ::Ice::OperationMode mode, - const ::std::pair& inParams, - const ::Ice::Callback_Object_ice_invokePtr& cb, - const ::Ice::LocalObjectPtr& cookie = 0) - { - return _iceI_begin_ice_invoke(operation, mode, inParams, ::Ice::noExplicitContext, cb, cookie); - } - - /** - * Invokes an operation dynamically. - * @param operation The name of the operation to invoke. - * @param mode The operation mode (normal or idempotent). - * @param inParams An encapsulation containing the encoded in-parameters for the operation. - * @param context The context map for the invocation. - * @param cb Asynchronous callback object. - * @param cookie User-defined data to associate with the invocation. - * @return The asynchronous result object for the invocation. - */ - ::Ice::AsyncResultPtr begin_ice_invoke(const ::std::string& operation, - ::Ice::OperationMode mode, - const ::std::pair& inParams, - const ::Ice::Context& context, - const ::Ice::Callback_Object_ice_invokePtr& cb, - const ::Ice::LocalObjectPtr& cookie = 0) - { - return _iceI_begin_ice_invoke(operation, mode, inParams, context, cb, cookie); - } - - /// \cond INTERNAL - bool _iceI_end_ice_invoke(::std::pair&, const ::Ice::AsyncResultPtr&); - /// \endcond - - /** - * Obtains the identity embedded in this proxy. - * @return The identity of the target object. - */ - ::Ice::Identity ice_getIdentity() const; - - /** - * Obtains a proxy that is identical to this proxy, except for the identity. - * @param id The identity for the new proxy. - * @return A proxy with the new identity. - */ - ::Ice::ObjectPrx ice_identity(const ::Ice::Identity& id) const; - - /** - * Obtains the per-proxy context for this proxy. - * @return The per-proxy context. - */ - ::Ice::Context ice_getContext() const; - - /** - * Obtains a proxy that is identical to this proxy, except for the per-proxy context. - * @param context The context for the new proxy. - * @return A proxy with the new per-proxy context. - */ - ::Ice::ObjectPrx ice_context(const ::Ice::Context& context) const; - - /** - * Obtains the facet for this proxy. - * @return The facet for this proxy. If the proxy uses the default facet, the return value is the empty string. - */ - const ::std::string& ice_getFacet() const; - - /** - * Obtains a proxy that is identical to this proxy, except for the facet. - * @param facet The facet for the new proxy. - * @return A proxy with the new facet. - */ - ::Ice::ObjectPrx ice_facet(const ::std::string& facet) const; - - /** - * Obtains the adapter ID for this proxy. - * @return The adapter ID. If the proxy does not have an adapter ID, the return value is the empty string. - */ - ::std::string ice_getAdapterId() const; - - /** - * Obtains a proxy that is identical to this proxy, except for the adapter ID. - * @param id The adapter ID for the new proxy. - * @return A proxy with the new adapter ID. - */ - ::Ice::ObjectPrx ice_adapterId(const ::std::string& id) const; - - /** - * Obtains the endpoints used by this proxy. - * @return The endpoints used by this proxy. - */ - ::Ice::EndpointSeq ice_getEndpoints() const; - - /** - * Obtains a proxy that is identical to this proxy, except for the endpoints. - * @param endpoints The endpoints for the new proxy. - * @return A proxy with the new endpoints. - */ - ::Ice::ObjectPrx ice_endpoints(const ::Ice::EndpointSeq& endpoints) const; - - /** - * Obtains the locator cache timeout of this proxy. - * @return The locator cache timeout value (in seconds). - */ - ::Ice::Int ice_getLocatorCacheTimeout() const; - - /** - * Obtains a proxy that is identical to this proxy, except for the locator cache timeout. - * @param timeout The new locator cache timeout (in seconds). - * @return A proxy with the new timeout. - */ - ::Ice::ObjectPrx ice_locatorCacheTimeout(::Ice::Int timeout) const; - - /** - * Determines whether this proxy caches connections. - * @return True if this proxy caches connections, false otherwise. - */ - bool ice_isConnectionCached() const; - - /** - * Obtains a proxy that is identical to this proxy, except for connection caching. - * @param b True if the new proxy should cache connections, false otherwise. - * @return A proxy with the specified caching policy. - */ - ::Ice::ObjectPrx ice_connectionCached(bool b) const; - - /** - * Obtains the endpoint selection policy for this proxy (randomly or ordered). - * @return The endpoint selection policy. - */ - ::Ice::EndpointSelectionType ice_getEndpointSelection() const; - - /** - * Obtains a proxy that is identical to this proxy, except for the endpoint selection policy. - * @param type The new endpoint selection policy. - * @return A proxy with the specified endpoint selection policy. - */ - ::Ice::ObjectPrx ice_endpointSelection(::Ice::EndpointSelectionType type) const; - - /** - * Determines whether this proxy uses only secure endpoints. - * @return True if this proxy communicates only via secure endpoints, false otherwise. - */ - bool ice_isSecure() const; - - /** - * Obtains a proxy that is identical to this proxy, except for how it selects endpoints. - * @param b If true, only endpoints that use a secure transport are used by the new proxy. - * If false, the returned proxy uses both secure and insecure endpoints. - * @return A proxy with the specified security policy. - */ - ::Ice::ObjectPrx ice_secure(bool b) const; - - /** - * Obtains the encoding version used to marshal request parameters. - * @return The encoding version. - */ - ::Ice::EncodingVersion ice_getEncodingVersion() const; - - /** - * Obtains a proxy that is identical to this proxy, except for the encoding used to marshal - * parameters. - * @param version The encoding version to use to marshal request parameters. - * @return A proxy with the specified encoding version. - */ - ::Ice::ObjectPrx ice_encodingVersion(const ::Ice::EncodingVersion& version) const; - - /** - * Determines whether this proxy prefers secure endpoints. - * @return True if the proxy always attempts to invoke via secure endpoints before it - * attempts to use insecure endpoints, false otherwise. - */ - bool ice_isPreferSecure() const; - - /** - * Obtains a proxy that is identical to this proxy, except for its endpoint selection policy. - * @param b If true, the new proxy will use secure endpoints for invocations and only use - * insecure endpoints if an invocation cannot be made via secure endpoints. If false, the - * proxy prefers insecure endpoints to secure ones. - * @return A proxy with the specified selection policy. - */ - ::Ice::ObjectPrx ice_preferSecure(bool b) const; - - /** - * Obtains the router for this proxy. - * @return The router for the proxy. If no router is configured for the proxy, the return value - * is nil. - */ - ::Ice::RouterPrx ice_getRouter() const; - - /** - * Obtains a proxy that is identical to this proxy, except for the router. - * @param router The router for the new proxy. - * @return A proxy with the specified router. - */ - ::Ice::ObjectPrx ice_router(const ::Ice::RouterPrx& router) const; - - /** - * Obtains the locator for this proxy. - * @return The locator for this proxy. If no locator is configured, the return value is nil. - */ - ::Ice::LocatorPrx ice_getLocator() const; - - /** - * Obtains a proxy that is identical to this proxy, except for the locator. - * @param locator The locator for the new proxy. - * @return A proxy with the specified locator. - */ - ::Ice::ObjectPrx ice_locator(const ::Ice::LocatorPrx& locator) const; - - /** - * Determines whether this proxy uses collocation optimization. - * @return True if the proxy uses collocation optimization, false otherwise. - */ - bool ice_isCollocationOptimized() const; - - /** - * Obtains a proxy that is identical to this proxy, except for collocation optimization. - * @param b True if the new proxy enables collocation optimization, false otherwise. - * @return A proxy with the specified collocation optimization. - */ - ::Ice::ObjectPrx ice_collocationOptimized(bool b) const; - - /** - * Obtains the invocation timeout of this proxy. - * @return The invocation timeout value (in milliseconds). - */ - ::Ice::Int ice_getInvocationTimeout() const; - - /** - * Obtains a proxy that is identical to this proxy, except for the invocation timeout. - * @param timeout The new invocation timeout (in milliseconds). - * @return A proxy with the new timeout. - */ - ::Ice::ObjectPrx ice_invocationTimeout(::Ice::Int timeout) const; - - /** - * Obtains a proxy that is identical to this proxy, but uses twoway invocations. - * @return A proxy that uses twoway invocations. - */ - ::Ice::ObjectPrx ice_twoway() const; - - /** - * Determines whether this proxy uses twoway invocations. - * @return True if this proxy uses twoway invocations, false otherwise. - */ - bool ice_isTwoway() const; - - /** - * Obtains a proxy that is identical to this proxy, but uses oneway invocations. - * @return A proxy that uses oneway invocations. - */ - ::Ice::ObjectPrx ice_oneway() const; - - /** - * Determines whether this proxy uses oneway invocations. - * @return True if this proxy uses oneway invocations, false otherwise. - */ - bool ice_isOneway() const; - - /** - * Obtains a proxy that is identical to this proxy, but uses batch oneway invocations. - * @return A proxy that uses batch oneway invocations. - */ - ::Ice::ObjectPrx ice_batchOneway() const; - - /** - * Determines whether this proxy uses batch oneway invocations. - * @return True if this proxy uses batch oneway invocations, false otherwise. - */ - bool ice_isBatchOneway() const; - - /** - * Obtains a proxy that is identical to this proxy, but uses datagram invocations. - * @return A proxy that uses datagram invocations. - */ - ::Ice::ObjectPrx ice_datagram() const; - - /** - * Determines whether this proxy uses datagram invocations. - * @return True if this proxy uses datagram invocations, false otherwise. - */ - bool ice_isDatagram() const; - - /** - * Obtains a proxy that is identical to this proxy, but uses batch datagram invocations. - * @return A proxy that uses batch datagram invocations. - */ - ::Ice::ObjectPrx ice_batchDatagram() const; - - /** - * Determines whether this proxy uses batch datagram invocations. - * @return True if this proxy uses batch datagram invocations, false otherwise. - */ - bool ice_isBatchDatagram() const; - - /** - * Obtains a proxy that is identical to this proxy, except for its compression setting which - * overrides the compression setting from the proxy endpoints. - * @param b True enables compression for the new proxy, false disables compression. - * @return A proxy with the specified compression override setting. - */ - ::Ice::ObjectPrx ice_compress(bool b) const; - - /** - * Obtains the compression override setting of this proxy. - * @return The compression override setting. If nullopt is returned, no override is set. Otherwise, true - * if compression is enabled, false otherwise. - */ - ::IceUtil::Optional ice_getCompress() const; - - /** - * Obtains a proxy that is identical to this proxy, except for its connection timeout setting - * which overrides the timeot setting from the proxy endpoints. - * @param timeout The connection timeout override for the proxy (in milliseconds). - * @return A proxy with the specified timeout override. - */ - ::Ice::ObjectPrx ice_timeout(int timeout) const; - - /** - * Obtains the timeout override of this proxy. - * @return The timeout override. If nullopt is returned, no override is set. Otherwise, returns - * the timeout override value. - */ - ::IceUtil::Optional ice_getTimeout() const; - - /** - * Obtains a proxy that is identical to this proxy, except for its connection ID. - * @param id The connection ID for the new proxy. An empty string removes the - * connection ID. - * @return A proxy with the specified connection ID. - */ - ::Ice::ObjectPrx ice_connectionId(const ::std::string& id) const; - - /** - * Obtains the connection ID of this proxy. - * @return The connection ID. - */ - ::std::string ice_getConnectionId() const; - - /** - * Obtains a proxy that is identical to this proxy, except it's a fixed proxy bound - * the given connection. - * @param connection The fixed proxy connection. - * @return A fixed proxy bound to the given connection. - */ - ::Ice::ObjectPrx ice_fixed(const ::Ice::ConnectionPtr& connection) const; - - /** - * Determines whether this proxy is a fixed proxy. - * @return True if this proxy is a fixed proxy, false otherwise. - */ - bool ice_isFixed() const; - - /** - * Obtains the Connection for this proxy. If the proxy does not yet have an established connection, - * it first attempts to create a connection. - * @return The connection for this proxy. - */ - ::Ice::ConnectionPtr ice_getConnection() - { - return end_ice_getConnection(begin_ice_getConnection()); - } - - /** - * Obtains the Connection for this proxy. If the proxy does not yet have an established connection, - * it first attempts to create a connection. - * @return The asynchronous result object for the invocation. - */ - ::Ice::AsyncResultPtr begin_ice_getConnection() - { - return _iceI_begin_ice_getConnection(::IceInternal::dummyCallback, 0); - } - - /** - * Obtains the Connection for this proxy. If the proxy does not yet have an established connection, - * it first attempts to create a connection. - * @param cb Asynchronous callback object. - * @param cookie User-defined data to associate with the invocation. - * @return The asynchronous result object for the invocation. - */ - ::Ice::AsyncResultPtr begin_ice_getConnection(const ::Ice::CallbackPtr& cb, - const ::Ice::LocalObjectPtr& cookie = 0) - { - return _iceI_begin_ice_getConnection(cb, cookie); - } - - /** - * Obtains the Connection for this proxy. If the proxy does not yet have an established connection, - * it first attempts to create a connection. - * @param cb Asynchronous callback object. - * @param cookie User-defined data to associate with the invocation. - * @return The asynchronous result object for the invocation. - */ - ::Ice::AsyncResultPtr begin_ice_getConnection(const ::Ice::Callback_Object_ice_getConnectionPtr& cb, - const ::Ice::LocalObjectPtr& cookie = 0) - { - return _iceI_begin_ice_getConnection(cb, cookie); - } - - /** - * Completes an invocation of begin_ice_getConnection. - * @param result The asynchronous result object for the invocation. - * @return The connection for this proxy. - */ - ::Ice::ConnectionPtr end_ice_getConnection(const ::Ice::AsyncResultPtr& result); - - /** - * Returns the cached connection for this proxy. If the proxy does not yet have an established - * connection, it does not attempt to create a connection. - * - * @return The cached connection for this proxy, or nil if the proxy does not have - * an established connection. - */ - ::Ice::ConnectionPtr ice_getCachedConnection() const; - - /** - * Flushes any pending batched requests for this proxy. The call blocks until the flush is complete. - */ - void ice_flushBatchRequests() - { - return end_ice_flushBatchRequests(begin_ice_flushBatchRequests()); - } - - /** - * Flushes asynchronously any pending batched requests for this proxy. - * @return The asynchronous result object for the invocation. - */ - ::Ice::AsyncResultPtr begin_ice_flushBatchRequests() - { - return _iceI_begin_ice_flushBatchRequests(::IceInternal::dummyCallback, 0); - } - - /** - * Flushes asynchronously any pending batched requests for this proxy. - * @param cb Asynchronous callback object. - * @param cookie User-defined data to associate with the invocation. - * @return The asynchronous result object for the invocation. - */ - ::Ice::AsyncResultPtr begin_ice_flushBatchRequests(const ::Ice::CallbackPtr& cb, - const ::Ice::LocalObjectPtr& cookie = 0) - { - return _iceI_begin_ice_flushBatchRequests(cb, cookie); - } - - /** - * Flushes asynchronously any pending batched requests for this proxy. - * @param cb Asynchronous callback object. - * @param cookie User-defined data to associate with the invocation. - * @return The asynchronous result object for the invocation. - */ - ::Ice::AsyncResultPtr begin_ice_flushBatchRequests(const ::Ice::Callback_Object_ice_flushBatchRequestsPtr& cb, - const ::Ice::LocalObjectPtr& cookie = 0) - { - return _iceI_begin_ice_flushBatchRequests(cb, cookie); - } - - /** - * Completes an invocation of begin_ice_flushBatchRequests. - * @param result The asynchronous result object for the invocation. - */ - void end_ice_flushBatchRequests(const ::Ice::AsyncResultPtr& result); - - /// \cond INTERNAL - const ::IceInternal::ReferencePtr& _getReference() const { return _reference; } - - ::Ice::Int _hash() const; - - void _copyFrom(const ::Ice::ObjectPrx&); - - int _handleException(const ::Ice::Exception&, const ::IceInternal::RequestHandlerPtr&, ::Ice::OperationMode, - bool, int&); - - void _checkTwowayOnly(const ::std::string&, bool) const; - - void _end(const ::Ice::AsyncResultPtr&, const std::string&) const; - - ::IceInternal::RequestHandlerPtr _getRequestHandler(); - ::IceInternal::BatchRequestQueuePtr _getBatchRequestQueue(); - ::IceInternal::RequestHandlerPtr _setRequestHandler(const ::IceInternal::RequestHandlerPtr&); - void _updateRequestHandler(const ::IceInternal::RequestHandlerPtr&, const ::IceInternal::RequestHandlerPtr&); - - void _write(::Ice::OutputStream&) const; - /// \endcond - -protected: - - /// \cond INTERNAL - virtual Object* _newInstance() const; - /// \endcond - -private: - - ::Ice::AsyncResultPtr _iceI_begin_ice_isA(const ::std::string&, - const ::Ice::Context&, - const ::IceInternal::CallbackBasePtr&, - const ::Ice::LocalObjectPtr&, - bool = false); - - ::Ice::AsyncResultPtr _iceI_begin_ice_ping(const ::Ice::Context&, - const ::IceInternal::CallbackBasePtr&, - const ::Ice::LocalObjectPtr&, - bool = false); - - ::Ice::AsyncResultPtr _iceI_begin_ice_ids(const ::Ice::Context&, - const ::IceInternal::CallbackBasePtr&, - const ::Ice::LocalObjectPtr&, - bool = false); - - ::Ice::AsyncResultPtr _iceI_begin_ice_id(const ::Ice::Context&, - const ::IceInternal::CallbackBasePtr&, - const ::Ice::LocalObjectPtr&, - bool = false); - - ::Ice::AsyncResultPtr _iceI_begin_ice_invoke(const ::std::string&, - ::Ice::OperationMode, - const ::std::vector< ::Ice::Byte>&, - const ::Ice::Context&, - const ::IceInternal::CallbackBasePtr&, - const ::Ice::LocalObjectPtr&, - bool = false); - - ::Ice::AsyncResultPtr _iceI_begin_ice_invoke(const ::std::string&, - ::Ice::OperationMode, - const ::std::pair&, - const ::Ice::Context&, - const ::IceInternal::CallbackBasePtr&, - const ::Ice::LocalObjectPtr&, - bool = false); - - ::Ice::AsyncResultPtr _iceI_begin_ice_getConnection(const ::IceInternal::CallbackBasePtr&, - const ::Ice::LocalObjectPtr&); - - ::Ice::AsyncResultPtr _iceI_begin_ice_flushBatchRequests(const ::IceInternal::CallbackBasePtr&, - const ::Ice::LocalObjectPtr&); - - void setup(const ::IceInternal::ReferencePtr&); - friend class ::IceInternal::ProxyFactory; - - ::IceInternal::ReferencePtr _reference; - ::IceInternal::RequestHandlerPtr _requestHandler; - ::IceInternal::BatchRequestQueuePtr _batchRequestQueue; - IceUtil::Mutex _mutex; -}; - -} } - -ICE_API ::std::ostream& operator<<(::std::ostream&, const ::IceProxy::Ice::Object&); - -namespace Ice -{ - -/** - * Helper template that supplies proxy factory functions. - * \headerfile Ice/Ice.h - */ -template -class Proxy : public virtual Base -{ -public: - - /** - * Obtains a proxy that is identical to this proxy, except for the per-proxy context. - * @param context The context for the new proxy. - * @return A proxy with the new per-proxy context. - */ - IceInternal::ProxyHandle ice_context(const ::Ice::Context& context) const - { - return dynamic_cast(::IceProxy::Ice::Object::ice_context(context).get()); - } - - /** - * Obtains a proxy that is identical to this proxy, except for the adapter ID. - * @param id The adapter ID for the new proxy. - * @return A proxy with the new adapter ID. - */ - IceInternal::ProxyHandle ice_adapterId(const ::std::string& id) const - { - return dynamic_cast(::IceProxy::Ice::Object::ice_adapterId(id).get()); - } - - /** - * Obtains a proxy that is identical to this proxy, except for the endpoints. - * @param endpoints The endpoints for the new proxy. - * @return A proxy with the new endpoints. - */ - IceInternal::ProxyHandle ice_endpoints(const ::Ice::EndpointSeq& endpoints) const - { - return dynamic_cast(::IceProxy::Ice::Object::ice_endpoints(endpoints).get()); - } - - /** - * Obtains a proxy that is identical to this proxy, except for the locator cache timeout. - * @param timeout The new locator cache timeout (in seconds). - * @return A proxy with the new timeout. - */ - IceInternal::ProxyHandle ice_locatorCacheTimeout(int timeout) const - { - return dynamic_cast(::IceProxy::Ice::Object::ice_locatorCacheTimeout(timeout).get()); - } - - /** - * Obtains a proxy that is identical to this proxy, except for connection caching. - * @param b True if the new proxy should cache connections, false otherwise. - * @return A proxy with the specified caching policy. - */ - IceInternal::ProxyHandle ice_connectionCached(bool b) const - { - return dynamic_cast(::IceProxy::Ice::Object::ice_connectionCached(b).get()); - } - - /** - * Obtains a proxy that is identical to this proxy, except for the endpoint selection policy. - * @param type The new endpoint selection policy. - * @return A proxy with the specified endpoint selection policy. - */ - IceInternal::ProxyHandle ice_endpointSelection(::Ice::EndpointSelectionType type) const - { - return dynamic_cast(::IceProxy::Ice::Object::ice_endpointSelection(type).get()); - } - - /** - * Obtains a proxy that is identical to this proxy, except for how it selects endpoints. - * @param b If true, only endpoints that use a secure transport are used by the new proxy. - * If false, the returned proxy uses both secure and insecure endpoints. - * @return A proxy with the specified security policy. - */ - IceInternal::ProxyHandle ice_secure(bool b) const - { - return dynamic_cast(::IceProxy::Ice::Object::ice_secure(b).get()); - } - - /** - * Obtains a proxy that is identical to this proxy, except for its endpoint selection policy. - * @param b If true, the new proxy will use secure endpoints for invocations and only use - * insecure endpoints if an invocation cannot be made via secure endpoints. If false, the - * proxy prefers insecure endpoints to secure ones. - * @return A proxy with the specified selection policy. - */ - IceInternal::ProxyHandle ice_preferSecure(bool b) const - { - return dynamic_cast(::IceProxy::Ice::Object::ice_preferSecure(b).get()); - } - - /** - * Obtains a proxy that is identical to this proxy, except for the router. - * @param router The router for the new proxy. - * @return A proxy with the specified router. - */ - IceInternal::ProxyHandle ice_router(const ::Ice::RouterPrx& router) const - { - return dynamic_cast(::IceProxy::Ice::Object::ice_router(router).get()); - } - - /** - * Obtains a proxy that is identical to this proxy, except for the locator. - * @param locator The locator for the new proxy. - * @return A proxy with the specified locator. - */ - IceInternal::ProxyHandle ice_locator(const ::Ice::LocatorPrx& locator) const - { - return dynamic_cast(::IceProxy::Ice::Object::ice_locator(locator).get()); - } - - /** - * Obtains a proxy that is identical to this proxy, except for collocation optimization. - * @param b True if the new proxy enables collocation optimization, false otherwise. - * @return A proxy with the specified collocation optimization. - */ - IceInternal::ProxyHandle ice_collocationOptimized(bool b) const - { - return dynamic_cast(::IceProxy::Ice::Object::ice_collocationOptimized(b).get()); - } - - /** - * Obtains a proxy that is identical to this proxy, except for the invocation timeout. - * @param timeout The new invocation timeout (in milliseconds). - * @return A proxy with the new timeout. - */ - IceInternal::ProxyHandle ice_invocationTimeout(int timeout) const - { - return dynamic_cast(::IceProxy::Ice::Object::ice_invocationTimeout(timeout).get()); - } - - /** - * Obtains a proxy that is identical to this proxy, but uses twoway invocations. - * @return A proxy that uses twoway invocations. - */ - IceInternal::ProxyHandle ice_twoway() const - { - return dynamic_cast(::IceProxy::Ice::Object::ice_twoway().get()); - } - - /** - * Obtains a proxy that is identical to this proxy, but uses oneway invocations. - * @return A proxy that uses oneway invocations. - */ - IceInternal::ProxyHandle ice_oneway() const - { - return dynamic_cast(::IceProxy::Ice::Object::ice_oneway().get()); - } - - /** - * Obtains a proxy that is identical to this proxy, but uses batch oneway invocations. - * @return A proxy that uses batch oneway invocations. - */ - IceInternal::ProxyHandle ice_batchOneway() const - { - return dynamic_cast(::IceProxy::Ice::Object::ice_batchOneway().get()); - } - - /** - * Obtains a proxy that is identical to this proxy, but uses datagram invocations. - * @return A proxy that uses datagram invocations. - */ - IceInternal::ProxyHandle ice_datagram() const - { - return dynamic_cast(::IceProxy::Ice::Object::ice_datagram().get()); - } - - /** - * Obtains a proxy that is identical to this proxy, but uses batch datagram invocations. - * @return A proxy that uses batch datagram invocations. - */ - IceInternal::ProxyHandle ice_batchDatagram() const - { - return dynamic_cast(::IceProxy::Ice::Object::ice_batchDatagram().get()); - } - - /** - * Obtains a proxy that is identical to this proxy, except for its compression setting which - * overrides the compression setting from the proxy endpoints. - * @param b True enables compression for the new proxy, false disables compression. - * @return A proxy with the specified compression override setting. - */ - IceInternal::ProxyHandle ice_compress(bool b) const - { - return dynamic_cast(::IceProxy::Ice::Object::ice_compress(b).get()); - } - - /** - * Obtains a proxy that is identical to this proxy, except for its connection timeout setting - * which overrides the timeot setting from the proxy endpoints. - * @param timeout The connection timeout override for the proxy (in milliseconds). - * @return A proxy with the specified timeout override. - */ - IceInternal::ProxyHandle ice_timeout(int timeout) const - { - return dynamic_cast(::IceProxy::Ice::Object::ice_timeout(timeout).get()); - } - - /** - * Obtains a proxy that is identical to this proxy, except for its connection ID. - * @param id The connection ID for the new proxy. An empty string removes the - * connection ID. - * @return A proxy with the specified connection ID. - */ - IceInternal::ProxyHandle ice_connectionId(const ::std::string& id) const - { - return dynamic_cast(::IceProxy::Ice::Object::ice_connectionId(id).get()); - } - - /** - * Obtains a proxy that is identical to this proxy, except it's a fixed proxy bound - * the given connection. - * @param connection The fixed proxy connection. - * @return A fixed proxy bound to the given connection. - */ - IceInternal::ProxyHandle ice_fixed(const ::Ice::ConnectionPtr& connection) const - { - return dynamic_cast(::IceProxy::Ice::Object::ice_fixed(connection).get()); - } - - /** - * Obtains a proxy that is identical to this proxy, except for the encoding used to marshal - * parameters. - * @param version The encoding version to use to marshal request parameters. - * @return A proxy with the specified encoding version. - */ - IceInternal::ProxyHandle ice_encodingVersion(const ::Ice::EncodingVersion& version) const - { - return dynamic_cast(::IceProxy::Ice::Object::ice_encodingVersion(version).get()); - } - -protected: - - /// \cond INTERNAL - virtual ::IceProxy::Ice::Object* _newInstance() const = 0; - /// \endcond -}; - -/** - * Compares the object identities of two proxies. - * @param lhs A proxy. - * @param rhs A proxy. - * @return True if the identity in lhs compares less than the identity in rhs, false otherwise. - */ -ICE_API bool proxyIdentityLess(const ObjectPrx& lhs, const ObjectPrx& rhs); - -/** - * Compares the object identities of two proxies. - * @param lhs A proxy. - * @param rhs A proxy. - * @return True if the identity in lhs compares equal to the identity in rhs, false otherwise. - */ -ICE_API bool proxyIdentityEqual(const ObjectPrx& lhs, const ObjectPrx& rhs); - -/** - * Compares the object identities and facets of two proxies. - * @param lhs A proxy. - * @param rhs A proxy. - * @return True if the identity and facet in lhs compare less than the identity and facet - * in rhs, false otherwise. - */ -ICE_API bool proxyIdentityAndFacetLess(const ObjectPrx& lhs, const ObjectPrx& rhs); - -/** - * Compares the object identities and facets of two proxies. - * @param lhs A proxy. - * @param rhs A proxy. - * @return True if the identity and facet in lhs compare equal to the identity and facet - * in rhs, false otherwise. - */ -ICE_API bool proxyIdentityAndFacetEqual(const ObjectPrx& lhs, const ObjectPrx& rhs); - -/** - * A functor that compares the object identities of two proxies. Evaluates true if the identity in lhs - * compares less than the identity in rhs, false otherwise. - * \headerfile Ice/Ice.h - */ -struct ProxyIdentityLess -{ - bool operator()(const ObjectPrx& lhs, const ObjectPrx& rhs) const - { - return proxyIdentityLess(lhs, rhs); - } -}; - -/** - * A functor that compares the object identities of two proxies. Evaluates true if the identity in lhs - * compares equal to the identity in rhs, false otherwise. - * \headerfile Ice/Ice.h - */ -struct ProxyIdentityEqual -{ - bool operator()(const ObjectPrx& lhs, const ObjectPrx& rhs) const - { - return proxyIdentityEqual(lhs, rhs); - } -}; - -/** - * A functor that compares the object identities and facets of two proxies. Evaluates true if the identity - * and facet in lhs compare less than the identity and facet in rhs, false otherwise. - * \headerfile Ice/Ice.h - */ -struct ProxyIdentityAndFacetLess -{ - bool operator()(const ObjectPrx& lhs, const ObjectPrx& rhs) const - { - return proxyIdentityAndFacetLess(lhs, rhs); - } -}; - -/** - * A functor that compares the object identities and facets of two proxies. Evaluates true if the identity - * and facet in lhs compare equal to the identity and facet in rhs, false otherwise. - * \headerfile Ice/Ice.h - */ -struct ProxyIdentityAndFacetEqual -{ - bool operator()(const ObjectPrx& lhs, const ObjectPrx& rhs) const - { - return proxyIdentityAndFacetEqual(lhs, rhs); - } -}; - -} - -namespace IceInternal -{ - -// -// Inline comparison functions for proxies -// -template -inline bool operator==(const ProxyHandle& lhs, const ProxyHandle& rhs) -{ - ::IceProxy::Ice::Object* l = lhs._upCast(); - ::IceProxy::Ice::Object* r = rhs._upCast(); - if(l && r) - { - return *l == *r; - } - else - { - return !l && !r; - } -} - -template -inline bool operator!=(const ProxyHandle& lhs, const ProxyHandle& rhs) -{ - return !operator==(lhs, rhs); -} - -template -inline bool operator<(const ProxyHandle& lhs, const ProxyHandle& rhs) -{ - ::IceProxy::Ice::Object* l = lhs._upCast(); - ::IceProxy::Ice::Object* r = rhs._upCast(); - if(l && r) - { - return *l < *r; - } - else - { - return !l && r; - } -} - -template -inline bool operator<=(const ProxyHandle& lhs, const ProxyHandle& rhs) -{ - return lhs < rhs || lhs == rhs; -} - -template -inline bool operator>(const ProxyHandle& lhs, const ProxyHandle& rhs) -{ - return !(lhs < rhs || lhs == rhs); -} - -template -inline bool operator>=(const ProxyHandle& lhs, const ProxyHandle& rhs) -{ - return !(lhs < rhs); -} - -// -// checkedCast and uncheckedCast functions without facet: -// -template P -checkedCastImpl(const ::Ice::ObjectPrx& b, const ::Ice::Context& context) -{ - P d = 0; - if(b.get()) - { - typedef typename P::element_type T; - - if(b->ice_isA(T::ice_staticId(), context)) - { - d = new T; - d->_copyFrom(b); - } - } - return d; -} - -template P -uncheckedCastImpl(const ::Ice::ObjectPrx& b) -{ - P d = 0; - if(b) - { - typedef typename P::element_type T; - - d = dynamic_cast(b.get()); - if(!d) - { - d = new T; - d->_copyFrom(b); - } - } - return d; -} - -// -// checkedCast and uncheckedCast with facet: -// - -// -// Helper with type ID. -// -ICE_API ::Ice::ObjectPrx checkedCastImpl(const ::Ice::ObjectPrx&, const std::string&, const std::string&, - const ::Ice::Context&); - -// -// Specializations for P = ::Ice::ObjectPrx -// We have to use inline functions for broken compilers such as VC7. -// - -template<> inline ::Ice::ObjectPrx -checkedCastImpl< ::Ice::ObjectPrx>(const ::Ice::ObjectPrx& b, const std::string& f, const ::Ice::Context& context) -{ - return checkedCastImpl(b, f, "::Ice::Object", context); -} - -template<> inline ::Ice::ObjectPrx -uncheckedCastImpl< ::Ice::ObjectPrx>(const ::Ice::ObjectPrx& b, const std::string& f) -{ - ::Ice::ObjectPrx d = 0; - if(b) - { - d = b->ice_facet(f); - } - return d; -} - -template P -checkedCastImpl(const ::Ice::ObjectPrx& b, const std::string& f, const ::Ice::Context& context) -{ - P d = 0; - - typedef typename P::element_type T; - ::Ice::ObjectPrx bb = checkedCastImpl(b, f, T::ice_staticId(), context); - - if(bb) - { - d = new T; - d->_copyFrom(bb); - } - return d; -} - -template P -uncheckedCastImpl(const ::Ice::ObjectPrx& b, const std::string& f) -{ - P d = 0; - if(b) - { - typedef typename P::element_type T; - - ::Ice::ObjectPrx bb = b->ice_facet(f); - d = new T; - d->_copyFrom(bb); - } - return d; -} -} - -// -// checkedCast and uncheckedCast functions provided in the Ice namespace -// -namespace Ice -{ - -/** - * Downcasts a proxy after confirming the target object's type via a remote invocation. - * @param b The target proxy. - * @param context The context map for the invocation. - * @return A proxy with the requested type, or nil if the target proxy is nil or the target - * object does not support the requested type. - */ -template inline P -checkedCast(const ::IceInternal::ProxyHandle& b, const ::Ice::Context& context = ::Ice::noExplicitContext) -{ - Y* tag = 0; - return ::IceInternal::checkedCastHelper(b, tag, context); -} - -/** - * Downcasts a proxy without confirming the target object's type via a remote invocation. - * @param b The target proxy. - * @return A proxy with the requested type. - */ -template inline P -uncheckedCast(const ::IceInternal::ProxyHandle& b) -{ - Y* tag = 0; - return ::IceInternal::uncheckedCastHelper(b, tag); -} - -/** - * Downcasts a proxy after confirming the target object's type via a remote invocation. - * @param b The target proxy. - * @param f A facet name. - * @param context The context map for the invocation. - * @return A proxy with the requested type and facet, or nil if the target proxy is nil or the target - * object does not support the requested type. - */ -template inline P -checkedCast(const ::Ice::ObjectPrx& b, const std::string& f, const ::Ice::Context& context = ::Ice::noExplicitContext) -{ - return ::IceInternal::checkedCastImpl

(b, f, context); -} - -/** - * Downcasts a proxy without confirming the target object's type via a remote invocation. - * @param b The target proxy. - * @param f A facet name. - * @return A proxy with the requested type and facet. - */ -template inline P -uncheckedCast(const ::Ice::ObjectPrx& b, const std::string& f) -{ - return ::IceInternal::uncheckedCastImpl

(b, f); -} - -} - -namespace IceInternal -{ - -// -// Base template for operation callbacks. -// -template -class CallbackNC : public virtual CallbackBase -{ -public: - - typedef T callback_type; - - typedef IceUtil::Handle TPtr; - - typedef void (T::*Exception)(const ::Ice::Exception&); - typedef void (T::*Sent)(bool); - - CallbackNC(const TPtr& instance, Exception excb, Sent sentcb) : _callback(instance), _exception(excb), _sent(sentcb) - { - } - - virtual CallbackBasePtr verify(const ::Ice::LocalObjectPtr& cookie) - { - if(cookie != 0) // Makes sure begin_ was called without a cookie - { - throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, "cookie specified for callback without cookie"); - } - return this; - } - - virtual void sent(const ::Ice::AsyncResultPtr& result) const - { - if(_sent) - { - (_callback.get()->*_sent)(result->sentSynchronously()); - } - } - - virtual bool hasSentCallback() const - { - return _sent != 0; - } - -protected: - - void exception(const ::Ice::AsyncResultPtr&, const ::Ice::Exception& ex) const - { - if(_exception) - { - (_callback.get()->*_exception)(ex); - } - } - - TPtr _callback; - -private: - - Exception _exception; - Sent _sent; -}; - -template -class Callback : public virtual CallbackBase -{ -public: - - typedef T callback_type; - typedef CT cookie_type; - - typedef IceUtil::Handle TPtr; - - typedef void (T::*Exception)(const ::Ice::Exception&, const CT&); - typedef void (T::*Sent)(bool, const CT&); - - Callback(const TPtr& instance, Exception excb, Sent sentcb) : _callback(instance), _exception(excb), _sent(sentcb) - { - } - - virtual CallbackBasePtr verify(const ::Ice::LocalObjectPtr& cookie) - { - if(cookie && !CT::dynamicCast(cookie)) - { - throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, "unexpected cookie type"); - } - return this; - } - - virtual void sent(const ::Ice::AsyncResultPtr& result) const - { - if(_sent) - { - (_callback.get()->*_sent)(result->sentSynchronously(), CT::dynamicCast(result->getCookie())); - } - } - - virtual bool hasSentCallback() const - { - return _sent != 0; - } - -protected: - - void exception(const ::Ice::AsyncResultPtr& result, const ::Ice::Exception& ex) const - { - if(_exception) - { - (_callback.get()->*_exception)(ex, CT::dynamicCast(result->getCookie())); - } - } - - TPtr _callback; - -private: - - Exception _exception; - Sent _sent; -}; - -// -// Base class for twoway operation callbacks. -// -template -class TwowayCallbackNC : public CallbackNC -{ -public: - - typedef IceUtil::Handle TPtr; - - typedef void (T::*Exception)(const ::Ice::Exception&); - typedef void (T::*Sent)(bool); - - TwowayCallbackNC(const TPtr& instance, bool cb, Exception excb, Sent sentcb) : CallbackNC(instance, excb, sentcb) - { - CallbackBase::checkCallback(instance, cb || excb != 0); - } -}; - -template -class TwowayCallback : public Callback -{ -public: - - typedef IceUtil::Handle TPtr; - - typedef void (T::*Exception)(const ::Ice::Exception&, const CT&); - typedef void (T::*Sent)(bool, const CT&); - - TwowayCallback(const TPtr& instance, bool cb, Exception excb, Sent sentcb) : Callback(instance, excb, sentcb) - { - CallbackBase::checkCallback(instance, cb || excb != 0); - } -}; - -// -// Base template class for oneway operations callbacks. -// -template -class OnewayCallbackNC : public CallbackNC -{ -public: - - typedef IceUtil::Handle TPtr; - - typedef void (T::*Exception)(const ::Ice::Exception&); - typedef void (T::*Sent)(bool); - typedef void (T::*Response)(); - - OnewayCallbackNC(const TPtr& instance, Response cb, Exception excb, Sent sentcb) : - CallbackNC(instance, excb, sentcb), _response(cb) - { - CallbackBase::checkCallback(instance, cb != 0 || excb != 0); - } - - virtual void completed(const ::Ice::AsyncResultPtr& result) const - { - try - { - result->getProxy()->_end(result, result->getOperation()); - } - catch(const ::Ice::Exception& ex) - { - CallbackNC::exception(result, ex); - return; - } - if(_response) - { - (CallbackNC::_callback.get()->*_response)(); - } - } - -private: - - Response _response; -}; - -template -class OnewayCallback : public Callback -{ -public: - - typedef IceUtil::Handle TPtr; - - typedef void (T::*Exception)(const ::Ice::Exception&, const CT&); - typedef void (T::*Sent)(bool, const CT&); - typedef void (T::*Response)(const CT&); - - OnewayCallback(const TPtr& instance, Response cb, Exception excb, Sent sentcb) : - Callback(instance, excb, sentcb), _response(cb) - { - CallbackBase::checkCallback(instance, cb != 0 || excb != 0); - } - - virtual void completed(const ::Ice::AsyncResultPtr& result) const - { - try - { - result->getProxy()->_end(result, result->getOperation()); - } - catch(const ::Ice::Exception& ex) - { - Callback::exception(result, ex); - return; - } - if(_response) - { - (Callback::_callback.get()->*_response)(CT::dynamicCast(result->getCookie())); - } - } - -private: - - Response _response; -}; - -} - -namespace Ice -{ - -/** - * Type-safe asynchronous callback wrapper class used for calls to - * IceProxy::Ice::Object::begin_ice_isA. - * Create a wrapper instance by calling ::Ice::newCallback_Object_ice_isA. - * \headerfile Ice/Ice.h - */ -template -class CallbackNC_Object_ice_isA : public Callback_Object_ice_isA_Base, public ::IceInternal::TwowayCallbackNC -{ -public: - - typedef IceUtil::Handle TPtr; - - typedef void (T::*Exception)(const ::Ice::Exception&); - typedef void (T::*Sent)(bool); - typedef void (T::*Response)(bool); - - CallbackNC_Object_ice_isA(const TPtr& instance, Response cb, Exception excb, Sent sentcb) : - ::IceInternal::TwowayCallbackNC(instance, cb != 0, excb, sentcb), _response(cb) - { - } - - /// \cond INTERNAL - virtual void completed(const ::Ice::AsyncResultPtr& result) const - { - bool ret; - try - { - ret = result->getProxy()->end_ice_isA(result); - } - catch(const ::Ice::Exception& ex) - { - ::IceInternal::CallbackNC::exception(result, ex); - return; - } - if(_response) - { - (::IceInternal::CallbackNC::_callback.get()->*_response)(ret); - } - } - /// \endcond - -private: - - Response _response; -}; - -/** - * Type-safe asynchronous callback wrapper class with cookie support used for calls to - * IceProxy::Ice::Object::begin_ice_isA. - * Create a wrapper instance by calling ::Ice::newCallback_Object_ice_isA. - * \headerfile Ice/Ice.h - */ -template -class Callback_Object_ice_isA : public Callback_Object_ice_isA_Base, public ::IceInternal::TwowayCallback -{ -public: - - typedef IceUtil::Handle TPtr; - - typedef void (T::*Exception)(const ::Ice::Exception&, const CT&); - typedef void (T::*Sent)(bool, const CT&); - typedef void (T::*Response)(bool, const CT&); - - Callback_Object_ice_isA(const TPtr& instance, Response cb, Exception excb, Sent sentcb) : - ::IceInternal::TwowayCallback(instance, cb != 0, excb, sentcb), _response(cb) - { - } - - /// \cond INTERNAL - virtual void completed(const ::Ice::AsyncResultPtr& result) const - { - bool ret; - try - { - ret = result->getProxy()->end_ice_isA(result); - } - catch(const ::Ice::Exception& ex) - { - ::IceInternal::Callback::exception(result, ex); - return; - } - if(_response) - { - (::IceInternal::Callback::_callback.get()->*_response)(ret, - CT::dynamicCast(result->getCookie())); - } - } - /// \endcond - -private: - - Response _response; -}; - -/** - * Type-safe asynchronous callback wrapper class used for calls to - * IceProxy::Ice::Object::begin_ice_ping. - * Create a wrapper instance by calling ::Ice::newCallback_Object_ice_ping. - * \headerfile Ice/Ice.h - */ -template -class CallbackNC_Object_ice_ping : public Callback_Object_ice_ping_Base, public ::IceInternal::OnewayCallbackNC -{ -public: - - typedef IceUtil::Handle TPtr; - - typedef void (T::*Exception)(const ::Ice::Exception&); - typedef void (T::*Sent)(bool); - typedef void (T::*Response)(); - - CallbackNC_Object_ice_ping(const TPtr& instance, Response cb, Exception excb, Sent sentcb) : - ::IceInternal::OnewayCallbackNC(instance, cb, excb, sentcb) - { - } -}; - -/** - * Type-safe asynchronous callback wrapper class with cookie support used for calls to - * IceProxy::Ice::Object::begin_ice_ping. - * Create a wrapper instance by calling ::Ice::newCallback_Object_ice_ping. - * \headerfile Ice/Ice.h - */ -template -class Callback_Object_ice_ping : public Callback_Object_ice_ping_Base, public ::IceInternal::OnewayCallback -{ -public: - - typedef IceUtil::Handle TPtr; - - typedef void (T::*Exception)(const ::Ice::Exception&, const CT&); - typedef void (T::*Sent)(bool, const CT&); - typedef void (T::*Response)(const CT&); - - Callback_Object_ice_ping(const TPtr& instance, Response cb, Exception excb, Sent sentcb) : - ::IceInternal::OnewayCallback(instance, cb, excb, sentcb) - { - } -}; - -/** - * Type-safe asynchronous callback wrapper class used for calls to - * IceProxy::Ice::Object::begin_ice_ids. - * Create a wrapper instance by calling ::Ice::newCallback_Object_ice_ids. - * \headerfile Ice/Ice.h - */ -template -class CallbackNC_Object_ice_ids : public Callback_Object_ice_ids_Base, public ::IceInternal::TwowayCallbackNC -{ -public: - - typedef IceUtil::Handle TPtr; - - typedef void (T::*Exception)(const ::Ice::Exception&); - typedef void (T::*Sent)(bool); - typedef void (T::*Response)(const ::std::vector< ::std::string>&); - - CallbackNC_Object_ice_ids(const TPtr& instance, Response cb, Exception excb, Sent sentcb) : - ::IceInternal::TwowayCallbackNC(instance, cb != 0, excb, sentcb), _response(cb) - { - } - - /// \cond INTERNAL - virtual void completed(const ::Ice::AsyncResultPtr& result) const - { - ::std::vector< ::std::string> ret; - try - { - ret = result->getProxy()->end_ice_ids(result); - } - catch(const ::Ice::Exception& ex) - { - ::IceInternal::CallbackNC::exception(result, ex); - return; - } - if(_response) - { - (::IceInternal::CallbackNC::_callback.get()->*_response)(ret); - } - } - /// \endcond - -private: - - Response _response; -}; - -/** - * Type-safe asynchronous callback wrapper class with cookie support used for calls to - * IceProxy::Ice::Object::begin_ice_ids. - * Create a wrapper instance by calling ::Ice::newCallback_Object_ice_ids. - * \headerfile Ice/Ice.h - */ -template -class Callback_Object_ice_ids : public Callback_Object_ice_ids_Base, public ::IceInternal::TwowayCallback -{ -public: - - typedef IceUtil::Handle TPtr; - - typedef void (T::*Exception)(const ::Ice::Exception&, const CT&); - typedef void (T::*Sent)(bool, const CT&); - typedef void (T::*Response)(const ::std::vector< ::std::string>&, const CT&); - - Callback_Object_ice_ids(const TPtr& instance, Response cb, Exception excb, Sent sentcb) : - ::IceInternal::TwowayCallback(instance, cb != 0, excb, sentcb), _response(cb) - { - } - - /// \cond INTERNAL - virtual void completed(const ::Ice::AsyncResultPtr& result) const - { - ::std::vector< ::std::string> ret; - try - { - ret = result->getProxy()->end_ice_ids(result); - } - catch(const ::Ice::Exception& ex) - { - ::IceInternal::Callback::exception(result, ex); - return; - } - if(_response) - { - (::IceInternal::Callback::_callback.get()->*_response)(ret, - CT::dynamicCast(result->getCookie())); - } - } - /// \endcond - -private: - - Response _response; -}; - -/** - * Type-safe asynchronous callback wrapper class used for calls to - * IceProxy::Ice::Object::begin_ice_id. - * Create a wrapper instance by calling ::Ice::newCallback_Object_ice_id. - * \headerfile Ice/Ice.h - */ -template -class CallbackNC_Object_ice_id : public Callback_Object_ice_id_Base, public ::IceInternal::TwowayCallbackNC -{ -public: - - typedef IceUtil::Handle TPtr; - - typedef void (T::*Exception)(const ::Ice::Exception&); - typedef void (T::*Sent)(bool); - typedef void (T::*Response)(const ::std::string&); - - CallbackNC_Object_ice_id(const TPtr& instance, Response cb, Exception excb, Sent sentcb) : - ::IceInternal::TwowayCallbackNC(instance, cb != 0, excb, sentcb), _response(cb) - { - } - - /// \cond INTERNAL - virtual void completed(const ::Ice::AsyncResultPtr& result) const - { - ::std::string ret; - try - { - ret = result->getProxy()->end_ice_id(result); - } - catch(const ::Ice::Exception& ex) - { - ::IceInternal::CallbackNC::exception(result, ex); - return; - } - if(_response) - { - (::IceInternal::CallbackNC::_callback.get()->*_response)(ret); - } - } - /// \endcond - -private: - - Response _response; -}; - -/** - * Type-safe asynchronous callback wrapper class with cookie support used for calls to - * IceProxy::Ice::Object::begin_ice_id. - * Create a wrapper instance by calling ::Ice::newCallback_Object_ice_id. - * \headerfile Ice/Ice.h - */ -template -class Callback_Object_ice_id : public Callback_Object_ice_id_Base, public ::IceInternal::TwowayCallback -{ -public: - - typedef IceUtil::Handle TPtr; - - typedef void (T::*Exception)(const ::Ice::Exception&, const CT&); - typedef void (T::*Sent)(bool, const CT&); - typedef void (T::*Response)(const ::std::string&, const CT&); - - Callback_Object_ice_id(const TPtr& instance, Response cb, Exception excb, Sent sentcb) : - ::IceInternal::TwowayCallback(instance, cb != 0, excb, sentcb), _response(cb) - { - } - - /// \cond INTERNAL - virtual void completed(const ::Ice::AsyncResultPtr& result) const - { - ::std::string ret; - try - { - ret = result->getProxy()->end_ice_id(result); - } - catch(const ::Ice::Exception& ex) - { - ::IceInternal::Callback::exception(result, ex); - return; - } - if(_response) - { - (::IceInternal::Callback::_callback.get()->*_response)(ret, - CT::dynamicCast(result->getCookie())); - } - } - /// \endcond - -private: - - Response _response; -}; - -/** - * Type-safe asynchronous callback wrapper class used for calls to - * IceProxy::Ice::Object::begin_ice_invoke. - * Create a wrapper instance by calling ::Ice::newCallback_Object_ice_invoke. - * \headerfile Ice/Ice.h - */ -template -class CallbackNC_Object_ice_invoke : public Callback_Object_ice_invoke_Base, public ::IceInternal::TwowayCallbackNC -{ -public: - - typedef IceUtil::Handle TPtr; - - typedef void (T::*Exception)(const ::Ice::Exception&); - typedef void (T::*Sent)(bool); - typedef void (T::*Response)(bool, const std::vector< ::Ice::Byte>&); - typedef void (T::*ResponseArray)(bool, const std::pair&); - - CallbackNC_Object_ice_invoke(const TPtr& instance, Response cb, Exception excb, Sent sentcb) : - ::IceInternal::TwowayCallbackNC(instance, cb != 0, excb, sentcb), _response(cb), _responseArray(0) - { - } - - CallbackNC_Object_ice_invoke(const TPtr& instance, ResponseArray cb, Exception excb, Sent sentcb) : - ::IceInternal::TwowayCallbackNC(instance, cb != 0, excb, sentcb), _response(0), _responseArray(cb) - { - } - - /// \cond INTERNAL - virtual void completed(const ::Ice::AsyncResultPtr& result) const - { - if(_response) - { - bool ok; - std::vector< ::Ice::Byte> outParams; - try - { - ok = result->getProxy()->end_ice_invoke(outParams, result); - } - catch(const ::Ice::Exception& ex) - { - ::IceInternal::CallbackNC::exception(result, ex); - return; - } - (::IceInternal::CallbackNC::_callback.get()->*_response)(ok, outParams); - } - else - { - bool ok; - std::pair outParams; - try - { - ok = result->getProxy()->_iceI_end_ice_invoke(outParams, result); - } - catch(const ::Ice::Exception& ex) - { - ::IceInternal::CallbackNC::exception(result, ex); - return; - } - if(_responseArray) - { - (::IceInternal::CallbackNC::_callback.get()->*_responseArray)(ok, outParams); - } - } - } - /// \endcond - -private: - - Response _response; - ResponseArray _responseArray; -}; - -/** - * Type-safe asynchronous callback wrapper class with cookie support used for calls to - * IceProxy::Ice::Object::begin_ice_invoke. - * Create a wrapper instance by calling ::Ice::newCallback_Object_ice_invoke. - * \headerfile Ice/Ice.h - */ -template -class Callback_Object_ice_invoke : public Callback_Object_ice_invoke_Base, public ::IceInternal::TwowayCallback -{ -public: - - typedef IceUtil::Handle TPtr; - - typedef void (T::*Exception)(const ::Ice::Exception&, const CT&); - typedef void (T::*Sent)(bool, const CT&); - typedef void (T::*Response)(bool, const std::vector< ::Ice::Byte>&, const CT&); - typedef void (T::*ResponseArray)(bool, const std::pair&, const CT&); - - Callback_Object_ice_invoke(const TPtr& instance, Response cb, Exception excb, Sent sentcb) : - ::IceInternal::TwowayCallback(instance, cb != 0, excb, sentcb), _response(cb), _responseArray(0) - { - } - - Callback_Object_ice_invoke(const TPtr& instance, ResponseArray cb, Exception excb, Sent sentcb) : - ::IceInternal::TwowayCallback(instance, cb != 0, excb, sentcb), _response(0), _responseArray(cb) - { - } - - /// \cond INTERNAL - virtual void completed(const ::Ice::AsyncResultPtr& result) const - { - if(_response) - { - bool ok; - std::vector< ::Ice::Byte> outParams; - try - { - ok = result->getProxy()->end_ice_invoke(outParams, result); - } - catch(const ::Ice::Exception& ex) - { - ::IceInternal::Callback::exception(result, ex); - return; - } - (::IceInternal::Callback::_callback.get()->*_response)(ok, - outParams, - CT::dynamicCast(result->getCookie())); - } - else - { - bool ok; - std::pair outParams; - try - { - ok = result->getProxy()->_iceI_end_ice_invoke(outParams, result); - } - catch(const ::Ice::Exception& ex) - { - ::IceInternal::Callback::exception(result, ex); - return; - } - if(_responseArray) - { - (::IceInternal::Callback::_callback.get()->*_responseArray)(ok, - outParams, - CT::dynamicCast( - result->getCookie())); - } - } - } - /// \endcond - -private: - - Response _response; - ResponseArray _responseArray; -}; - -/** - * Type-safe asynchronous callback wrapper class used for calls to - * IceProxy::Ice::Object::begin_ice_getConnection. - * Create a wrapper instance by calling ::Ice::newCallback_Object_ice_getConnection. - * \headerfile Ice/Ice.h - */ -template -class CallbackNC_Object_ice_getConnection : public Callback_Object_ice_getConnection_Base, - public ::IceInternal::CallbackNC -{ -public: - - typedef IceUtil::Handle TPtr; - - typedef void (T::*Response)(const ::Ice::ConnectionPtr&); - typedef void (T::*Exception)(const ::Ice::Exception&); - typedef void (T::*Sent)(bool); - - CallbackNC_Object_ice_getConnection(const TPtr& instance, Response cb, Exception excb, Sent sentcb) : - ::IceInternal::CallbackNC(instance, excb, sentcb), _response(cb) - { - } - - /// \cond INTERNAL - virtual void completed(const ::Ice::AsyncResultPtr& result) const - { - ::Ice::ConnectionPtr ret; - try - { - ret = result->getProxy()->end_ice_getConnection(result); - } - catch(const ::Ice::Exception& ex) - { - ::IceInternal::CallbackNC::exception(result, ex); - return; - } - if(_response) - { - (::IceInternal::CallbackNC::_callback.get()->*_response)(ret); - } - } - /// \endcond - -private: - - Response _response; -}; - -/** - * Type-safe asynchronous callback wrapper class with cookie support used for calls to - * IceProxy::Ice::Object::begin_ice_getConnection. - * Create a wrapper instance by calling ::Ice::newCallback_Object_ice_getConnection. - * \headerfile Ice/Ice.h - */ -template -class Callback_Object_ice_getConnection : public Callback_Object_ice_getConnection_Base, - public ::IceInternal::Callback -{ -public: - - typedef IceUtil::Handle TPtr; - - typedef void (T::*Response)(const ::Ice::ConnectionPtr&, const CT&); - typedef void (T::*Exception)(const ::Ice::Exception&, const CT&); - typedef void (T::*Sent)(bool, const CT&); - - Callback_Object_ice_getConnection(const TPtr& instance, Response cb, Exception excb, Sent sentcb) : - ::IceInternal::Callback(instance, excb, sentcb), _response(cb) - { - } - - /// \cond INTERNAL - virtual void completed(const ::Ice::AsyncResultPtr& result) const - { - ::Ice::ConnectionPtr ret; - try - { - ret = result->getProxy()->end_ice_getConnection(result); - } - catch(const ::Ice::Exception& ex) - { - ::IceInternal::Callback::exception(result, ex); - return; - } - if(_response) - { - (::IceInternal::Callback::_callback.get()->*_response)(ret, - CT::dynamicCast(result->getCookie())); - } - } - /// \endcond - -private: - - Response _response; -}; - -/** - * Type-safe asynchronous callback wrapper class used for calls to - * IceProxy::Ice::Object::begin_ice_flushBatchRequests. - * Create a wrapper instance by calling ::Ice::newCallback_Object_ice_flushBatchRequests. - * \headerfile Ice/Ice.h - */ -template -class CallbackNC_Object_ice_flushBatchRequests : public Callback_Object_ice_flushBatchRequests_Base, - public ::IceInternal::OnewayCallbackNC -{ -public: - - typedef IceUtil::Handle TPtr; - - typedef void (T::*Exception)(const ::Ice::Exception&); - typedef void (T::*Sent)(bool); - - CallbackNC_Object_ice_flushBatchRequests(const TPtr& instance, Exception excb, Sent sentcb) : - ::IceInternal::OnewayCallbackNC(instance, 0, excb, sentcb) - { - } -}; - -/** - * Type-safe asynchronous callback wrapper class with cookie support used for calls to - * IceProxy::Ice::Object::begin_ice_flushBatchRequests. - * Create a wrapper instance by calling ::Ice::newCallback_Object_ice_flushBatchRequests. - * \headerfile Ice/Ice.h - */ -template -class Callback_Object_ice_flushBatchRequests : public Callback_Object_ice_flushBatchRequests_Base, - public ::IceInternal::OnewayCallback -{ -public: - - typedef IceUtil::Handle TPtr; - - typedef void (T::*Exception)(const ::Ice::Exception&, const CT&); - typedef void (T::*Sent)(bool, const CT&); - - Callback_Object_ice_flushBatchRequests(const TPtr& instance, Exception excb, Sent sentcb) : - ::IceInternal::OnewayCallback(instance, 0, excb, sentcb) - { - } -}; - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param cb The success method of the callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_isA. - */ -template Callback_Object_ice_isAPtr -newCallback_Object_ice_isA(const IceUtil::Handle& instance, - void (T::*cb)(bool), - void (T::*excb)(const ::Ice::Exception&), - void (T::*sentcb)(bool) = 0) -{ - return new CallbackNC_Object_ice_isA(instance, cb, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param cb The success method of the callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_isA. - */ -template Callback_Object_ice_isAPtr -newCallback_Object_ice_isA(const IceUtil::Handle& instance, - void (T::*cb)(bool, const CT&), - void (T::*excb)(const ::Ice::Exception&, const CT&), - void (T::*sentcb)(bool, const CT&) = 0) -{ - return new Callback_Object_ice_isA(instance, cb, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_isA. - */ -template Callback_Object_ice_isAPtr -newCallback_Object_ice_isA(const IceUtil::Handle& instance, - void (T::*excb)(const ::Ice::Exception&), - void (T::*sentcb)(bool) = 0) -{ - return new CallbackNC_Object_ice_isA(instance, 0, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_isA. - */ -template Callback_Object_ice_isAPtr -newCallback_Object_ice_isA(const IceUtil::Handle& instance, - void (T::*excb)(const ::Ice::Exception&, const CT&), - void (T::*sentcb)(bool, const CT&) = 0) -{ - return new Callback_Object_ice_isA(instance, 0, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param cb The success method of the callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_isA. - */ -template Callback_Object_ice_isAPtr -newCallback_Object_ice_isA(T* instance, - void (T::*cb)(bool), - void (T::*excb)(const ::Ice::Exception&), - void (T::*sentcb)(bool) = 0) -{ - return new CallbackNC_Object_ice_isA(instance, cb, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param cb The success method of the callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_isA. - */ -template Callback_Object_ice_isAPtr -newCallback_Object_ice_isA(T* instance, - void (T::*cb)(bool, const CT&), - void (T::*excb)(const ::Ice::Exception&, const CT&), - void (T::*sentcb)(bool, const CT&) = 0) -{ - return new Callback_Object_ice_isA(instance, cb, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_isA. - */ -template Callback_Object_ice_isAPtr -newCallback_Object_ice_isA(T* instance, - void (T::*excb)(const ::Ice::Exception&), - void (T::*sentcb)(bool) = 0) -{ - return new CallbackNC_Object_ice_isA(instance, 0, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_isA. - */ -template Callback_Object_ice_isAPtr -newCallback_Object_ice_isA(T* instance, - void (T::*excb)(const ::Ice::Exception&, const CT&), - void (T::*sentcb)(bool, const CT&) = 0) -{ - return new Callback_Object_ice_isA(instance, 0, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param cb The success method of the callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_ping. - */ -template Callback_Object_ice_pingPtr -newCallback_Object_ice_ping(const IceUtil::Handle& instance, - void (T::*cb)(), - void (T::*excb)(const ::Ice::Exception&), - void (T::*sentcb)(bool) = 0) -{ - return new CallbackNC_Object_ice_ping(instance, cb, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param cb The success method of the callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_ping. - */ -template Callback_Object_ice_pingPtr -newCallback_Object_ice_ping(const IceUtil::Handle& instance, - void (T::*cb)(const CT&), - void (T::*excb)(const ::Ice::Exception&, const CT&), - void (T::*sentcb)(bool, const CT&) = 0) -{ - return new Callback_Object_ice_ping(instance, cb, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_ping. - */ -template Callback_Object_ice_pingPtr -newCallback_Object_ice_ping(const IceUtil::Handle& instance, - void (T::*excb)(const ::Ice::Exception&), - void (T::*sentcb)(bool) = 0) -{ - return new CallbackNC_Object_ice_ping(instance, 0, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_ping. - */ -template Callback_Object_ice_pingPtr -newCallback_Object_ice_ping(const IceUtil::Handle& instance, - void (T::*excb)(const ::Ice::Exception&, const CT&), - void (T::*sentcb)(bool, const CT&) = 0) -{ - return new Callback_Object_ice_ping(instance, 0, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param cb The success method of the callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_ping. - */ -template Callback_Object_ice_pingPtr -newCallback_Object_ice_ping(T* instance, - void (T::*cb)(), - void (T::*excb)(const ::Ice::Exception&), - void (T::*sentcb)(bool) = 0) -{ - return new CallbackNC_Object_ice_ping(instance, cb, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param cb The success method of the callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_ping. - */ -template Callback_Object_ice_pingPtr -newCallback_Object_ice_ping(T* instance, - void (T::*cb)(const CT&), - void (T::*excb)(const ::Ice::Exception&, const CT&), - void (T::*sentcb)(bool, const CT&) = 0) -{ - return new Callback_Object_ice_ping(instance, cb, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_ping. - */ -template Callback_Object_ice_pingPtr -newCallback_Object_ice_ping(T* instance, - void (T::*excb)(const ::Ice::Exception&), - void (T::*sentcb)(bool) = 0) -{ - return new CallbackNC_Object_ice_ping(instance, 0, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_ping. - */ -template Callback_Object_ice_pingPtr -newCallback_Object_ice_ping(T* instance, - void (T::*excb)(const ::Ice::Exception&, const CT&), - void (T::*sentcb)(bool, const CT&) = 0) -{ - return new Callback_Object_ice_ping(instance, 0, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param cb The success method of the callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_ids. - */ -template Callback_Object_ice_idsPtr -newCallback_Object_ice_ids(const IceUtil::Handle& instance, - void (T::*cb)(const ::std::vector< ::std::string>&), - void (T::*excb)(const ::Ice::Exception&), - void (T::*sentcb)(bool) = 0) -{ - return new CallbackNC_Object_ice_ids(instance, cb, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param cb The success method of the callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_ids. - */ -template Callback_Object_ice_idsPtr -newCallback_Object_ice_ids(const IceUtil::Handle& instance, - void (T::*cb)(const ::std::vector< ::std::string>&, const CT&), - void (T::*excb)(const ::Ice::Exception&, const CT&), - void (T::*sentcb)(bool, const CT&) = 0) -{ - return new Callback_Object_ice_ids(instance, cb, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_ids. - */ -template Callback_Object_ice_idsPtr -newCallback_Object_ice_ids(const IceUtil::Handle& instance, - void (T::*excb)(const ::Ice::Exception&), - void (T::*sentcb)(bool) = 0) -{ - return new CallbackNC_Object_ice_ids(instance, 0, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_ids. - */ -template Callback_Object_ice_idsPtr -newCallback_Object_ice_ids(const IceUtil::Handle& instance, - void (T::*excb)(const ::Ice::Exception&, const CT&), - void (T::*sentcb)(bool, const CT&) = 0) -{ - return new Callback_Object_ice_ids(instance, 0, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param cb The success method of the callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_ids. - */ -template Callback_Object_ice_idsPtr -newCallback_Object_ice_ids(T* instance, - void (T::*cb)(const ::std::vector< ::std::string>&), - void (T::*excb)(const ::Ice::Exception&), - void (T::*sentcb)(bool) = 0) -{ - return new CallbackNC_Object_ice_ids(instance, cb, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param cb The success method of the callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_ids. - */ -template Callback_Object_ice_idsPtr -newCallback_Object_ice_ids(T* instance, - void (T::*cb)(const ::std::vector< ::std::string>&, const CT&), - void (T::*excb)(const ::Ice::Exception&, const CT&), - void (T::*sentcb)(bool, const CT&) = 0) -{ - return new Callback_Object_ice_ids(instance, cb, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_ids. - */ -template Callback_Object_ice_idsPtr -newCallback_Object_ice_ids(T* instance, - void (T::*excb)(const ::Ice::Exception&), - void (T::*sentcb)(bool) = 0) -{ - return new CallbackNC_Object_ice_ids(instance, 0, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_ids. - */ -template Callback_Object_ice_idsPtr -newCallback_Object_ice_ids(T* instance, - void (T::*excb)(const ::Ice::Exception&, const CT&), - void (T::*sentcb)(bool, const CT&) = 0) -{ - return new Callback_Object_ice_ids(instance, 0, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param cb The success method of the callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_id. - */ -template Callback_Object_ice_idPtr -newCallback_Object_ice_id(const IceUtil::Handle& instance, - void (T::*cb)(const ::std::string&), - void (T::*excb)(const ::Ice::Exception&), - void (T::*sentcb)(bool) = 0) -{ - return new CallbackNC_Object_ice_id(instance, cb, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param cb The success method of the callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_id. - */ -template Callback_Object_ice_idPtr -newCallback_Object_ice_id(const IceUtil::Handle& instance, - void (T::*cb)(const ::std::string&, const CT&), - void (T::*excb)(const ::Ice::Exception&, const CT&), - void (T::*sentcb)(bool, const CT&) = 0) -{ - return new Callback_Object_ice_id(instance, cb, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_id. - */ -template Callback_Object_ice_idPtr -newCallback_Object_ice_id(const IceUtil::Handle& instance, - void (T::*excb)(const ::Ice::Exception&), - void (T::*sentcb)(bool) = 0) -{ - return new CallbackNC_Object_ice_id(instance, 0, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_id. - */ -template Callback_Object_ice_idPtr -newCallback_Object_ice_id(const IceUtil::Handle& instance, - void (T::*excb)(const ::Ice::Exception&, const CT&), - void (T::*sentcb)(bool, const CT&) = 0) -{ - return new Callback_Object_ice_id(instance, 0, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param cb The success method of the callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_id. - */ -template Callback_Object_ice_idPtr -newCallback_Object_ice_id(T* instance, - void (T::*cb)(const ::std::string&), - void (T::*excb)(const ::Ice::Exception&), - void (T::*sentcb)(bool) = 0) -{ - return new CallbackNC_Object_ice_id(instance, cb, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param cb The success method of the callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_id. - */ -template Callback_Object_ice_idPtr -newCallback_Object_ice_id(T* instance, - void (T::*cb)(const ::std::string&, const CT&), - void (T::*excb)(const ::Ice::Exception&, const CT&), - void (T::*sentcb)(bool, const CT&) = 0) -{ - return new Callback_Object_ice_id(instance, cb, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_id. - */ -template Callback_Object_ice_idPtr -newCallback_Object_ice_id(T* instance, - void (T::*excb)(const ::Ice::Exception&), - void (T::*sentcb)(bool) = 0) -{ - return new CallbackNC_Object_ice_id(instance, 0, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_id. - */ -template Callback_Object_ice_idPtr -newCallback_Object_ice_id(T* instance, - void (T::*excb)(const ::Ice::Exception&, const CT&), - void (T::*sentcb)(bool, const CT&) = 0) -{ - return new Callback_Object_ice_id(instance, 0, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param cb The success method of the callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_invoke. - */ -template Callback_Object_ice_invokePtr -newCallback_Object_ice_invoke(const IceUtil::Handle& instance, - void (T::*cb)(bool, const std::vector&), - void (T::*excb)(const ::Ice::Exception&), - void (T::*sentcb)(bool) = 0) -{ - return new CallbackNC_Object_ice_invoke(instance, cb, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param cb The success method of the callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_invoke. - */ -template Callback_Object_ice_invokePtr -newCallback_Object_ice_invoke(const IceUtil::Handle& instance, - void (T::*cb)(bool, const std::pair&), - void (T::*excb)(const ::Ice::Exception&), - void (T::*sentcb)(bool) = 0) -{ - return new CallbackNC_Object_ice_invoke(instance, cb, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param cb The success method of the callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_invoke. - */ -template Callback_Object_ice_invokePtr -newCallback_Object_ice_invoke(const IceUtil::Handle& instance, - void (T::*cb)(bool, const std::vector&, const CT&), - void (T::*excb)(const ::Ice::Exception&, const CT&), - void (T::*sentcb)(bool, const CT&) = 0) -{ - return new Callback_Object_ice_invoke(instance, cb, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param cb The success method of the callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_invoke. - */ -template Callback_Object_ice_invokePtr -newCallback_Object_ice_invoke(const IceUtil::Handle& instance, - void (T::*cb)(bool, const std::pair&, - const CT&), - void (T::*excb)(const ::Ice::Exception&, const CT&), - void (T::*sentcb)(bool, const CT&) = 0) -{ - return new Callback_Object_ice_invoke(instance, cb, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_invoke. - */ -template Callback_Object_ice_invokePtr -newCallback_Object_ice_invoke(const IceUtil::Handle& instance, - void (T::*excb)(const ::Ice::Exception&), - void (T::*sentcb)(bool) = 0) -{ - return new CallbackNC_Object_ice_invoke(instance, 0, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_invoke. - */ -template Callback_Object_ice_invokePtr -newCallback_Object_ice_invoke(const IceUtil::Handle& instance, - void (T::*excb)(const ::Ice::Exception&, const CT&), - void (T::*sentcb)(bool, const CT&) = 0) -{ - return new Callback_Object_ice_invoke(instance, 0, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param cb The success method of the callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_invoke. - */ -template Callback_Object_ice_invokePtr -newCallback_Object_ice_invoke(T* instance, - void (T::*cb)(bool, const std::vector&), - void (T::*excb)(const ::Ice::Exception&), - void (T::*sentcb)(bool) = 0) -{ - return new CallbackNC_Object_ice_invoke(instance, cb, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param cb The success method of the callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_invoke. - */ -template Callback_Object_ice_invokePtr -newCallback_Object_ice_invoke(T* instance, - void (T::*cb)(bool, const std::pair&), - void (T::*excb)(const ::Ice::Exception&), - void (T::*sentcb)(bool) = 0) -{ - return new CallbackNC_Object_ice_invoke(instance, cb, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param cb The success method of the callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_invoke. - */ -template Callback_Object_ice_invokePtr -newCallback_Object_ice_invoke(T* instance, - void (T::*cb)(bool, const std::vector&, const CT&), - void (T::*excb)(const ::Ice::Exception&, const CT&), - void (T::*sentcb)(bool, const CT&) = 0) -{ - return new Callback_Object_ice_invoke(instance, cb, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param cb The success method of the callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_invoke. - */ -template Callback_Object_ice_invokePtr -newCallback_Object_ice_invoke(T* instance, - void (T::*cb)(bool, const std::pair&, const CT&), - void (T::*excb)(const ::Ice::Exception&, const CT&), - void (T::*sentcb)(bool, const CT&) = 0) -{ - return new Callback_Object_ice_invoke(instance, cb, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_invoke. - */ -template Callback_Object_ice_invokePtr -newCallback_Object_ice_invoke(T* instance, - void (T::*excb)(const ::Ice::Exception&), - void (T::*sentcb)(bool) = 0) -{ - return new CallbackNC_Object_ice_invoke( - instance, static_cast&)>(0), excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_invoke. - */ -template Callback_Object_ice_invokePtr -newCallback_Object_ice_invoke(T* instance, - void (T::*excb)(const ::Ice::Exception&, const CT&), - void (T::*sentcb)(bool, const CT&) = 0) -{ - return new Callback_Object_ice_invoke( - instance, static_cast&, const CT&)>(0), excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param cb The success method of the callback object. - * @param excb The exception method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_getConnection. - */ -template Callback_Object_ice_getConnectionPtr -newCallback_Object_ice_getConnection(const IceUtil::Handle& instance, - void (T::*cb)(const ::Ice::ConnectionPtr&), - void (T::*excb)(const ::Ice::Exception&)) -{ - return new CallbackNC_Object_ice_getConnection(instance, cb, excb, 0); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param cb The success method of the callback object. - * @param excb The exception method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_getConnection. - */ -template Callback_Object_ice_getConnectionPtr -newCallback_Object_ice_getConnection(const IceUtil::Handle& instance, - void (T::*cb)(const ::Ice::ConnectionPtr&, const CT&), - void (T::*excb)(const ::Ice::Exception&, const CT&)) -{ - return new Callback_Object_ice_getConnection(instance, cb, excb, 0); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param cb The success method of the callback object. - * @param excb The exception method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_getConnection. - */ -template Callback_Object_ice_getConnectionPtr -newCallback_Object_ice_getConnection(T* instance, - void (T::*cb)(const ::Ice::ConnectionPtr&), - void (T::*excb)(const ::Ice::Exception&)) -{ - return new CallbackNC_Object_ice_getConnection(instance, cb, excb, 0); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param cb The success method of the callback object. - * @param excb The exception method of the callback object. - * @return An object that can be passed to an asynchronous invocation of IceProxy::Ice::Object::begin_ice_getConnection. - */ -template Callback_Object_ice_getConnectionPtr -newCallback_Object_ice_getConnection(T* instance, - void (T::*cb)(const ::Ice::ConnectionPtr&, const CT&), - void (T::*excb)(const ::Ice::Exception&, const CT&)) -{ - return new Callback_Object_ice_getConnection(instance, cb, excb, 0); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of - * IceProxy::Ice::Object::begin_ice_flushBatchRequests. - */ -template Callback_Object_ice_flushBatchRequestsPtr -newCallback_Object_ice_flushBatchRequests(const IceUtil::Handle& instance, - void (T::*excb)(const ::Ice::Exception&), - void (T::*sentcb)(bool) = 0) -{ - return new CallbackNC_Object_ice_flushBatchRequests(instance, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of - * IceProxy::Ice::Object::begin_ice_flushBatchRequests. - */ -template Callback_Object_ice_flushBatchRequestsPtr -newCallback_Object_ice_flushBatchRequests(const IceUtil::Handle& instance, - void (T::*excb)(const ::Ice::Exception&, const CT&), - void (T::*sentcb)(bool, const CT&) = 0) -{ - return new Callback_Object_ice_flushBatchRequests(instance, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of - * IceProxy::Ice::Object::begin_ice_flushBatchRequests. - */ -template Callback_Object_ice_flushBatchRequestsPtr -newCallback_Object_ice_flushBatchRequests(T* instance, - void (T::*excb)(const ::Ice::Exception&), - void (T::*sentcb)(bool) = 0) -{ - return new CallbackNC_Object_ice_flushBatchRequests(instance, excb, sentcb); -} - -/** - * Creates a callback wrapper instance that delegates to your object. - * @param instance The callback object. - * @param excb The exception method of the callback object. - * @param sentcb The sent method of the callback object. - * @return An object that can be passed to an asynchronous invocation of - * IceProxy::Ice::Object::begin_ice_flushBatchRequests. - */ -template Callback_Object_ice_flushBatchRequestsPtr -newCallback_Object_ice_flushBatchRequests(T* instance, - void (T::*excb)(const ::Ice::Exception&, const CT&), - void (T::*sentcb)(bool, const CT&) = 0) -{ - return new Callback_Object_ice_flushBatchRequests(instance, excb, sentcb); -} - -} -#endif - #endif diff --git a/cpp/include/Ice/ProxyF.h b/cpp/include/Ice/ProxyF.h index 63bcebbe57b..db5bb92e288 100644 --- a/cpp/include/Ice/ProxyF.h +++ b/cpp/include/Ice/ProxyF.h @@ -5,10 +5,9 @@ #ifndef ICE_PROXY_F_H #define ICE_PROXY_F_H -#include -#include +#include "Config.h" +#include -#ifdef ICE_CPP11_MAPPING namespace Ice { @@ -26,28 +25,4 @@ template ::std::shared_ptr

createProxy(); } - -#else // C++98 mapping -namespace IceProxy -{ - -namespace Ice -{ - -class Object; -inline Object* upCast(Object* o) { return o; } - -} - -} - -namespace Ice -{ - -typedef IceInternal::ProxyHandle< ::IceProxy::Ice::Object> ObjectPrx; -typedef ObjectPrx ObjectPrxPtr; - -} - -#endif #endif diff --git a/cpp/include/Ice/ProxyHandle.h b/cpp/include/Ice/ProxyHandle.h deleted file mode 100644 index 42377a5272f..00000000000 --- a/cpp/include/Ice/ProxyHandle.h +++ /dev/null @@ -1,287 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#ifndef ICE_PROXY_HANDLE_H -#define ICE_PROXY_HANDLE_H - -#ifndef ICE_CPP11_MAPPING // C++98 mapping - -#include -#include -#include - -#include - -namespace IceInternal -{ - -template class ProxyHandle; -template class Handle; - -} - -namespace IceProxy -{ -namespace Ice -{ - -class Object; - -} -} - -namespace Ice -{ - -/** Smart pointer for an object proxy. */ -typedef ::IceInternal::ProxyHandle< ::IceProxy::Ice::Object> ObjectPrx; - -class ObjectAdapter; -using ObjectAdapterPtr = ::std::shared_ptr; - -/** - * A request context. Context is used to transmit metadata about a - * request from the server to the client, such as Quality-of-Service - * (QoS) parameters. Each remote operation on a proxy optionally - * accepts a Context parameter. - **/ -typedef ::std::map< ::std::string, ::std::string> Context; - -/** Sentinel value indicating that no explicit context argument was passed to a remote invocation. */ -ICE_API extern const Context noExplicitContext; - -} - -namespace IceInternal -{ - -template P -checkedCastImpl(const ::Ice::ObjectPrx&, const ::Ice::Context&); - -template P -checkedCastImpl(const ::Ice::ObjectPrx&, const std::string&, const ::Ice::Context&); - -template P -uncheckedCastImpl(const ::Ice::ObjectPrx&); - -template P -uncheckedCastImpl(const ::Ice::ObjectPrx&, const std::string&); - -// -// Upcast -// -template inline ProxyHandle -checkedCastHelper(const ::IceInternal::ProxyHandle& b, T*, const ::Ice::Context&) -{ - return b; -} - -template inline ProxyHandle -uncheckedCastHelper(const ::IceInternal::ProxyHandle& b, T*) -{ - return b; -} - -// -// Downcast -// -template inline ProxyHandle -checkedCastHelper(const ::IceInternal::ProxyHandle& b, void*, const ::Ice::Context& ctx) -{ - return checkedCastImpl >(b, ctx); -} - -template inline ProxyHandle -uncheckedCastHelper(const ::IceInternal::ProxyHandle& b, void*) -{ - return uncheckedCastImpl >(b); -} - -// -// Like IceInternal::Handle, but specifically for proxies, with -// support for checkedCast() and uncheckedCast() instead of -// dynamicCast(). -// -template -class ProxyHandle : public ::IceUtil::HandleBase -{ -public: - - ProxyHandle(T* p = 0) - { - this->_ptr = p; - - if(this->_ptr) - { - upCast(this->_ptr)->__incRef(); - } - } - - template - ProxyHandle(const ProxyHandle& r) - { - this->_ptr = r._ptr; - - if(this->_ptr) - { - upCast(this->_ptr)->__incRef(); - } - } - - template - ProxyHandle(const ::IceUtil::Handle& r) - { - this->_ptr = r._ptr; - - if(this->_ptr) - { - upCast(this->_ptr)->__incRef(); - } - } - - ProxyHandle(const ProxyHandle& r) - { - this->_ptr = r._ptr; - - if(this->_ptr) - { - upCast(this->_ptr)->__incRef(); - } - } - - ~ProxyHandle() - { - if(this->_ptr) - { - upCast(this->_ptr)->__decRef(); - } - } - - ProxyHandle& operator=(T* p) - { - if(this->_ptr != p) - { - if(p) - { - upCast(p)->__incRef(); - } - - if(this->_ptr) - { - upCast(this->_ptr)->__decRef(); - } - - this->_ptr = p; - } - return *this; - } - - template - ProxyHandle& operator=(const ProxyHandle& r) - { - if(this->_ptr != r._ptr) - { - if(r._ptr) - { - upCast(r._ptr)->__incRef(); - } - - if(this->_ptr) - { - upCast(this->_ptr)->__decRef(); - } - - this->_ptr = r._ptr; - } - return *this; - } - - template - ProxyHandle& operator=(const ::IceUtil::Handle& r) - { - if(this->_ptr != r._ptr) - { - if(r._ptr) - { - upCast(r._ptr)->__incRef(); - } - - if(this->_ptr) - { - upCast(this->_ptr)->__decRef(); - } - - this->_ptr = r._ptr; - } - return *this; - } - - ProxyHandle& operator=(const ProxyHandle& r) - { - if(this->_ptr != r._ptr) - { - if(r._ptr) - { - upCast(r._ptr)->__incRef(); - } - - if(this->_ptr) - { - upCast(this->_ptr)->__decRef(); - } - - this->_ptr = r._ptr; - } - return *this; - } - - ::IceProxy::Ice::Object* _upCast() const - { - return upCast(this->_ptr); - } - - template - static ProxyHandle checkedCast(const ProxyHandle& r, const ::Ice::Context& ctx = ::Ice::noExplicitContext) - { - Y* tag = 0; - return ::IceInternal::checkedCastHelper(r, tag, ctx); - } - - template - static ProxyHandle checkedCast(const ProxyHandle& r, const std::string& f, - const ::Ice::Context& ctx = ::Ice::noExplicitContext) - { - return ::IceInternal::checkedCastImpl(r, f, ctx); - } - - template - static ProxyHandle uncheckedCast(const ProxyHandle& r) - { - Y* tag = 0; - return::IceInternal::uncheckedCastHelper(r, tag); - } - - template - static ProxyHandle uncheckedCast(const ProxyHandle& r, const std::string& f) - { - return ::IceInternal::uncheckedCastImpl(r, f); - } - - static const std::string& ice_staticId() - { - return T::ice_staticId(); - } -}; - -template -std::ostream& operator<<(std::ostream& os, ::IceInternal::ProxyHandle p) -{ - return os << (p ? p->ice_toString() : std::string("")); -} - -} - -#endif - -#endif diff --git a/cpp/include/Ice/RequestHandlerF.h b/cpp/include/Ice/RequestHandlerF.h index 325f304ab83..2324a71726a 100644 --- a/cpp/include/Ice/RequestHandlerF.h +++ b/cpp/include/Ice/RequestHandlerF.h @@ -5,25 +5,17 @@ #ifndef ICE_REQUEST_HANDLER_F_H #define ICE_REQUEST_HANDLER_F_H -#include -#include +#include "Config.h" +#include namespace IceInternal { class CancellationHandler; class RequestHandler; - -#ifdef ICE_CPP11_MAPPING using CancellationHandlerPtr = ::std::shared_ptr; using RequestHandlerPtr = ::std::shared_ptr; -#else -ICE_API IceUtil::Shared* upCast(CancellationHandler*); -typedef IceInternal::Handle CancellationHandlerPtr; -ICE_API IceUtil::Shared* upCast(RequestHandler*); -typedef IceInternal::Handle RequestHandlerPtr; -#endif } diff --git a/cpp/include/Ice/ResponseHandlerF.h b/cpp/include/Ice/ResponseHandlerF.h index 53e86505b35..85f4cc433d7 100644 --- a/cpp/include/Ice/ResponseHandlerF.h +++ b/cpp/include/Ice/ResponseHandlerF.h @@ -5,20 +5,14 @@ #ifndef ICE_RESPONSE_HANDLER_F_H #define ICE_RESPONSE_HANDLER_F_H -#include -#include +#include "Config.h" +#include namespace IceInternal { class ResponseHandler; - -#ifdef ICE_CPP11_MAPPING using ResponseHandlerPtr = ::std::shared_ptr; -#else -ICE_API IceUtil::Shared* upCast(ResponseHandler*); -typedef IceInternal::Handle ResponseHandlerPtr; -#endif } diff --git a/cpp/include/Ice/RouterF.h b/cpp/include/Ice/RouterF.h index aeeb7ab1759..67b540837de 100644 --- a/cpp/include/Ice/RouterF.h +++ b/cpp/include/Ice/RouterF.h @@ -5,15 +5,9 @@ #ifndef ICE_ROUTER_F_H #define ICE_ROUTER_F_H -// TODO: remove this include when we remove the C++98 mapping. -#include - #include "Config.h" #include #include "ProxyF.h" -#include "SharedPtr.h" - -#ifdef ICE_CPP11_MAPPING // C++11 mapping namespace Ice { @@ -26,36 +20,4 @@ using RouterPrxPtr = ::std::shared_ptr; } -#else // C++98 mapping - -namespace Ice -{ - class InputStream; -} - -namespace IceProxy::Ice -{ - -class Router; -/// \cond INTERNAL -ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< Router>&); -ICE_API ::IceProxy::Ice::Object* upCast(Router*); -/// \endcond - -} - -namespace Ice -{ -typedef ::IceInternal::ProxyHandle< ::IceProxy::Ice::Router> RouterPrx; -typedef RouterPrx RouterPrxPtr; - -class Router; -using RouterPtr = ::Ice::SharedPtr< Router>; - -} - -#endif - -// TODO: remove this include when we remove the C++98 mapping. -#include #endif diff --git a/cpp/include/Ice/SHA1.h b/cpp/include/Ice/SHA1.h index 9b4fe5394dc..11e902e2f56 100644 --- a/cpp/include/Ice/SHA1.h +++ b/cpp/include/Ice/SHA1.h @@ -5,9 +5,9 @@ #ifndef ICE_SHA1_H #define ICE_SHA1_H -#include -#include +#include "Config.h" +#include #include namespace IceInternal @@ -33,7 +33,7 @@ class ICE_API SHA1 SHA1 operator=(const SHA1&); class Hasher; - UniquePtr _hasher; + std::unique_ptr _hasher; }; } diff --git a/cpp/include/Ice/SharedPtr.h b/cpp/include/Ice/SharedPtr.h deleted file mode 100644 index 0fcc8689a0b..00000000000 --- a/cpp/include/Ice/SharedPtr.h +++ /dev/null @@ -1,138 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#ifndef ICE_SHARED_PTR_H -#define ICE_SHARED_PTR_H - -#include - -namespace Ice -{ - -/** - * A smart pointer that wraps a std::shared_ptr and provides an API similar to the IceUtil::Handle API. - * It's the primary smart pointer for the Original Mapping. - * \headerfile Ice/Ice.h - */ -template -class SharedPtr -{ -public: - - typedef T element_type; - - SharedPtr(T* p = nullptr) noexcept : _ptr(p) - { - } - - SharedPtr(const SharedPtr&) noexcept = default; - - template - SharedPtr(const SharedPtr& r) noexcept : _ptr(r.underlying()) - { - } - - SharedPtr(std::shared_ptr&& r) noexcept : _ptr(std::move(r)) - { - } - - SharedPtr(const std::shared_ptr& r) noexcept : _ptr(r) - { - } - - ~SharedPtr() = default; - - SharedPtr& operator=(T* p) noexcept - { - if(_ptr.get() != p) - { - _ptr = std::shared_ptr(p); - } - return *this; - } - - template - SharedPtr& operator=(const SharedPtr& r) noexcept - { - if(_ptr != r.underlying()) - { - _ptr = r.underlying(); - } - return *this; - } - - SharedPtr& operator=(const SharedPtr& r) noexcept - { - if(_ptr != r._ptr) - { - _ptr = r._ptr; - } - return *this; - } - - T* get() const noexcept { return _ptr.get(); } - - T* operator->() const noexcept { return _ptr.get(); } - - T& operator*() const noexcept { return *_ptr; } - - operator bool() const noexcept { return _ptr.operator bool(); } - - void swap(SharedPtr& other) noexcept { _ptr.swap(other._ptr); } - - std::shared_ptr& underlying() noexcept { return _ptr; } - const std::shared_ptr& underlying() const noexcept { return _ptr; } - - template - static SharedPtr dynamicCast(const SharedPtr& r) noexcept - { - return dynamicCast(r.underlying()); - } - - template - static SharedPtr dynamicCast(const std::shared_ptr& r) noexcept - { - return SharedPtr(std::dynamic_pointer_cast(r)); - } - -private: - - std::shared_ptr _ptr; -}; - -// The semantics of these comparison operators is _not_ the same as with IceUtil::Handle. IceUtil::Handle compares the -// pointed-to objects, after dereferencing the pointers. SharedPtr compares the pointers like shared_ptr. -// This does not make a significant difference for Ice::Value and Ice::Object since their default comparison operators -// in Ice 3.7 and before compares "this". - -template -inline bool operator==(const SharedPtr& lhs, const SharedPtr& rhs) noexcept { return lhs.underlying() == rhs.underlying(); } - -#if __cplusplus >= 202002L - -template -inline std::strong_ordering operator<=>(const SharedPtr& lhs, const SharedPtr& rhs) noexcept { return lhs.underlying() <=> rhs.underlying(); } - -#else - -template -inline bool operator!=(const SharedPtr& lhs, const SharedPtr& rhs) noexcept { return lhs.underlying() != rhs.underlying(); } - -template -inline bool operator<(const SharedPtr& lhs, const SharedPtr& rhs) noexcept { return lhs.underlying() < rhs.underlying();} - -template -inline bool operator<=(const SharedPtr& lhs, const SharedPtr& rhs) noexcept { return lhs.underlying() <= rhs.underlying(); } - -template -inline bool operator>(const SharedPtr& lhs, const SharedPtr& rhs) noexcept { return lhs.underlying() > rhs.underlying(); } - -template -inline bool operator>=(const SharedPtr& lhs, const SharedPtr& rhs) noexcept { return lhs.underlying() >= rhs.underlying(); } - -#endif - -} - -#endif diff --git a/cpp/include/Ice/SlicedData.h b/cpp/include/Ice/SlicedData.h index c847ef1464f..4b6c2d5133e 100644 --- a/cpp/include/Ice/SlicedData.h +++ b/cpp/include/Ice/SlicedData.h @@ -100,11 +100,7 @@ class ICE_API UnknownSlicedValue : public Value */ inline UnknownSlicedValuePtr ice_clone() const { -#ifdef ICE_CPP11_MAPPING return std::static_pointer_cast(_iceCloneImpl()); -#else - return UnknownSlicedValuePtr(std::static_pointer_cast(_iceCloneImpl())); -#endif } /// \cond STREAM diff --git a/cpp/include/Ice/SlicedDataF.h b/cpp/include/Ice/SlicedDataF.h index 6b3d3815a82..48d12706a2d 100644 --- a/cpp/include/Ice/SlicedDataF.h +++ b/cpp/include/Ice/SlicedDataF.h @@ -5,9 +5,10 @@ #ifndef ICE_SLICED_DATA_F_H #define ICE_SLICED_DATA_F_H -#include -#include -#include +#include + +#include +#include namespace Ice { @@ -19,13 +20,9 @@ class UnknownSlicedValue; using SliceInfoPtr = ::std::shared_ptr; using SlicedDataPtr = ::std::shared_ptr; -#ifdef ICE_CPP11_MAPPING /// \cond INTERNAL using UnknownSlicedValuePtr = ::std::shared_ptr; /// \endcond -#else -using UnknownSlicedValuePtr = SharedPtr; -#endif /** The slices of unknown types. */ typedef ::std::vector SliceInfoSeq; diff --git a/cpp/include/Ice/StreamHelpers.h b/cpp/include/Ice/StreamHelpers.h index 9fc0910330d..51ad63522f8 100644 --- a/cpp/include/Ice/StreamHelpers.h +++ b/cpp/include/Ice/StreamHelpers.h @@ -10,10 +10,6 @@ #include #include -#ifndef ICE_CPP11_MAPPING -# include -#endif - #include namespace Ice @@ -55,7 +51,6 @@ const StreamHelperCategory StreamHelperCategoryUserException = 9; * and how it can be skipped by the unmarshaling code if the optional ID * isn't known to the receiver. */ -#ifdef ICE_CPP11_MAPPING enum class OptionalFormat : unsigned char { /** Fixed 1-byte encoding. */ @@ -78,30 +73,6 @@ enum class OptionalFormat : unsigned char /** Class instance. */ Class = 7 }; -#else -enum OptionalFormat -{ - /** Fixed 1-byte encoding. */ - OptionalFormatF1 = 0, - /** Fixed 2-byte encoding. */ - OptionalFormatF2 = 1, - /** Fixed 4-byte encoding. */ - OptionalFormatF4 = 2, - /** Fixed 8-byte encoding. */ - OptionalFormatF8 = 3, - /** "Size encoding" using 1 to 5 bytes, e.g., enum, class identifier. */ - OptionalFormatSize = 4, - /** - * "Size encoding" using 1 to 5 bytes followed by data, e.g., string, fixed size - * struct, or containers whose size can be computed prior to marshaling. - */ - OptionalFormatVSize = 5, - /** Fixed size using 4 bytes followed by data, e.g., variable-size struct, container. */ - OptionalFormatFSize = 6, - /** Class instance. */ - OptionalFormatClass = 7 -}; -#endif /** * Determines whether the provided type is a container. For now, the implementation only checks @@ -137,8 +108,6 @@ struct IsMap static const bool value = IsContainer::value && sizeof(test(0)) == sizeof(char); }; -#ifdef ICE_CPP11_MAPPING - /** * Base traits template. Types with no specialized trait use this trait. * \headerfile Ice/Ice.h @@ -201,62 +170,6 @@ struct StreamableTraits> static const bool fixedLength = false; }; -#else - -/** - * Base traits template. Types with no specialized trait use this trait, including sequence and - * dictionary types. - * \headerfile Ice/Ice.h - */ -template -struct StreamableTraits -{ - static const StreamHelperCategory helper = IsMap::value ? StreamHelperCategoryDictionary : - (IsContainer::value ? StreamHelperCategorySequence : StreamHelperCategoryUnknown); - - /** - * When extracting a sequence from a stream, we can ensure the - * stream has at least StreamableTraits::minWireSize * size bytes. - * For containers, the minWireSize is 1 (just 1 byte for an empty container). - */ - static const int minWireSize = 1; - - /** - * Is this type encoded on a fixed number of bytes? - * Used only for marshaling/unmarshaling optional data members and parameters. - */ - static const bool fixedLength = false; -}; - -/** - * Specialization for exceptions. - * \headerfile Ice/Ice.h - */ -template<> -struct StreamableTraits -{ - static const StreamHelperCategory helper = StreamHelperCategoryUserException; - - // - // There is no sequence/dictionary of UserException (so no need for minWireSize) - // and no optional UserException (so no need for fixedLength) - // -}; - -/** - * Specialization for array / range mapped sequences. The type can be a std::pair or a - * std::pair, std::pair >. - * \headerfile Ice/Ice.h - */ -template -struct StreamableTraits< ::std::pair > -{ - static const StreamHelperCategory helper = StreamHelperCategorySequence; - static const int minWireSize = 1; - static const bool fixedLength = false; -}; -#endif - /** * Specialization for built-in type (this is needed for sequence * marshaling to figure out the minWireSize of each type). @@ -390,7 +303,6 @@ struct StreamableTraits< ::std::vector > * Specialization for proxy types. * \headerfile Ice/Ice.h */ -#ifdef ICE_CPP11_MAPPING template struct StreamableTraits<::std::shared_ptr, typename ::std::enable_if<::std::is_base_of<::Ice::ObjectPrx, T>::value>::type> { @@ -398,21 +310,11 @@ struct StreamableTraits<::std::shared_ptr, typename ::std::enable_if<::std::i static const int minWireSize = 2; static const bool fixedLength = false; }; -#else -template -struct StreamableTraits< ::IceInternal::ProxyHandle > -{ - static const StreamHelperCategory helper = StreamHelperCategoryProxy; - static const int minWireSize = 2; - static const bool fixedLength = false; -}; -#endif /** * Specialization for class types. * \headerfile Ice/Ice.h */ -#ifdef ICE_CPP11_MAPPING template struct StreamableTraits<::std::shared_ptr, typename ::std::enable_if<::std::is_base_of<::Ice::Value, T>::value>::type> { @@ -420,15 +322,6 @@ struct StreamableTraits<::std::shared_ptr, typename ::std::enable_if<::std::i static const int minWireSize = 1; static const bool fixedLength = false; }; -#else -template -struct StreamableTraits> -{ - static const StreamHelperCategory helper = StreamHelperCategoryClass; - static const int minWireSize = 1; - static const bool fixedLength = false; -}; -#endif // // StreamHelper templates used by streams to read and write data. @@ -470,17 +363,10 @@ struct StreamHelper template struct StreamWriter { -#ifdef ICE_CPP11_MAPPING static inline void write(S* stream, const T& v) { stream->writeAll(v.ice_tuple()); } -#else - static inline void write(S*, const T&) - { - // Default is to write nothing for C++98 - } -#endif }; /** @@ -615,69 +501,6 @@ struct StreamHelper, StreamHelperCategorySequence> } }; -#ifndef ICE_CPP11_MAPPING - -/** - * Helper for range custom sequence parameters. - * \headerfile Ice/Ice.h - */ -template -struct StreamHelper, StreamHelperCategorySequence> -{ - template static inline void - write(S* stream, const std::pair& v) - { - stream->writeSize(static_cast(std::distance(v.first, v.second))); - for(T p = v.first; p != v.second; ++p) - { - stream->write(*p); - } - } - - template static inline void - read(S* stream, std::pair& v) - { - stream->read(v); - } -}; - -/** - * Specialization for sequence. - * \headerfile Ice/Ice.h - */ -template<> -struct StreamHelper::const_iterator, - ::std::vector::const_iterator>, StreamHelperCategorySequence> -{ - template static inline void - write(S* stream, const std::pair< ::std::vector::const_iterator, - ::std::vector::const_iterator>& v) - { - stream->writeSize(static_cast(std::distance(v.first, v.second))); - for(::std::vector::const_iterator p = v.first; p != v.second; ++p) - { - stream->write(static_cast(*p)); - } - } -}; - -/** - * Helper for zero-copy array sequence parameters. - * \headerfile Ice/Ice.h - */ -template -struct StreamHelper, std::pair >, StreamHelperCategorySequence> -{ - template static inline void - read(S* stream, std::pair, std::pair >& v) - { - stream->read(v.second, v.first); - } - - // no write: only used for unmarshaling -}; -#endif - /** * Helper for dictionaries. * \headerfile Ice/Ice.h @@ -1097,65 +920,6 @@ struct StreamOptionalHelper, StreamHelperCategoryS } }; -#ifndef ICE_CPP11_MAPPING - -/** - * Helper to write sequences, delegates to the optional container - * helper template partial specializations. - * \headerfile Ice/Ice.h - */ -template -struct StreamOptionalHelper, StreamHelperCategorySequence, false> -{ - typedef std::pair P; - static const int size = StreamableTraits::minWireSize; - static const bool fixedLength = StreamableTraits::fixedLength; - - // The optional type of a sequence depends on whether or not elements are fixed - // or variable size elements and their size. - static const OptionalFormat optionalFormat = StreamOptionalContainerHelper::optionalFormat; - - template static inline void - write(S* stream, const P& v) - { - Int n = static_cast(v.second - v.first); - StreamOptionalContainerHelper::write(stream, v, n); - } - - template static inline void - read(S* stream, P& v) - { - StreamOptionalContainerHelper::read(stream, v); - } -}; - -/** - * Helper to write sequences, delegates to the optional container - * helper template partial specializations. - * \headerfile Ice/Ice.h - */ -template -struct StreamOptionalHelper, std::pair >, - StreamHelperCategorySequence, false> -{ - typedef std::pair, std::pair > P; - static const int size = StreamableTraits::minWireSize; - static const bool fixedLength = StreamableTraits::fixedLength; - - // The optional type of a sequence depends on whether or not elements are fixed - // or variable size elements and their size. - static const OptionalFormat optionalFormat = StreamOptionalContainerHelper::optionalFormat; - - template static inline void - read(S* stream, P& v) - { - StreamOptionalContainerHelper::read(stream, v); - } - - // no write: only used for unmarshaling -}; -#endif - /** * Helper to write dictionaries, delegates to the optional container * helper template partial specializations. diff --git a/cpp/include/Ice/StringConverter.h b/cpp/include/Ice/StringConverter.h index 025063c845f..9a5ab294eb8 100644 --- a/cpp/include/Ice/StringConverter.h +++ b/cpp/include/Ice/StringConverter.h @@ -26,11 +26,9 @@ typedef IceUtil::WstringConverterPtr WstringConverterPtr; /** Indicates an error occurred during string conversion. */ typedef IceUtil::IllegalConversionException IllegalConversionException; -#ifdef ICE_CPP11_MAPPING /** Base class for a string converter. */ template using BasicStringConverter = IceUtil::BasicStringConverter; -#endif #ifdef _WIN32 /** diff --git a/cpp/include/Ice/UniquePtr.h b/cpp/include/Ice/UniquePtr.h deleted file mode 100644 index c1ba3e5ee73..00000000000 --- a/cpp/include/Ice/UniquePtr.h +++ /dev/null @@ -1,95 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#ifndef ICE_UNIQUE_PTR_H -#define ICE_UNIQUE_PTR_H - -#include - -namespace IceInternal -{ - -#ifdef ICE_CPP11_MAPPING - -template -using UniquePtr = std::unique_ptr; - -#else - -template -class UniquePtr -{ -public: - - explicit UniquePtr(T* ptr = 0) : - _ptr(ptr) - { - } - - ~UniquePtr() - { - if(_ptr != 0) - { - delete _ptr; - } - } - - T* release() - { - T* r = _ptr; - _ptr = 0; - return r; - } - - void reset(T* ptr = 0) - { - assert(ptr == 0 || ptr != _ptr); - - if(_ptr != 0) - { - delete _ptr; - } - _ptr = ptr; - } - - T& operator*() const - { - return *_ptr; - } - - T* operator->() const - { - return _ptr; - } - - T* get() const - { - return _ptr; - } - - operator bool() const - { - return _ptr != 0; - } - - void swap(UniquePtr& a) - { - T* tmp = a._ptr; - a._ptr = _ptr; - _ptr = tmp; - } - -private: - - UniquePtr(UniquePtr&); - UniquePtr& operator=(UniquePtr&); - - T* _ptr; -}; - -#endif - -} - -#endif diff --git a/cpp/include/Ice/UserExceptionFactory.h b/cpp/include/Ice/UserExceptionFactory.h index 61feafb42a9..7c371dd13ab 100644 --- a/cpp/include/Ice/UserExceptionFactory.h +++ b/cpp/include/Ice/UserExceptionFactory.h @@ -9,8 +9,6 @@ #include #include -#ifdef ICE_CPP11_MAPPING - namespace Ice { @@ -35,54 +33,5 @@ defaultUserExceptionFactory(const std::string& typeId) } } -#else - -namespace Ice -{ - -/** - * Creates and throws a user exception. - * \headerfile Ice/Ice.h - */ -class ICE_API UserExceptionFactory : public IceUtil::Shared -{ -public: - - virtual void createAndThrow(const ::std::string&) = 0; - virtual ~UserExceptionFactory(); -}; -typedef ::IceUtil::Handle UserExceptionFactoryPtr; - -} - -namespace IceInternal -{ -template -class DefaultUserExceptionFactory : public Ice::UserExceptionFactory -{ -public: - - DefaultUserExceptionFactory(const ::std::string& typeId) : - _typeId(typeId) - { - } - -#ifdef NDEBUG - virtual void createAndThrow(const ::std::string&) -#else - virtual void createAndThrow(const ::std::string& typeId) -#endif - { - assert(typeId == _typeId); - throw E(); - } - -private: - const ::std::string _typeId; -}; - -} - -#endif #endif diff --git a/cpp/include/Ice/Value.h b/cpp/include/Ice/Value.h index b7c7f7110c3..9148ebb7af8 100644 --- a/cpp/include/Ice/Value.h +++ b/cpp/include/Ice/Value.h @@ -64,17 +64,10 @@ class ICE_API Value * Returns a shallow copy of the object. * @return The cloned value. */ -#if defined ICE_CPP11_MAPPING inline std::shared_ptr ice_clone() const { return _iceCloneImpl(); } -#else - inline SharedPtr ice_clone() const - { - return SharedPtr(_iceCloneImpl()); - } -#endif /** * Obtains the sliced data associated with this instance. @@ -109,17 +102,10 @@ template class ValueHelper : public Base ValueHelper() = default; -#if defined ICE_CPP11_MAPPING std::shared_ptr ice_clone() const { return std::static_pointer_cast(_iceCloneImpl()); } -#else - SharedPtr ice_clone() const - { - return SharedPtr(std::static_pointer_cast(_iceCloneImpl())); - } -#endif virtual std::string ice_id() const override { diff --git a/cpp/include/Ice/ValueF.h b/cpp/include/Ice/ValueF.h index 192e5841cc9..fe7974fd065 100644 --- a/cpp/include/Ice/ValueF.h +++ b/cpp/include/Ice/ValueF.h @@ -6,24 +6,14 @@ #define ICE_VALUE_F_H #include -#include - namespace Ice { class Value; -#ifdef ICE_CPP11_MAPPING - /// \cond INTERNAL using ValuePtr = ::std::shared_ptr; /// \endcond -#else - -using ValuePtr = SharedPtr; - -#endif - } #endif diff --git a/cpp/include/IceBT/ConnectionInfo.h b/cpp/include/IceBT/ConnectionInfo.h index ca5360ce68b..328f5536eb3 100644 --- a/cpp/include/IceBT/ConnectionInfo.h +++ b/cpp/include/IceBT/ConnectionInfo.h @@ -5,7 +5,6 @@ #ifndef __IceBT_ConnectionInfo_h__ #define __IceBT_ConnectionInfo_h__ -#include #include #include #include @@ -14,7 +13,6 @@ #include #include #include -#include #include #include #include @@ -29,8 +27,6 @@ # endif #endif -#ifdef ICE_CPP11_MAPPING // C++11 mapping - namespace IceBT { @@ -125,13 +121,6 @@ class ICE_CLASS(ICEBT_API) ConnectionInfo : public ::Ice::ConnectionInfo } -/// \cond STREAM -namespace Ice -{ - -} -/// \endcond - /// \cond INTERNAL namespace IceBT { @@ -141,127 +130,4 @@ using ConnectionInfoPtr = ::std::shared_ptr; } /// \endcond -#else // C++98 mapping - -namespace IceBT -{ - -class ConnectionInfo; -/// \cond INTERNAL -ICEBT_API ::Ice::LocalObject* upCast(ConnectionInfo*); -/// \endcond -typedef ::IceInternal::Handle< ConnectionInfo> ConnectionInfoPtr; - -} - -namespace IceBT -{ - -/** - * Provides access to the details of a Bluetooth connection. - * \headerfile IceBT/IceBT.h - */ -class ICEBT_API ConnectionInfo : public ::Ice::ConnectionInfo -{ -public: - - typedef ConnectionInfoPtr PointerType; - - virtual ~ConnectionInfo(); - - /** Default constructor that assigns default values to members as specified in the Slice definition. */ - ConnectionInfo() : - localAddress(""), - localChannel(-1), - remoteAddress(""), - remoteChannel(-1), - uuid(""), - rcvSize(0), - sndSize(0) - { - } - - /** - * One-shot constructor to initialize all data members. - * @param underlying The information of the underyling transport or null if there's no underlying transport. - * @param incoming Whether or not the connection is an incoming or outgoing connection. - * @param adapterName The name of the adapter associated with the connection. - * @param connectionId The connection id. - * @param localAddress The local Bluetooth address. - * @param localChannel The local RFCOMM channel. - * @param remoteAddress The remote Bluetooth address. - * @param remoteChannel The remote RFCOMM channel. - * @param uuid The UUID of the service being offered (in a server) or targeted (in a client). - * @param rcvSize The connection buffer receive size. - * @param sndSize The connection buffer send size. - */ - ConnectionInfo(const ::Ice::ConnectionInfoPtr& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const ::std::string& localAddress, ::Ice::Int localChannel, const ::std::string& remoteAddress, ::Ice::Int remoteChannel, const ::std::string& uuid, ::Ice::Int rcvSize, ::Ice::Int sndSize) : - ::Ice::ConnectionInfo(underlying, incoming, adapterName, connectionId), - localAddress(localAddress), - localChannel(localChannel), - remoteAddress(remoteAddress), - remoteChannel(remoteChannel), - uuid(uuid), - rcvSize(rcvSize), - sndSize(sndSize) - { - } - - ConnectionInfo(const ConnectionInfo&) = default; - ConnectionInfo& operator=(const ConnectionInfo&) = default; - - /** - * The local Bluetooth address. - */ - ::std::string localAddress; - /** - * The local RFCOMM channel. - */ - ::Ice::Int localChannel; - /** - * The remote Bluetooth address. - */ - ::std::string remoteAddress; - /** - * The remote RFCOMM channel. - */ - ::Ice::Int remoteChannel; - /** - * The UUID of the service being offered (in a server) or targeted (in a client). - */ - ::std::string uuid; - /** - * The connection buffer receive size. - */ - ::Ice::Int rcvSize; - /** - * The connection buffer send size. - */ - ::Ice::Int sndSize; -}; - -/// \cond INTERNAL -inline bool operator==(const ConnectionInfo& lhs, const ConnectionInfo& rhs) -{ - return static_cast(lhs) == static_cast(rhs); -} - -inline bool operator<(const ConnectionInfo& lhs, const ConnectionInfo& rhs) -{ - return static_cast(lhs) < static_cast(rhs); -} -/// \endcond - -} - -/// \cond STREAM -namespace Ice -{ - -} -/// \endcond - -#endif - -#include #endif diff --git a/cpp/include/IceBT/EndpointInfo.h b/cpp/include/IceBT/EndpointInfo.h index 365410cf832..8ee188629d4 100644 --- a/cpp/include/IceBT/EndpointInfo.h +++ b/cpp/include/IceBT/EndpointInfo.h @@ -5,7 +5,6 @@ #ifndef __IceBT_EndpointInfo_h__ #define __IceBT_EndpointInfo_h__ -#include #include #include #include @@ -13,7 +12,6 @@ #include #include #include -#include #include #include #include @@ -28,8 +26,6 @@ # endif #endif -#ifdef ICE_CPP11_MAPPING // C++11 mapping - namespace IceBT { @@ -84,13 +80,6 @@ class ICE_CLASS(ICEBT_API) EndpointInfo : public ::Ice::EndpointInfo } -/// \cond STREAM -namespace Ice -{ - -} -/// \endcond - /// \cond INTERNAL namespace IceBT { @@ -100,88 +89,4 @@ using EndpointInfoPtr = ::std::shared_ptr; } /// \endcond -#else // C++98 mapping - -namespace IceBT -{ - -class EndpointInfo; -/// \cond INTERNAL -ICEBT_API ::Ice::LocalObject* upCast(EndpointInfo*); -/// \endcond -typedef ::IceInternal::Handle< EndpointInfo> EndpointInfoPtr; - -} - -namespace IceBT -{ - -/** - * Provides access to Bluetooth endpoint information. - * \headerfile IceBT/IceBT.h - */ -class ICEBT_API EndpointInfo : public ::Ice::EndpointInfo -{ -public: - - typedef EndpointInfoPtr PointerType; - - virtual ~EndpointInfo(); - - EndpointInfo() - { - } - - /** - * One-shot constructor to initialize all data members. - * @param underlying The information of the underyling endpoint or null if there's no underlying endpoint. - * @param timeout The timeout for the endpoint in milliseconds. - * @param compress Specifies whether or not compression should be used if available when using this endpoint. - * @param addr The address configured with the endpoint. - * @param uuid The UUID configured with the endpoint. - */ - EndpointInfo(const ::Ice::EndpointInfoPtr& underlying, ::Ice::Int timeout, bool compress, const ::std::string& addr, const ::std::string& uuid) : - ::Ice::EndpointInfo(underlying, timeout, compress), - addr(addr), - uuid(uuid) - { - } - - EndpointInfo(const EndpointInfo&) = default; - EndpointInfo& operator=(const EndpointInfo&) = default; - - /** - * The address configured with the endpoint. - */ - ::std::string addr; - /** - * The UUID configured with the endpoint. - */ - ::std::string uuid; -}; - -/// \cond INTERNAL -inline bool operator==(const EndpointInfo& lhs, const EndpointInfo& rhs) -{ - return static_cast(lhs) == static_cast(rhs); -} - -inline bool operator<(const EndpointInfo& lhs, const EndpointInfo& rhs) -{ - return static_cast(lhs) < static_cast(rhs); -} -/// \endcond - -} - -/// \cond STREAM -namespace Ice -{ - -} -/// \endcond - -#endif - -#include #endif diff --git a/cpp/include/IceBT/Plugin.h b/cpp/include/IceBT/Plugin.h index eed2e876927..7204df290d1 100644 --- a/cpp/include/IceBT/Plugin.h +++ b/cpp/include/IceBT/Plugin.h @@ -26,25 +26,6 @@ typedef std::map PropertyMap; /** A collection of properties for each device. */ typedef std::map DeviceMap; -#ifndef ICE_CPP11_MAPPING -/** - * An application can receive discovery notifications by implementing the DiscoveryCallback interface. - * \headerfile IceBT/IceBT.h - */ -class ICEBT_API DiscoveryCallback : public IceUtil::Shared -{ -public: - - /** - * Called for each discovered device. The same device may be reported multiple times. - * @param addr The discovered device's Bluetooth address. - * @param props A map of device properties supplied by the system's Bluetooth stack. - */ - virtual void discovered(const std::string& addr, const PropertyMap& props) = 0; -}; -typedef IceUtil::Handle DiscoveryCallbackPtr; -#endif - /** * Represents the IceBT plug-in object. * \headerfile IceBT/IceBT.h @@ -61,12 +42,8 @@ class ICEBT_API Plugin : public Ice::Plugin * @param address The address associated with the Bluetooth adapter. * @param cb The callback to invoke when a device is discovered. */ -#ifdef ICE_CPP11_MAPPING virtual void startDiscovery(const std::string& address, std::function cb) = 0; -#else - virtual void startDiscovery(const std::string& address, const DiscoveryCallbackPtr& cb) = 0; -#endif /** * Stops Bluetooth device discovery on the adapter with the specified address. diff --git a/cpp/include/IceBT/Types.h b/cpp/include/IceBT/Types.h index 7a29d477820..e04c235050c 100644 --- a/cpp/include/IceBT/Types.h +++ b/cpp/include/IceBT/Types.h @@ -5,7 +5,6 @@ #ifndef __IceBT_Types_h__ #define __IceBT_Types_h__ -#include #include #include #include @@ -13,7 +12,6 @@ #include #include #include -#include #include #include #include @@ -28,8 +26,6 @@ # endif #endif -#ifdef ICE_CPP11_MAPPING // C++11 mapping - namespace IceBT { @@ -94,80 +90,4 @@ class ICE_CLASS(ICEBT_API) BluetoothException : public ::Ice::LocalExceptionHelp } -/// \cond STREAM -namespace Ice -{ - -} -/// \endcond - -#else // C++98 mapping - -namespace IceBT -{ - -/** - * Indicates a failure in the Bluetooth plug-in. - * \headerfile IceBT/IceBT.h - */ -class ICEBT_API BluetoothException : public ::Ice::LocalException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - BluetoothException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param reason Provides more information about the failure. - */ - BluetoothException(const char* file, int line, const ::std::string& reason); - - BluetoothException(const BluetoothException&) = default; - virtual ~BluetoothException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual BluetoothException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; - - /** - * Provides more information about the failure. - */ - ::std::string reason; -}; - -} - -/// \cond STREAM -namespace Ice -{ - -} -/// \endcond - -#endif - -#include #endif diff --git a/cpp/include/IceBox/Service.h b/cpp/include/IceBox/Service.h index 724246df8cc..e5b1d580f58 100644 --- a/cpp/include/IceBox/Service.h +++ b/cpp/include/IceBox/Service.h @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include @@ -36,9 +35,6 @@ # define ICEBOX_API ICE_DECLSPEC_IMPORT # endif #endif - -#ifdef ICE_CPP11_MAPPING // C++11 mapping - namespace IceBox { @@ -152,126 +148,5 @@ using ServicePtr = ::std::shared_ptr; } /// \endcond -#else // C++98 mapping - -namespace IceBox -{ - -class Service; -/// \cond INTERNAL -ICEBOX_API ::Ice::LocalObject* upCast(Service*); -/// \endcond -typedef ::IceInternal::Handle< Service> ServicePtr; - -} - -namespace IceBox -{ - -/** - * This exception is a general failure notification. It is thrown for errors such as a service encountering an error - * during initialization, or the service manager being unable to load a service executable. - * \headerfile IceBox/IceBox.h - */ -class ICEBOX_API FailureException : public ::Ice::LocalException -{ -public: - - /** - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - */ - FailureException(const char* file, int line); - /** - * One-shot constructor to initialize all data members. - * The file and line number are required for all local exceptions. - * @param file The file name in which the exception was raised, typically __FILE__. - * @param line The line number at which the exception was raised, typically __LINE__. - * @param reason The reason for the failure. - */ - FailureException(const char* file, int line, const ::std::string& reason); - FailureException(const FailureException&) = default; - virtual ~FailureException(); - - /** - * Obtains the Slice type ID of this exception. - * @return The fully-scoped type ID. - */ - virtual ::std::string ice_id() const; - /** - * Prints this exception to the given stream. - * @param stream The target stream. - */ - virtual void ice_print(::std::ostream& stream) const; - /** - * Polymorphically clones this exception. - * @return A shallow copy of this exception. - */ - virtual FailureException* ice_clone() const; - /** - * Throws this exception. - */ - virtual void ice_throw() const; - - /** - * The reason for the failure. - */ - ::std::string reason; -}; - -} - -namespace IceBox -{ - -/** - * An application service managed by a {@link ServiceManager}. - * \headerfile IceBox/IceBox.h - */ -class ICEBOX_API Service : public virtual ::Ice::LocalObject -{ -public: - - typedef ServicePtr PointerType; - - virtual ~Service(); - Service() = default; - Service(const Service&) = default; - Service& operator=(const Service&) = default; - - /** - * Start the service. The given communicator is created by the {@link ServiceManager} for use by the service. This - * communicator may also be used by other services, depending on the service configuration. - *

The {@link ServiceManager} owns this communicator, and is responsible for destroying it. - * @param name The service's name, as determined by the configuration. - * @param communicator A communicator for use by the service. - * @param args The service arguments that were not converted into properties. - * @throws IceBox::FailureException Raised if {@link #start} failed. - */ - virtual void start(const ::std::string& name, const ::Ice::CommunicatorPtr& communicator, const ::Ice::StringSeq& args) = 0; - - /** - * Stop the service. - */ - virtual void stop() = 0; -}; - -/// \cond INTERNAL -inline bool operator==(const Service& lhs, const Service& rhs) -{ - return static_cast(lhs) == static_cast(rhs); -} - -inline bool operator<(const Service& lhs, const Service& rhs) -{ - return static_cast(lhs) < static_cast(rhs); -} -/// \endcond - -} - -#endif - #include #endif diff --git a/cpp/include/IceGrid/PluginFacade.h b/cpp/include/IceGrid/PluginFacade.h index a197a38db74..56a93c3a507 100644 --- a/cpp/include/IceGrid/PluginFacade.h +++ b/cpp/include/IceGrid/PluginFacade.h @@ -5,7 +5,6 @@ #ifndef __IceGrid_PluginFacade_h__ #define __IceGrid_PluginFacade_h__ -#include #include #include #include @@ -19,7 +18,6 @@ #include #include #include -#include #include #include #include @@ -39,8 +37,6 @@ # endif #endif -#ifdef ICE_CPP11_MAPPING // C++11 mapping - namespace IceGrid { @@ -257,297 +253,4 @@ using RegistryPluginFacadePtr = ::std::shared_ptr; } /// \endcond -#else // C++98 mapping - -namespace IceProxy -{ - -} - -namespace IceGrid -{ - -class ReplicaGroupFilter; -/// \cond INTERNAL -ICEGRID_API ::Ice::LocalObject* upCast(ReplicaGroupFilter*); -/// \endcond -typedef ::IceInternal::Handle< ReplicaGroupFilter> ReplicaGroupFilterPtr; - -class TypeFilter; -/// \cond INTERNAL -ICEGRID_API ::Ice::LocalObject* upCast(TypeFilter*); -/// \endcond -typedef ::IceInternal::Handle< TypeFilter> TypeFilterPtr; - -class RegistryPluginFacade; -/// \cond INTERNAL -ICEGRID_API ::Ice::LocalObject* upCast(RegistryPluginFacade*); -/// \endcond -typedef ::IceInternal::Handle< RegistryPluginFacade> RegistryPluginFacadePtr; - -} - -/// \cond INTERNAL -namespace IceAsync -{ - -} -/// \endcond - -namespace IceProxy -{ - -} - -namespace IceGrid -{ - -/** - * The ReplicaGroupFilter is used by IceGrid to filter adapters returned to the client when it resolves a filtered - * replica group. - * IceGrid provides the list of available adapters. The implementationof this method can use the provided context and - * connection to filter and return the filtered set of adapters. - * \headerfile IceGrid/IceGrid.h - */ -class ICEGRID_API ReplicaGroupFilter : public virtual ::Ice::LocalObject -{ -public: - - typedef ReplicaGroupFilterPtr PointerType; - - virtual ~ReplicaGroupFilter(); - - ReplicaGroupFilter() = default; - ReplicaGroupFilter(const ReplicaGroupFilter&) = default; - ReplicaGroupFilter& operator=(const ReplicaGroupFilter&) = default; - - /** - * Filter the given set of adapters. - * @param replicaGroupId The replica group ID. - * @param adapterIds The adpater IDs to filter. - * @param con The connection from the Ice client which is resolving the replica group endpoints. - * @param ctx The context from the Ice client which is resolving the replica group endpoints. - * @return The filtered adapter IDs. - */ - virtual ::Ice::StringSeq filter(const ::std::string& replicaGroupId, const ::Ice::StringSeq& adapterIds, const ::Ice::ConnectionPtr& con, const ::Ice::Context& ctx) = 0; -}; - -/// \cond INTERNAL -inline bool operator==(const ReplicaGroupFilter& lhs, const ReplicaGroupFilter& rhs) -{ - return static_cast(lhs) == static_cast(rhs); -} - -inline bool operator<(const ReplicaGroupFilter& lhs, const ReplicaGroupFilter& rhs) -{ - return static_cast(lhs) < static_cast(rhs); -} -/// \endcond - -/** - * The TypeFilter is used by IceGrid to filter well-known proxies returned to the client when it searches a well-known - * object by type. - * IceGrid provides the list of available proxies. The implementation of this method can use the provided context and - * connection to filter and return the filtered set of proxies. - * \headerfile IceGrid/IceGrid.h - */ -class ICEGRID_API TypeFilter : public virtual ::Ice::LocalObject -{ -public: - - typedef TypeFilterPtr PointerType; - - virtual ~TypeFilter(); - - TypeFilter() = default; - TypeFilter(const TypeFilter&) = default; - TypeFilter& operator=(const TypeFilter&) = default; - - /** - * Filter the given set of proxies. - * @param type The type. - * @param proxies The proxies to filter. - * @param con The connection from the Ice client which is looking up well-known objects by type. - * @param ctx The context from the Ice client which is looking up well-known objects by type. - * @return The filtered proxies. - */ - virtual ::Ice::ObjectProxySeq filter(const ::std::string& type, const ::Ice::ObjectProxySeq& proxies, const ::Ice::ConnectionPtr& con, const ::Ice::Context& ctx) = 0; -}; - -/// \cond INTERNAL -inline bool operator==(const TypeFilter& lhs, const TypeFilter& rhs) -{ - return static_cast(lhs) == static_cast(rhs); -} - -inline bool operator<(const TypeFilter& lhs, const TypeFilter& rhs) -{ - return static_cast(lhs) < static_cast(rhs); -} -/// \endcond - -/** - * The RegistryPluginFacade is implemented by IceGrid and can be used by plugins and filter implementations to - * retrieve information from IceGrid about the well-known objects or adapters. It's also used to register/unregister - * replica group and type filters. - * \headerfile IceGrid/IceGrid.h - */ -class ICEGRID_API RegistryPluginFacade : public virtual ::Ice::LocalObject -{ -public: - - typedef RegistryPluginFacadePtr PointerType; - - virtual ~RegistryPluginFacade(); - - RegistryPluginFacade() = default; - RegistryPluginFacade(const RegistryPluginFacade&) = default; - RegistryPluginFacade& operator=(const RegistryPluginFacade&) = default; - - /** - * Get an application descriptor. - * @param name The application name. - * @return The application descriptor. - * @throws IceGrid::ApplicationNotExistException Raised if the application doesn't exist. - */ - virtual ApplicationInfo getApplicationInfo(const ::std::string& name) const = 0; - - /** - * Get the server information for the server with the given id. - * @param id The server id. - * @return The server information. - * @throws IceGrid::ServerNotExistException Raised if the server doesn't exist. - */ - virtual ServerInfo getServerInfo(const ::std::string& id) const = 0; - - /** - * Get the ID of the server to which the given adapter belongs. - * @param adapterId The adapter ID. - * @return The server ID or the empty string if the given identifier is not associated to an object adapter - * defined with an application descriptor. - * @throws IceGrid::AdapterNotExistException Raised if the adapter doesn't exist. - */ - virtual ::std::string getAdapterServer(const ::std::string& adapterId) const = 0; - - /** - * Get the name of the application to which the given adapter belongs. - * @param adapterId The adapter ID. - * @return The application name or the empty string if the given identifier is not associated to a replica group - * or object adapter defined with an application descriptor. - * @throws IceGrid::AdapterNotExistException Raised if the adapter doesn't exist. - */ - virtual ::std::string getAdapterApplication(const ::std::string& adapterId) const = 0; - - /** - * Get the name of the node to which the given adapter belongs. - * @param adapterId The adapter ID. - * @return The node name or the empty string if the given identifier is not associated to an object adapter - * defined with an application descriptor. - * @throws IceGrid::AdapterNotExistException Raised if the adapter doesn't exist. - */ - virtual ::std::string getAdapterNode(const ::std::string& adapterId) const = 0; - - /** - * Get the adapter information for the replica group or adapter with the given id. - * @param id The adapter id. - * @return A sequence of adapter information structures. If the given id refers to an adapter, this sequence will - * contain only one element. If the given id refers to a replica group, the sequence will contain the adapter - * information of each member of the replica group. - * @throws IceGrid::AdapterNotExistException Raised if the adapter or replica group doesn't exist. - */ - virtual AdapterInfoSeq getAdapterInfo(const ::std::string& id) const = 0; - - /** - * Get the object info for the object with the given identity. - * @param id The identity of the object. - * @return The object info. - * @throws IceGrid::ObjectNotRegisteredException Raised if the object isn't registered with the registry. - */ - virtual ObjectInfo getObjectInfo(const ::Ice::Identity& id) const = 0; - - /** - * Get the node information for the node with the given name. - * @param name The node name. - * @return The node information. - * @throws IceGrid::NodeNotExistException Raised if the node doesn't exist. - * @throws IceGrid::NodeUnreachableException Raised if the node could not be reached. - */ - virtual NodeInfo getNodeInfo(const ::std::string& name) const = 0; - - /** - * Get the load averages of the node. - * @param name The node name. - * @return The node load information. - * @throws IceGrid::NodeNotExistException Raised if the node doesn't exist. - * @throws IceGrid::NodeUnreachableException Raised if the node could not be reached. - */ - virtual LoadInfo getNodeLoad(const ::std::string& name) const = 0; - - /** - * Get the property value for the given property and adapter. The property is looked up in the server or service - * descriptor where the adapter is defined. - * @param adapterId The adapter ID - * @param name The name of the property. - * @return The property value. - * @throws IceGrid::AdapterNotExistException Raised if the adapter doesn't exist. - */ - virtual ::std::string getPropertyForAdapter(const ::std::string& adapterId, const ::std::string& name) const = 0; - - /** - * Add a replica group filter. - * @param id The identifier of the filter. This identifier must match the value of the "filter" attribute - * specified in the replica group descriptor. To filter dynamically registered replica groups, you should use the - * empty filter id. - * @param filter The filter implementation. - */ - virtual void addReplicaGroupFilter(const ::std::string& id, const ReplicaGroupFilterPtr& filter) noexcept = 0; - - /** - * Remove a replica group filter. - * @param id The identifier of the filter. - * @param filter The filter implementation. - * @return True of the filter was removed, false otherwise. - */ - virtual bool removeReplicaGroupFilter(const ::std::string& id, const ReplicaGroupFilterPtr& filter) noexcept = 0; - - /** - * Add a type filter. - * @param type The type to register this filter with. - * @param filter The filter implementation. - */ - virtual void addTypeFilter(const ::std::string& type, const TypeFilterPtr& filter) noexcept = 0; - - /** - * Remove a type filter. - * @param type The type to register this filter with. - * @param filter The filter implementation. - * @return True of the filter was removed, false otherwise. - */ - virtual bool removeTypeFilter(const ::std::string& type, const TypeFilterPtr& filter) noexcept = 0; -}; - -/// \cond INTERNAL -inline bool operator==(const RegistryPluginFacade& lhs, const RegistryPluginFacade& rhs) -{ - return static_cast(lhs) == static_cast(rhs); -} - -inline bool operator<(const RegistryPluginFacade& lhs, const RegistryPluginFacade& rhs) -{ - return static_cast(lhs) < static_cast(rhs); -} -/// \endcond - -} - -/// \cond STREAM -namespace Ice -{ - -} -/// \endcond - -#endif - -#include #endif diff --git a/cpp/include/IceIAP/ConnectionInfo.h b/cpp/include/IceIAP/ConnectionInfo.h index aae310246d2..8e0beff214a 100644 --- a/cpp/include/IceIAP/ConnectionInfo.h +++ b/cpp/include/IceIAP/ConnectionInfo.h @@ -5,7 +5,6 @@ #ifndef __IceIAP_ConnectionInfo_h__ #define __IceIAP_ConnectionInfo_h__ -#include #include #include #include @@ -14,7 +13,6 @@ #include #include #include -#include #include #include #include @@ -29,8 +27,6 @@ # endif #endif -#ifdef ICE_CPP11_MAPPING // C++11 mapping - namespace IceIAP { @@ -110,13 +106,6 @@ class ICE_CLASS(ICEIAP_API) ConnectionInfo : public ::Ice::ConnectionInfo } -/// \cond STREAM -namespace Ice -{ - -} -/// \endcond - /// \cond INTERNAL namespace IceIAP { @@ -126,113 +115,4 @@ using ConnectionInfoPtr = ::std::shared_ptr; } /// \endcond -#else // C++98 mapping - -namespace IceIAP -{ - -class ConnectionInfo; -/// \cond INTERNAL -ICEIAP_API ::Ice::LocalObject* upCast(ConnectionInfo*); -/// \endcond -typedef ::IceInternal::Handle< ConnectionInfo> ConnectionInfoPtr; - -} - -namespace IceIAP -{ - -/** - * Provides access to the connection details of an IAP connection - * \headerfile IceIAP/IceIAP.h - */ -class ICEIAP_API ConnectionInfo : public ::Ice::ConnectionInfo -{ -public: - - typedef ConnectionInfoPtr PointerType; - - virtual ~ConnectionInfo(); - - ConnectionInfo() - { - } - - /** - * One-shot constructor to initialize all data members. - * @param underlying The information of the underyling transport or null if there's no underlying transport. - * @param incoming Whether or not the connection is an incoming or outgoing connection. - * @param adapterName The name of the adapter associated with the connection. - * @param connectionId The connection id. - * @param name The accessory name. - * @param manufacturer The accessory manufacturer. - * @param modelNumber The accessory model number. - * @param firmwareRevision The accessory firmare revision. - * @param hardwareRevision The accessory hardware revision. - * @param protocol The protocol used by the accessory. - */ - ConnectionInfo(const ::Ice::ConnectionInfoPtr& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const ::std::string& name, const ::std::string& manufacturer, const ::std::string& modelNumber, const ::std::string& firmwareRevision, const ::std::string& hardwareRevision, const ::std::string& protocol) : - ::Ice::ConnectionInfo(underlying, incoming, adapterName, connectionId), - name(name), - manufacturer(manufacturer), - modelNumber(modelNumber), - firmwareRevision(firmwareRevision), - hardwareRevision(hardwareRevision), - protocol(protocol) - { - } - - ConnectionInfo(const ConnectionInfo&) = default; - ConnectionInfo& operator=(const ConnectionInfo&) = default; - - /** - * The accessory name. - */ - ::std::string name; - /** - * The accessory manufacturer. - */ - ::std::string manufacturer; - /** - * The accessory model number. - */ - ::std::string modelNumber; - /** - * The accessory firmare revision. - */ - ::std::string firmwareRevision; - /** - * The accessory hardware revision. - */ - ::std::string hardwareRevision; - /** - * The protocol used by the accessory. - */ - ::std::string protocol; -}; - -/// \cond INTERNAL -inline bool operator==(const ConnectionInfo& lhs, const ConnectionInfo& rhs) -{ - return static_cast(lhs) == static_cast(rhs); -} - -inline bool operator<(const ConnectionInfo& lhs, const ConnectionInfo& rhs) -{ - return static_cast(lhs) < static_cast(rhs); -} -/// \endcond - -} - -/// \cond STREAM -namespace Ice -{ - -} -/// \endcond - -#endif - -#include #endif diff --git a/cpp/include/IceIAP/EndpointInfo.h b/cpp/include/IceIAP/EndpointInfo.h index ec146eb658e..68badd0241a 100644 --- a/cpp/include/IceIAP/EndpointInfo.h +++ b/cpp/include/IceIAP/EndpointInfo.h @@ -5,7 +5,6 @@ #ifndef __IceIAP_EndpointInfo_h__ #define __IceIAP_EndpointInfo_h__ -#include #include #include #include @@ -13,7 +12,6 @@ #include #include #include -#include #include #include #include @@ -28,8 +26,6 @@ # endif #endif -#ifdef ICE_CPP11_MAPPING // C++11 mapping - namespace IceIAP { @@ -99,13 +95,6 @@ class ICE_CLASS(ICEIAP_API) EndpointInfo : public ::Ice::EndpointInfo } -/// \cond STREAM -namespace Ice -{ - -} -/// \endcond - /// \cond INTERNAL namespace IceIAP { @@ -115,103 +104,4 @@ using EndpointInfoPtr = ::std::shared_ptr; } /// \endcond -#else // C++98 mapping - -namespace IceIAP -{ - -class EndpointInfo; -/// \cond INTERNAL -ICEIAP_API ::Ice::LocalObject* upCast(EndpointInfo*); -/// \endcond -typedef ::IceInternal::Handle< EndpointInfo> EndpointInfoPtr; - -} - -namespace IceIAP -{ - -/** - * Provides access to an IAP endpoint information. - * \headerfile IceIAP/IceIAP.h - */ -class ICEIAP_API EndpointInfo : public ::Ice::EndpointInfo -{ -public: - - typedef EndpointInfoPtr PointerType; - - virtual ~EndpointInfo(); - - EndpointInfo() - { - } - - /** - * One-shot constructor to initialize all data members. - * @param underlying The information of the underyling endpoint of null if there's no underlying endpoint. - * @param timeout The timeout for the endpoint in milliseconds. - * @param compress Specifies whether or not compression should be used if available when using this endpoint. - * @param manufacturer The accessory manufacturer or empty to not match against a manufacturer. - * @param modelNumber The accessory model number or empty to not match against a model number. - * @param name The accessory name or empty to not match against the accessory name. - * @param protocol The protocol supported by the accessory. - */ - EndpointInfo(const ::Ice::EndpointInfoPtr& underlying, ::Ice::Int timeout, bool compress, const ::std::string& manufacturer, const ::std::string& modelNumber, const ::std::string& name, const ::std::string& protocol) : - ::Ice::EndpointInfo(underlying, timeout, compress), - manufacturer(manufacturer), - modelNumber(modelNumber), - name(name), - protocol(protocol) - { - } - - EndpointInfo(const EndpointInfo&) = default; - EndpointInfo& operator=(const EndpointInfo&) = default; - - /** - * The accessory manufacturer or empty to not match against - * a manufacturer. - */ - ::std::string manufacturer; - /** - * The accessory model number or empty to not match against - * a model number. - */ - ::std::string modelNumber; - /** - * The accessory name or empty to not match against - * the accessory name. - */ - ::std::string name; - /** - * The protocol supported by the accessory. - */ - ::std::string protocol; -}; - -/// \cond INTERNAL -inline bool operator==(const EndpointInfo& lhs, const EndpointInfo& rhs) -{ - return static_cast(lhs) == static_cast(rhs); -} - -inline bool operator<(const EndpointInfo& lhs, const EndpointInfo& rhs) -{ - return static_cast(lhs) < static_cast(rhs); -} -/// \endcond - -} - -/// \cond STREAM -namespace Ice -{ - -} -/// \endcond - -#endif - -#include #endif diff --git a/cpp/include/IcePatch2/ClientUtil.h b/cpp/include/IcePatch2/ClientUtil.h index 10be3e3c7fa..e5b3d6d8a18 100644 --- a/cpp/include/IcePatch2/ClientUtil.h +++ b/cpp/include/IcePatch2/ClientUtil.h @@ -20,9 +20,6 @@ namespace IcePatch2 // on the patching. // class ICEPATCH2_API PatcherFeedback -#ifndef ICE_CPP11_MAPPING - : public IceUtil::Shared -#endif // !ICE_CPP11_MAPPING { public: @@ -68,19 +65,13 @@ class ICEPATCH2_API PatcherFeedback virtual bool patchProgress(Ice::Long, Ice::Long, Ice::Long, Ice::Long) = 0; virtual bool patchEnd() = 0; }; -#ifdef ICE_CPP11_MAPPING typedef std::shared_ptr PatcherFeedbackPtr; -#else -typedef IceUtil::Handle PatcherFeedbackPtr; -#endif + // // IcePatch2 clients instantiate the IcePatch2::Patcher class to patch // a given local data directory. // class ICEPATCH2_API Patcher -#ifndef ICE_CPP11_MAPPING - : public IceUtil::Shared -#endif { public: @@ -115,21 +106,13 @@ class ICEPATCH2_API Patcher // virtual void finish() = 0; }; - -#ifdef ICE_CPP11_MAPPING typedef std::shared_ptr PatcherPtr; -#else -typedef IceUtil::Handle PatcherPtr; -#endif // ICE_CPP11_MAPPING // // IcePatch2 clients instantiate the IcePatch2::Patcher class // using the patcher factory. // class ICEPATCH2_API PatcherFactory -#ifndef ICE_CPP11_MAPPING - : public IceUtil::noncopyable -#endif // !ICE_CPP11_MAPPING { public: diff --git a/cpp/include/IceSSL/ConnectionInfo.h b/cpp/include/IceSSL/ConnectionInfo.h index d7d3c209e72..f3516d946bd 100644 --- a/cpp/include/IceSSL/ConnectionInfo.h +++ b/cpp/include/IceSSL/ConnectionInfo.h @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include @@ -30,8 +29,6 @@ # endif #endif -#ifdef ICE_CPP11_MAPPING // C++11 mapping - namespace IceSSL { @@ -109,95 +106,5 @@ using ConnectionInfoPtr = ::std::shared_ptr; } /// \endcond -#else // C++98 mapping - -namespace IceSSL -{ - -class ConnectionInfo; -/// \cond INTERNAL -ICESSL_API ::Ice::LocalObject* upCast(ConnectionInfo*); -/// \endcond -typedef ::IceInternal::Handle< ConnectionInfo> ConnectionInfoPtr; - -} - -namespace IceSSL -{ - -/** - * Provides access to the connection details of an SSL connection - * \headerfile IceSSL/IceSSL.h - */ -class ICESSL_API ConnectionInfo : public ::Ice::ConnectionInfo -{ -public: - - typedef ConnectionInfoPtr PointerType; - - virtual ~ConnectionInfo(); - - ConnectionInfo() - { - } - - /** - * One-shot constructor to initialize all data members. - * @param underlying The information of the underyling transport or null if there's no underlying transport. - * @param incoming Whether or not the connection is an incoming or outgoing connection. - * @param adapterName The name of the adapter associated with the connection. - * @param connectionId The connection id. - * @param cipher The negotiated cipher suite. - * @param certs The certificate chain. - * @param verified The certificate chain verification status. - */ - ConnectionInfo(const ::Ice::ConnectionInfoPtr& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const ::std::string& cipher, const std::vector& certs, bool verified) : - ::Ice::ConnectionInfo(underlying, incoming, adapterName, connectionId), - cipher(cipher), - certs(certs), - verified(verified) - { - } - - ConnectionInfo(const ConnectionInfo&) = default; - ConnectionInfo& operator=(const ConnectionInfo&) = default; - - /** - * The negotiated cipher suite. - */ - ::std::string cipher; - /** - * The certificate chain. - */ - std::vector certs; - /** - * The certificate chain verification status. - */ - bool verified; -}; - -/// \cond INTERNAL -inline bool operator==(const ConnectionInfo& lhs, const ConnectionInfo& rhs) -{ - return static_cast(lhs) == static_cast(rhs); -} - -inline bool operator<(const ConnectionInfo& lhs, const ConnectionInfo& rhs) -{ - return static_cast(lhs) < static_cast(rhs); -} -/// \endcond - -} - -/// \cond STREAM -namespace Ice -{ - -} -/// \endcond - -#endif - #include #endif diff --git a/cpp/include/IceSSL/ConnectionInfoF.h b/cpp/include/IceSSL/ConnectionInfoF.h index 995ddad3144..7c8beecb8af 100644 --- a/cpp/include/IceSSL/ConnectionInfoF.h +++ b/cpp/include/IceSSL/ConnectionInfoF.h @@ -5,7 +5,6 @@ #ifndef __IceSSL_ConnectionInfoF_h__ #define __IceSSL_ConnectionInfoF_h__ -#include #include #include #include @@ -13,7 +12,6 @@ #include #include #include -#include #include #include @@ -27,8 +25,6 @@ # endif #endif -#ifdef ICE_CPP11_MAPPING // C++11 mapping - namespace IceSSL { @@ -52,27 +48,4 @@ using ConnectionInfoPtr = ::std::shared_ptr; } /// \endcond -#else // C++98 mapping - -namespace IceSSL -{ - -class ConnectionInfo; -/// \cond INTERNAL -ICESSL_API ::Ice::LocalObject* upCast(ConnectionInfo*); -/// \endcond -typedef ::IceInternal::Handle< ConnectionInfo> ConnectionInfoPtr; - -} - -/// \cond STREAM -namespace Ice -{ - -} -/// \endcond - -#endif - -#include #endif diff --git a/cpp/include/IceSSL/EndpointInfo.h b/cpp/include/IceSSL/EndpointInfo.h index 1ec16043d15..83a886fc51a 100644 --- a/cpp/include/IceSSL/EndpointInfo.h +++ b/cpp/include/IceSSL/EndpointInfo.h @@ -5,7 +5,6 @@ #ifndef __IceSSL_EndpointInfo_h__ #define __IceSSL_EndpointInfo_h__ -#include #include #include #include @@ -13,7 +12,6 @@ #include #include #include -#include #include #include #include @@ -28,8 +26,6 @@ # endif #endif -#ifdef ICE_CPP11_MAPPING // C++11 mapping - namespace IceSSL { @@ -71,13 +67,6 @@ class ICE_CLASS(ICESSL_API) EndpointInfo : public ::Ice::EndpointInfo } -/// \cond STREAM -namespace Ice -{ - -} -/// \endcond - /// \cond INTERNAL namespace IceSSL { @@ -87,75 +76,4 @@ using EndpointInfoPtr = ::std::shared_ptr; } /// \endcond -#else // C++98 mapping - -namespace IceSSL -{ - -class EndpointInfo; -/// \cond INTERNAL -ICESSL_API ::Ice::LocalObject* upCast(EndpointInfo*); -/// \endcond -typedef ::IceInternal::Handle< EndpointInfo> EndpointInfoPtr; - -} - -namespace IceSSL -{ - -/** - * Provides access to an SSL endpoint information. - * \headerfile IceSSL/IceSSL.h - */ -class ICESSL_API EndpointInfo : public ::Ice::EndpointInfo -{ -public: - - typedef EndpointInfoPtr PointerType; - - virtual ~EndpointInfo(); - - EndpointInfo() - { - } - - /** - * One-shot constructor to initialize all data members. - * @param underlying The information of the underyling endpoint or null if there's no underlying endpoint. - * @param timeout The timeout for the endpoint in milliseconds. - * @param compress Specifies whether or not compression should be used if available when using this endpoint. - */ - EndpointInfo(const ::Ice::EndpointInfoPtr& underlying, ::Ice::Int timeout, bool compress) : - ::Ice::EndpointInfo(underlying, timeout, compress) - { - } - - EndpointInfo(const EndpointInfo&) = default; - EndpointInfo& operator=(const EndpointInfo&) = default; -}; - -/// \cond INTERNAL -inline bool operator==(const EndpointInfo& lhs, const EndpointInfo& rhs) -{ - return static_cast(lhs) == static_cast(rhs); -} - -inline bool operator<(const EndpointInfo& lhs, const EndpointInfo& rhs) -{ - return static_cast(lhs) < static_cast(rhs); -} -/// \endcond - -} - -/// \cond STREAM -namespace Ice -{ - -} -/// \endcond - -#endif - -#include #endif diff --git a/cpp/include/IceSSL/Plugin.h b/cpp/include/IceSSL/Plugin.h index 953d14f2aea..fa7cf953cc9 100644 --- a/cpp/include/IceSSL/Plugin.h +++ b/cpp/include/IceSSL/Plugin.h @@ -9,12 +9,7 @@ #include #include -#ifdef ICE_CPP11_MAPPING -# include -#else -# include -#endif - +#include #include #include @@ -34,11 +29,7 @@ namespace IceSSL /** * The reason for an IceSSL certificate verification failure. */ -#ifdef ICE_CPP11_MAPPING enum class TrustError : unsigned char -#else -enum TrustError -#endif { /** The certification verification succeed */ NoError = 0, @@ -167,13 +158,6 @@ class ICESSL_API CertificateReadException : public IceUtil::ExceptionHelper -#else - public virtual IceUtil::Shared -#endif +class ICESSL_API Certificate : public std::enable_shared_from_this { public: @@ -449,11 +409,7 @@ class ICESSL_API Certificate : * @param t The target time. * @return True if the certificate is valid, false otherwise. */ -#ifdef ICE_CPP11_MAPPING virtual bool checkValidity(const std::chrono::system_clock::time_point& t) const = 0; -#else - virtual bool checkValidity(const IceUtil::Time& t) const = 0; -#endif /** * Returns the value of the key usage extension. The flags KEY_USAGE_DIGITAL_SIGNATURE, @@ -477,21 +433,13 @@ class ICESSL_API Certificate : * Obtains the not-after validity time. * @return The time after which this certificate is invalid. */ -#ifdef ICE_CPP11_MAPPING virtual std::chrono::system_clock::time_point getNotAfter() const = 0; -#else - virtual IceUtil::Time getNotAfter() const = 0; -#endif /** * Obtains the not-before validity time. * @return The time at which this certificate is valid. */ -#ifdef ICE_CPP11_MAPPING virtual std::chrono::system_clock::time_point getNotBefore() const = 0; -#else - virtual IceUtil::Time getNotBefore() const = 0; -#endif /** * Obtains the serial number. This is an arbitrarily large number. @@ -590,61 +538,6 @@ class ICESSL_API Certificate : static CertificatePtr decode(const std::string& str); }; -#ifndef ICE_CPP11_MAPPING // C++98 mapping - -/** - * An application can customize the certificate verification process - * by implementing the CertificateVerifier interface. - * \headerfile IceSSL/IceSSL.h - */ -class ICESSL_API CertificateVerifier : public IceUtil::Shared -{ -public: - - virtual ~CertificateVerifier(); - - /** - * Determines whether to accept a certificate. - * @param info Information about the connection. - * @return False if the connection should be rejected, or true to allow it. - */ - virtual bool verify(const ConnectionInfoPtr& info) = 0; -}; -typedef IceUtil::Handle CertificateVerifierPtr; - -/** - * In order to read an encrypted file, such as one containing a - * private key, OpenSSL requests a password from IceSSL. The password - * can be defined using an IceSSL configuration property, but a - * plain-text password is a security risk. If a password is not - * supplied via configuration, IceSSL allows OpenSSL to prompt the - * user interactively. This may not be desirable (or even possible), - * so the application can supply an implementation of PasswordPrompt - * to take responsibility for obtaining the password. - * - * Note that the password is needed during plug-in initialization, so - * in general you will need to delay initialization (by defining - * IceSSL.DelayInit=1), configure the PasswordPrompt, then manually - * initialize the plug-in. - * \headerfile IceSSL/IceSSL.h - */ -class ICESSL_API PasswordPrompt : public IceUtil::Shared -{ -public: - - virtual ~PasswordPrompt(); - - /** - * Obtains the password. This method may be invoked repeatedly, such as when - * several encrypted files are opened, or when multiple password - * attempts are allowed. - * @return The clear-text password. - */ - virtual std::string getPassword() = 0; -}; -typedef IceUtil::Handle PasswordPromptPtr; -#endif - /** * Represents the IceSSL plug-in object. * \headerfile IceSSL/IceSSL.h @@ -660,22 +553,14 @@ class ICESSL_API Plugin : public Ice::Plugin * before any connections are established. * @param v The verifier. */ -#ifdef ICE_CPP11_MAPPING virtual void setCertificateVerifier(std::function&)> v) = 0; -#else - virtual void setCertificateVerifier(const CertificateVerifierPtr& v) = 0; -#endif /** * Establish the password prompt object. This must be done before * the plug-in is initialized. * @param p The password prompt. */ -#ifdef ICE_CPP11_MAPPING virtual void setPasswordPrompt(std::function p) = 0; -#else - virtual void setPasswordPrompt(const PasswordPromptPtr& p) = 0; -#endif /** * Load the certificate from a file. The certificate must use the diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h index 5334db4300f..ed45a4f5cc4 100644 --- a/cpp/include/IceUtil/Config.h +++ b/cpp/include/IceUtil/Config.h @@ -217,23 +217,14 @@ # if !defined(ICE_STATIC_LIBS) && (!defined(_DLL) || !defined(_MT)) # error "Only multi-threaded DLL libraries can be used with Ice!" # endif - -# ifdef ICE_CPP11_MAPPING -# if defined(_DEBUG) -# define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "++11D.lib" -# else -# define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "++11.lib" -# endif +# if defined(_DEBUG) +# define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "D.lib" # else -# if defined(_DEBUG) -# define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "D.lib" -# else -# define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION ".lib" -# endif +# define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION ".lib" # endif // -// Automatically link with Ice[D|++11|++11D].lib +// Automatically link with Ice[D].lib // # if !defined(ICE_BUILDING_ICE) && !defined(ICE_BUILDING_SLICE_COMPILERS) # pragma comment(lib, ICE_LIBNAME("Ice")) @@ -283,10 +274,7 @@ typedef long long Int64; } -// -// Macros to facilitate C++98 -> C++11 transition -// -#ifdef ICE_CPP11_MAPPING // C++11 mapping +// TODO remove the helper macros # include # include # define ICE_HANDLE ::std::shared_ptr @@ -308,26 +296,5 @@ typedef long long Int64; # define ICE_DELEGATE(T) T # define ICE_IN(...) __VA_ARGS__ # define ICE_SET_EXCEPTION_FROM_CLONE(T, V) T = V -#else // C++98 mapping -# define ICE_HANDLE ::IceUtil::Handle -# define ICE_INTERNAL_HANDLE ::IceInternal::Handle -# define ICE_SHARED_PTR ::Ice::SharedPtr -# define ICE_PROXY_HANDLE ::IceInternal::ProxyHandle -# define ICE_MAKE_SHARED(T, ...) new T(__VA_ARGS__) -# define ICE_DEFINE_PTR(TPtr, T) typedef ::IceUtil::Handle TPtr -# define ICE_DEFINE_SHARED_PTR(TPtr, T) using TPtr = ::Ice::SharedPtr -# define ICE_ENUM(CLASS,ENUMERATOR) ENUMERATOR -# define ICE_SCOPED_ENUM(CLASS,ENUMERATOR) CLASS##ENUMERATOR -# define ICE_NULLPTR 0 -# define ICE_DYNAMIC_CAST(T,V) T##Ptr::dynamicCast(V) -# define ICE_SHARED_FROM_THIS this -# define ICE_SHARED_FROM_CONST_THIS(T) const_cast(this) -# define ICE_GET_SHARED_FROM_THIS(p) p -# define ICE_CHECKED_CAST(T, ...) T::checkedCast(__VA_ARGS__) -# define ICE_UNCHECKED_CAST(T, ...) T::uncheckedCast(__VA_ARGS__) -# define ICE_DELEGATE(T) T##Ptr -# define ICE_IN(...) const __VA_ARGS__& -# define ICE_SET_EXCEPTION_FROM_CLONE(T, V) T.reset(V) -#endif #endif diff --git a/cpp/include/IceUtil/ConsoleUtil.h b/cpp/include/IceUtil/ConsoleUtil.h index 3b5d9165aa3..c608a7bedb3 100644 --- a/cpp/include/IceUtil/ConsoleUtil.h +++ b/cpp/include/IceUtil/ConsoleUtil.h @@ -18,9 +18,6 @@ class ConsoleUtil; ICE_DEFINE_PTR(ConsoleUtilPtr, ConsoleUtil); class ICE_API ConsoleUtil -# ifndef ICE_CPP11_MAPPING - : public IceUtil::Shared -# endif { public: diff --git a/cpp/include/IceUtil/CtrlCHandler.h b/cpp/include/IceUtil/CtrlCHandler.h index 079306831a4..9c379c906f6 100644 --- a/cpp/include/IceUtil/CtrlCHandler.h +++ b/cpp/include/IceUtil/CtrlCHandler.h @@ -17,11 +17,7 @@ namespace IceUtil * functions that are not async-signal safe. * @param sig The signal number that occurred. */ -#ifdef ICE_CPP11_MAPPING using CtrlCHandlerCallback = std::function; -#else -typedef void (*CtrlCHandlerCallback)(int sig); -#endif /** * Provides a portable way to handle Ctrl-C and Ctrl-C like signals. @@ -81,10 +77,6 @@ class ICE_API CtrlCHandlerException : public ExceptionHelper ice_clone() const; -#else - /** - * Returns a shallow polymorphic copy of this exception. - * @return A pointer to the new shallow copy. The caller owns the returned object. - */ - virtual Exception* ice_clone() const = 0; - - ICE_DEPRECATED_API("ice_name() is deprecated, use ice_id() instead.") - std::string ice_name() const; -#endif /** * Throws this exception. @@ -96,11 +85,9 @@ class ICE_API Exception : public std::exception protected: -#ifdef ICE_CPP11_MAPPING /// \cond INTERNAL virtual Exception* ice_cloneImpl() const = 0; /// \endcond -#endif private: @@ -112,8 +99,6 @@ class ICE_API Exception : public std::exception ICE_API std::ostream& operator<<(std::ostream&, const Exception&); -#ifdef ICE_CPP11_MAPPING - /** * Helper template for the implementation of Ice::Exception. * It implements ice_clone and ice_throw. @@ -146,33 +131,6 @@ class ExceptionHelper : public B /// \endcond }; -#else // C++98 mapping - -/** - * Helper template for the implementation of Ice::Exception. It implements ice_throw. - * \headerfile Ice/Ice.h - */ -template -class ExceptionHelper : public Exception -{ -public: - - ExceptionHelper() - { - } - - ExceptionHelper(const char* file, int line) : Exception(file, line) - { - } - - virtual void ice_throw() const - { - throw static_cast(*this); - } -}; - -#endif - /** * This exception indicates an attempt to dereference a null IceUtil::Handle or * IceInternal::Handle. @@ -184,10 +142,6 @@ class ICE_API NullHandleException : public ExceptionHelper NullHandleException(const char*, int); virtual std::string ice_id() const; - -#ifndef ICE_CPP11_MAPPING - virtual NullHandleException* ice_clone() const; -#endif }; /** @@ -206,10 +160,6 @@ class ICE_API IllegalArgumentException : public ExceptionHelper virtual std::string ice_id() const; virtual void ice_print(std::ostream&) const; -#ifndef ICE_CPP11_MAPPING - virtual SyscallException* ice_clone() const; -#endif - /** * Provides the error number returned by the system call. * @return The error number. @@ -278,36 +220,9 @@ class ICE_API SyscallException : public ExceptionHelper const int _error; }; -#ifdef ICE_CPP11_MAPPING - template using SyscallExceptionHelper = ExceptionHelper; -#else // C++98 mapping - -/** -* Helper template for the implementation of SyscallException. It implements -* ice_throw. -* \headerfile Ice/Ice.h -*/ -template -class SyscallExceptionHelper : public SyscallException -{ -public: - - SyscallExceptionHelper(const char* file, int line, int errorCode) : - SyscallException(file, line, errorCode) - { - } - - virtual void ice_throw() const - { - throw static_cast(*this); - } -}; - -#endif - /** * This exception indicates the failure to lock a file. * \headerfile Ice/Ice.h @@ -321,10 +236,6 @@ class ICE_API FileLockException : public ExceptionHelper virtual std::string ice_id() const; virtual void ice_print(std::ostream&) const; -#ifndef ICE_CPP11_MAPPING - virtual FileLockException* ice_clone() const; -#endif - /** * Returns the path to the file. * @return The file path. @@ -354,10 +265,6 @@ class ICE_API OptionalNotSetException : public ExceptionHelper #include #include -#include #include #include #include diff --git a/cpp/include/IceUtil/Options.h b/cpp/include/IceUtil/Options.h index 0790e394f51..1f6ba3c59d7 100644 --- a/cpp/include/IceUtil/Options.h +++ b/cpp/include/IceUtil/Options.h @@ -24,10 +24,6 @@ class ICE_API APIException : public IceUtil::ExceptionHelper APIException(const char*, int, const ::std::string&); virtual ::std::string ice_id() const; virtual void ice_print(std::ostream&) const; -#ifndef ICE_CPP11_MAPPING - virtual APIException* ice_clone() const; -#endif - ::std::string reason; }; @@ -41,10 +37,6 @@ class ICE_API BadOptException : public IceUtil::ExceptionHelper virtual ::std::string ice_id() const; virtual void ice_print(std::ostream&) const; -#ifndef ICE_CPP11_MAPPING - virtual BadOptException* ice_clone() const; -#endif - ::std::string reason; }; diff --git a/cpp/include/IceUtil/ResourceConfig.h b/cpp/include/IceUtil/ResourceConfig.h index 47790d3b92d..61ba98722c1 100644 --- a/cpp/include/IceUtil/ResourceConfig.h +++ b/cpp/include/IceUtil/ResourceConfig.h @@ -14,18 +14,10 @@ #define ICE_COPYRIGHT "\251 ZeroC, Inc.\0" #define ICE_PRODUCT_NAME "Ice\0" -#ifdef ICE_CPP11_MAPPING -# if defined(_DEBUG) -# define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "++11D" -# else -# define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "++11" -# endif +#if defined(_DEBUG) +# define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "D" #else -# if defined(_DEBUG) -# define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "D" -# else -# define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "" -# endif +# define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "" #endif #ifndef DEBUG diff --git a/cpp/include/IceUtil/ScopedArray.h b/cpp/include/IceUtil/ScopedArray.h deleted file mode 100644 index 9760134457d..00000000000 --- a/cpp/include/IceUtil/ScopedArray.h +++ /dev/null @@ -1,97 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#ifndef ICE_UTIL_SCOPED_ARRAY_H -#define ICE_UTIL_SCOPED_ARRAY_H - -#include - -#ifndef ICE_CPP11_MAPPING - -// -// Only for the C++98 mapping -// - -namespace IceUtil -{ - -template -class ScopedArray -{ -public: - - explicit ScopedArray(T* ptr = 0) : - _ptr(ptr) - { - } - - ScopedArray(const ScopedArray& other) - { - _ptr = other._ptr; - const_cast(other)._ptr = 0; - } - - ~ScopedArray() - { - if(_ptr != 0) - { - delete[] _ptr; - } - } - - void reset(T* ptr = 0) - { - assert(ptr == 0 || ptr != _ptr); - if(_ptr != 0) - { - delete[] _ptr; - } - _ptr = ptr; - } - - ScopedArray& operator=(const ScopedArray& other) - { - if(_ptr != 0) - { - delete[] _ptr; - } - _ptr = other._ptr; - const_cast(other)._ptr = 0; - return *this; - } - - T& operator[](size_t i) const - { - assert(_ptr != 0); - return _ptr[i]; - } - - T* get() const - { - return _ptr; - } - - void swap(ScopedArray& a) - { - T* tmp = a._ptr; - a._ptr = _ptr; - _ptr = tmp; - } - - T* release() - { - T* tmp = _ptr; - _ptr = 0; - return tmp; - } - -private: - - T* _ptr; -}; - -} // End of namespace IceUtil - -#endif -#endif diff --git a/cpp/include/IceUtil/StringConverter.h b/cpp/include/IceUtil/StringConverter.h index ea233ed05f4..d485e7d746d 100644 --- a/cpp/include/IceUtil/StringConverter.h +++ b/cpp/include/IceUtil/StringConverter.h @@ -44,9 +44,6 @@ class ICE_API UTF8Buffer */ template class BasicStringConverter -#ifndef ICE_CPP11_MAPPING - : public IceUtil::Shared -#endif { public: diff --git a/cpp/include/IceUtil/StringUtil.h b/cpp/include/IceUtil/StringUtil.h index 0891f00fab4..3ec7cb1da7f 100644 --- a/cpp/include/IceUtil/StringUtil.h +++ b/cpp/include/IceUtil/StringUtil.h @@ -14,12 +14,7 @@ namespace IceUtilInternal // // Must be kept in sync with Ice::ToStringMode // -#ifdef ICE_CPP11_MAPPING -enum class ToStringMode : unsigned char -#else -enum ToStringMode -#endif -{ Unicode, ASCII, Compat }; +enum class ToStringMode : unsigned char{ Unicode, ASCII, Compat }; // // Add escape sequences (like "\n", or "\123") to the input string diff --git a/cpp/include/IceUtil/ThreadException.h b/cpp/include/IceUtil/ThreadException.h index 0b13fcffe6b..62fb2d085f8 100644 --- a/cpp/include/IceUtil/ThreadException.h +++ b/cpp/include/IceUtil/ThreadException.h @@ -17,10 +17,6 @@ class ICE_API ThreadSyscallException : public SyscallExceptionHelper @@ -29,10 +25,6 @@ class ICE_API ThreadLockedException : public ExceptionHelper @@ -41,11 +33,6 @@ class ICE_API ThreadStartedException : public ExceptionHelper @@ -54,10 +41,6 @@ class ICE_API ThreadNotStartedException : public ExceptionHelper @@ -66,10 +49,6 @@ class ICE_API BadThreadControlException : public ExceptionHelper @@ -80,10 +59,6 @@ class ICE_API InvalidTimeoutException : public ExceptionHelper TimerPtr; // code at a specific time or repeatedly. // class ICE_API TimerTask -#ifndef ICE_CPP11_MAPPING - : public virtual IceUtil::Shared -#endif { public: diff --git a/cpp/src/Glacier2/Instrumentation.cpp b/cpp/src/Glacier2/Instrumentation.cpp index 8e4181985a0..6545eb50976 100644 --- a/cpp/src/Glacier2/Instrumentation.cpp +++ b/cpp/src/Glacier2/Instrumentation.cpp @@ -16,63 +16,14 @@ # pragma GCC diagnostic ignored "-Wshadow" #endif -#ifdef ICE_CPP11_MAPPING // C++11 mapping - -namespace -{ - -} - -Glacier2::Instrumentation::SessionObserver::~SessionObserver() -{ -} - -Glacier2::Instrumentation::ObserverUpdater::~ObserverUpdater() -{ -} - -Glacier2::Instrumentation::RouterObserver::~RouterObserver() -{ -} - -#else // C++98 mapping - -namespace -{ - -namespace -{ - -} - -} - Glacier2::Instrumentation::SessionObserver::~SessionObserver() { } -/// \cond INTERNAL -::Ice::LocalObject* Glacier2::Instrumentation::upCast(SessionObserver* p) { return p; } -/// \endcond - Glacier2::Instrumentation::ObserverUpdater::~ObserverUpdater() { } -/// \cond INTERNAL -::Ice::LocalObject* Glacier2::Instrumentation::upCast(ObserverUpdater* p) { return p; } -/// \endcond - Glacier2::Instrumentation::RouterObserver::~RouterObserver() { } - -/// \cond INTERNAL -::Ice::LocalObject* Glacier2::Instrumentation::upCast(RouterObserver* p) { return p; } -/// \endcond - -namespace Ice -{ -} - -#endif diff --git a/cpp/src/Glacier2/Instrumentation.h b/cpp/src/Glacier2/Instrumentation.h index 7ef3a6774a0..adf3e99ba99 100644 --- a/cpp/src/Glacier2/Instrumentation.h +++ b/cpp/src/Glacier2/Instrumentation.h @@ -5,7 +5,6 @@ #ifndef __Glacier2_Instrumentation_h__ #define __Glacier2_Instrumentation_h__ -#include #include #include #include @@ -13,13 +12,10 @@ #include #include #include -#include #include #include #include -#ifdef ICE_CPP11_MAPPING // C++11 mapping - namespace Glacier2 { @@ -123,13 +119,6 @@ class RouterObserver } -/// \cond STREAM -namespace Ice -{ - -} -/// \endcond - /// \cond INTERNAL namespace Glacier2 { @@ -150,187 +139,4 @@ using RouterObserverPtr = ::std::shared_ptr; } /// \endcond -#else // C++98 mapping - -namespace Glacier2 -{ - -namespace Instrumentation -{ - -class SessionObserver; -/// \cond INTERNAL -::Ice::LocalObject* upCast(SessionObserver*); -/// \endcond -typedef ::IceInternal::Handle< SessionObserver> SessionObserverPtr; - -class ObserverUpdater; -/// \cond INTERNAL -::Ice::LocalObject* upCast(ObserverUpdater*); -/// \endcond -typedef ::IceInternal::Handle< ObserverUpdater> ObserverUpdaterPtr; - -class RouterObserver; -/// \cond INTERNAL -::Ice::LocalObject* upCast(RouterObserver*); -/// \endcond -typedef ::IceInternal::Handle< RouterObserver> RouterObserverPtr; - -} - -} - -namespace Glacier2 -{ - -namespace Instrumentation -{ - -class SessionObserver : virtual public ::Ice::Instrumentation::Observer -{ -public: - - typedef SessionObserverPtr PointerType; - - virtual ~SessionObserver(); - - SessionObserver() = default; - SessionObserver(const SessionObserver&) = default; - SessionObserver& operator=(const SessionObserver&) = default; - - /** - * Notification of a forwarded request. This also implies removing the event from the queue. - * @param client True if client request, false if server request. - */ - virtual void forwarded(bool client) = 0; - - /** - * Notification of a queued request. - * @param client True if client request, false if server request. - */ - virtual void queued(bool client) = 0; - - /** - * Notification of a overridden request. This implies adding and removing an event to the queue. - * @param client True if client request, false if server request. - */ - virtual void overridden(bool client) = 0; - - /** - * Notification of a routing table size change. - * @param delta The size adjustement. - */ - virtual void routingTableSize(::Ice::Int delta) = 0; -}; - -/// \cond INTERNAL -inline bool operator==(const SessionObserver& lhs, const SessionObserver& rhs) -{ - return static_cast(lhs) == static_cast(rhs); -} - -inline bool operator<(const SessionObserver& lhs, const SessionObserver& rhs) -{ - return static_cast(lhs) < static_cast(rhs); -} -/// \endcond - -/** - * The ObserverUpdater interface is implemented by Glacier2 and an instance of this interface is provided on - * initialization to the RouterObserver object. - * This interface can be used by add-ins imlementing the RouterObserver interface to update the obsevers of observed - * objects. - */ -class ObserverUpdater : public virtual ::Ice::LocalObject -{ -public: - - typedef ObserverUpdaterPtr PointerType; - - virtual ~ObserverUpdater(); - - ObserverUpdater() = default; - ObserverUpdater(const ObserverUpdater&) = default; - ObserverUpdater& operator=(const ObserverUpdater&) = default; - - /** - * Update the router sessions. - * When called, this method goes through all the sessions and for each session RouterObserver::getSessionObserver - * is called. The implementation of getSessionObserver has the possibility to return an updated observer if - * necessary. - */ - virtual void updateSessionObservers() = 0; -}; - -/// \cond INTERNAL -inline bool operator==(const ObserverUpdater& lhs, const ObserverUpdater& rhs) -{ - return static_cast(lhs) == static_cast(rhs); -} - -inline bool operator<(const ObserverUpdater& lhs, const ObserverUpdater& rhs) -{ - return static_cast(lhs) < static_cast(rhs); -} -/// \endcond - -/** - * The router observer interface used by Glacier2 to obtain and update observers for its observeable objects. This - * interface should be implemented by add-ins that wish to observe Glacier2 objects in order to collect statistics. - */ -class RouterObserver : public virtual ::Ice::LocalObject -{ -public: - - typedef RouterObserverPtr PointerType; - - virtual ~RouterObserver(); - - RouterObserver() = default; - RouterObserver(const RouterObserver&) = default; - RouterObserver& operator=(const RouterObserver&) = default; - - /** - * This method should return an observer for the given session. - * @param id The id of the session (the user id or the SSL DN). - * @param con The connection associated to the session. - * @param routingTableSize The size of the routing table for this session. - * @param old The previous observer, only set when updating an existing observer. - */ - virtual SessionObserverPtr getSessionObserver(const ::std::string& id, const ::Ice::ConnectionPtr& con, ::Ice::Int routingTableSize, const SessionObserverPtr& old) = 0; - - /** - * Glacier2 calls this method on initialization. The add-in implementing this interface can use this object to get - * Glacier2 to re-obtain observers for topics and subscribers. - * @param updater The observer updater object. - */ - virtual void setObserverUpdater(const ObserverUpdaterPtr& updater) = 0; -}; - -/// \cond INTERNAL -inline bool operator==(const RouterObserver& lhs, const RouterObserver& rhs) -{ - return static_cast(lhs) == static_cast(rhs); -} - -inline bool operator<(const RouterObserver& lhs, const RouterObserver& rhs) -{ - return static_cast(lhs) < static_cast(rhs); -} -/// \endcond - -} - -} - -/// \cond STREAM -namespace Ice -{ - -} -/// \endcond - -#endif - -#include #endif diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp b/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp index 648bf861b4b..8e059547828 100644 --- a/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp +++ b/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp @@ -493,529 +493,3 @@ createCryptPermissionsVerifier(const shared_ptr& communicator, con } } - -#else - -namespace -{ - -#if defined(__FreeBSD__) && !defined(__GLIBC__) - -// FreeBSD crypt is no reentrat we use this global mutex to serialize access. -mutex staticMutex; - -#elif defined(__APPLE__) - -// UniqueRef helper class for CoreFoundation classes, comparable to std::unique_ptr - -template -class UniqueRef -{ -public: - - explicit UniqueRef(R ref = 0) : - _ref(ref) - { - } - - ~UniqueRef() - { - if(_ref != 0) - { - CFRelease(_ref); - } - } - - R release() - { - R r = _ref; - _ref = 0; - return r; - } - - void reset(R ref = 0) - { - assert(ref == 0 || ref != _ref); - - if(_ref != 0) - { - CFRelease(_ref); - } - _ref = ref; - } - - R& get() - { - return _ref; - } - - R get() const - { - return _ref; - } - - operator bool() const - { - return _ref != 0; - } - - void swap(UniqueRef& a) - { - R tmp = a._ref; - a._ref = _ref; - _ref = tmp; - } - -private: - - UniqueRef(UniqueRef&); - UniqueRef& operator=(UniqueRef&); - - R _ref; -}; - -#endif - -class CryptPermissionsVerifierI : public PermissionsVerifier -{ -public: - - CryptPermissionsVerifierI(const map&); - - virtual bool checkPermissions(const string&, const string&, string&, const Ice::Current&) const; - -private: - - const map _passwords; - IceUtil::Mutex _cryptMutex; // for old thread-unsafe crypt() -}; - -class CryptPermissionsVerifierPlugin : public Ice::Plugin -{ -public: - - CryptPermissionsVerifierPlugin(const CommunicatorPtr&); - - virtual void initialize(); - virtual void destroy(); - -private: - - CommunicatorPtr _communicator; -}; - -map -retrievePasswordMap(const string& file) -{ - ifstream passwordFile(IceUtilInternal::streamFilename(file).c_str()); - if(!passwordFile) - { - string err = IceUtilInternal::lastErrorToString(); - throw Ice::InitializationException(__FILE__, __LINE__, "cannot open `" + file + "' for reading: " + err); - } - map passwords; - - while(true) - { - string userId; - passwordFile >> userId; - if(!passwordFile) - { - break; - } - - string password; - passwordFile >> password; - if(!passwordFile) - { - break; - } - - assert(!userId.empty()); - assert(!password.empty()); - passwords.insert(make_pair(userId, password)); - } - return passwords; -} - -CryptPermissionsVerifierI::CryptPermissionsVerifierI(const map& passwords) : - _passwords(passwords) -{ -} - -namespace -{ - -#if defined(__APPLE__) || defined(_WIN32) - -const string padBytes0 = ""; -const string padBytes1 = "="; -const string padBytes2 = "=="; - -inline string -paddingBytes(size_t length) -{ - switch(length % 4) - { - case 2: - { - return padBytes2; - } - case 3: - { - return padBytes1; - } - default: - { - return padBytes0; - } - } -} -#endif - -} -bool -CryptPermissionsVerifierI::checkPermissions(const string& userId, const string& password, string&, const Current&) const -{ - map::const_iterator p = _passwords.find(userId); - - if(p == _passwords.end()) - { - return false; - } -#if defined(__GLIBC__) || defined(__FreeBSD__) - size_t i = p->second.rfind('$'); - string salt; - if(i == string::npos) - { - // - // Crypt DES - // - if(p->second.size() != 13) // DES passwords are 13 characters long. - { - return false; - } - salt = p->second.substr(0, 2); - } - else - { - salt = p->second.substr(0, i + 1); - if(salt.empty()) - { - return false; - } - } -# if defined(__GLIBC__) - struct crypt_data data; - data.initialized = 0; - return p->second == crypt_r(password.c_str(), salt.c_str(), &data); -# else - lock_guard lock(staticMutex); - return p->second == crypt(password.c_str(), salt.c_str()); -# endif -#elif defined(__APPLE__) || defined(_WIN32) - // - // Pbkdf2 string format: - // - // $pbkdf2-digest$rounds$salt$checksum - // $pbkdf2$rounds$salt$checksum (SHA1 digest) - // - size_t beg = 0; - size_t end = 0; - - // - // Determine the digest algorithm - // -# if defined(__APPLE__) - CCPseudoRandomAlgorithm algorithmId = 0; -# else - LPCWSTR algorithmId = 0; -# endif - size_t checksumLength = 0; - - const string pbkdf2SHA1Token = "$pbkdf2$"; - - if(p->second.find(pbkdf2SHA1Token) == 0) - { -# if defined(__APPLE__) - algorithmId = kCCPRFHmacAlgSHA1; -# else - algorithmId = BCRYPT_SHA1_ALGORITHM; -# endif - checksumLength = 20; - beg = pbkdf2SHA1Token.size(); - } - else - { - // - // Pbkdf2 string format: - // - // $pbkdf2-digest$rounds$salt$checksum - // - const string pbkdf2Token = "$pbkdf2-"; - if(p->second.find(pbkdf2Token) != 0) - { - return false; // PBKDF2 start token not found - } - - beg = pbkdf2Token.size(); - end = p->second.find('$', beg); - if(end == string::npos) - { - return false; // Digest algorithm end token not found - } - - if(p->second.substr(beg, (end - beg)) == "sha256") - { -# if defined(__APPLE__) - algorithmId = kCCPRFHmacAlgSHA256; -# else - algorithmId = BCRYPT_SHA256_ALGORITHM; -# endif - checksumLength = 32; - } - else if(p->second.substr(beg, (end - beg)) == "sha512") - { -# if defined(__APPLE__) - algorithmId = kCCPRFHmacAlgSHA512; -# else - algorithmId = BCRYPT_SHA512_ALGORITHM; -# endif - checksumLength = 64; - } - else - { - return false; // Invalid digest algorithm - } - beg = end + 1; - } - // - // Determine the number of rounds - // - end = p->second.find('$', beg); - if(end == string::npos) - { - return false; // Rounds end token not found - } - - IceUtil::Int64 rounds = 0; - if(!IceUtilInternal::stringToInt64(p->second.substr(beg, (end - beg)), rounds)) - { - return false; // Invalid rounds value - } - - // - // Determine salt and checksum - // - beg = end + 1; - end = p->second.find('$', beg); - if(end == string::npos) - { - return false; // Salt value end token not found - } - - string salt = p->second.substr(beg, (end - beg)); - string checksum = p->second.substr(end + 1); - if(checksum.empty()) - { - return false; - } - - // - // passlib encoding is identical to base64 except that it uses . instead of +, - // and omits trailing padding = and whitepsace. - // - std::replace(salt.begin(), salt.end(), '.', '+'); - salt += paddingBytes(salt.size()); - - std::replace(checksum.begin(), checksum.end(), '.', '+'); - checksum += paddingBytes(checksum.size()); -# if defined(__APPLE__) - UniqueRef error; - UniqueRef decoder(SecDecodeTransformCreate(kSecBase64Encoding, &error.get())); - if(error) - { - return false; - } - - UniqueRef data(CFDataCreateWithBytesNoCopy(kCFAllocatorDefault, - reinterpret_cast(salt.c_str()), - static_cast(salt.size()), - kCFAllocatorNull)); - - SecTransformSetAttribute(decoder.get(), kSecTransformInputAttributeName, data.get(), &error.get()); - if(error) - { - return false; - } - - UniqueRef saltBuffer(static_cast(SecTransformExecute(decoder.get(), &error.get()))); - if(error) - { - return false; - } - - vector checksumBuffer1(checksumLength); - OSStatus status = CCKeyDerivationPBKDF(kCCPBKDF2, - password.c_str(), - password.size(), - CFDataGetBytePtr(saltBuffer.get()), - static_cast(CFDataGetLength(saltBuffer.get())), - algorithmId, - static_cast(rounds), - &checksumBuffer1[0], - checksumLength); - if(status != errSecSuccess) - { - return false; - } - - decoder.reset(SecDecodeTransformCreate(kSecBase64Encoding, &error.get())); - if(error) - { - return false; - } - data.reset(CFDataCreateWithBytesNoCopy(kCFAllocatorDefault, - reinterpret_cast(checksum.c_str()), - static_cast(checksum.size()), - kCFAllocatorNull)); - SecTransformSetAttribute(decoder.get(), kSecTransformInputAttributeName, data.get(), &error.get()); - if(error) - { - return false; - } - - data.reset(static_cast(SecTransformExecute(decoder.get(), &error.get()))); - if(error) - { - return false; - } - - vector checksumBuffer2(CFDataGetBytePtr(data.get()), CFDataGetBytePtr(data.get()) + CFDataGetLength(data.get())); - return checksumBuffer1 == checksumBuffer2; -# else - DWORD saltLength = static_cast(salt.size()); - vector saltBuffer(saltLength); - - if(!CryptStringToBinary(salt.c_str(), static_cast(salt.size()), CRYPT_STRING_BASE64, &saltBuffer[0], &saltLength, 0, 0)) - { - return false; - } - saltBuffer.resize(saltLength); - - BCRYPT_ALG_HANDLE algorithmHandle = 0; - if(BCryptOpenAlgorithmProvider(&algorithmHandle, algorithmId, 0, BCRYPT_ALG_HANDLE_HMAC_FLAG) != 0) - { - return false; - } - - vector checksumBuffer1(checksumLength); - - vector passwordBuffer(password.begin(), password.end()); - - DWORD status = BCryptDeriveKeyPBKDF2(algorithmHandle, &passwordBuffer[0], - static_cast(passwordBuffer.size()), - &saltBuffer[0], saltLength, rounds, - &checksumBuffer1[0], static_cast(checksumLength), 0); - - BCryptCloseAlgorithmProvider(algorithmHandle, 0); - - if(status != 0) - { - return false; - } - - DWORD checksumBuffer2Length = static_cast(checksumLength); - vector checksumBuffer2(checksumLength); - - if(!CryptStringToBinary(checksum.c_str(), static_cast(checksum.size()), - CRYPT_STRING_BASE64, &checksumBuffer2[0], - &checksumBuffer2Length, 0, 0)) - { - return false; - } - return checksumBuffer1 == checksumBuffer2; -# endif -#else - // Fallback to plain crypt() - DES-style - - if(p->second.size() != 13) - { - return false; - } - string salt = p->second.substr(0, 2); - - IceUtil::Mutex::Lock lock(_cryptMutex); - return p->second == crypt(password.c_str(), salt.c_str()); - -#endif -} - -CryptPermissionsVerifierPlugin::CryptPermissionsVerifierPlugin(const CommunicatorPtr& communicator) : - _communicator(communicator) -{ -} - -void -CryptPermissionsVerifierPlugin::initialize() -{ - const string prefix = "Glacier2CryptPermissionsVerifier."; - const PropertyDict props = _communicator->getProperties()->getPropertiesForPrefix(prefix); - - if(!props.empty()) - { - ObjectAdapterPtr adapter = _communicator->createObjectAdapter(""); // colloc-only adapter - - // Each prop represents a property to set + the associated password file - - for(PropertyDict::const_iterator p = props.begin(); p != props.end(); ++p) - { - string name = p->first.substr(prefix.size()); - Identity id; - id.name = Ice::generateUUID(); - id.category = "Glacier2CryptPermissionsVerifier"; - ObjectPrx prx = adapter->add(new CryptPermissionsVerifierI(retrievePasswordMap(p->second)), id); - _communicator->getProperties()->setProperty(name, _communicator->proxyToString(prx)); - } - - adapter->activate(); - } -} - -void -CryptPermissionsVerifierPlugin::destroy() -{ -} - -} - -#ifndef CRYPT_PERMISSIONS_VERIFIER_API -# ifdef CRYPT_PERMISSIONS_VERIFIER_API_EXPORTS -# define CRYPT_PERMISSIONS_VERIFIER_API ICE_DECLSPEC_EXPORT -# else -# define CRYPT_PERMISSIONS_VERIFIER_API /**/ -# endif -#endif - -// -// Plug-in factory function. -// -extern "C" -{ - -CRYPT_PERMISSIONS_VERIFIER_API Ice::Plugin* -createCryptPermissionsVerifier(const CommunicatorPtr& communicator, const string& name, const StringSeq& args) -{ - if(args.size() > 0) - { - Error out(communicator->getLogger()); - out << "Plugin " << name << ": too many arguments"; - return 0; - } - - return new CryptPermissionsVerifierPlugin(communicator); -} - -} - -#endif diff --git a/cpp/src/Glacier2Lib/Application.cpp b/cpp/src/Glacier2Lib/Application.cpp index ef330e41e88..8f474e83cfe 100644 --- a/cpp/src/Glacier2Lib/Application.cpp +++ b/cpp/src/Glacier2Lib/Application.cpp @@ -15,44 +15,12 @@ Glacier2::RouterPrxPtr Glacier2::Application::_router; Glacier2::SessionPrxPtr Glacier2::Application::_session; string Glacier2::Application::_category; -namespace -{ -#ifndef ICE_CPP11_MAPPING // C++98 -class CloseCallbackI : public Ice::CloseCallback -{ -public: - - CloseCallbackI(Glacier2::Application* app) : _app(app) - { - } - - virtual void - closed(const Ice::ConnectionPtr&) - { - _app->sessionDestroyed(); - } - -private: - - Glacier2::Application* _app; -}; -#endif -} - string Glacier2::RestartSessionException::ice_id() const { return "::Glacier2::RestartSessionException"; } -#ifndef ICE_CPP11_MAPPING -Glacier2::RestartSessionException* -Glacier2::RestartSessionException::ice_clone() const -{ - return new RestartSessionException(*this); -} -#endif - Glacier2::Application::Application(SignalPolicy signalPolicy) : Ice::Application(signalPolicy) { @@ -217,15 +185,11 @@ Glacier2::Application::doMain(Ice::StringSeq& args, const Ice::InitializationDat Ice::ConnectionPtr connection = _router->ice_getCachedConnection(); assert(connection); connection->setACM(acmTimeout, IceUtil::None, ICE_ENUM(ACMHeartbeat, HeartbeatAlways)); -#ifdef ICE_CPP11_MAPPING connection->setCloseCallback( [this](Ice::ConnectionPtr) { sessionDestroyed(); }); -#else - connection->setCloseCallback(ICE_MAKE_SHARED(CloseCallbackI, this)); -#endif } _category = _router->getCategoryForClient(); diff --git a/cpp/src/Glacier2Lib/NullPermissionsVerifier.cpp b/cpp/src/Glacier2Lib/NullPermissionsVerifier.cpp index 382f25240fc..26724f38cce 100644 --- a/cpp/src/Glacier2Lib/NullPermissionsVerifier.cpp +++ b/cpp/src/Glacier2Lib/NullPermissionsVerifier.cpp @@ -16,11 +16,7 @@ class NullPermissionsVerifier : public Glacier2::PermissionsVerifier { public: -#ifdef ICE_CPP11_MAPPING bool checkPermissions(string, string, string&, const Current&) const -#else - bool checkPermissions(const string&, const string&, string&, const Current&) const -#endif { return true; } @@ -30,13 +26,8 @@ class NullSSLPermissionsVerifier : public Glacier2::SSLPermissionsVerifier { public: -#ifdef ICE_CPP11_MAPPING virtual bool authorize(Glacier2::SSLInfo, string&, const Ice::Current&) const -#else - virtual bool - authorize(const Glacier2::SSLInfo&, string&, const Ice::Current&) const -#endif { return true; } diff --git a/cpp/src/Glacier2Lib/SessionHelper.cpp b/cpp/src/Glacier2Lib/SessionHelper.cpp index 3909c928008..1cfca4ef4de 100644 --- a/cpp/src/Glacier2Lib/SessionHelper.cpp +++ b/cpp/src/Glacier2Lib/SessionHelper.cpp @@ -15,12 +15,7 @@ using namespace std; namespace Glacier2 { -class SessionThreadCallback : -#ifdef ICE_CPP11_MAPPING - public std::enable_shared_from_this -#else - public virtual IceUtil::Shared -#endif +class SessionThreadCallback : public std::enable_shared_from_this { public: @@ -46,9 +41,6 @@ namespace { class ConnectStrategy -#ifndef ICE_CPP11_MAPPING - : public Ice::LocalObject -#endif { public: @@ -81,10 +73,7 @@ class Disconnected : public Ice::DispatcherCall const Glacier2::SessionCallbackPtr _callback; }; -class SessionHelperI : public Glacier2::SessionHelper -#ifdef ICE_CPP11_MAPPING - , public std::enable_shared_from_this -#endif +class SessionHelperI : public Glacier2::SessionHelper, public std::enable_shared_from_this { public: @@ -310,20 +299,6 @@ Glacier2::SessionHelper::~SessionHelper() // Out of line to avoid weak vtable } -#ifndef ICE_CPP11_MAPPING -bool -Glacier2::SessionHelper::operator==(const Glacier2::SessionHelper& other) const -{ - return this == &other; -} - -bool -Glacier2::SessionHelper::operator!=(const Glacier2::SessionHelper& other) const -{ - return this != &other; -} -#endif - Ice::ObjectAdapterPtr SessionHelperI::internalObjectAdapter() { @@ -519,7 +494,7 @@ class ConnectFailed : public Ice::DispatcherCall const Glacier2::SessionCallbackPtr _callback; const Glacier2::SessionHelperPtr _session; - IceInternal::UniquePtr _ex; + unique_ptr _ex; }; class CreatedCommunicator : public Ice::DispatcherCall @@ -704,27 +679,6 @@ class Connected : public Ice::DispatcherCall const Glacier2::SessionHelperPtr _session; }; -#ifndef ICE_CPP11_MAPPING // C++98 -class CloseCallbackI : public Ice::CloseCallback -{ -public: - - CloseCallbackI(const SessionHelperIPtr& sessionHelper) : _sessionHelper(sessionHelper) - { - } - - virtual void - closed(const Ice::ConnectionPtr&) - { - _sessionHelper->destroy(); - } - -private: - - SessionHelperIPtr _sessionHelper; -}; -#endif - } void @@ -786,15 +740,11 @@ SessionHelperI::connected(const Glacier2::RouterPrxPtr& router, const Glacier2:: Ice::ConnectionPtr connection = _router->ice_getCachedConnection(); assert(connection); connection->setACM(acmTimeout, IceUtil::None, Ice::ICE_ENUM(ACMHeartbeat, HeartbeatAlways)); -#ifdef ICE_CPP11_MAPPING auto self = shared_from_this(); connection->setCloseCallback([self](Ice::ConnectionPtr) { self->destroy(); }); -#else - connection->setCloseCallback(ICE_MAKE_SHARED(CloseCallbackI, this)); -#endif } } } @@ -818,15 +768,11 @@ SessionHelperI::dispatchCallback(const Ice::DispatcherCallPtr& call, const Ice:: { if(_initData.dispatcher) { -#ifdef ICE_CPP11_MAPPING _initData.dispatcher([call]() { call->run(); }, conn); -#else - _initData.dispatcher->dispatch(call, conn); -#endif } else { @@ -870,15 +816,11 @@ SessionHelperI::dispatchCallbackAndWait(const Ice::DispatcherCallPtr& call, cons { IceUtilInternal::CountDownLatch cdl(1); Ice::DispatcherCallPtr callWait = new DispatcherCallWait(cdl, call); -#ifdef ICE_CPP11_MAPPING _initData.dispatcher([callWait]() { callWait->run(); }, conn); -#else - _initData.dispatcher->dispatch(callWait, conn); -#endif cdl.await(); } else @@ -1027,11 +969,7 @@ Glacier2::SessionFactoryHelper::setProtocol(const string& protocol) protocol != "ws" && protocol != "wss") { -#ifdef ICE_CPP11_MAPPING throw invalid_argument("Unknown protocol `" + protocol + "'"); -#else - throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, "Unknown protocol `" + protocol + "'"); -#endif } _protocol = protocol; } diff --git a/cpp/src/Ice/ACM.cpp b/cpp/src/Ice/ACM.cpp index 3bfa3df63af..f2bd476a96e 100644 --- a/cpp/src/Ice/ACM.cpp +++ b/cpp/src/Ice/ACM.cpp @@ -13,11 +13,6 @@ using namespace std; using namespace Ice; using namespace IceInternal; -#ifndef ICE_CPP11_MAPPING -IceUtil::Shared* IceInternal::upCast(ACMMonitor* p) { return p; } -IceUtil::Shared* IceInternal::upCast(FactoryACMMonitor* p) { return p; } -#endif - IceInternal::ACMConfig::ACMConfig(bool server) : timeout(IceUtil::Time::seconds(60)), heartbeat(ICE_ENUM(ACMHeartbeat, HeartbeatOnDispatch)), diff --git a/cpp/src/Ice/ACM.h b/cpp/src/Ice/ACM.h index 107803a6f89..fa847bf0f7e 100644 --- a/cpp/src/Ice/ACM.h +++ b/cpp/src/Ice/ACM.h @@ -45,10 +45,9 @@ class ACMMonitor : public IceUtil::TimerTask virtual Ice::ACM getACM() = 0; }; -class FactoryACMMonitor : public ACMMonitor, public IceUtil::Monitor -#ifdef ICE_CPP11_MAPPING - , public std::enable_shared_from_this -#endif +class FactoryACMMonitor : public ACMMonitor, + public IceUtil::Monitor, + public std::enable_shared_from_this { public: @@ -84,10 +83,8 @@ class FactoryACMMonitor : public ACMMonitor, public IceUtil::Monitor -#endif + public IceUtil::Mutex, + public std::enable_shared_from_this { public: diff --git a/cpp/src/Ice/ACMF.h b/cpp/src/Ice/ACMF.h index afaa1b78fe0..80636ac16b6 100644 --- a/cpp/src/Ice/ACMF.h +++ b/cpp/src/Ice/ACMF.h @@ -14,16 +14,8 @@ namespace IceInternal class ACMMonitor; class FactoryACMMonitor; -#ifdef ICE_CPP11_MAPPING using ACMMonitorPtr = ::std::shared_ptr; using FactoryACMMonitorPtr = ::std::shared_ptr; -#else -IceUtil::Shared* upCast(ACMMonitor*); -typedef IceInternal::Handle ACMMonitorPtr; - -IceUtil::Shared* upCast(FactoryACMMonitor*); -typedef IceInternal::Handle FactoryACMMonitorPtr; -#endif } diff --git a/cpp/src/Ice/Application.cpp b/cpp/src/Ice/Application.cpp index fffd70d9902..87a8a8a4c6b 100644 --- a/cpp/src/Ice/Application.cpp +++ b/cpp/src/Ice/Application.cpp @@ -77,33 +77,28 @@ Ice::Application::main(int argc, const char* const argv[], ICE_CONFIG_FILE_STRIN } InitializationData initData; -#ifndef ICE_CPP11_MAPPING - if(configFile) -#endif + try { - try - { - initData.properties = createProperties(); - initData.properties->load(configFile); - } - catch(const Ice::Exception& ex) - { - Error out(getProcessLogger()); - out << ex; - return EXIT_FAILURE; - } - catch(const std::exception& ex) - { - Error out(getProcessLogger()); - out << ex; - return EXIT_FAILURE; - } - catch(...) - { - Error out(getProcessLogger()); - out << "unknown exception"; - return EXIT_FAILURE; - } + initData.properties = createProperties(); + initData.properties->load(configFile); + } + catch(const Ice::Exception& ex) + { + Error out(getProcessLogger()); + out << ex; + return EXIT_FAILURE; + } + catch(const std::exception& ex) + { + Error out(getProcessLogger()); + out << ex; + return EXIT_FAILURE; + } + catch(...) + { + Error out(getProcessLogger()); + out << "unknown exception"; + return EXIT_FAILURE; } return main(argc, argv, initData, version); } diff --git a/cpp/src/Ice/AsyncResult.cpp b/cpp/src/Ice/AsyncResult.cpp deleted file mode 100644 index 9e898337291..00000000000 --- a/cpp/src/Ice/AsyncResult.cpp +++ /dev/null @@ -1,70 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#ifndef ICE_CPP11_MAPPING - -#include -#include - -using namespace std; -using namespace Ice; - -IceUtil::Shared* Ice::upCast(AsyncResult* p) { return p; } - -AsyncResult::~AsyncResult() -{ - // Out of line to avoid weak vtable -} - -void -AsyncResult::_check(const AsyncResultPtr& r, const IceProxy::Ice::Object* prx, const string& operation) -{ - check(r, operation); - if(r->getProxy().get() != prx) - { - throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, "Proxy for call to end_" + operation + - " does not match proxy that was used to call corresponding begin_" + - operation + " method"); - } -} - -void -AsyncResult::_check(const AsyncResultPtr& r, const Ice::Communicator* com, const string& operation) -{ - check(r, operation); - if(r->getCommunicator().get() != com) - { - throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, "Communicator for call to end_" + operation + - " does not match communicator that was used to call corresponding " + - "begin_" + operation + " method"); - } -} - -void -AsyncResult::_check(const AsyncResultPtr& r, const Ice::Connection* con, const string& operation) -{ - check(r, operation); - if(r->getConnection().get() != con) - { - throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, "Connection for call to end_" + operation + - " does not match connection that was used to call corresponding " + - "begin_" + operation + " method"); - } -} - -void -AsyncResult::check(const AsyncResultPtr& r, const string& operation) -{ - if(!r) - { - throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, "AsyncResult == null"); - } - else if(r->getOperation() != operation) - { - throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, "Incorrect operation for end_" + operation + - " method: " + r->getOperation()); - } -} - -#endif diff --git a/cpp/src/Ice/BatchRequestQueue.cpp b/cpp/src/Ice/BatchRequestQueue.cpp index 5fb44746696..29ebb257b8b 100644 --- a/cpp/src/Ice/BatchRequestQueue.cpp +++ b/cpp/src/Ice/BatchRequestQueue.cpp @@ -115,22 +115,14 @@ BatchRequestQueue::finishBatchRequest(OutputStream* os, if(_maxSize > 0 && _batchStream.b.size() >= _maxSize) { -#ifdef ICE_CPP11_MAPPING proxy->ice_flushBatchRequestsAsync(); -#else - proxy->begin_ice_flushBatchRequests(); -#endif } assert(_batchMarker < _batchStream.b.size()); if(_interceptor) { BatchRequestI request(*this, proxy, operation, static_cast(_batchStream.b.size() - _batchMarker)); -#ifdef ICE_CPP11_MAPPING _interceptor(request, _batchRequestNum, static_cast(_batchMarker)); -#else - _interceptor->enqueue(request, _batchRequestNum, static_cast(_batchMarker)); -#endif } else { @@ -213,11 +205,7 @@ void BatchRequestQueue::destroy(const Ice::LocalException& ex) { Lock sync(*this); -#ifdef ICE_CPP11_MAPPING _exception = ex.ice_clone(); -#else - _exception.reset(ex.ice_clone()); -#endif } bool diff --git a/cpp/src/Ice/BatchRequestQueue.h b/cpp/src/Ice/BatchRequestQueue.h index 5ef6921d461..9da72f8082f 100644 --- a/cpp/src/Ice/BatchRequestQueue.h +++ b/cpp/src/Ice/BatchRequestQueue.h @@ -8,7 +8,6 @@ #include #include #include -#include #include #include @@ -39,18 +38,14 @@ class BatchRequestQueue : public IceUtil::Shared, private IceUtil::Monitor _interceptor; -#else - Ice::BatchRequestInterceptorPtr _interceptor; -#endif Ice::OutputStream _batchStream; bool _batchStreamInUse; bool _batchStreamCanFlush; bool _batchCompress; int _batchRequestNum; size_t _batchMarker; - IceInternal::UniquePtr _exception; + std::unique_ptr _exception; size_t _maxSize; }; diff --git a/cpp/src/Ice/CollocatedRequestHandler.h b/cpp/src/Ice/CollocatedRequestHandler.h index 50f79efea81..25f7dbfd848 100644 --- a/cpp/src/Ice/CollocatedRequestHandler.h +++ b/cpp/src/Ice/CollocatedRequestHandler.h @@ -59,12 +59,10 @@ class CollocatedRequestHandler : public RequestHandler, void invokeAll(Ice::OutputStream*, Ice::Int, Ice::Int); -#ifdef ICE_CPP11_MAPPING std::shared_ptr shared_from_this() { return std::static_pointer_cast(ResponseHandler::shared_from_this()); } -#endif private: diff --git a/cpp/src/Ice/Communicator.cpp b/cpp/src/Ice/Communicator.cpp index 94aef0d1d14..2789fe178b2 100644 --- a/cpp/src/Ice/Communicator.cpp +++ b/cpp/src/Ice/Communicator.cpp @@ -2,55 +2,8 @@ // Copyright (c) ZeroC, Inc. All rights reserved. // -#ifndef ICE_API_EXPORTS -# define ICE_API_EXPORTS -#endif #include -#include -#include -#include -#include -#include -#include -#include -#include - -#if defined(_MSC_VER) -# pragma warning(disable:4458) // declaration of ... hides class member -#elif defined(__clang__) -# pragma clang diagnostic ignored "-Wshadow" -#elif defined(__GNUC__) -# pragma GCC diagnostic ignored "-Wshadow" -#endif - -#ifdef ICE_CPP11_MAPPING // C++11 mapping - -namespace -{ - -} - -Ice::Communicator::~Communicator() -{ -} - -#else // C++98 mapping - -namespace -{ - -} Ice::Communicator::~Communicator() { } - -/// \cond INTERNAL -ICE_API ::Ice::LocalObject* Ice::upCast(Communicator* p) { return p; } -/// \endcond - -namespace Ice -{ -} - -#endif diff --git a/cpp/src/Ice/CommunicatorF.cpp b/cpp/src/Ice/CommunicatorF.cpp deleted file mode 100644 index ff35f810eea..00000000000 --- a/cpp/src/Ice/CommunicatorF.cpp +++ /dev/null @@ -1,38 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#ifndef ICE_API_EXPORTS -# define ICE_API_EXPORTS -#endif -#include -#include -#include - -#if defined(_MSC_VER) -# pragma warning(disable:4458) // declaration of ... hides class member -#elif defined(__clang__) -# pragma clang diagnostic ignored "-Wshadow" -#elif defined(__GNUC__) -# pragma GCC diagnostic ignored "-Wshadow" -#endif - -#ifdef ICE_CPP11_MAPPING // C++11 mapping - -namespace -{ - -} - -#else // C++98 mapping - -namespace -{ - -} - -namespace Ice -{ -} - -#endif diff --git a/cpp/src/Ice/CommunicatorI.cpp b/cpp/src/Ice/CommunicatorI.cpp index f774cc8a66e..e40c5814375 100644 --- a/cpp/src/Ice/CommunicatorI.cpp +++ b/cpp/src/Ice/CommunicatorI.cpp @@ -22,10 +22,6 @@ using namespace std; using namespace Ice; using namespace IceInternal; -#ifndef ICE_CPP11_MAPPING -IceUtil::Shared* IceInternal::upCast(CommunicatorFlushBatchAsync* p) { return p; } -#endif - CommunicatorFlushBatchAsync::~CommunicatorFlushBatchAsync() { // Out of line to avoid weak vtable @@ -388,8 +384,6 @@ const ::std::string flushBatchRequests_name = "flushBatchRequests"; } -#ifdef ICE_CPP11_MAPPING - ::std::function Ice::CommunicatorI::flushBatchRequestsAsync(CompressBatch compress, function ex, @@ -411,83 +405,6 @@ Ice::CommunicatorI::flushBatchRequestsAsync(CompressBatch compress, return [outAsync]() { outAsync->cancel(); }; } -#else - -void -Ice::CommunicatorI::flushBatchRequests(CompressBatch compress) -{ - end_flushBatchRequests(begin_flushBatchRequests(compress)); -} - -AsyncResultPtr -Ice::CommunicatorI::begin_flushBatchRequests(CompressBatch compress) -{ - return _iceI_begin_flushBatchRequests(compress, ::IceInternal::dummyCallback, 0); -} - -AsyncResultPtr -Ice::CommunicatorI::begin_flushBatchRequests(CompressBatch compress, - const CallbackPtr& cb, - const LocalObjectPtr& cookie) -{ - return _iceI_begin_flushBatchRequests(compress, cb, cookie); -} - -AsyncResultPtr -Ice::CommunicatorI::begin_flushBatchRequests(CompressBatch compress, - const Callback_Communicator_flushBatchRequestsPtr& cb, - const LocalObjectPtr& cookie) -{ - return _iceI_begin_flushBatchRequests(compress, cb, cookie); -} - -AsyncResultPtr -Ice::CommunicatorI::_iceI_begin_flushBatchRequests(CompressBatch compress, - const IceInternal::CallbackBasePtr& cb, - const LocalObjectPtr& cookie) -{ - class CommunicatorFlushBatchAsyncWithCallback : public CommunicatorFlushBatchAsync, public CallbackCompletion - { - public: - - CommunicatorFlushBatchAsyncWithCallback(const Ice::CommunicatorPtr& communicator, - const InstancePtr& instance, - const CallbackBasePtr& callback, - const Ice::LocalObjectPtr& cookie) : - CommunicatorFlushBatchAsync(instance), CallbackCompletion(callback, cookie), _communicator(communicator) - { - _cookie = cookie; - } - - virtual Ice::CommunicatorPtr getCommunicator() const - { - return _communicator; - } - - virtual const std::string& - getOperation() const - { - return flushBatchRequests_name; - } - - private: - - Ice::CommunicatorPtr _communicator; - }; - - CommunicatorFlushBatchAsyncPtr result = new CommunicatorFlushBatchAsyncWithCallback(this, _instance, cb, cookie); - result->invoke(flushBatchRequests_name, compress); - return result; -} - -void -Ice::CommunicatorI::end_flushBatchRequests(const AsyncResultPtr& r) -{ - AsyncResult::_check(r, this, flushBatchRequests_name); - r->_waitForResponse(); -} -#endif - ObjectPrxPtr Ice::CommunicatorI::createAdmin(const ObjectAdapterPtr& adminAdapter, const Identity& adminId) { diff --git a/cpp/src/Ice/CommunicatorI.h b/cpp/src/Ice/CommunicatorI.h index 7c404639b25..e3a540d0f91 100644 --- a/cpp/src/Ice/CommunicatorI.h +++ b/cpp/src/Ice/CommunicatorI.h @@ -10,7 +10,6 @@ #include #include #include -#include #include #include @@ -32,12 +31,10 @@ class CommunicatorFlushBatchAsync : public OutgoingAsyncBase void flushConnection(const Ice::ConnectionIPtr&, Ice::CompressBatch); void invoke(const std::string&, Ice::CompressBatch); -#ifdef ICE_CPP11_MAPPING std::shared_ptr shared_from_this() { return std::static_pointer_cast(OutgoingAsyncBase::shared_from_this()); } -#endif private: @@ -54,11 +51,7 @@ namespace Ice class CommunicatorI; ICE_DEFINE_PTR(CommunicatorIPtr, CommunicatorI); -class CommunicatorI : public Communicator -#ifdef ICE_CPP11_MAPPING - , public std::enable_shared_from_this -#endif - +class CommunicatorI : public Communicator, public std::enable_shared_from_this { public: @@ -102,21 +95,10 @@ class CommunicatorI : public Communicator virtual void postToClientThreadPool(::std::function call); -#ifdef ICE_CPP11_MAPPING virtual ::std::function flushBatchRequestsAsync(CompressBatch, ::std::function, ::std::function = nullptr); -#else - virtual void flushBatchRequests(CompressBatch); - virtual AsyncResultPtr begin_flushBatchRequests(CompressBatch); - virtual AsyncResultPtr begin_flushBatchRequests(CompressBatch, const CallbackPtr&, const LocalObjectPtr& = 0); - virtual AsyncResultPtr begin_flushBatchRequests(CompressBatch, - const Callback_Communicator_flushBatchRequestsPtr&, - const LocalObjectPtr& = 0); - - virtual void end_flushBatchRequests(const AsyncResultPtr&); -#endif virtual ObjectPrxPtr createAdmin(const ObjectAdapterPtr&, const Identity&); virtual ObjectPrxPtr getAdmin() const; @@ -129,10 +111,6 @@ class CommunicatorI : public Communicator private: -#ifndef ICE_CPP11_MAPPING - CommunicatorI() {} -#endif - static CommunicatorIPtr create(const InitializationData&); // @@ -146,13 +124,6 @@ class CommunicatorI : public Communicator friend ICE_API CommunicatorPtr initialize(const InitializationData&, Int); friend ICE_API ::IceInternal::InstancePtr IceInternal::getInstance(const ::Ice::CommunicatorPtr&); friend ICE_API ::IceUtil::TimerPtr IceInternal::getInstanceTimer(const ::Ice::CommunicatorPtr&); - -#ifndef ICE_CPP11_MAPPING - AsyncResultPtr _iceI_begin_flushBatchRequests(CompressBatch, - const IceInternal::CallbackBasePtr&, - const LocalObjectPtr&); -#endif - const ::IceInternal::InstancePtr _instance; // diff --git a/cpp/src/Ice/ConnectRequestHandler.cpp b/cpp/src/Ice/ConnectRequestHandler.cpp index c50c47401db..b95a45139ad 100644 --- a/cpp/src/Ice/ConnectRequestHandler.cpp +++ b/cpp/src/Ice/ConnectRequestHandler.cpp @@ -17,10 +17,6 @@ using namespace std; using namespace IceInternal; -#ifndef ICE_CPP11_MAPPING -IceUtil::Shared* IceInternal::upCast(ConnectRequestHandler* p) { return p; } -#endif - ConnectRequestHandler::ConnectRequestHandler(const ReferencePtr& ref, const Ice::ObjectPrxPtr& proxy) : RequestHandler(ref), _proxy(proxy), @@ -273,11 +269,7 @@ ConnectRequestHandler::flushRequests() _flushing = true; } -#ifdef ICE_CPP11_MAPPING std::unique_ptr exception; -#else - IceInternal::UniquePtr exception; -#endif while(!_requests.empty()) // _requests is immutable when _flushing = true { ProxyOutgoingAsyncBasePtr& req = _requests.front(); @@ -327,11 +319,7 @@ ConnectRequestHandler::flushRequests() { Lock sync(*this); assert(!_initialized); -#ifdef ICE_CPP11_MAPPING swap(_exception, exception); -#else - _exception.swap(exception); -#endif _initialized = !_exception; _flushing = false; diff --git a/cpp/src/Ice/ConnectRequestHandler.h b/cpp/src/Ice/ConnectRequestHandler.h index a8f79661308..e092b569212 100644 --- a/cpp/src/Ice/ConnectRequestHandler.h +++ b/cpp/src/Ice/ConnectRequestHandler.h @@ -7,7 +7,6 @@ #include #include -#include #include #include @@ -25,10 +24,8 @@ class ConnectRequestHandler final : public RequestHandler, public Reference::GetConnectionCallback, public RouterInfo::AddProxyCallback, - public IceUtil::Monitor -#ifdef ICE_CPP11_MAPPING - , public std::enable_shared_from_this -#endif + public IceUtil::Monitor, + public std::enable_shared_from_this { public: @@ -59,7 +56,7 @@ class ConnectRequestHandler final : Ice::ConnectionIPtr _connection; bool _compress; - IceInternal::UniquePtr _exception; + std::unique_ptr _exception; bool _initialized; bool _flushing; diff --git a/cpp/src/Ice/ConnectRequestHandlerF.h b/cpp/src/Ice/ConnectRequestHandlerF.h index aed35baf27e..2ca6aeb9561 100644 --- a/cpp/src/Ice/ConnectRequestHandlerF.h +++ b/cpp/src/Ice/ConnectRequestHandlerF.h @@ -12,12 +12,7 @@ namespace IceInternal { class ConnectRequestHandler; -#ifdef ICE_CPP11_MAPPING using ConnectRequestHandlerPtr = ::std::shared_ptr; -#else -IceUtil::Shared* upCast(ConnectRequestHandler*); -typedef IceInternal::Handle ConnectRequestHandlerPtr; -#endif } diff --git a/cpp/src/Ice/Connection.cpp b/cpp/src/Ice/Connection.cpp index 789659a7dca..ede824a0de0 100644 --- a/cpp/src/Ice/Connection.cpp +++ b/cpp/src/Ice/Connection.cpp @@ -19,114 +19,26 @@ # pragma GCC diagnostic ignored "-Wshadow" #endif -#ifdef ICE_CPP11_MAPPING // C++11 mapping - -namespace -{ - -} - -Ice::ConnectionInfo::~ConnectionInfo() -{ -} - -Ice::Connection::~Connection() -{ -} - -Ice::IPConnectionInfo::~IPConnectionInfo() -{ -} - -Ice::TCPConnectionInfo::~TCPConnectionInfo() -{ -} - -Ice::UDPConnectionInfo::~UDPConnectionInfo() -{ -} - -Ice::WSConnectionInfo::~WSConnectionInfo() -{ -} - -namespace Ice -{ -} - -#else // C++98 mapping - -namespace -{ - -} - Ice::ConnectionInfo::~ConnectionInfo() { } -/// \cond INTERNAL -ICE_API ::Ice::LocalObject* Ice::upCast(ConnectionInfo* p) { return p; } -/// \endcond - -Ice::CloseCallback::~CloseCallback() -{ -} - -/// \cond INTERNAL -ICE_API ::Ice::LocalObject* Ice::upCast(CloseCallback* p) { return p; } -/// \endcond - -Ice::HeartbeatCallback::~HeartbeatCallback() -{ -} - -/// \cond INTERNAL -ICE_API ::Ice::LocalObject* Ice::upCast(HeartbeatCallback* p) { return p; } -/// \endcond - Ice::Connection::~Connection() { } -/// \cond INTERNAL -ICE_API ::Ice::LocalObject* Ice::upCast(Connection* p) { return p; } -/// \endcond - Ice::IPConnectionInfo::~IPConnectionInfo() { } -/// \cond INTERNAL -ICE_API ::Ice::LocalObject* Ice::upCast(IPConnectionInfo* p) { return p; } -/// \endcond - Ice::TCPConnectionInfo::~TCPConnectionInfo() { } -/// \cond INTERNAL -ICE_API ::Ice::LocalObject* Ice::upCast(TCPConnectionInfo* p) { return p; } -/// \endcond - Ice::UDPConnectionInfo::~UDPConnectionInfo() { } -/// \cond INTERNAL -ICE_API ::Ice::LocalObject* Ice::upCast(UDPConnectionInfo* p) { return p; } -/// \endcond - Ice::WSConnectionInfo::~WSConnectionInfo() { } - -/// \cond INTERNAL -ICE_API ::Ice::LocalObject* Ice::upCast(WSConnectionInfo* p) { return p; } -/// \endcond - -namespace Ice -{ -} - -#endif diff --git a/cpp/src/Ice/ConnectionF.cpp b/cpp/src/Ice/ConnectionF.cpp deleted file mode 100644 index f770be7e196..00000000000 --- a/cpp/src/Ice/ConnectionF.cpp +++ /dev/null @@ -1,38 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#ifndef ICE_API_EXPORTS -# define ICE_API_EXPORTS -#endif -#include -#include -#include - -#if defined(_MSC_VER) -# pragma warning(disable:4458) // declaration of ... hides class member -#elif defined(__clang__) -# pragma clang diagnostic ignored "-Wshadow" -#elif defined(__GNUC__) -# pragma GCC diagnostic ignored "-Wshadow" -#endif - -#ifdef ICE_CPP11_MAPPING // C++11 mapping - -namespace -{ - -} - -#else // C++98 mapping - -namespace -{ - -} - -namespace Ice -{ -} - -#endif diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp index 566fa175d00..d41015ab402 100644 --- a/cpp/src/Ice/ConnectionFactory.cpp +++ b/cpp/src/Ice/ConnectionFactory.cpp @@ -40,10 +40,6 @@ using namespace IceInternal; IceUtil::Shared* IceInternal::upCast(OutgoingConnectionFactory* p) { return p; } -#ifndef ICE_CPP11_MAPPING -IceUtil::Shared* IceInternal::upCast(IncomingConnectionFactory* p) { return p; } -#endif - namespace { @@ -77,10 +73,7 @@ find(const Map& m, const typename Map::key_type& k, Predicate predicate) return nullptr; } -class StartAcceptor : public IceUtil::TimerTask -#ifdef ICE_CPP11_MAPPING - , public std::enable_shared_from_this -#endif +class StartAcceptor : public IceUtil::TimerTask, public std::enable_shared_from_this { public: @@ -249,11 +242,7 @@ IceInternal::OutgoingConnectionFactory::create(const vector& endpt return; } -#ifdef ICE_CPP11_MAPPING auto cb = make_shared(_instance, this, endpoints, hasMore, callback, selType); -#else - ConnectCallbackPtr cb = new ConnectCallback(_instance, this, endpoints, hasMore, callback, selType); -#endif cb->getConnectors(); } diff --git a/cpp/src/Ice/ConnectionFactory.h b/cpp/src/Ice/ConnectionFactory.h index 4fbce02ad42..1f1c553f9c6 100644 --- a/cpp/src/Ice/ConnectionFactory.h +++ b/cpp/src/Ice/ConnectionFactory.h @@ -81,11 +81,8 @@ class OutgoingConnectionFactory : public virtual IceUtil::Shared, public IceUtil }; class ConnectCallback : public Ice::ConnectionI::StartCallback, - public IceInternal::EndpointI_connectors -#ifdef ICE_CPP11_MAPPING - , public std::enable_shared_from_this -#endif - + public IceInternal::EndpointI_connectors, + public std::enable_shared_from_this { public: @@ -157,11 +154,7 @@ class OutgoingConnectionFactory : public virtual IceUtil::Shared, public IceUtil std::multimap _connections; std::map > _pending; -#ifdef ICE_CPP11_MAPPING std::multimap> _connectionsByEndpoint; -#else - std::multimap _connectionsByEndpoint; -#endif int _pendingConnectCount; }; @@ -213,12 +206,10 @@ class IncomingConnectionFactory : public EventHandler, void initialize(); virtual ~IncomingConnectionFactory(); -#ifdef ICE_CPP11_MAPPING std::shared_ptr shared_from_this() { return std::static_pointer_cast(EventHandler::shared_from_this()); } -#endif private: diff --git a/cpp/src/Ice/ConnectionFactoryF.h b/cpp/src/Ice/ConnectionFactoryF.h index 40829f37624..c3929638fb0 100644 --- a/cpp/src/Ice/ConnectionFactoryF.h +++ b/cpp/src/Ice/ConnectionFactoryF.h @@ -18,12 +18,7 @@ typedef IceInternal::Handle OutgoingConnectionFactory class IncomingConnectionFactory; -#ifdef ICE_CPP11_MAPPING using IncomingConnectionFactoryPtr = ::std::shared_ptr; -#else -IceUtil::Shared* upCast(IncomingConnectionFactory*); -typedef IceInternal::Handle IncomingConnectionFactoryPtr; -#endif } diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp index 31f63e200b1..68f93aecb4d 100644 --- a/cpp/src/Ice/ConnectionI.cpp +++ b/cpp/src/Ice/ConnectionI.cpp @@ -32,10 +32,6 @@ using namespace Ice; using namespace Ice::Instrumentation; using namespace IceInternal; -#ifndef ICE_CPP11_MAPPING -Ice::LocalObject* Ice::upCast(ConnectionI* p) { return p; } -#endif - namespace { @@ -777,7 +773,6 @@ Ice::ConnectionI::getBatchRequestQueue() const return _batchRequestQueue; } -#ifdef ICE_CPP11_MAPPING std::function Ice::ConnectionI::flushBatchRequestsAsync(CompressBatch compress, ::std::function ex, @@ -799,95 +794,6 @@ Ice::ConnectionI::flushBatchRequestsAsync(CompressBatch compress, outAsync->invoke(flushBatchRequests_name, compress); return [outAsync]() { outAsync->cancel(); }; } -#else -void -Ice::ConnectionI::flushBatchRequests(CompressBatch compress) -{ - end_flushBatchRequests(begin_flushBatchRequests(compress)); -} - -AsyncResultPtr -Ice::ConnectionI::begin_flushBatchRequests(CompressBatch compress) -{ - return _iceI_begin_flushBatchRequests(compress, dummyCallback, 0); -} - -AsyncResultPtr -Ice::ConnectionI::begin_flushBatchRequests(CompressBatch compress, - const CallbackPtr& cb, - const LocalObjectPtr& cookie) -{ - return _iceI_begin_flushBatchRequests(compress, cb, cookie); -} - -AsyncResultPtr -Ice::ConnectionI::begin_flushBatchRequests(CompressBatch compress, - const Callback_Connection_flushBatchRequestsPtr& cb, - const LocalObjectPtr& cookie) -{ - return _iceI_begin_flushBatchRequests(compress, cb, cookie); -} - -AsyncResultPtr -Ice::ConnectionI::_iceI_begin_flushBatchRequests(CompressBatch compress, - const CallbackBasePtr& cb, - const LocalObjectPtr& cookie) -{ - class ConnectionFlushBatchAsyncWithCallback : public ConnectionFlushBatchAsync, public CallbackCompletion - { - public: - - ConnectionFlushBatchAsyncWithCallback(const Ice::ConnectionIPtr& connection, - const Ice::CommunicatorPtr& communicator, - const InstancePtr& instance, - const CallbackBasePtr& callback, - const Ice::LocalObjectPtr& cookie) : - ConnectionFlushBatchAsync(connection, instance), - CallbackCompletion(callback, cookie), - _communicator(communicator), - _connection(connection) - { - _cookie = cookie; - } - - virtual Ice::CommunicatorPtr getCommunicator() const - { - return _communicator; - } - - virtual Ice::ConnectionPtr getConnection() const - { - return _connection; - } - - virtual const std::string& - getOperation() const - { - return flushBatchRequests_name; - } - - private: - - Ice::CommunicatorPtr _communicator; - Ice::ConnectionPtr _connection; - }; - - ConnectionFlushBatchAsyncPtr result = new ConnectionFlushBatchAsyncWithCallback(this, - _communicator, - _instance, - cb, - cookie); - result->invoke(flushBatchRequests_name, compress); - return result; -} - -void -Ice::ConnectionI::end_flushBatchRequests(const AsyncResultPtr& r) -{ - AsyncResult::_check(r, this, flushBatchRequests_name); - r->_waitForResponse(); -} -#endif namespace { @@ -973,7 +879,6 @@ typedef IceUtil::Handle HeartbeatAsyncPtr; } -#ifdef ICE_CPP11_MAPPING void Ice::ConnectionI::heartbeat() { @@ -1000,62 +905,6 @@ Ice::ConnectionI::heartbeatAsync(::std::function ex, outAsync->invoke(); return [outAsync]() { outAsync->cancel(); }; } -#else -void -Ice::ConnectionI::heartbeat() -{ - end_heartbeat(begin_heartbeat()); -} - -AsyncResultPtr -Ice::ConnectionI::begin_heartbeat() -{ - return _iceI_begin_heartbeat(dummyCallback, 0); -} - -AsyncResultPtr -Ice::ConnectionI::begin_heartbeat(const CallbackPtr& cb, const LocalObjectPtr& cookie) -{ - return _iceI_begin_heartbeat(cb, cookie); -} - -AsyncResultPtr -Ice::ConnectionI::begin_heartbeat(const Callback_Connection_heartbeatPtr& cb, const LocalObjectPtr& cookie) -{ - return _iceI_begin_heartbeat(cb, cookie); -} - -AsyncResultPtr -Ice::ConnectionI::_iceI_begin_heartbeat(const CallbackBasePtr& cb, const LocalObjectPtr& cookie) -{ - class HeartbeatCallback : public HeartbeatAsync, public CallbackCompletion - { - public: - - HeartbeatCallback(const ConnectionIPtr& connection, - const CommunicatorPtr& communicator, - const InstancePtr& instance, - const CallbackBasePtr& callback, - const LocalObjectPtr& cookie) : - HeartbeatAsync(connection, communicator, instance), - CallbackCompletion(callback, cookie) - { - _cookie = cookie; - } - }; - - HeartbeatAsyncPtr result = new HeartbeatCallback(this, _communicator, _instance, cb, cookie); - result->invoke(); - return result; -} - -void -Ice::ConnectionI::end_heartbeat(const AsyncResultPtr& r) -{ - AsyncResult::_check(r, this, heartbeat_name); - r->_waitForResponse(); -} -#endif void Ice::ConnectionI::setHeartbeatCallback(ICE_IN(ICE_DELEGATE(HeartbeatCallback)) callback) @@ -1082,11 +931,7 @@ Ice::ConnectionI::setCloseCallback(ICE_IN(ICE_DELEGATE(CloseCallback)) callback) CallbackWorkItem(const ConnectionIPtr& connection, ICE_IN(ICE_DELEGATE(CloseCallback)) callback) : _connection(connection), -#ifdef ICE_CPP11_MAPPING _callback(std::move(callback)) -#else - _callback(callback) -#endif { } @@ -1100,11 +945,7 @@ Ice::ConnectionI::setCloseCallback(ICE_IN(ICE_DELEGATE(CloseCallback)) callback) const ConnectionIPtr _connection; const ICE_DELEGATE(CloseCallback) _callback; }; -#ifdef ICE_CPP11_MAPPING _threadPool->dispatch(new CallbackWorkItem(ICE_SHARED_FROM_THIS, std::move(callback))); -#else - _threadPool->dispatch(new CallbackWorkItem(ICE_SHARED_FROM_THIS, callback)); -#endif } } else @@ -1118,11 +959,7 @@ Ice::ConnectionI::closeCallback(const ICE_DELEGATE(CloseCallback)& callback) { try { -#ifdef ICE_CPP11_MAPPING callback(ICE_SHARED_FROM_THIS); -#else - callback->closed(ICE_SHARED_FROM_THIS); -#endif } catch(const std::exception& ex) { @@ -1144,11 +981,7 @@ Ice::ConnectionI::setACM(const IceUtil::Optional& timeout, IceUtil::Monitor::Lock sync(*this); if(timeout && *timeout < 0) { -#ifdef ICE_CPP11_MAPPING throw invalid_argument("invalid negative ACM timeout value"); -#else - throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, "invalid negative ACM timeout value"); -#endif } if(!_monitor || _state >= StateClosed) { @@ -1925,11 +1758,7 @@ ConnectionI::dispatch(const StartCallbackPtr& startCB, const vectorheartbeat(ICE_SHARED_FROM_THIS); -#endif } catch(const std::exception& ex) { diff --git a/cpp/src/Ice/ConnectionI.h b/cpp/src/Ice/ConnectionI.h index 337b71c09ea..c64df08ae06 100644 --- a/cpp/src/Ice/ConnectionI.h +++ b/cpp/src/Ice/ConnectionI.h @@ -10,7 +10,6 @@ #include #include #include -#include #include #include @@ -30,7 +29,6 @@ #include #include #include -#include #include #include #include @@ -75,12 +73,10 @@ class ConnectionI : public Connection, public: -#ifdef ICE_CPP11_MAPPING std::shared_ptr shared_from_this() { return std::dynamic_pointer_cast(VirtualEnableSharedFromThisBase::shared_from_this()); } -#endif struct OutgoingMessage { @@ -118,7 +114,6 @@ class ConnectionI : public Connection, #endif }; -#ifdef ICE_CPP11_MAPPING class StartCallback { public: @@ -127,16 +122,6 @@ class ConnectionI : public Connection, virtual void connectionStartFailed(const ConnectionIPtr&, const Ice::LocalException&) = 0; }; using StartCallbackPtr = ::std::shared_ptr; -#else - class StartCallback : public virtual IceUtil::Shared - { - public: - - virtual void connectionStartCompleted(const ConnectionIPtr&) = 0; - virtual void connectionStartFailed(const ConnectionIPtr&, const Ice::LocalException&) = 0; - }; - typedef IceUtil::Handle StartCallbackPtr; -#endif enum DestructionReason { @@ -166,37 +151,18 @@ class ConnectionI : public Connection, IceInternal::BatchRequestQueuePtr getBatchRequestQueue() const; -#ifdef ICE_CPP11_MAPPING virtual std::function flushBatchRequestsAsync(CompressBatch, ::std::function, ::std::function = nullptr); -#else - virtual void flushBatchRequests(CompressBatch); - virtual AsyncResultPtr begin_flushBatchRequests(CompressBatch); - virtual AsyncResultPtr begin_flushBatchRequests(CompressBatch, const CallbackPtr&, const LocalObjectPtr& = 0); - virtual AsyncResultPtr begin_flushBatchRequests(CompressBatch, - const Callback_Connection_flushBatchRequestsPtr&, - const LocalObjectPtr& = 0); - - virtual void end_flushBatchRequests(const AsyncResultPtr&); -#endif virtual void setCloseCallback(ICE_IN(ICE_DELEGATE(CloseCallback))); virtual void setHeartbeatCallback(ICE_IN(ICE_DELEGATE(HeartbeatCallback))); virtual void heartbeat(); -#ifdef ICE_CPP11_MAPPING virtual std::function heartbeatAsync(::std::function, ::std::function = nullptr); -#else - virtual AsyncResultPtr begin_heartbeat(); - virtual AsyncResultPtr begin_heartbeat(const CallbackPtr&, const LocalObjectPtr& = 0); - virtual AsyncResultPtr begin_heartbeat(const Callback_Connection_heartbeatPtr&, const LocalObjectPtr& = 0); - - virtual void end_heartbeat(const AsyncResultPtr&); -#endif virtual void setACM(const IceUtil::Optional&, const IceUtil::Optional&, @@ -313,13 +279,6 @@ class ConnectionI : public Connection, void reap(); -#ifndef ICE_CPP11_MAPPING - AsyncResultPtr _iceI_begin_flushBatchRequests(CompressBatch, - const IceInternal::CallbackBasePtr&, - const LocalObjectPtr&); - AsyncResultPtr _iceI_begin_heartbeat(const IceInternal::CallbackBasePtr&, const LocalObjectPtr&); -#endif - Ice::CommunicatorPtr _communicator; const IceInternal::InstancePtr _instance; IceInternal::ACMMonitorPtr _monitor; @@ -359,7 +318,7 @@ class ConnectionI : public Connection, std::map _asyncRequests; std::map::iterator _asyncRequestsHint; - IceInternal::UniquePtr _exception; + std::unique_ptr _exception; const size_t _messageSizeMax; IceInternal::BatchRequestQueuePtr _batchRequestQueue; diff --git a/cpp/src/Ice/ConnectionRequestHandler.h b/cpp/src/Ice/ConnectionRequestHandler.h index 6499119fb74..bf71d410ae3 100644 --- a/cpp/src/Ice/ConnectionRequestHandler.h +++ b/cpp/src/Ice/ConnectionRequestHandler.h @@ -12,10 +12,9 @@ namespace IceInternal { -class ConnectionRequestHandler final : public RequestHandler -#ifdef ICE_CPP11_MAPPING - , public std::enable_shared_from_this -#endif +class ConnectionRequestHandler final : + public RequestHandler, + public std::enable_shared_from_this { public: diff --git a/cpp/src/Ice/Current.cpp b/cpp/src/Ice/Current.cpp deleted file mode 100644 index 4f0764e09c9..00000000000 --- a/cpp/src/Ice/Current.cpp +++ /dev/null @@ -1,39 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#ifndef ICE_API_EXPORTS -# define ICE_API_EXPORTS -#endif -#include -#include -#include -#include -#include - -#if defined(_MSC_VER) -# pragma warning(disable:4458) // declaration of ... hides class member -#elif defined(__clang__) -# pragma clang diagnostic ignored "-Wshadow" -#elif defined(__GNUC__) -# pragma GCC diagnostic ignored "-Wshadow" -#endif - -#ifdef ICE_CPP11_MAPPING // C++11 mapping - -namespace -{ - -} - -namespace Ice -{ -} - -#else // C++98 mapping - -namespace Ice -{ -} - -#endif diff --git a/cpp/src/Ice/DynamicLibrary.cpp b/cpp/src/Ice/DynamicLibrary.cpp index 359ac35eb20..acd7a2312f0 100644 --- a/cpp/src/Ice/DynamicLibrary.cpp +++ b/cpp/src/Ice/DynamicLibrary.cpp @@ -10,10 +10,6 @@ # include #endif -#if defined(ICE_CPP11) && defined(__GNUC__) && (__GNUC__ < 6) && defined(__GLIBCXX__) -# define ICE_LIBSUFFIX "++11" -#endif - using namespace Ice; using namespace IceInternal; using namespace std; @@ -88,9 +84,6 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc if(comma == string::npos) { libName = libSpec; -# if defined(ICE_CPP11_MAPPING) && !defined(_WIN32) - libName += "++11"; -# endif if(useIceVersion) { int majorVersion = (ICE_INT_VERSION / 10000); @@ -117,9 +110,6 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc return 0; } libName = libSpec.substr(0, comma); -# if defined(ICE_CPP11_MAPPING) && !defined(_WIN32) - libName += "++11"; -# endif version = libSpec.substr(comma + 1); } @@ -129,10 +119,6 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc lib += libName; lib += version; -# ifdef ICE_CPP11_MAPPING - lib += "++11"; -# endif - # if defined(_DEBUG) lib += 'd'; # endif diff --git a/cpp/src/Ice/Endpoint.cpp b/cpp/src/Ice/Endpoint.cpp index 76ea747c3eb..913a6f05f39 100644 --- a/cpp/src/Ice/Endpoint.cpp +++ b/cpp/src/Ice/Endpoint.cpp @@ -19,106 +19,30 @@ # pragma GCC diagnostic ignored "-Wshadow" #endif -#ifdef ICE_CPP11_MAPPING // C++11 mapping - -namespace -{ - -} - -Ice::EndpointInfo::~EndpointInfo() -{ -} - -Ice::Endpoint::~Endpoint() -{ -} - -Ice::IPEndpointInfo::~IPEndpointInfo() -{ -} - -Ice::TCPEndpointInfo::~TCPEndpointInfo() -{ -} - -Ice::UDPEndpointInfo::~UDPEndpointInfo() -{ -} - -Ice::WSEndpointInfo::~WSEndpointInfo() -{ -} - -Ice::OpaqueEndpointInfo::~OpaqueEndpointInfo() -{ -} - -#else // C++98 mapping - -namespace -{ - -} - Ice::EndpointInfo::~EndpointInfo() { } -/// \cond INTERNAL -ICE_API ::Ice::LocalObject* Ice::upCast(EndpointInfo* p) { return p; } -/// \endcond - Ice::Endpoint::~Endpoint() { } -/// \cond INTERNAL -ICE_API ::Ice::LocalObject* Ice::upCast(Endpoint* p) { return p; } -/// \endcond - Ice::IPEndpointInfo::~IPEndpointInfo() { } -/// \cond INTERNAL -ICE_API ::Ice::LocalObject* Ice::upCast(IPEndpointInfo* p) { return p; } -/// \endcond - Ice::TCPEndpointInfo::~TCPEndpointInfo() { } -/// \cond INTERNAL -ICE_API ::Ice::LocalObject* Ice::upCast(TCPEndpointInfo* p) { return p; } -/// \endcond - Ice::UDPEndpointInfo::~UDPEndpointInfo() { } -/// \cond INTERNAL -ICE_API ::Ice::LocalObject* Ice::upCast(UDPEndpointInfo* p) { return p; } -/// \endcond - Ice::WSEndpointInfo::~WSEndpointInfo() { } -/// \cond INTERNAL -ICE_API ::Ice::LocalObject* Ice::upCast(WSEndpointInfo* p) { return p; } -/// \endcond - Ice::OpaqueEndpointInfo::~OpaqueEndpointInfo() { } - -/// \cond INTERNAL -ICE_API ::Ice::LocalObject* Ice::upCast(OpaqueEndpointInfo* p) { return p; } -/// \endcond - -namespace Ice -{ -} - -#endif diff --git a/cpp/src/Ice/EndpointF.cpp b/cpp/src/Ice/EndpointF.cpp deleted file mode 100644 index 9482cae41d9..00000000000 --- a/cpp/src/Ice/EndpointF.cpp +++ /dev/null @@ -1,38 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#ifndef ICE_API_EXPORTS -# define ICE_API_EXPORTS -#endif -#include -#include -#include - -#if defined(_MSC_VER) -# pragma warning(disable:4458) // declaration of ... hides class member -#elif defined(__clang__) -# pragma clang diagnostic ignored "-Wshadow" -#elif defined(__GNUC__) -# pragma GCC diagnostic ignored "-Wshadow" -#endif - -#ifdef ICE_CPP11_MAPPING // C++11 mapping - -namespace -{ - -} - -#else // C++98 mapping - -namespace -{ - -} - -namespace Ice -{ -} - -#endif diff --git a/cpp/src/Ice/EndpointI.cpp b/cpp/src/Ice/EndpointI.cpp index 15a626da0e7..0bfcd0be7d6 100644 --- a/cpp/src/Ice/EndpointI.cpp +++ b/cpp/src/Ice/EndpointI.cpp @@ -7,11 +7,6 @@ using namespace std; -#ifndef ICE_CPP11_MAPPING -IceUtil::Shared* IceInternal::upCast(EndpointI* p) { return p; } -IceUtil::Shared* IceInternal::upCast(EndpointI_connectors* p) { return p; } -#endif - IceInternal::EndpointI_connectors::~EndpointI_connectors() { // Out of line to avoid weak vtable diff --git a/cpp/src/Ice/EndpointI.h b/cpp/src/Ice/EndpointI.h index f91635883ca..23f147d1736 100644 --- a/cpp/src/Ice/EndpointI.h +++ b/cpp/src/Ice/EndpointI.h @@ -24,9 +24,6 @@ namespace IceInternal { class ICE_API EndpointI_connectors -#ifndef ICE_CPP11_MAPPING - : public virtual IceUtil::Shared -#endif { public: @@ -144,14 +141,6 @@ class ICE_API EndpointI : public Ice::Endpoint // virtual bool equivalent(const EndpointIPtr&) const = 0; - // - // Compare endpoints for sorting purposes. - // -#ifndef ICE_CPP11_MAPPING - virtual bool operator==(const Ice::LocalObject&) const = 0; - virtual bool operator<(const Ice::LocalObject&) const = 0; -#endif - virtual ::Ice::Int hash() const = 0; // @@ -168,18 +157,6 @@ class ICE_API EndpointI : public Ice::Endpoint }; -#ifndef ICE_CPP11_MAPPING -inline bool operator==(const EndpointI& l, const EndpointI& r) -{ - return static_cast(l) == static_cast(r); -} - -inline bool operator<(const EndpointI& l, const EndpointI& r) -{ - return static_cast(l) < static_cast(r); -} -#endif - template class InfoI : public T { public: diff --git a/cpp/src/Ice/EndpointIF.h b/cpp/src/Ice/EndpointIF.h index 7944b286d22..27858f67144 100644 --- a/cpp/src/Ice/EndpointIF.h +++ b/cpp/src/Ice/EndpointIF.h @@ -17,33 +17,12 @@ class UdpEndpointI; class WSEndpoint; class EndpointI_connectors; -#ifdef ICE_CPP11_MAPPING // C++11 mapping - using EndpointIPtr = ::std::shared_ptr; using TcpEndpointIPtr = ::std::shared_ptr; using UdpEndpointIPtr = ::std::shared_ptr; using WSEndpointPtr = ::std::shared_ptr; using EndpointI_connectorsPtr = ::std::shared_ptr; -#else // C++98 mapping - -ICE_API IceUtil::Shared* upCast(EndpointI*); -typedef Handle EndpointIPtr; - -ICE_API IceUtil::Shared* upCast(TcpEndpointI*); -typedef Handle TcpEndpointIPtr; - -ICE_API IceUtil::Shared* upCast(UdpEndpointI*); -typedef Handle UdpEndpointIPtr; - -ICE_API IceUtil::Shared* upCast(WSEndpoint*); -typedef Handle WSEndpointPtr; - -ICE_API IceUtil::Shared* upCast(EndpointI_connectors*); -typedef Handle EndpointI_connectorsPtr; - -#endif - } #endif diff --git a/cpp/src/Ice/EventHandler.cpp b/cpp/src/Ice/EventHandler.cpp index 96e56d8b641..b61e8aac94d 100644 --- a/cpp/src/Ice/EventHandler.cpp +++ b/cpp/src/Ice/EventHandler.cpp @@ -9,10 +9,6 @@ using namespace std; using namespace Ice; using namespace IceInternal; -#ifndef ICE_CPP11_MAPPING -IceUtil::Shared* IceInternal::upCast(EventHandler* p) { return p; } -#endif - IceInternal::EventHandler::EventHandler() : #if defined(ICE_USE_IOCP) _pending(SocketOperationNone), diff --git a/cpp/src/Ice/EventHandler.h b/cpp/src/Ice/EventHandler.h index c3c45b7845d..ca8df83f3f1 100644 --- a/cpp/src/Ice/EventHandler.h +++ b/cpp/src/Ice/EventHandler.h @@ -15,12 +15,7 @@ namespace IceInternal { -class ICE_API EventHandler : -#ifdef ICE_CPP11_MAPPING - public EnableSharedFromThis -#else - public virtual Ice::LocalObject -#endif +class ICE_API EventHandler : public EnableSharedFromThis { public: diff --git a/cpp/src/Ice/EventHandlerF.h b/cpp/src/Ice/EventHandlerF.h index e762d31a988..592e3f48bdb 100644 --- a/cpp/src/Ice/EventHandlerF.h +++ b/cpp/src/Ice/EventHandlerF.h @@ -13,12 +13,8 @@ namespace IceInternal { class EventHandler; -#ifdef ICE_CPP11_MAPPING using EventHandlerPtr = ::std::shared_ptr; -#else -ICE_API IceUtil::Shared* upCast(EventHandler*); -typedef Handle EventHandlerPtr; -#endif + } #endif diff --git a/cpp/src/Ice/Exception.cpp b/cpp/src/Ice/Exception.cpp index e1384a524dc..fccdeefa78b 100644 --- a/cpp/src/Ice/Exception.cpp +++ b/cpp/src/Ice/Exception.cpp @@ -91,13 +91,11 @@ Ice::UserException::ice_staticId() return userException_ids[0]; } -#ifdef ICE_CPP11_MAPPING unique_ptr Ice::UserException::ice_clone() const { return unique_ptr(static_cast(ice_cloneImpl())); } -#endif Ice::SlicedDataPtr Ice::UserException::ice_getSlicedData() const @@ -137,13 +135,11 @@ Ice::LocalException::~LocalException() // Out of line to avoid weak vtable } -#ifdef ICE_CPP11_MAPPING unique_ptr Ice::LocalException::ice_clone() const { return unique_ptr(static_cast(ice_cloneImpl())); } -#endif namespace { @@ -170,13 +166,11 @@ Ice::SystemException::~SystemException() { } -#ifdef ICE_CPP11_MAPPING unique_ptr Ice::SystemException::ice_clone() const { return unique_ptr(static_cast(ice_cloneImpl())); } -#endif namespace { diff --git a/cpp/src/Ice/FactoryTable.cpp b/cpp/src/Ice/FactoryTable.cpp index aa4ac0c5cb1..8682d1fc9c0 100644 --- a/cpp/src/Ice/FactoryTable.cpp +++ b/cpp/src/Ice/FactoryTable.cpp @@ -7,15 +7,6 @@ using namespace std; -#ifndef ICE_CPP11_MAPPING - -Ice::UserExceptionFactory::~UserExceptionFactory() -{ - // Out of line to avoid weak vtable -} - -#endif - // // Add a factory to the exception factory table. // If the factory is present already, increment its reference count. diff --git a/cpp/src/Ice/IPEndpointI.cpp b/cpp/src/Ice/IPEndpointI.cpp index f3d0d20c19d..2efb82a4df8 100644 --- a/cpp/src/Ice/IPEndpointI.cpp +++ b/cpp/src/Ice/IPEndpointI.cpp @@ -16,9 +16,6 @@ using namespace Ice; using namespace Ice::Instrumentation; using namespace IceInternal; -#ifndef ICE_CPP11_MAPPING -IceUtil::Shared* IceInternal::upCast(IPEndpointI* p) { return p; } -#endif IceUtil::Shared* IceInternal::upCast(EndpointHostResolver* p) { return p; } IceInternal::IPEndpointInfoI::IPEndpointInfoI(const EndpointIPtr& endpoint) : _endpoint(endpoint) @@ -247,11 +244,7 @@ IceInternal::IPEndpointI::options() const } bool -#ifdef ICE_CPP11_MAPPING IceInternal::IPEndpointI::operator==(const Endpoint& r) const -#else -IceInternal::IPEndpointI::operator==(const LocalObject& r) const -#endif { const IPEndpointI* p = dynamic_cast(&r); if(!p) @@ -287,11 +280,7 @@ IceInternal::IPEndpointI::operator==(const LocalObject& r) const } bool -#ifdef ICE_CPP11_MAPPING IceInternal::IPEndpointI::operator<(const Endpoint& r) const -#else -IceInternal::IPEndpointI::operator<(const LocalObject& r) const -#endif { const IPEndpointI* p = dynamic_cast(&r); if(!p) diff --git a/cpp/src/Ice/IPEndpointI.h b/cpp/src/Ice/IPEndpointI.h index 88085c05087..6e70f35ee6a 100644 --- a/cpp/src/Ice/IPEndpointI.h +++ b/cpp/src/Ice/IPEndpointI.h @@ -37,10 +37,7 @@ class ICE_API IPEndpointInfoI : public Ice::IPEndpointInfo const EndpointIPtr _endpoint; }; -class ICE_API IPEndpointI : public EndpointI -#ifdef ICE_CPP11_MAPPING - , public std::enable_shared_from_this -#endif +class ICE_API IPEndpointI : public EndpointI, public std::enable_shared_from_this { public: @@ -61,13 +58,8 @@ class ICE_API IPEndpointI : public EndpointI virtual ::Ice::Int hash() const; virtual std::string options() const; -#ifdef ICE_CPP11_MAPPING virtual bool operator==(const Ice::Endpoint&) const; virtual bool operator<(const Ice::Endpoint&) const; -#else - virtual bool operator==(const Ice::LocalObject&) const; - virtual bool operator<(const Ice::LocalObject&) const; -#endif virtual std::vector connectors(const std::vector

&, const NetworkProxyPtr&) const; @@ -137,18 +129,6 @@ class ICE_API EndpointHostResolver : public IceUtil::Thread, public IceUtil::Mon ObserverHelperT _observer; }; -#ifndef ICE_CPP11_MAPPING -inline bool operator==(const IPEndpointI& l, const IPEndpointI& r) -{ - return static_cast(l) == static_cast(r); -} - -inline bool operator<(const IPEndpointI& l, const IPEndpointI& r) -{ - return static_cast(l) < static_cast(r); -} -#endif - } #endif diff --git a/cpp/src/Ice/IPEndpointIF.h b/cpp/src/Ice/IPEndpointIF.h index 1125285fb6a..c6fc53b83a0 100644 --- a/cpp/src/Ice/IPEndpointIF.h +++ b/cpp/src/Ice/IPEndpointIF.h @@ -13,12 +13,7 @@ namespace IceInternal class IPEndpointI; -#ifdef ICE_CPP11_MAPPING using IPEndpointIPtr = ::std::shared_ptr; -#else -ICE_API IceUtil::Shared* upCast(IPEndpointI*); -typedef Handle IPEndpointIPtr; -#endif class EndpointHostResolver; ICE_API IceUtil::Shared* upCast(EndpointHostResolver*); diff --git a/cpp/src/Ice/IconvStringConverter.cpp b/cpp/src/Ice/IconvStringConverter.cpp index 2c7bc61effa..3d8d9cdf6dd 100644 --- a/cpp/src/Ice/IconvStringConverter.cpp +++ b/cpp/src/Ice/IconvStringConverter.cpp @@ -29,14 +29,6 @@ IconvInitializationException::ice_id() const return "::Ice::IconvInitializationException"; } -#ifndef ICE_CPP11_MAPPING -IconvInitializationException* -IconvInitializationException::ice_clone() const -{ - return new IconvInitializationException(*this); -} -#endif - string IconvInitializationException::reason() const { diff --git a/cpp/src/Ice/ImplicitContext.cpp b/cpp/src/Ice/ImplicitContext.cpp index 98057fe0479..451d90ad28e 100644 --- a/cpp/src/Ice/ImplicitContext.cpp +++ b/cpp/src/Ice/ImplicitContext.cpp @@ -19,34 +19,6 @@ # pragma GCC diagnostic ignored "-Wshadow" #endif -#ifdef ICE_CPP11_MAPPING // C++11 mapping - -namespace -{ - -} - -Ice::ImplicitContext::~ImplicitContext() -{ -} - -#else // C++98 mapping - -namespace -{ - -} - Ice::ImplicitContext::~ImplicitContext() { } - -/// \cond INTERNAL -ICE_API ::Ice::LocalObject* Ice::upCast(ImplicitContext* p) { return p; } -/// \endcond - -namespace Ice -{ -} - -#endif diff --git a/cpp/src/Ice/ImplicitContextF.cpp b/cpp/src/Ice/ImplicitContextF.cpp deleted file mode 100644 index dad1af5e14e..00000000000 --- a/cpp/src/Ice/ImplicitContextF.cpp +++ /dev/null @@ -1,38 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#ifndef ICE_API_EXPORTS -# define ICE_API_EXPORTS -#endif -#include -#include -#include - -#if defined(_MSC_VER) -# pragma warning(disable:4458) // declaration of ... hides class member -#elif defined(__clang__) -# pragma clang diagnostic ignored "-Wshadow" -#elif defined(__GNUC__) -# pragma GCC diagnostic ignored "-Wshadow" -#endif - -#ifdef ICE_CPP11_MAPPING // C++11 mapping - -namespace -{ - -} - -#else // C++98 mapping - -namespace -{ - -} - -namespace Ice -{ -} - -#endif diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp index b7cc91488d2..41a7e50ce4f 100644 --- a/cpp/src/Ice/Incoming.cpp +++ b/cpp/src/Ice/Incoming.cpp @@ -32,7 +32,6 @@ extern bool printStackTraces; } -#ifdef ICE_CPP11_MAPPING Ice::MarshaledResult::MarshaledResult(const Ice::Current& current) : ostr(make_shared(current.adapter->getCommunicator(), Ice::currentProtocolEncoding)) { @@ -40,7 +39,6 @@ Ice::MarshaledResult::MarshaledResult(const Ice::Current& current) : ostr->write(current.requestId); ostr->write(replyOK); } -#endif IceInternal::IncomingBase::IncomingBase(Instance* instance, ResponseHandler* responseHandler, Ice::Connection* connection, const ObjectAdapterPtr& adapter, @@ -52,12 +50,8 @@ IceInternal::IncomingBase::IncomingBase(Instance* instance, ResponseHandler* res _responseHandler(responseHandler) { _current.adapter = adapter; -#ifdef ICE_CPP11_MAPPING ::Ice::ConnectionI* conn = dynamic_cast<::Ice::ConnectionI*>(connection); _current.con = conn ? conn->shared_from_this() : nullptr; -#else - _current.con = connection; -#endif _current.requestId = requestId; _current.encoding.major = 0; _current.encoding.minor = 0; @@ -143,13 +137,11 @@ IncomingBase::writeParamEncaps(const Byte* v, Ice::Int sz, bool ok) } } -#ifdef ICE_CPP11_MAPPING void IceInternal::IncomingBase::setMarshaledResult(const Ice::MarshaledResult& result) { result.getOutputStream()->swap(_os); } -#endif void IceInternal::IncomingBase::response(bool amd) @@ -563,19 +555,11 @@ IceInternal::Incoming::Incoming(Instance* instance, ResponseHandler* responseHan { } -#ifdef ICE_CPP11_MAPPING void IceInternal::Incoming::push(function response, function exception) { _interceptorCBs.push_front(make_pair(response, exception)); } -#else -void -IceInternal::Incoming::push(const Ice::DispatchInterceptorAsyncCallbackPtr& cb) -{ - _interceptorCBs.push_front(cb); -} -#endif void IceInternal::Incoming::pop() diff --git a/cpp/src/Ice/IncomingAsync.cpp b/cpp/src/Ice/IncomingAsync.cpp index df111632d8c..2dac5b24a47 100644 --- a/cpp/src/Ice/IncomingAsync.cpp +++ b/cpp/src/Ice/IncomingAsync.cpp @@ -16,21 +16,6 @@ using namespace std; using namespace Ice; using namespace IceInternal; -#ifndef ICE_CPP11_MAPPING -IceUtil::Shared* IceInternal::upCast(IncomingAsync* p) { return p; } -IceUtil::Shared* Ice::upCast(AMD_Object_ice_invoke* p) { return p; } - -Ice::AMDCallback::~AMDCallback() -{ - // Out of line to avoid weak vtable -} - -Ice::AMD_Object_ice_invoke::~AMD_Object_ice_invoke() -{ - // Out of line to avoid weak vtable -} -#endif - namespace { @@ -61,12 +46,8 @@ IceInternal::IncomingAsync::IncomingAsync(Incoming& in) : _responseSent(false), _responseHandlerCopy(ICE_GET_SHARED_FROM_THIS(_responseHandler)) { -#ifndef ICE_CPP11_MAPPING - in.setAsync(this); -#endif } -#ifdef ICE_CPP11_MAPPING shared_ptr IceInternal::IncomingAsync::create(Incoming& in) { @@ -74,54 +55,6 @@ IceInternal::IncomingAsync::create(Incoming& in) in.setAsync(async); return async; } -#endif - -#ifndef ICE_CPP11_MAPPING -void -IceInternal::IncomingAsync::ice_exception(const ::std::exception& exc) -{ - try - { - for(DispatchInterceptorCallbacks::iterator p = _interceptorCBs.begin(); p != _interceptorCBs.end(); ++p) - { - if(!(*p)->exception(exc)) - { - return; - } - } - } - catch(...) - { - return; - } - - checkResponseSent(); - IncomingBase::exception(exc, true); // User thread -} - -void -IceInternal::IncomingAsync::ice_exception() -{ - try - { - for(DispatchInterceptorCallbacks::iterator p = _interceptorCBs.begin(); p != _interceptorCBs.end(); ++p) - { - if(!(*p)->exception()) - { - return; - } - } - } - catch(...) - { - return; - } - - checkResponseSent(); - IncomingBase::exception("unknown c++ exception", true); // User thread -} - -#endif void IceInternal::IncomingAsync::kill(Incoming& in) @@ -137,11 +70,7 @@ IceInternal::IncomingAsync::completed() { try { -#ifdef ICE_CPP11_MAPPING if(p->first && !p->first()) -#else - if(!(*p)->response()) -#endif { return; } @@ -155,7 +84,6 @@ IceInternal::IncomingAsync::completed() IncomingBase::response(true); // User thread } -#ifdef ICE_CPP11_MAPPING void IceInternal::IncomingAsync::completed(exception_ptr ex) { @@ -187,7 +115,6 @@ IceInternal::IncomingAsync::completed(exception_ptr ex) IncomingBase::exception("unknown c++ exception", true); // User thread } } -#endif void IceInternal::IncomingAsync::checkResponseSent() @@ -199,30 +126,3 @@ IceInternal::IncomingAsync::checkResponseSent() } _responseSent = true; } - -#ifndef ICE_CPP11_MAPPING -IceAsync::Ice::AMD_Object_ice_invoke::AMD_Object_ice_invoke(Incoming& in) : IncomingAsync(in) -{ -} - -void -IceAsync::Ice::AMD_Object_ice_invoke::ice_response(bool ok, const vector& outEncaps) -{ - if(outEncaps.empty()) - { - writeParamEncaps(0, 0, ok); - } - else - { - writeParamEncaps(&outEncaps[0], static_cast(outEncaps.size()), ok); - } - completed(); -} - -void -IceAsync::Ice::AMD_Object_ice_invoke::ice_response(bool ok, const pair& outEncaps) -{ - writeParamEncaps(outEncaps.first, static_cast(outEncaps.second - outEncaps.first), ok); - completed(); -} -#endif diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp index 6bd37bc1244..baac541eaa7 100644 --- a/cpp/src/Ice/Initialize.cpp +++ b/cpp/src/Ice/Initialize.cpp @@ -172,7 +172,6 @@ Ice::createProperties(int& argc, const wchar_t* argv[], const PropertiesPtr& def } #endif -#ifdef ICE_CPP11_MAPPING Ice::ThreadHookPlugin::ThreadHookPlugin(const CommunicatorPtr& communicator, function threadStart, function threadStop) @@ -185,18 +184,7 @@ Ice::ThreadHookPlugin::ThreadHookPlugin(const CommunicatorPtr& communicator, IceInternal::InstancePtr instance = IceInternal::getInstance(communicator); instance->setThreadHook(std::move(threadStart), std::move(threadStop)); } -#else -Ice::ThreadHookPlugin::ThreadHookPlugin(const CommunicatorPtr& communicator, const ThreadNotificationPtr& threadHook) -{ - if(communicator == 0) - { - throw PluginInitializationException(__FILE__, __LINE__, "Communicator cannot be null"); - } - IceInternal::InstancePtr instance = IceInternal::getInstance(communicator); - instance->setThreadHook(threadHook); -} -#endif void Ice::ThreadHookPlugin::initialize() { @@ -377,7 +365,6 @@ Ice::CommunicatorHolder::CommunicatorHolder() { } -#ifdef ICE_CPP11_MAPPING Ice::CommunicatorHolder::CommunicatorHolder(shared_ptr communicator) : _communicator(std::move(communicator)) { @@ -405,91 +392,6 @@ Ice::CommunicatorHolder::operator=(CommunicatorHolder&& other) noexcept return *this; } -#else // C++98 mapping - -Ice::CommunicatorHolder::CommunicatorHolder(int& argc, const char* argv[], const InitializationData& initData, - int version) : - _communicator(initialize(argc, argv, initData, version)) -{ -} - -Ice::CommunicatorHolder::CommunicatorHolder(int& argc, char* argv[], const InitializationData& initData, int version) : - _communicator(initialize(argc, argv, initData, version)) -{ -} - -Ice::CommunicatorHolder::CommunicatorHolder(int& argc, const char* argv[], const char* configFile, int version) : - _communicator(initialize(argc, argv, configFile, version)) -{ -} - -Ice::CommunicatorHolder::CommunicatorHolder(int& argc, char* argv[], const char* configFile, int version) : - _communicator(initialize(argc, argv, configFile, version)) -{ -} - -# ifdef _WIN32 -Ice::CommunicatorHolder::CommunicatorHolder(int& argc, const wchar_t* argv[], const InitializationData& initData, - int version) : - _communicator(initialize(argc, argv, initData, version)) -{ -} - -Ice::CommunicatorHolder::CommunicatorHolder(int& argc, wchar_t* argv[], const InitializationData& initData, - int version) : - _communicator(initialize(argc, argv, initData, version)) -{ -} - -Ice::CommunicatorHolder::CommunicatorHolder(int& argc, const wchar_t* argv[], const char* configFile, int version) : - _communicator(initialize(argc, argv, configFile, version)) -{ -} - -Ice::CommunicatorHolder::CommunicatorHolder(int& argc, wchar_t* argv[], const char* configFile, int version) : - _communicator(initialize(argc, argv, configFile, version)) -{ -} -# endif - -Ice::CommunicatorHolder::CommunicatorHolder(StringSeq& args, const InitializationData& initData, int version) : - _communicator(initialize(args, initData, version)) -{ -} - -Ice::CommunicatorHolder::CommunicatorHolder(StringSeq& args, const char* configFile, int version) : - _communicator(initialize(args, configFile, version)) -{ -} - -Ice::CommunicatorHolder::CommunicatorHolder(const InitializationData& initData, int version) : - _communicator(initialize(initData, version)) -{ -} - -Ice::CommunicatorHolder::CommunicatorHolder(const char* configFile, int version) : - _communicator(initialize(configFile, version)) -{ -} - -Ice::CommunicatorHolder::CommunicatorHolder(const CommunicatorPtr& communicator) : - _communicator(communicator) -{ -} - -Ice::CommunicatorHolder& -Ice::CommunicatorHolder::operator=(const CommunicatorPtr& communicator) -{ - if(_communicator) - { - _communicator->destroy(); - } - _communicator = communicator; - return *this; -} - -#endif - Ice::CommunicatorHolder::~CommunicatorHolder() { if(_communicator) @@ -518,13 +420,7 @@ Ice::CommunicatorHolder::operator->() const Ice::CommunicatorPtr Ice::CommunicatorHolder::release() { -#ifdef ICE_CPP11_MAPPING return std::move(_communicator); -#else - CommunicatorPtr result; - result.swap(_communicator); - return result; -#endif } InstancePtr diff --git a/cpp/src/Ice/InputStream.cpp b/cpp/src/Ice/InputStream.cpp index e58ca42ec9c..b8d5c918746 100644 --- a/cpp/src/Ice/InputStream.cpp +++ b/cpp/src/Ice/InputStream.cpp @@ -201,11 +201,7 @@ Ice::InputStream::setLogger(const LoggerPtr& logger) } void -#ifdef ICE_CPP11_MAPPING Ice::InputStream::setCompactIdResolver(std::function r) -#else -Ice::InputStream::setCompactIdResolver(const CompactIdResolverPtr& r) -#endif { _compactIdResolver = r; } @@ -487,7 +483,6 @@ struct ReadBoolHelper<1> } -#ifdef ICE_CPP11_MAPPING void Ice::InputStream::read(pair& v) { @@ -507,24 +502,6 @@ Ice::InputStream::read(pair& v) } } -#else -void -Ice::InputStream::read(pair& v, IceUtil::ScopedArray& result) -{ - Int sz = readAndCheckSeqSize(1); - if(sz > 0) - { - result.reset(ReadBoolHelper::read(v, sz, i)); - i += sz; - } - else - { - result.reset(); - v.first = v.second = reinterpret_cast(i); - } -} -#endif - void Ice::InputStream::read(Short& v) { @@ -573,13 +550,8 @@ Ice::InputStream::read(vector& v) } } -#ifdef ICE_CPP11_MAPPING void Ice::InputStream::read(pair& v) -#else -void -Ice::InputStream::read(pair& v, IceUtil::ScopedArray& result) -#endif { Int sz = readAndCheckSeqSize(static_cast(sizeof(Short))); if(sz > 0) @@ -589,16 +561,10 @@ Ice::InputStream::read(pair& v, IceUtil::ScopedArray i += sz * static_cast(sizeof(Short)); v.second = reinterpret_cast(i); #else -# ifdef ICE_CPP11_MAPPING auto result = new short[static_cast(sz)]; _deleters.push_back([result] { delete[] result; }); v.first = result; v.second = result + sz; -# else - result.reset(new Short[static_cast(sz)]); - v.first = result.get(); - v.second = result.get() + sz; -# endif Container::iterator begin = i; i += sz * static_cast(sizeof(Short)); @@ -618,9 +584,6 @@ Ice::InputStream::read(pair& v, IceUtil::ScopedArray } else { -#ifndef ICE_CPP11_MAPPING - result.reset(); -#endif v.first = v.second = 0; } } @@ -655,13 +618,8 @@ Ice::InputStream::read(vector& v) } } -#ifdef ICE_CPP11_MAPPING void Ice::InputStream::read(pair& v) -#else -void -Ice::InputStream::read(pair& v, ::IceUtil::ScopedArray& result) -#endif { Int sz = readAndCheckSeqSize(static_cast(sizeof(Int))); if(sz > 0) @@ -672,16 +630,10 @@ Ice::InputStream::read(pair& v, ::IceUtil::ScopedArray(i); #else -# ifdef ICE_CPP11_MAPPING auto result = new int[static_cast(sz)]; _deleters.push_back([result] { delete[] result; }); v.first = result; v.second = result + sz; -# else - result.reset(new Int[static_cast(sz)]); - v.first = result.get(); - v.second = result.get() + sz; -# endif Container::iterator begin = i; i += sz * static_cast(sizeof(Int)); @@ -703,9 +655,6 @@ Ice::InputStream::read(pair& v, ::IceUtil::ScopedArray& v) } } -#ifdef ICE_CPP11_MAPPING void Ice::InputStream::read(pair& v) -#else -void -Ice::InputStream::read(pair& v, IceUtil::ScopedArray& result) -#endif { Int sz = readAndCheckSeqSize(static_cast(sizeof(Long))); if(sz > 0) @@ -793,16 +737,10 @@ Ice::InputStream::read(pair& v, IceUtil::ScopedArray(i); #else -# ifdef ICE_CPP11_MAPPING auto result = new long long[static_cast(sz)]; _deleters.push_back([result] { delete[] result; }); v.first = result; v.second = result + sz; -# else - result.reset(new Long[static_cast(sz)]); - v.first = result.get(); - v.second = result.get() + sz; -# endif Container::iterator begin = i; i += sz * static_cast(sizeof(Long)); @@ -828,9 +766,6 @@ Ice::InputStream::read(pair& v, IceUtil::ScopedArray& v) } } -#ifdef ICE_CPP11_MAPPING void Ice::InputStream::read(pair& v) -#else -void -Ice::InputStream::read(pair& v, IceUtil::ScopedArray& result) -#endif { Int sz = readAndCheckSeqSize(static_cast(sizeof(Float))); if(sz > 0) @@ -906,16 +836,10 @@ Ice::InputStream::read(pair& v, IceUtil::ScopedArray v.second = reinterpret_cast(i); #else -# ifdef ICE_CPP11_MAPPING auto result = new float[static_cast(sz)]; _deleters.push_back([result] { delete[] result; }); v.first = result; v.second = result + sz; -# else - result.reset(new Float[static_cast(sz)]); - v.first = result.get(); - v.second = result.get() + sz; -# endif Container::iterator begin = i; i += sz * static_cast(sizeof(Float)); @@ -937,9 +861,6 @@ Ice::InputStream::read(pair& v, IceUtil::ScopedArray } else { -#ifndef ICE_CPP11_MAPPING - result.reset(); -#endif v.first = v.second = 0; } } @@ -1010,13 +931,8 @@ Ice::InputStream::read(vector& v) } } -#ifdef ICE_CPP11_MAPPING void Ice::InputStream::read(pair& v) -#else -void -Ice::InputStream::read(pair& v, IceUtil::ScopedArray& result) -#endif { Int sz = readAndCheckSeqSize(static_cast(sizeof(Double))); if(sz > 0) @@ -1027,16 +943,10 @@ Ice::InputStream::read(pair& v, IceUtil::ScopedArr v.second = reinterpret_cast(i); #else -# ifdef ICE_CPP11_MAPPING auto result = new double[static_cast(sz)]; _deleters.push_back([result] { delete[] result; }); v.first = result; v.second = result + sz; -# else - result.reset(new Double[static_cast(sz)]); - v.first = result.get(); - v.second = result.get() + sz; -# endif Container::iterator begin = i; i += sz * static_cast(sizeof(Double)); @@ -1062,9 +972,6 @@ Ice::InputStream::read(pair& v, IceUtil::ScopedArr } else { -#ifndef ICE_CPP11_MAPPING - result.reset(); -#endif v.first = v.second = 0; } } @@ -1092,7 +999,6 @@ Ice::InputStream::read(std::string& v, bool convert) } } -#ifdef ICE_CPP11_MAPPING void Ice::InputStream::read(const char*& vdata, size_t& vsize, bool convert) { @@ -1147,62 +1053,6 @@ Ice::InputStream::read(const char*& vdata, size_t& vsize, bool convert) } } -#else - -void -Ice::InputStream::read(const char*& vdata, size_t& vsize) -{ - Int sz = readSize(); - if(sz > 0) - { - if(b.end() - i < sz) - { - throwUnmarshalOutOfBoundsException(__FILE__, __LINE__); - } - - vdata = reinterpret_cast(&*i); - vsize = static_cast(sz); - i += sz; - } - else - { - vdata = 0; - vsize = 0; - } -} - -void -Ice::InputStream::read(const char*& vdata, size_t& vsize, string& holder) -{ - Int sz = readSize(); - if(sz > 0) - { - if(b.end() - i < sz) - { - throwUnmarshalOutOfBoundsException(__FILE__, __LINE__); - } - - if(readConverted(holder, sz)) - { - vdata = holder.data(); - vsize = holder.size(); - } - else - { - vdata = reinterpret_cast(&*i); - vsize = static_cast(sz); - } - i += sz; - } - else - { - holder.clear(); - vdata = 0; - vsize = 0; - } -} -#endif - bool Ice::InputStream::readConverted(string& v, int sz) { @@ -1315,7 +1165,6 @@ Ice::InputStream::read(vector& v) } } -#ifdef ICE_CPP11_MAPPING shared_ptr Ice::InputStream::readProxy() { @@ -1326,18 +1175,6 @@ Ice::InputStream::readProxy() return _instance->proxyFactory()->streamToProxy(this); } -#else -void -Ice::InputStream::read(ObjectPrx& v) -{ - if(!_instance) - { - throw MarshalException(__FILE__, __LINE__, "cannot unmarshal a proxy without a communicator"); - } - - v = _instance->proxyFactory()->streamToProxy(this); -} -#endif Int Ice::InputStream::readEnum(Int maxValue) @@ -1529,21 +1366,12 @@ Ice::InputStream::resolveCompactId(int id) const { string type; -#ifdef ICE_CPP11_MAPPING function resolver = compactIdResolver(); -#else - CompactIdResolverPtr resolver = compactIdResolver(); -#endif - if(resolver) { try { -#ifdef ICE_CPP11_MAPPING type = resolver(id); -#else - type = resolver->resolve(id); -#endif } catch(const LocalException&) { @@ -1636,7 +1464,6 @@ Ice::InputStream::logger() const return 0; } -#ifdef ICE_CPP11_MAPPING function Ice::InputStream::compactIdResolver() const { @@ -1651,22 +1478,6 @@ Ice::InputStream::compactIdResolver() const return nullptr; } -#else -CompactIdResolverPtr -Ice::InputStream::compactIdResolver() const -{ - if(_compactIdResolver) - { - return _compactIdResolver; - } - else if(_instance) - { - return _instance->initializationData().compactIdResolver; - } - - return 0; -} -#endif void Ice::InputStream::initEncaps() @@ -1958,11 +1769,7 @@ Ice::InputStream::EncapsDecoder10::throwException(ICE_IN(ICE_DELEGATE(UserExcept // try { -#ifdef ICE_CPP11_MAPPING exceptionFactory(_typeId); -#else - exceptionFactory->createAndThrow(_typeId); -#endif } catch(UserException& ex) { @@ -2276,11 +2083,7 @@ Ice::InputStream::EncapsDecoder11::throwException(ICE_IN(ICE_DELEGATE(UserExcept // try { -#ifdef ICE_CPP11_MAPPING exceptionFactory(_current->typeId); -#else - exceptionFactory->createAndThrow(_current->typeId); -#endif } catch(UserException& ex) { diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp index 7566a4bf578..a0d84332929 100644 --- a/cpp/src/Ice/Instance.cpp +++ b/cpp/src/Ice/Instance.cpp @@ -904,24 +904,12 @@ IceInternal::Instance::setLogger(const Ice::LoggerPtr& logger) _initData.logger = logger; } -#ifdef ICE_CPP11_MAPPING void IceInternal::Instance::setThreadHook(function threadStart, function threadStop) { _initData.threadStart = std::move(threadStart); _initData.threadStop = std::move(threadStop); } -#else -void -IceInternal::Instance::setThreadHook(const Ice::ThreadNotificationPtr& threadHook) -{ - // - // No locking, as it can only be called during plug-in loading - // - _initData.threadHook = threadHook; -} -#endif - namespace { @@ -1398,11 +1386,7 @@ IceInternal::Instance::finishSetup(int& argc, const char* argv[], const Ice::Com if(_adminFacetFilter.empty() || _adminFacetFilter.find(propertiesFacetName) != _adminFacetFilter.end()) { propsAdmin = ICE_MAKE_SHARED(PropertiesAdminI, this); -#ifdef ICE_CPP11_MAPPING _adminFacets.insert(make_pair(propertiesFacetName, propsAdmin)); -#else - _adminFacets.insert(make_pair(propertiesFacetName, propsAdmin.underlying())); -#endif } // @@ -1840,11 +1824,7 @@ IceInternal::ProcessI::shutdown(const Current&) } void -#ifdef ICE_CPP11_MAPPING IceInternal::ProcessI::writeMessage(string message, Int fd, const Current&) -#else -IceInternal::ProcessI::writeMessage(const string& message, Int fd, const Current&) -#endif { switch(fd) { diff --git a/cpp/src/Ice/Instance.h b/cpp/src/Ice/Instance.h index 1407a351747..d3276e0aeb7 100644 --- a/cpp/src/Ice/Instance.h +++ b/cpp/src/Ice/Instance.h @@ -124,11 +124,7 @@ class Instance : public IceUtil::Shared, public IceUtil::Monitor, std::function); -#else - void setThreadHook(const Ice::ThreadNotificationPtr&); -#endif const Ice::StringConverterPtr& getStringConverter() const { return _stringConverter; } const Ice::WstringConverterPtr& getWstringConverter() const { return _wstringConverter; } @@ -209,11 +205,7 @@ class ProcessI : public Ice::Process ProcessI(const Ice::CommunicatorPtr&); virtual void shutdown(const Ice::Current&); -#ifdef ICE_CPP11_MAPPING virtual void writeMessage(std::string, Ice::Int, const Ice::Current&); -#else - virtual void writeMessage(const std::string&, Ice::Int, const Ice::Current&); -#endif private: diff --git a/cpp/src/Ice/InstrumentationI.cpp b/cpp/src/Ice/InstrumentationI.cpp index fa7c35cead3..f4e52ffddb2 100644 --- a/cpp/src/Ice/InstrumentationI.cpp +++ b/cpp/src/Ice/InstrumentationI.cpp @@ -17,11 +17,7 @@ using namespace IceInternal; using namespace Ice::Instrumentation; using namespace IceMX; -#ifdef ICE_CPP11_MAPPING -# define ICE_OBJECT_PRX Ice::ObjectPrx -#else -# define ICE_OBJECT_PRX IceProxy::Ice::Object -#endif +#define ICE_OBJECT_PRX Ice::ObjectPrx namespace { diff --git a/cpp/src/Ice/LocalException.cpp b/cpp/src/Ice/LocalException.cpp index a195fe4af8a..6be34d00043 100644 --- a/cpp/src/Ice/LocalException.cpp +++ b/cpp/src/Ice/LocalException.cpp @@ -19,8 +19,6 @@ # pragma GCC diagnostic ignored "-Wshadow" #endif -#ifdef ICE_CPP11_MAPPING // C++11 mapping - Ice::InitializationException::~InitializationException() { } @@ -746,2098 +744,3 @@ Ice::ResponseSentException::ice_staticId() static const ::std::string typeId = "::Ice::ResponseSentException"; return typeId; } - -#else // C++98 mapping - -Ice::InitializationException::InitializationException(const char* file, int line) : - LocalException(file, line) -{ -} - -Ice::InitializationException::InitializationException(const char* file, int line, const ::std::string& reason) : - LocalException(file, line), - reason(reason) -{ -} - -Ice::InitializationException::~InitializationException() -{ -} - -::std::string -Ice::InitializationException::ice_id() const -{ - return "::Ice::InitializationException"; -} - -Ice::InitializationException* -Ice::InitializationException::ice_clone() const -{ - return new InitializationException(*this); -} - -void -Ice::InitializationException::ice_throw() const -{ - throw *this; -} - -Ice::PluginInitializationException::PluginInitializationException(const char* file, int line) : - LocalException(file, line) -{ -} - -Ice::PluginInitializationException::PluginInitializationException(const char* file, int line, const ::std::string& reason) : - LocalException(file, line), - reason(reason) -{ -} - -Ice::PluginInitializationException::~PluginInitializationException() -{ -} - -::std::string -Ice::PluginInitializationException::ice_id() const -{ - return "::Ice::PluginInitializationException"; -} - -Ice::PluginInitializationException* -Ice::PluginInitializationException::ice_clone() const -{ - return new PluginInitializationException(*this); -} - -void -Ice::PluginInitializationException::ice_throw() const -{ - throw *this; -} - -Ice::CollocationOptimizationException::CollocationOptimizationException(const char* file, int line) : - LocalException(file, line) -{ -} - -Ice::CollocationOptimizationException::~CollocationOptimizationException() -{ -} - -::std::string -Ice::CollocationOptimizationException::ice_id() const -{ - return "::Ice::CollocationOptimizationException"; -} - -Ice::CollocationOptimizationException* -Ice::CollocationOptimizationException::ice_clone() const -{ - return new CollocationOptimizationException(*this); -} - -void -Ice::CollocationOptimizationException::ice_throw() const -{ - throw *this; -} - -Ice::AlreadyRegisteredException::AlreadyRegisteredException(const char* file, int line) : - LocalException(file, line) -{ -} - -Ice::AlreadyRegisteredException::AlreadyRegisteredException(const char* file, int line, const ::std::string& kindOfObject, const ::std::string& id) : - LocalException(file, line), - kindOfObject(kindOfObject), - id(id) -{ -} - -Ice::AlreadyRegisteredException::~AlreadyRegisteredException() -{ -} - -::std::string -Ice::AlreadyRegisteredException::ice_id() const -{ - return "::Ice::AlreadyRegisteredException"; -} - -Ice::AlreadyRegisteredException* -Ice::AlreadyRegisteredException::ice_clone() const -{ - return new AlreadyRegisteredException(*this); -} - -void -Ice::AlreadyRegisteredException::ice_throw() const -{ - throw *this; -} - -Ice::NotRegisteredException::NotRegisteredException(const char* file, int line) : - LocalException(file, line) -{ -} - -Ice::NotRegisteredException::NotRegisteredException(const char* file, int line, const ::std::string& kindOfObject, const ::std::string& id) : - LocalException(file, line), - kindOfObject(kindOfObject), - id(id) -{ -} - -Ice::NotRegisteredException::~NotRegisteredException() -{ -} - -::std::string -Ice::NotRegisteredException::ice_id() const -{ - return "::Ice::NotRegisteredException"; -} - -Ice::NotRegisteredException* -Ice::NotRegisteredException::ice_clone() const -{ - return new NotRegisteredException(*this); -} - -void -Ice::NotRegisteredException::ice_throw() const -{ - throw *this; -} - -Ice::TwowayOnlyException::TwowayOnlyException(const char* file, int line) : - LocalException(file, line) -{ -} - -Ice::TwowayOnlyException::TwowayOnlyException(const char* file, int line, const ::std::string& operation) : - LocalException(file, line), - operation(operation) -{ -} - -Ice::TwowayOnlyException::~TwowayOnlyException() -{ -} - -::std::string -Ice::TwowayOnlyException::ice_id() const -{ - return "::Ice::TwowayOnlyException"; -} - -Ice::TwowayOnlyException* -Ice::TwowayOnlyException::ice_clone() const -{ - return new TwowayOnlyException(*this); -} - -void -Ice::TwowayOnlyException::ice_throw() const -{ - throw *this; -} - -Ice::CloneNotImplementedException::CloneNotImplementedException(const char* file, int line) : - LocalException(file, line) -{ -} - -Ice::CloneNotImplementedException::~CloneNotImplementedException() -{ -} - -::std::string -Ice::CloneNotImplementedException::ice_id() const -{ - return "::Ice::CloneNotImplementedException"; -} - -Ice::CloneNotImplementedException* -Ice::CloneNotImplementedException::ice_clone() const -{ - return new CloneNotImplementedException(*this); -} - -void -Ice::CloneNotImplementedException::ice_throw() const -{ - throw *this; -} - -Ice::UnknownException::UnknownException(const char* file, int line) : - LocalException(file, line) -{ -} - -Ice::UnknownException::UnknownException(const char* file, int line, const ::std::string& unknown) : - LocalException(file, line), - unknown(unknown) -{ -} - -Ice::UnknownException::~UnknownException() -{ -} - -::std::string -Ice::UnknownException::ice_id() const -{ - return "::Ice::UnknownException"; -} - -Ice::UnknownException* -Ice::UnknownException::ice_clone() const -{ - return new UnknownException(*this); -} - -void -Ice::UnknownException::ice_throw() const -{ - throw *this; -} - -Ice::UnknownLocalException::UnknownLocalException(const char* file, int line) : - UnknownException(file, line) -{ -} - -Ice::UnknownLocalException::UnknownLocalException(const char* file, int line, const ::std::string& unknown) : - UnknownException(file, line, unknown) -{ -} - -Ice::UnknownLocalException::~UnknownLocalException() -{ -} - -::std::string -Ice::UnknownLocalException::ice_id() const -{ - return "::Ice::UnknownLocalException"; -} - -Ice::UnknownLocalException* -Ice::UnknownLocalException::ice_clone() const -{ - return new UnknownLocalException(*this); -} - -void -Ice::UnknownLocalException::ice_throw() const -{ - throw *this; -} - -Ice::UnknownUserException::UnknownUserException(const char* file, int line) : - UnknownException(file, line) -{ -} - -Ice::UnknownUserException::UnknownUserException(const char* file, int line, const ::std::string& unknown) : - UnknownException(file, line, unknown) -{ -} - -Ice::UnknownUserException::~UnknownUserException() -{ -} - -::std::string -Ice::UnknownUserException::ice_id() const -{ - return "::Ice::UnknownUserException"; -} - -Ice::UnknownUserException* -Ice::UnknownUserException::ice_clone() const -{ - return new UnknownUserException(*this); -} - -void -Ice::UnknownUserException::ice_throw() const -{ - throw *this; -} - -Ice::VersionMismatchException::VersionMismatchException(const char* file, int line) : - LocalException(file, line) -{ -} - -Ice::VersionMismatchException::~VersionMismatchException() -{ -} - -::std::string -Ice::VersionMismatchException::ice_id() const -{ - return "::Ice::VersionMismatchException"; -} - -Ice::VersionMismatchException* -Ice::VersionMismatchException::ice_clone() const -{ - return new VersionMismatchException(*this); -} - -void -Ice::VersionMismatchException::ice_throw() const -{ - throw *this; -} - -Ice::CommunicatorDestroyedException::CommunicatorDestroyedException(const char* file, int line) : - LocalException(file, line) -{ -} - -Ice::CommunicatorDestroyedException::~CommunicatorDestroyedException() -{ -} - -::std::string -Ice::CommunicatorDestroyedException::ice_id() const -{ - return "::Ice::CommunicatorDestroyedException"; -} - -Ice::CommunicatorDestroyedException* -Ice::CommunicatorDestroyedException::ice_clone() const -{ - return new CommunicatorDestroyedException(*this); -} - -void -Ice::CommunicatorDestroyedException::ice_throw() const -{ - throw *this; -} - -Ice::ObjectAdapterDeactivatedException::ObjectAdapterDeactivatedException(const char* file, int line) : - LocalException(file, line) -{ -} - -Ice::ObjectAdapterDeactivatedException::ObjectAdapterDeactivatedException(const char* file, int line, const ::std::string& name) : - LocalException(file, line), - name(name) -{ -} - -Ice::ObjectAdapterDeactivatedException::~ObjectAdapterDeactivatedException() -{ -} - -::std::string -Ice::ObjectAdapterDeactivatedException::ice_id() const -{ - return "::Ice::ObjectAdapterDeactivatedException"; -} - -Ice::ObjectAdapterDeactivatedException* -Ice::ObjectAdapterDeactivatedException::ice_clone() const -{ - return new ObjectAdapterDeactivatedException(*this); -} - -void -Ice::ObjectAdapterDeactivatedException::ice_throw() const -{ - throw *this; -} - -Ice::ObjectAdapterIdInUseException::ObjectAdapterIdInUseException(const char* file, int line) : - LocalException(file, line) -{ -} - -Ice::ObjectAdapterIdInUseException::ObjectAdapterIdInUseException(const char* file, int line, const ::std::string& id) : - LocalException(file, line), - id(id) -{ -} - -Ice::ObjectAdapterIdInUseException::~ObjectAdapterIdInUseException() -{ -} - -::std::string -Ice::ObjectAdapterIdInUseException::ice_id() const -{ - return "::Ice::ObjectAdapterIdInUseException"; -} - -Ice::ObjectAdapterIdInUseException* -Ice::ObjectAdapterIdInUseException::ice_clone() const -{ - return new ObjectAdapterIdInUseException(*this); -} - -void -Ice::ObjectAdapterIdInUseException::ice_throw() const -{ - throw *this; -} - -Ice::NoEndpointException::NoEndpointException(const char* file, int line) : - LocalException(file, line) -{ -} - -Ice::NoEndpointException::NoEndpointException(const char* file, int line, const ::std::string& proxy) : - LocalException(file, line), - proxy(proxy) -{ -} - -Ice::NoEndpointException::~NoEndpointException() -{ -} - -::std::string -Ice::NoEndpointException::ice_id() const -{ - return "::Ice::NoEndpointException"; -} - -Ice::NoEndpointException* -Ice::NoEndpointException::ice_clone() const -{ - return new NoEndpointException(*this); -} - -void -Ice::NoEndpointException::ice_throw() const -{ - throw *this; -} - -Ice::EndpointParseException::EndpointParseException(const char* file, int line) : - LocalException(file, line) -{ -} - -Ice::EndpointParseException::EndpointParseException(const char* file, int line, const ::std::string& str) : - LocalException(file, line), - str(str) -{ -} - -Ice::EndpointParseException::~EndpointParseException() -{ -} - -::std::string -Ice::EndpointParseException::ice_id() const -{ - return "::Ice::EndpointParseException"; -} - -Ice::EndpointParseException* -Ice::EndpointParseException::ice_clone() const -{ - return new EndpointParseException(*this); -} - -void -Ice::EndpointParseException::ice_throw() const -{ - throw *this; -} - -Ice::EndpointSelectionTypeParseException::EndpointSelectionTypeParseException(const char* file, int line) : - LocalException(file, line) -{ -} - -Ice::EndpointSelectionTypeParseException::EndpointSelectionTypeParseException(const char* file, int line, const ::std::string& str) : - LocalException(file, line), - str(str) -{ -} - -Ice::EndpointSelectionTypeParseException::~EndpointSelectionTypeParseException() -{ -} - -::std::string -Ice::EndpointSelectionTypeParseException::ice_id() const -{ - return "::Ice::EndpointSelectionTypeParseException"; -} - -Ice::EndpointSelectionTypeParseException* -Ice::EndpointSelectionTypeParseException::ice_clone() const -{ - return new EndpointSelectionTypeParseException(*this); -} - -void -Ice::EndpointSelectionTypeParseException::ice_throw() const -{ - throw *this; -} - -Ice::VersionParseException::VersionParseException(const char* file, int line) : - LocalException(file, line) -{ -} - -Ice::VersionParseException::VersionParseException(const char* file, int line, const ::std::string& str) : - LocalException(file, line), - str(str) -{ -} - -Ice::VersionParseException::~VersionParseException() -{ -} - -::std::string -Ice::VersionParseException::ice_id() const -{ - return "::Ice::VersionParseException"; -} - -Ice::VersionParseException* -Ice::VersionParseException::ice_clone() const -{ - return new VersionParseException(*this); -} - -void -Ice::VersionParseException::ice_throw() const -{ - throw *this; -} - -Ice::IdentityParseException::IdentityParseException(const char* file, int line) : - LocalException(file, line) -{ -} - -Ice::IdentityParseException::IdentityParseException(const char* file, int line, const ::std::string& str) : - LocalException(file, line), - str(str) -{ -} - -Ice::IdentityParseException::~IdentityParseException() -{ -} - -::std::string -Ice::IdentityParseException::ice_id() const -{ - return "::Ice::IdentityParseException"; -} - -Ice::IdentityParseException* -Ice::IdentityParseException::ice_clone() const -{ - return new IdentityParseException(*this); -} - -void -Ice::IdentityParseException::ice_throw() const -{ - throw *this; -} - -Ice::ProxyParseException::ProxyParseException(const char* file, int line) : - LocalException(file, line) -{ -} - -Ice::ProxyParseException::ProxyParseException(const char* file, int line, const ::std::string& str) : - LocalException(file, line), - str(str) -{ -} - -Ice::ProxyParseException::~ProxyParseException() -{ -} - -::std::string -Ice::ProxyParseException::ice_id() const -{ - return "::Ice::ProxyParseException"; -} - -Ice::ProxyParseException* -Ice::ProxyParseException::ice_clone() const -{ - return new ProxyParseException(*this); -} - -void -Ice::ProxyParseException::ice_throw() const -{ - throw *this; -} - -Ice::IllegalIdentityException::IllegalIdentityException(const char* file, int line) : - LocalException(file, line) -{ -} - -Ice::IllegalIdentityException::IllegalIdentityException(const char* file, int line, const Identity& id) : - LocalException(file, line), - id(id) -{ -} - -Ice::IllegalIdentityException::~IllegalIdentityException() -{ -} - -::std::string -Ice::IllegalIdentityException::ice_id() const -{ - return "::Ice::IllegalIdentityException"; -} - -Ice::IllegalIdentityException* -Ice::IllegalIdentityException::ice_clone() const -{ - return new IllegalIdentityException(*this); -} - -void -Ice::IllegalIdentityException::ice_throw() const -{ - throw *this; -} - -Ice::IllegalServantException::IllegalServantException(const char* file, int line) : - LocalException(file, line) -{ -} - -Ice::IllegalServantException::IllegalServantException(const char* file, int line, const ::std::string& reason) : - LocalException(file, line), - reason(reason) -{ -} - -Ice::IllegalServantException::~IllegalServantException() -{ -} - -::std::string -Ice::IllegalServantException::ice_id() const -{ - return "::Ice::IllegalServantException"; -} - -Ice::IllegalServantException* -Ice::IllegalServantException::ice_clone() const -{ - return new IllegalServantException(*this); -} - -void -Ice::IllegalServantException::ice_throw() const -{ - throw *this; -} - -Ice::RequestFailedException::RequestFailedException(const char* file, int line) : - LocalException(file, line) -{ -} - -Ice::RequestFailedException::RequestFailedException(const char* file, int line, const Identity& id, const ::std::string& facet, const ::std::string& operation) : - LocalException(file, line), - id(id), - facet(facet), - operation(operation) -{ -} - -Ice::RequestFailedException::~RequestFailedException() -{ -} - -::std::string -Ice::RequestFailedException::ice_id() const -{ - return "::Ice::RequestFailedException"; -} - -Ice::RequestFailedException* -Ice::RequestFailedException::ice_clone() const -{ - return new RequestFailedException(*this); -} - -void -Ice::RequestFailedException::ice_throw() const -{ - throw *this; -} - -Ice::ObjectNotExistException::ObjectNotExistException(const char* file, int line) : - RequestFailedException(file, line) -{ -} - -Ice::ObjectNotExistException::ObjectNotExistException(const char* file, int line, const Identity& id, const ::std::string& facet, const ::std::string& operation) : - RequestFailedException(file, line, id, facet, operation) -{ -} - -Ice::ObjectNotExistException::~ObjectNotExistException() -{ -} - -::std::string -Ice::ObjectNotExistException::ice_id() const -{ - return "::Ice::ObjectNotExistException"; -} - -Ice::ObjectNotExistException* -Ice::ObjectNotExistException::ice_clone() const -{ - return new ObjectNotExistException(*this); -} - -void -Ice::ObjectNotExistException::ice_throw() const -{ - throw *this; -} - -Ice::FacetNotExistException::FacetNotExistException(const char* file, int line) : - RequestFailedException(file, line) -{ -} - -Ice::FacetNotExistException::FacetNotExistException(const char* file, int line, const Identity& id, const ::std::string& facet, const ::std::string& operation) : - RequestFailedException(file, line, id, facet, operation) -{ -} - -Ice::FacetNotExistException::~FacetNotExistException() -{ -} - -::std::string -Ice::FacetNotExistException::ice_id() const -{ - return "::Ice::FacetNotExistException"; -} - -Ice::FacetNotExistException* -Ice::FacetNotExistException::ice_clone() const -{ - return new FacetNotExistException(*this); -} - -void -Ice::FacetNotExistException::ice_throw() const -{ - throw *this; -} - -Ice::OperationNotExistException::OperationNotExistException(const char* file, int line) : - RequestFailedException(file, line) -{ -} - -Ice::OperationNotExistException::OperationNotExistException(const char* file, int line, const Identity& id, const ::std::string& facet, const ::std::string& operation) : - RequestFailedException(file, line, id, facet, operation) -{ -} - -Ice::OperationNotExistException::~OperationNotExistException() -{ -} - -::std::string -Ice::OperationNotExistException::ice_id() const -{ - return "::Ice::OperationNotExistException"; -} - -Ice::OperationNotExistException* -Ice::OperationNotExistException::ice_clone() const -{ - return new OperationNotExistException(*this); -} - -void -Ice::OperationNotExistException::ice_throw() const -{ - throw *this; -} - -Ice::SyscallException::SyscallException(const char* file, int line) : - LocalException(file, line), - error(0) -{ -} - -Ice::SyscallException::SyscallException(const char* file, int line, Int error) : - LocalException(file, line), - error(error) -{ -} - -Ice::SyscallException::~SyscallException() -{ -} - -::std::string -Ice::SyscallException::ice_id() const -{ - return "::Ice::SyscallException"; -} - -Ice::SyscallException* -Ice::SyscallException::ice_clone() const -{ - return new SyscallException(*this); -} - -void -Ice::SyscallException::ice_throw() const -{ - throw *this; -} - -Ice::SocketException::SocketException(const char* file, int line) : - SyscallException(file, line) -{ -} - -Ice::SocketException::SocketException(const char* file, int line, Int error) : - SyscallException(file, line, error) -{ -} - -Ice::SocketException::~SocketException() -{ -} - -::std::string -Ice::SocketException::ice_id() const -{ - return "::Ice::SocketException"; -} - -Ice::SocketException* -Ice::SocketException::ice_clone() const -{ - return new SocketException(*this); -} - -void -Ice::SocketException::ice_throw() const -{ - throw *this; -} - -Ice::CFNetworkException::CFNetworkException(const char* file, int line) : - SocketException(file, line) -{ -} - -Ice::CFNetworkException::CFNetworkException(const char* file, int line, Int error, const ::std::string& domain) : - SocketException(file, line, error), - domain(domain) -{ -} - -Ice::CFNetworkException::~CFNetworkException() -{ -} - -::std::string -Ice::CFNetworkException::ice_id() const -{ - return "::Ice::CFNetworkException"; -} - -Ice::CFNetworkException* -Ice::CFNetworkException::ice_clone() const -{ - return new CFNetworkException(*this); -} - -void -Ice::CFNetworkException::ice_throw() const -{ - throw *this; -} - -Ice::FileException::FileException(const char* file, int line) : - SyscallException(file, line) -{ -} - -Ice::FileException::FileException(const char* file, int line, Int error, const ::std::string& path) : - SyscallException(file, line, error), - path(path) -{ -} - -Ice::FileException::~FileException() -{ -} - -::std::string -Ice::FileException::ice_id() const -{ - return "::Ice::FileException"; -} - -Ice::FileException* -Ice::FileException::ice_clone() const -{ - return new FileException(*this); -} - -void -Ice::FileException::ice_throw() const -{ - throw *this; -} - -Ice::ConnectFailedException::ConnectFailedException(const char* file, int line) : - SocketException(file, line) -{ -} - -Ice::ConnectFailedException::ConnectFailedException(const char* file, int line, Int error) : - SocketException(file, line, error) -{ -} - -Ice::ConnectFailedException::~ConnectFailedException() -{ -} - -::std::string -Ice::ConnectFailedException::ice_id() const -{ - return "::Ice::ConnectFailedException"; -} - -Ice::ConnectFailedException* -Ice::ConnectFailedException::ice_clone() const -{ - return new ConnectFailedException(*this); -} - -void -Ice::ConnectFailedException::ice_throw() const -{ - throw *this; -} - -Ice::ConnectionRefusedException::ConnectionRefusedException(const char* file, int line) : - ConnectFailedException(file, line) -{ -} - -Ice::ConnectionRefusedException::ConnectionRefusedException(const char* file, int line, Int error) : - ConnectFailedException(file, line, error) -{ -} - -Ice::ConnectionRefusedException::~ConnectionRefusedException() -{ -} - -::std::string -Ice::ConnectionRefusedException::ice_id() const -{ - return "::Ice::ConnectionRefusedException"; -} - -Ice::ConnectionRefusedException* -Ice::ConnectionRefusedException::ice_clone() const -{ - return new ConnectionRefusedException(*this); -} - -void -Ice::ConnectionRefusedException::ice_throw() const -{ - throw *this; -} - -Ice::ConnectionLostException::ConnectionLostException(const char* file, int line) : - SocketException(file, line) -{ -} - -Ice::ConnectionLostException::ConnectionLostException(const char* file, int line, Int error) : - SocketException(file, line, error) -{ -} - -Ice::ConnectionLostException::~ConnectionLostException() -{ -} - -::std::string -Ice::ConnectionLostException::ice_id() const -{ - return "::Ice::ConnectionLostException"; -} - -Ice::ConnectionLostException* -Ice::ConnectionLostException::ice_clone() const -{ - return new ConnectionLostException(*this); -} - -void -Ice::ConnectionLostException::ice_throw() const -{ - throw *this; -} - -Ice::DNSException::DNSException(const char* file, int line) : - LocalException(file, line), - error(0) -{ -} - -Ice::DNSException::DNSException(const char* file, int line, Int error, const ::std::string& host) : - LocalException(file, line), - error(error), - host(host) -{ -} - -Ice::DNSException::~DNSException() -{ -} - -::std::string -Ice::DNSException::ice_id() const -{ - return "::Ice::DNSException"; -} - -Ice::DNSException* -Ice::DNSException::ice_clone() const -{ - return new DNSException(*this); -} - -void -Ice::DNSException::ice_throw() const -{ - throw *this; -} - -Ice::OperationInterruptedException::OperationInterruptedException(const char* file, int line) : - LocalException(file, line) -{ -} - -Ice::OperationInterruptedException::~OperationInterruptedException() -{ -} - -::std::string -Ice::OperationInterruptedException::ice_id() const -{ - return "::Ice::OperationInterruptedException"; -} - -Ice::OperationInterruptedException* -Ice::OperationInterruptedException::ice_clone() const -{ - return new OperationInterruptedException(*this); -} - -void -Ice::OperationInterruptedException::ice_throw() const -{ - throw *this; -} - -Ice::TimeoutException::TimeoutException(const char* file, int line) : - LocalException(file, line) -{ -} - -Ice::TimeoutException::~TimeoutException() -{ -} - -::std::string -Ice::TimeoutException::ice_id() const -{ - return "::Ice::TimeoutException"; -} - -Ice::TimeoutException* -Ice::TimeoutException::ice_clone() const -{ - return new TimeoutException(*this); -} - -void -Ice::TimeoutException::ice_throw() const -{ - throw *this; -} - -Ice::ConnectTimeoutException::ConnectTimeoutException(const char* file, int line) : - TimeoutException(file, line) -{ -} - -Ice::ConnectTimeoutException::~ConnectTimeoutException() -{ -} - -::std::string -Ice::ConnectTimeoutException::ice_id() const -{ - return "::Ice::ConnectTimeoutException"; -} - -Ice::ConnectTimeoutException* -Ice::ConnectTimeoutException::ice_clone() const -{ - return new ConnectTimeoutException(*this); -} - -void -Ice::ConnectTimeoutException::ice_throw() const -{ - throw *this; -} - -Ice::CloseTimeoutException::CloseTimeoutException(const char* file, int line) : - TimeoutException(file, line) -{ -} - -Ice::CloseTimeoutException::~CloseTimeoutException() -{ -} - -::std::string -Ice::CloseTimeoutException::ice_id() const -{ - return "::Ice::CloseTimeoutException"; -} - -Ice::CloseTimeoutException* -Ice::CloseTimeoutException::ice_clone() const -{ - return new CloseTimeoutException(*this); -} - -void -Ice::CloseTimeoutException::ice_throw() const -{ - throw *this; -} - -Ice::ConnectionTimeoutException::ConnectionTimeoutException(const char* file, int line) : - TimeoutException(file, line) -{ -} - -Ice::ConnectionTimeoutException::~ConnectionTimeoutException() -{ -} - -::std::string -Ice::ConnectionTimeoutException::ice_id() const -{ - return "::Ice::ConnectionTimeoutException"; -} - -Ice::ConnectionTimeoutException* -Ice::ConnectionTimeoutException::ice_clone() const -{ - return new ConnectionTimeoutException(*this); -} - -void -Ice::ConnectionTimeoutException::ice_throw() const -{ - throw *this; -} - -Ice::InvocationTimeoutException::InvocationTimeoutException(const char* file, int line) : - TimeoutException(file, line) -{ -} - -Ice::InvocationTimeoutException::~InvocationTimeoutException() -{ -} - -::std::string -Ice::InvocationTimeoutException::ice_id() const -{ - return "::Ice::InvocationTimeoutException"; -} - -Ice::InvocationTimeoutException* -Ice::InvocationTimeoutException::ice_clone() const -{ - return new InvocationTimeoutException(*this); -} - -void -Ice::InvocationTimeoutException::ice_throw() const -{ - throw *this; -} - -Ice::InvocationCanceledException::InvocationCanceledException(const char* file, int line) : - LocalException(file, line) -{ -} - -Ice::InvocationCanceledException::~InvocationCanceledException() -{ -} - -::std::string -Ice::InvocationCanceledException::ice_id() const -{ - return "::Ice::InvocationCanceledException"; -} - -Ice::InvocationCanceledException* -Ice::InvocationCanceledException::ice_clone() const -{ - return new InvocationCanceledException(*this); -} - -void -Ice::InvocationCanceledException::ice_throw() const -{ - throw *this; -} - -Ice::ProtocolException::ProtocolException(const char* file, int line) : - LocalException(file, line) -{ -} - -Ice::ProtocolException::ProtocolException(const char* file, int line, const ::std::string& reason) : - LocalException(file, line), - reason(reason) -{ -} - -Ice::ProtocolException::~ProtocolException() -{ -} - -::std::string -Ice::ProtocolException::ice_id() const -{ - return "::Ice::ProtocolException"; -} - -Ice::ProtocolException* -Ice::ProtocolException::ice_clone() const -{ - return new ProtocolException(*this); -} - -void -Ice::ProtocolException::ice_throw() const -{ - throw *this; -} - -Ice::BadMagicException::BadMagicException(const char* file, int line) : - ProtocolException(file, line) -{ -} - -Ice::BadMagicException::BadMagicException(const char* file, int line, const ::std::string& reason, const ByteSeq& badMagic) : - ProtocolException(file, line, reason), - badMagic(badMagic) -{ -} - -Ice::BadMagicException::~BadMagicException() -{ -} - -::std::string -Ice::BadMagicException::ice_id() const -{ - return "::Ice::BadMagicException"; -} - -Ice::BadMagicException* -Ice::BadMagicException::ice_clone() const -{ - return new BadMagicException(*this); -} - -void -Ice::BadMagicException::ice_throw() const -{ - throw *this; -} - -Ice::UnsupportedProtocolException::UnsupportedProtocolException(const char* file, int line) : - ProtocolException(file, line) -{ -} - -Ice::UnsupportedProtocolException::UnsupportedProtocolException(const char* file, int line, const ::std::string& reason, const ProtocolVersion& bad, const ProtocolVersion& supported) : - ProtocolException(file, line, reason), - bad(bad), - supported(supported) -{ -} - -Ice::UnsupportedProtocolException::~UnsupportedProtocolException() -{ -} - -::std::string -Ice::UnsupportedProtocolException::ice_id() const -{ - return "::Ice::UnsupportedProtocolException"; -} - -Ice::UnsupportedProtocolException* -Ice::UnsupportedProtocolException::ice_clone() const -{ - return new UnsupportedProtocolException(*this); -} - -void -Ice::UnsupportedProtocolException::ice_throw() const -{ - throw *this; -} - -Ice::UnsupportedEncodingException::UnsupportedEncodingException(const char* file, int line) : - ProtocolException(file, line) -{ -} - -Ice::UnsupportedEncodingException::UnsupportedEncodingException(const char* file, int line, const ::std::string& reason, const EncodingVersion& bad, const EncodingVersion& supported) : - ProtocolException(file, line, reason), - bad(bad), - supported(supported) -{ -} - -Ice::UnsupportedEncodingException::~UnsupportedEncodingException() -{ -} - -::std::string -Ice::UnsupportedEncodingException::ice_id() const -{ - return "::Ice::UnsupportedEncodingException"; -} - -Ice::UnsupportedEncodingException* -Ice::UnsupportedEncodingException::ice_clone() const -{ - return new UnsupportedEncodingException(*this); -} - -void -Ice::UnsupportedEncodingException::ice_throw() const -{ - throw *this; -} - -Ice::UnknownMessageException::UnknownMessageException(const char* file, int line) : - ProtocolException(file, line) -{ -} - -Ice::UnknownMessageException::UnknownMessageException(const char* file, int line, const ::std::string& reason) : - ProtocolException(file, line, reason) -{ -} - -Ice::UnknownMessageException::~UnknownMessageException() -{ -} - -::std::string -Ice::UnknownMessageException::ice_id() const -{ - return "::Ice::UnknownMessageException"; -} - -Ice::UnknownMessageException* -Ice::UnknownMessageException::ice_clone() const -{ - return new UnknownMessageException(*this); -} - -void -Ice::UnknownMessageException::ice_throw() const -{ - throw *this; -} - -Ice::ConnectionNotValidatedException::ConnectionNotValidatedException(const char* file, int line) : - ProtocolException(file, line) -{ -} - -Ice::ConnectionNotValidatedException::ConnectionNotValidatedException(const char* file, int line, const ::std::string& reason) : - ProtocolException(file, line, reason) -{ -} - -Ice::ConnectionNotValidatedException::~ConnectionNotValidatedException() -{ -} - -::std::string -Ice::ConnectionNotValidatedException::ice_id() const -{ - return "::Ice::ConnectionNotValidatedException"; -} - -Ice::ConnectionNotValidatedException* -Ice::ConnectionNotValidatedException::ice_clone() const -{ - return new ConnectionNotValidatedException(*this); -} - -void -Ice::ConnectionNotValidatedException::ice_throw() const -{ - throw *this; -} - -Ice::UnknownRequestIdException::UnknownRequestIdException(const char* file, int line) : - ProtocolException(file, line) -{ -} - -Ice::UnknownRequestIdException::UnknownRequestIdException(const char* file, int line, const ::std::string& reason) : - ProtocolException(file, line, reason) -{ -} - -Ice::UnknownRequestIdException::~UnknownRequestIdException() -{ -} - -::std::string -Ice::UnknownRequestIdException::ice_id() const -{ - return "::Ice::UnknownRequestIdException"; -} - -Ice::UnknownRequestIdException* -Ice::UnknownRequestIdException::ice_clone() const -{ - return new UnknownRequestIdException(*this); -} - -void -Ice::UnknownRequestIdException::ice_throw() const -{ - throw *this; -} - -Ice::UnknownReplyStatusException::UnknownReplyStatusException(const char* file, int line) : - ProtocolException(file, line) -{ -} - -Ice::UnknownReplyStatusException::UnknownReplyStatusException(const char* file, int line, const ::std::string& reason) : - ProtocolException(file, line, reason) -{ -} - -Ice::UnknownReplyStatusException::~UnknownReplyStatusException() -{ -} - -::std::string -Ice::UnknownReplyStatusException::ice_id() const -{ - return "::Ice::UnknownReplyStatusException"; -} - -Ice::UnknownReplyStatusException* -Ice::UnknownReplyStatusException::ice_clone() const -{ - return new UnknownReplyStatusException(*this); -} - -void -Ice::UnknownReplyStatusException::ice_throw() const -{ - throw *this; -} - -Ice::CloseConnectionException::CloseConnectionException(const char* file, int line) : - ProtocolException(file, line) -{ -} - -Ice::CloseConnectionException::CloseConnectionException(const char* file, int line, const ::std::string& reason) : - ProtocolException(file, line, reason) -{ -} - -Ice::CloseConnectionException::~CloseConnectionException() -{ -} - -::std::string -Ice::CloseConnectionException::ice_id() const -{ - return "::Ice::CloseConnectionException"; -} - -Ice::CloseConnectionException* -Ice::CloseConnectionException::ice_clone() const -{ - return new CloseConnectionException(*this); -} - -void -Ice::CloseConnectionException::ice_throw() const -{ - throw *this; -} - -Ice::ConnectionManuallyClosedException::ConnectionManuallyClosedException(const char* file, int line) : - LocalException(file, line) -{ -} - -Ice::ConnectionManuallyClosedException::ConnectionManuallyClosedException(const char* file, int line, bool graceful) : - LocalException(file, line), - graceful(graceful) -{ -} - -Ice::ConnectionManuallyClosedException::~ConnectionManuallyClosedException() -{ -} - -::std::string -Ice::ConnectionManuallyClosedException::ice_id() const -{ - return "::Ice::ConnectionManuallyClosedException"; -} - -Ice::ConnectionManuallyClosedException* -Ice::ConnectionManuallyClosedException::ice_clone() const -{ - return new ConnectionManuallyClosedException(*this); -} - -void -Ice::ConnectionManuallyClosedException::ice_throw() const -{ - throw *this; -} - -Ice::IllegalMessageSizeException::IllegalMessageSizeException(const char* file, int line) : - ProtocolException(file, line) -{ -} - -Ice::IllegalMessageSizeException::IllegalMessageSizeException(const char* file, int line, const ::std::string& reason) : - ProtocolException(file, line, reason) -{ -} - -Ice::IllegalMessageSizeException::~IllegalMessageSizeException() -{ -} - -::std::string -Ice::IllegalMessageSizeException::ice_id() const -{ - return "::Ice::IllegalMessageSizeException"; -} - -Ice::IllegalMessageSizeException* -Ice::IllegalMessageSizeException::ice_clone() const -{ - return new IllegalMessageSizeException(*this); -} - -void -Ice::IllegalMessageSizeException::ice_throw() const -{ - throw *this; -} - -Ice::CompressionException::CompressionException(const char* file, int line) : - ProtocolException(file, line) -{ -} - -Ice::CompressionException::CompressionException(const char* file, int line, const ::std::string& reason) : - ProtocolException(file, line, reason) -{ -} - -Ice::CompressionException::~CompressionException() -{ -} - -::std::string -Ice::CompressionException::ice_id() const -{ - return "::Ice::CompressionException"; -} - -Ice::CompressionException* -Ice::CompressionException::ice_clone() const -{ - return new CompressionException(*this); -} - -void -Ice::CompressionException::ice_throw() const -{ - throw *this; -} - -Ice::DatagramLimitException::DatagramLimitException(const char* file, int line) : - ProtocolException(file, line) -{ -} - -Ice::DatagramLimitException::DatagramLimitException(const char* file, int line, const ::std::string& reason) : - ProtocolException(file, line, reason) -{ -} - -Ice::DatagramLimitException::~DatagramLimitException() -{ -} - -::std::string -Ice::DatagramLimitException::ice_id() const -{ - return "::Ice::DatagramLimitException"; -} - -Ice::DatagramLimitException* -Ice::DatagramLimitException::ice_clone() const -{ - return new DatagramLimitException(*this); -} - -void -Ice::DatagramLimitException::ice_throw() const -{ - throw *this; -} - -Ice::MarshalException::MarshalException(const char* file, int line) : - ProtocolException(file, line) -{ -} - -Ice::MarshalException::MarshalException(const char* file, int line, const ::std::string& reason) : - ProtocolException(file, line, reason) -{ -} - -Ice::MarshalException::~MarshalException() -{ -} - -::std::string -Ice::MarshalException::ice_id() const -{ - return "::Ice::MarshalException"; -} - -Ice::MarshalException* -Ice::MarshalException::ice_clone() const -{ - return new MarshalException(*this); -} - -void -Ice::MarshalException::ice_throw() const -{ - throw *this; -} - -Ice::ProxyUnmarshalException::ProxyUnmarshalException(const char* file, int line) : - MarshalException(file, line) -{ -} - -Ice::ProxyUnmarshalException::ProxyUnmarshalException(const char* file, int line, const ::std::string& reason) : - MarshalException(file, line, reason) -{ -} - -Ice::ProxyUnmarshalException::~ProxyUnmarshalException() -{ -} - -::std::string -Ice::ProxyUnmarshalException::ice_id() const -{ - return "::Ice::ProxyUnmarshalException"; -} - -Ice::ProxyUnmarshalException* -Ice::ProxyUnmarshalException::ice_clone() const -{ - return new ProxyUnmarshalException(*this); -} - -void -Ice::ProxyUnmarshalException::ice_throw() const -{ - throw *this; -} - -Ice::UnmarshalOutOfBoundsException::UnmarshalOutOfBoundsException(const char* file, int line) : - MarshalException(file, line) -{ -} - -Ice::UnmarshalOutOfBoundsException::UnmarshalOutOfBoundsException(const char* file, int line, const ::std::string& reason) : - MarshalException(file, line, reason) -{ -} - -Ice::UnmarshalOutOfBoundsException::~UnmarshalOutOfBoundsException() -{ -} - -::std::string -Ice::UnmarshalOutOfBoundsException::ice_id() const -{ - return "::Ice::UnmarshalOutOfBoundsException"; -} - -Ice::UnmarshalOutOfBoundsException* -Ice::UnmarshalOutOfBoundsException::ice_clone() const -{ - return new UnmarshalOutOfBoundsException(*this); -} - -void -Ice::UnmarshalOutOfBoundsException::ice_throw() const -{ - throw *this; -} - -Ice::NoValueFactoryException::NoValueFactoryException(const char* file, int line) : - MarshalException(file, line) -{ -} - -Ice::NoValueFactoryException::NoValueFactoryException(const char* file, int line, const ::std::string& reason, const ::std::string& type) : - MarshalException(file, line, reason), - type(type) -{ -} - -Ice::NoValueFactoryException::~NoValueFactoryException() -{ -} - -::std::string -Ice::NoValueFactoryException::ice_id() const -{ - return "::Ice::NoValueFactoryException"; -} - -Ice::NoValueFactoryException* -Ice::NoValueFactoryException::ice_clone() const -{ - return new NoValueFactoryException(*this); -} - -void -Ice::NoValueFactoryException::ice_throw() const -{ - throw *this; -} - -Ice::UnexpectedObjectException::UnexpectedObjectException(const char* file, int line) : - MarshalException(file, line) -{ -} - -Ice::UnexpectedObjectException::UnexpectedObjectException(const char* file, int line, const ::std::string& reason, const ::std::string& type, const ::std::string& expectedType) : - MarshalException(file, line, reason), - type(type), - expectedType(expectedType) -{ -} - -Ice::UnexpectedObjectException::~UnexpectedObjectException() -{ -} - -::std::string -Ice::UnexpectedObjectException::ice_id() const -{ - return "::Ice::UnexpectedObjectException"; -} - -Ice::UnexpectedObjectException* -Ice::UnexpectedObjectException::ice_clone() const -{ - return new UnexpectedObjectException(*this); -} - -void -Ice::UnexpectedObjectException::ice_throw() const -{ - throw *this; -} - -Ice::MemoryLimitException::MemoryLimitException(const char* file, int line) : - MarshalException(file, line) -{ -} - -Ice::MemoryLimitException::MemoryLimitException(const char* file, int line, const ::std::string& reason) : - MarshalException(file, line, reason) -{ -} - -Ice::MemoryLimitException::~MemoryLimitException() -{ -} - -::std::string -Ice::MemoryLimitException::ice_id() const -{ - return "::Ice::MemoryLimitException"; -} - -Ice::MemoryLimitException* -Ice::MemoryLimitException::ice_clone() const -{ - return new MemoryLimitException(*this); -} - -void -Ice::MemoryLimitException::ice_throw() const -{ - throw *this; -} - -Ice::StringConversionException::StringConversionException(const char* file, int line) : - MarshalException(file, line) -{ -} - -Ice::StringConversionException::StringConversionException(const char* file, int line, const ::std::string& reason) : - MarshalException(file, line, reason) -{ -} - -Ice::StringConversionException::~StringConversionException() -{ -} - -::std::string -Ice::StringConversionException::ice_id() const -{ - return "::Ice::StringConversionException"; -} - -Ice::StringConversionException* -Ice::StringConversionException::ice_clone() const -{ - return new StringConversionException(*this); -} - -void -Ice::StringConversionException::ice_throw() const -{ - throw *this; -} - -Ice::EncapsulationException::EncapsulationException(const char* file, int line) : - MarshalException(file, line) -{ -} - -Ice::EncapsulationException::EncapsulationException(const char* file, int line, const ::std::string& reason) : - MarshalException(file, line, reason) -{ -} - -Ice::EncapsulationException::~EncapsulationException() -{ -} - -::std::string -Ice::EncapsulationException::ice_id() const -{ - return "::Ice::EncapsulationException"; -} - -Ice::EncapsulationException* -Ice::EncapsulationException::ice_clone() const -{ - return new EncapsulationException(*this); -} - -void -Ice::EncapsulationException::ice_throw() const -{ - throw *this; -} - -Ice::FeatureNotSupportedException::FeatureNotSupportedException(const char* file, int line) : - LocalException(file, line) -{ -} - -Ice::FeatureNotSupportedException::FeatureNotSupportedException(const char* file, int line, const ::std::string& unsupportedFeature) : - LocalException(file, line), - unsupportedFeature(unsupportedFeature) -{ -} - -Ice::FeatureNotSupportedException::~FeatureNotSupportedException() -{ -} - -::std::string -Ice::FeatureNotSupportedException::ice_id() const -{ - return "::Ice::FeatureNotSupportedException"; -} - -Ice::FeatureNotSupportedException* -Ice::FeatureNotSupportedException::ice_clone() const -{ - return new FeatureNotSupportedException(*this); -} - -void -Ice::FeatureNotSupportedException::ice_throw() const -{ - throw *this; -} - -Ice::SecurityException::SecurityException(const char* file, int line) : - LocalException(file, line) -{ -} - -Ice::SecurityException::SecurityException(const char* file, int line, const ::std::string& reason) : - LocalException(file, line), - reason(reason) -{ -} - -Ice::SecurityException::~SecurityException() -{ -} - -::std::string -Ice::SecurityException::ice_id() const -{ - return "::Ice::SecurityException"; -} - -Ice::SecurityException* -Ice::SecurityException::ice_clone() const -{ - return new SecurityException(*this); -} - -void -Ice::SecurityException::ice_throw() const -{ - throw *this; -} - -Ice::FixedProxyException::FixedProxyException(const char* file, int line) : - LocalException(file, line) -{ -} - -Ice::FixedProxyException::~FixedProxyException() -{ -} - -::std::string -Ice::FixedProxyException::ice_id() const -{ - return "::Ice::FixedProxyException"; -} - -Ice::FixedProxyException* -Ice::FixedProxyException::ice_clone() const -{ - return new FixedProxyException(*this); -} - -void -Ice::FixedProxyException::ice_throw() const -{ - throw *this; -} - -Ice::ResponseSentException::ResponseSentException(const char* file, int line) : - LocalException(file, line) -{ -} - -Ice::ResponseSentException::~ResponseSentException() -{ -} - -::std::string -Ice::ResponseSentException::ice_id() const -{ - return "::Ice::ResponseSentException"; -} - -Ice::ResponseSentException* -Ice::ResponseSentException::ice_clone() const -{ - return new ResponseSentException(*this); -} - -void -Ice::ResponseSentException::ice_throw() const -{ - throw *this; -} - -namespace Ice -{ -} - -#endif diff --git a/cpp/src/Ice/LocatorInfo.cpp b/cpp/src/Ice/LocatorInfo.cpp index adf189fa5ae..9f4990da8c9 100644 --- a/cpp/src/Ice/LocatorInfo.cpp +++ b/cpp/src/Ice/LocatorInfo.cpp @@ -39,7 +39,6 @@ class ObjectRequest : public LocatorInfo::Request { try { -#ifdef ICE_CPP11_MAPPING LocatorInfo::RequestPtr request = this; _locatorInfo->getLocator()->findObjectByIdAsync( _reference->getIdentity(), @@ -58,13 +57,6 @@ class ObjectRequest : public LocatorInfo::Request request->exception(ex); } }); -#else - _locatorInfo->getLocator()->begin_findObjectById( - _reference->getIdentity(), - newCallback_Locator_findObjectById(static_cast(this), - &LocatorInfo::Request::response, - &LocatorInfo::Request::exception)); -#endif } catch(const Ice::Exception& ex) { @@ -86,7 +78,6 @@ class AdapterRequest : public LocatorInfo::Request { try { -#ifdef ICE_CPP11_MAPPING LocatorInfo::RequestPtr request = this; _locatorInfo->getLocator()->findAdapterByIdAsync(_reference->getAdapterId(), [request](const shared_ptr& object) @@ -104,13 +95,6 @@ class AdapterRequest : public LocatorInfo::Request request->exception(ex); } }); -#else - _locatorInfo->getLocator()->begin_findAdapterById( - _reference->getAdapterId(), - newCallback_Locator_findAdapterById(static_cast(this), - &LocatorInfo::Request::response, - &LocatorInfo::Request::exception)); -#endif } catch(const Ice::Exception& ex) { diff --git a/cpp/src/Ice/LocatorInfo.h b/cpp/src/Ice/LocatorInfo.h index b156c46cb64..1358b9e1731 100644 --- a/cpp/src/Ice/LocatorInfo.h +++ b/cpp/src/Ice/LocatorInfo.h @@ -17,8 +17,6 @@ #include #include -#include - namespace IceInternal { @@ -40,13 +38,9 @@ class LocatorManager : public IceUtil::Shared, public IceUtil::Mutex const bool _background; -#ifdef ICE_CPP11_MAPPING using LocatorInfoTable = std::map, LocatorInfoPtr, Ice::TargetCompare, std::less>>; -#else - typedef std::map LocatorInfoTable; -#endif LocatorInfoTable _table; LocatorInfoTable::iterator _tableHint; @@ -133,7 +127,7 @@ class LocatorInfo : public IceUtil::Shared, public IceUtil::Mutex bool _sent; bool _response; Ice::ObjectPrxPtr _proxy; - IceInternal::UniquePtr _exception; + std::unique_ptr _exception; }; typedef IceUtil::Handle RequestPtr; diff --git a/cpp/src/Ice/Logger.cpp b/cpp/src/Ice/Logger.cpp index 603764c24c1..8920e85694d 100644 --- a/cpp/src/Ice/Logger.cpp +++ b/cpp/src/Ice/Logger.cpp @@ -2,49 +2,8 @@ // Copyright (c) ZeroC, Inc. All rights reserved. // -#ifndef ICE_API_EXPORTS -# define ICE_API_EXPORTS -#endif #include -#include -#include - -#if defined(_MSC_VER) -# pragma warning(disable:4458) // declaration of ... hides class member -#elif defined(__clang__) -# pragma clang diagnostic ignored "-Wshadow" -#elif defined(__GNUC__) -# pragma GCC diagnostic ignored "-Wshadow" -#endif - -#ifdef ICE_CPP11_MAPPING // C++11 mapping - -namespace -{ - -} - -Ice::Logger::~Logger() -{ -} - -#else // C++98 mapping - -namespace -{ - -} Ice::Logger::~Logger() { } - -/// \cond INTERNAL -ICE_API ::Ice::LocalObject* Ice::upCast(Logger* p) { return p; } -/// \endcond - -namespace Ice -{ -} - -#endif diff --git a/cpp/src/Ice/LoggerAdminI.cpp b/cpp/src/Ice/LoggerAdminI.cpp index 4eb5a869c41..fec999dd490 100644 --- a/cpp/src/Ice/LoggerAdminI.cpp +++ b/cpp/src/Ice/LoggerAdminI.cpp @@ -29,21 +29,12 @@ class LoggerAdminI : public Ice::LoggerAdmin, LoggerAdminI(const PropertiesPtr&); -#ifdef ICE_CPP11_MAPPING virtual void attachRemoteLogger(shared_ptr, LogMessageTypeSeq, StringSeq, Int, const Current&); virtual bool detachRemoteLogger(shared_ptr, const Current&); virtual LogMessageSeq getLog(LogMessageTypeSeq, StringSeq, Int, string&, const Current&); -#else - virtual void attachRemoteLogger(const RemoteLoggerPrx&, const LogMessageTypeSeq&, - const StringSeq&, Int, const Current&); - - virtual bool detachRemoteLogger(const RemoteLoggerPrx&, const Current&); - - virtual LogMessageSeq getLog(const LogMessageTypeSeq&, const StringSeq&, Int, string&, const Current&); -#endif void destroy(); @@ -60,10 +51,6 @@ class LoggerAdminI : public Ice::LoggerAdmin, bool removeRemoteLogger(const RemoteLoggerPrxPtr&); -#ifndef ICE_CPP11_MAPPING // C++98 mapping begin_init callback - void initCompleted(const AsyncResultPtr&); -#endif - IceUtil::Mutex _mutex; list _queue; int _logCount; // non-trace messages @@ -132,11 +119,7 @@ class Job : public IceUtil::Shared }; typedef IceUtil::Handle JobPtr; -class LoggerAdminLoggerI : public IceInternal::LoggerAdminLogger -#ifdef ICE_CPP11_MAPPING - , public std::enable_shared_from_this -#endif - +class LoggerAdminLoggerI : public IceInternal::LoggerAdminLogger, public std::enable_shared_from_this { public: @@ -163,9 +146,6 @@ class LoggerAdminLoggerI : public IceInternal::LoggerAdminLogger private: void log(const LogMessage&); -#ifndef ICE_CPP11_MAPPING // C++98 mapping begin_log callback - void logCompleted(const AsyncResultPtr&); -#endif LoggerPtr _localLogger; const LoggerAdminIPtr _loggerAdmin; @@ -330,19 +310,11 @@ LoggerAdminI::LoggerAdminI(const PropertiesPtr& props) : } void -#ifdef ICE_CPP11_MAPPING LoggerAdminI::attachRemoteLogger(shared_ptr prx, LogMessageTypeSeq messageTypes, StringSeq categories, Int messageMax, const Current& current) -#else -LoggerAdminI::attachRemoteLogger(const RemoteLoggerPrx& prx, - const LogMessageTypeSeq& messageTypes, - const StringSeq& categories, - Int messageMax, - const Current& current) -#endif { if(!prx) { @@ -402,7 +374,6 @@ LoggerAdminI::attachRemoteLogger(const RemoteLoggerPrx& prx, filterLogMessages(initLogMessages, filters.messageTypes, filters.traceCategories, messageMax); } -#ifdef ICE_CPP11_MAPPING try { auto self = shared_from_this(); @@ -432,26 +403,10 @@ LoggerAdminI::attachRemoteLogger(const RemoteLoggerPrx& prx, deadRemoteLogger(remoteLogger, logger, ex, "init"); throw; } -#else - CallbackPtr initCompletedCb = newCallback(LoggerAdminIPtr(shared_from_this()), &LoggerAdminI::initCompleted); - try - { - remoteLogger->begin_init(logger->getPrefix(), initLogMessages, initCompletedCb, logger); - } - catch(const LocalException& ex) - { - deadRemoteLogger(remoteLogger, logger, ex, "init"); - throw; - } -#endif } bool -#ifdef ICE_CPP11_MAPPING LoggerAdminI::detachRemoteLogger(shared_ptr remoteLogger, const Current& current) -#else -LoggerAdminI::detachRemoteLogger(const RemoteLoggerPrx& remoteLogger, const Current& current) -#endif { if(remoteLogger == 0) { @@ -480,13 +435,8 @@ LoggerAdminI::detachRemoteLogger(const RemoteLoggerPrx& remoteLogger, const Curr } LogMessageSeq -#ifdef ICE_CPP11_MAPPING LoggerAdminI::getLog(LogMessageTypeSeq messageTypes, StringSeq categories, Int messageMax, string& prefix, const Current& current) -#else -LoggerAdminI::getLog(const LogMessageTypeSeq& messageTypes, const StringSeq& categories, - Int messageMax, string& prefix, const Current& current) -#endif { LogMessageSeq logMessages; { @@ -648,33 +598,6 @@ LoggerAdminI::removeRemoteLogger(const RemoteLoggerPrxPtr& remoteLogger) return _remoteLoggerMap.erase(remoteLogger) > 0; } -#ifndef ICE_CPP11_MAPPING -// -// begin_init callback method for C++98 mapping -// -void -LoggerAdminI::initCompleted(const AsyncResultPtr& r) -{ - RemoteLoggerPrxPtr remoteLogger = ICE_UNCHECKED_CAST(RemoteLoggerPrx, r->getProxy()); - - try - { - remoteLogger->end_init(r); - - if(_traceLevel > 1) - { - LoggerPtr logger = ICE_DYNAMIC_CAST(Logger, r->getCookie()); - Trace trace(logger, traceCategory); - trace << r->getOperation() << " on `" << remoteLogger << "' completed successfully"; - } - } - catch(const LocalException& ex) - { - deadRemoteLogger(remoteLogger, ICE_DYNAMIC_CAST(Logger, r->getCookie()), ex, r->getOperation()); - } -} -#endif - // // LoggerAdminLoggerI // @@ -811,10 +734,6 @@ LoggerAdminLoggerI::run() trace << "send log thread started"; } -#ifndef ICE_CPP11_MAPPING - CallbackPtr logCompletedCb = newCallback(this, &LoggerAdminLoggerI::logCompleted); -#endif - for(;;) { IceUtil::Monitor::Lock lock(_monitor); @@ -842,7 +761,6 @@ LoggerAdminLoggerI::run() try { -#ifdef ICE_CPP11_MAPPING RemoteLoggerPrxPtr remoteLogger = *p; auto self = shared_from_this(); remoteLogger->logAsync(job->logMessage, @@ -869,12 +787,6 @@ LoggerAdminLoggerI::run() self->_loggerAdmin->deadRemoteLogger(remoteLogger, self->_localLogger, ex, "log"); } }); -#else - // - // *p is a proxy associated with the _sendLogCommunicator - // - (*p)->begin_log(job->logMessage, logCompletedCb); -#endif } catch(const LocalException& ex) { @@ -890,36 +802,6 @@ LoggerAdminLoggerI::run() } } -#ifndef ICE_CPP11_MAPPING -// -// begin_log callback for C++98 mapping -// -void -LoggerAdminLoggerI::logCompleted(const AsyncResultPtr& r) -{ - RemoteLoggerPrxPtr remoteLogger = ICE_UNCHECKED_CAST(RemoteLoggerPrx, r->getProxy()); - - try - { - remoteLogger->end_log(r); - - if(_loggerAdmin->getTraceLevel() > 1) - { - Trace trace(_localLogger, traceCategory); - trace << r->getOperation() << " on `" << remoteLogger << "' completed successfully"; - } - } - catch(const CommunicatorDestroyedException&) - { - // expected if there are outstanding calls during communicator destruction - } - catch(const LocalException& ex) - { - _loggerAdmin->deadRemoteLogger(remoteLogger, _localLogger, ex, r->getOperation()); - } -} -#endif - // // SendLogThread // diff --git a/cpp/src/Ice/LoggerF.cpp b/cpp/src/Ice/LoggerF.cpp deleted file mode 100644 index 6a3311e88bf..00000000000 --- a/cpp/src/Ice/LoggerF.cpp +++ /dev/null @@ -1,38 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#ifndef ICE_API_EXPORTS -# define ICE_API_EXPORTS -#endif -#include -#include -#include - -#if defined(_MSC_VER) -# pragma warning(disable:4458) // declaration of ... hides class member -#elif defined(__clang__) -# pragma clang diagnostic ignored "-Wshadow" -#elif defined(__GNUC__) -# pragma GCC diagnostic ignored "-Wshadow" -#endif - -#ifdef ICE_CPP11_MAPPING // C++11 mapping - -namespace -{ - -} - -#else // C++98 mapping - -namespace -{ - -} - -namespace Ice -{ -} - -#endif diff --git a/cpp/src/Ice/MetricsAdminI.cpp b/cpp/src/Ice/MetricsAdminI.cpp index e71e96df1d0..3038cfb99a2 100644 --- a/cpp/src/Ice/MetricsAdminI.cpp +++ b/cpp/src/Ice/MetricsAdminI.cpp @@ -478,11 +478,7 @@ MetricsAdminI::getMetricsViewNames(Ice::StringSeq& disabledViews, const Current& } void -#ifdef ICE_CPP11_MAPPING MetricsAdminI::enableMetricsView(string viewName, const Current&) -#else -MetricsAdminI::enableMetricsView(const string& viewName, const Current&) -#endif { { Lock sync(*this); @@ -493,11 +489,7 @@ MetricsAdminI::enableMetricsView(const string& viewName, const Current&) } void -#ifdef ICE_CPP11_MAPPING MetricsAdminI::disableMetricsView(string viewName, const Current&) -#else -MetricsAdminI::disableMetricsView(const string& viewName, const Current&) -#endif { { Lock sync(*this); @@ -508,11 +500,7 @@ MetricsAdminI::disableMetricsView(const string& viewName, const Current&) } MetricsView -#ifdef ICE_CPP11_MAPPING MetricsAdminI::getMetricsView(string viewName, ::Ice::Long& timestamp, const Current&) -#else -MetricsAdminI::getMetricsView(const string& viewName, ::Ice::Long& timestamp, const Current&) -#endif { Lock sync(*this); MetricsViewIPtr view = getMetricsView(viewName); @@ -525,11 +513,7 @@ MetricsAdminI::getMetricsView(const string& viewName, ::Ice::Long& timestamp, co } MetricsFailuresSeq -#ifdef ICE_CPP11_MAPPING MetricsAdminI::getMapMetricsFailures(string viewName, string map, const Current&) -#else -MetricsAdminI::getMapMetricsFailures(const string& viewName, const string& map, const Current&) -#endif { Lock sync(*this); MetricsViewIPtr view = getMetricsView(viewName); @@ -541,11 +525,7 @@ MetricsAdminI::getMapMetricsFailures(const string& viewName, const string& map, } MetricsFailures -#ifdef ICE_CPP11_MAPPING MetricsAdminI::getMetricsFailures(string viewName, string map, string id, const Current&) -#else -MetricsAdminI::getMetricsFailures(const string& viewName, const string& map, const string& id, const Current&) -#endif { Lock sync(*this); MetricsViewIPtr view = getMetricsView(viewName); diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp index 42d677630ea..99ce897c659 100644 --- a/cpp/src/Ice/Object.cpp +++ b/cpp/src/Ice/Object.cpp @@ -36,13 +36,6 @@ const string object_all[] = } -#ifndef ICE_CPP11_MAPPING -Ice::DispatchInterceptorAsyncCallback::~DispatchInterceptorAsyncCallback() -{ - // Out of line to avoid weak vtable -} -#endif - Ice::Request::~Request() { // Out of line to avoid weak vtable @@ -131,23 +124,13 @@ Ice::Object::_iceD_ice_id(Incoming& inS, const Current& current) } bool -#ifdef ICE_CPP11_MAPPING Ice::Object::ice_dispatch(Request& request, std::function r, std::function e) -#else -Ice::Object::ice_dispatch(Request& request, const DispatchInterceptorAsyncCallbackPtr& cb) -#endif { IceInternal::Incoming& in = dynamic_cast(request)._in; in.startOver(); -#ifdef ICE_CPP11_MAPPING if(r || e) { in.push(r, e); -#else - if(cb) - { - in.push(cb); -#endif try { bool sync = _iceDispatch(in, in.getCurrent()); @@ -222,14 +205,8 @@ operationModeToString(OperationMode mode) // // This could not happen with C++11 strong type enums // -#ifdef ICE_CPP11_MAPPING assert(false); return ""; -#else - ostringstream os; - os << "unknown value (" << mode << ")"; - return os.str(); -#endif } } @@ -303,7 +280,6 @@ Ice::BlobjectAsync::_iceDispatch(Incoming& in, const Current& current) const Byte* inEncaps; Int sz; in.readParamEncaps(inEncaps, sz); -#ifdef ICE_CPP11_MAPPING auto async = IncomingAsync::create(in); ice_invokeAsync(vector(inEncaps, inEncaps + sz), [async](bool ok, const vector& outEncaps) @@ -319,9 +295,6 @@ Ice::BlobjectAsync::_iceDispatch(Incoming& in, const Current& current) async->completed(); }, async->exception(), current); -#else - ice_invoke_async(new ::IceAsync::Ice::AMD_Object_ice_invoke(in), vector(inEncaps, inEncaps + sz), current); -#endif return false; } @@ -332,7 +305,6 @@ Ice::BlobjectArrayAsync::_iceDispatch(Incoming& in, const Current& current) Int sz; in.readParamEncaps(inEncaps.first, sz); inEncaps.second = inEncaps.first + sz; -#ifdef ICE_CPP11_MAPPING auto async = IncomingAsync::create(in); ice_invokeAsync(inEncaps, [async](bool ok, const pair& outE) @@ -341,8 +313,5 @@ Ice::BlobjectArrayAsync::_iceDispatch(Incoming& in, const Current& current) async->completed(); }, async->exception(), current); -#else - ice_invoke_async(new ::IceAsync::Ice::AMD_Object_ice_invoke(in), inEncaps, current); -#endif return false; } diff --git a/cpp/src/Ice/ObjectAdapterFactory.cpp b/cpp/src/Ice/ObjectAdapterFactory.cpp index d4e75867ae1..0550078e150 100644 --- a/cpp/src/Ice/ObjectAdapterFactory.cpp +++ b/cpp/src/Ice/ObjectAdapterFactory.cpp @@ -12,10 +12,6 @@ using namespace std; using namespace Ice; using namespace IceInternal; -#ifndef ICE_CPP11_MAPPING -IceUtil::Shared* IceInternal::upCast(ObjectAdapterFactory* p) { return p; } -#endif - void IceInternal::ObjectAdapterFactory::shutdown() { diff --git a/cpp/src/Ice/ObjectAdapterFactory.h b/cpp/src/Ice/ObjectAdapterFactory.h index 0b042308a76..55ad0f0bf76 100644 --- a/cpp/src/Ice/ObjectAdapterFactory.h +++ b/cpp/src/Ice/ObjectAdapterFactory.h @@ -15,11 +15,7 @@ namespace IceInternal { class ObjectAdapterFactory : public ::IceUtil::Monitor< ::IceUtil::RecMutex>, -#ifdef ICE_CPP11_MAPPING public std::enable_shared_from_this -#else - public virtual IceUtil::Shared -#endif { public: diff --git a/cpp/src/Ice/ObjectAdapterFactoryF.h b/cpp/src/Ice/ObjectAdapterFactoryF.h index 38c7bc5b99e..960b2bb12ca 100644 --- a/cpp/src/Ice/ObjectAdapterFactoryF.h +++ b/cpp/src/Ice/ObjectAdapterFactoryF.h @@ -13,12 +13,7 @@ namespace IceInternal { class ObjectAdapterFactory; -#ifdef ICE_CPP11_MAPPING using ObjectAdapterFactoryPtr = ::std::shared_ptr; -#else -IceUtil::Shared* upCast(ObjectAdapterFactory*); -typedef IceInternal::Handle ObjectAdapterFactoryPtr; -#endif } diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp index ad4038ee05e..08cd3b08734 100644 --- a/cpp/src/Ice/ObjectAdapterI.cpp +++ b/cpp/src/Ice/ObjectAdapterI.cpp @@ -663,11 +663,7 @@ Ice::ObjectAdapterI::setPublishedEndpoints(const EndpointSeq& newEndpoints) if(_routerInfo) { const string s("can't set published endpoints on object adapter associated with a router"); - #ifdef ICE_CPP11_MAPPING throw invalid_argument(s); - #else - throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, s); - #endif } oldPublishedEndpoints = _publishedEndpoints; diff --git a/cpp/src/Ice/OpaqueEndpointI.cpp b/cpp/src/Ice/OpaqueEndpointI.cpp index d2efc499ef2..c787d4c8d42 100644 --- a/cpp/src/Ice/OpaqueEndpointI.cpp +++ b/cpp/src/Ice/OpaqueEndpointI.cpp @@ -230,11 +230,7 @@ IceInternal::OpaqueEndpointI::options() const } bool -#ifdef ICE_CPP11_MAPPING IceInternal::OpaqueEndpointI::operator==(const Endpoint& r) const -#else -IceInternal::OpaqueEndpointI::operator==(const LocalObject& r) const -#endif { const OpaqueEndpointI* p = dynamic_cast(&r); if(!p) @@ -266,11 +262,7 @@ IceInternal::OpaqueEndpointI::operator==(const LocalObject& r) const } bool -#ifdef ICE_CPP11_MAPPING IceInternal::OpaqueEndpointI::operator<(const Endpoint& r) const -#else -IceInternal::OpaqueEndpointI::operator<(const LocalObject& r) const -#endif { const OpaqueEndpointI* p = dynamic_cast(&r); if(!p) diff --git a/cpp/src/Ice/OpaqueEndpointI.h b/cpp/src/Ice/OpaqueEndpointI.h index dd97c5c9abc..e2f986ba258 100644 --- a/cpp/src/Ice/OpaqueEndpointI.h +++ b/cpp/src/Ice/OpaqueEndpointI.h @@ -11,10 +11,7 @@ namespace IceInternal { -class OpaqueEndpointI : public EndpointI -#ifdef ICE_CPP11_MAPPING - , public std::enable_shared_from_this -#endif +class OpaqueEndpointI : public EndpointI, public std::enable_shared_from_this { public: @@ -44,13 +41,8 @@ class OpaqueEndpointI : public EndpointI virtual Ice::Int hash() const; virtual std::string options() const; -#ifdef ICE_CPP11_MAPPING virtual bool operator==(const Ice::Endpoint&) const; virtual bool operator<(const Ice::Endpoint&) const; -#else - virtual bool operator==(const Ice::LocalObject&) const; - virtual bool operator<(const Ice::LocalObject&) const; -#endif using EndpointI::connectionId; diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp index 1572ddf97d8..29c1f563b6d 100644 --- a/cpp/src/Ice/OutgoingAsync.cpp +++ b/cpp/src/Ice/OutgoingAsync.cpp @@ -20,18 +20,8 @@ using namespace std; using namespace Ice; using namespace IceInternal; -#ifndef ICE_CPP11_MAPPING -IceUtil::Shared* IceInternal::upCast(OutgoingAsyncBase* p) { return p; } -IceUtil::Shared* IceInternal::upCast(ProxyOutgoingAsyncBase* p) { return p; } -IceUtil::Shared* IceInternal::upCast(OutgoingAsync* p) { return p; } -#endif - const unsigned char OutgoingAsyncBase::OK = 0x1; const unsigned char OutgoingAsyncBase::Sent = 0x2; -#ifndef ICE_CPP11_MAPPING -const unsigned char OutgoingAsyncBase::Done = 0x4; -const unsigned char OutgoingAsyncBase::EndCalled = 0x8; -#endif OutgoingAsyncCompletionCallback::~OutgoingAsyncCompletionCallback() { @@ -204,7 +194,6 @@ OutgoingAsyncBase::invokeResponse() try { -#ifdef ICE_CPP11_MAPPING try { handleInvokeResponse(_state & OK, this); @@ -220,9 +209,6 @@ OutgoingAsyncBase::invokeResponse() { rethrow_exception(ex); } -#else - handleInvokeResponse(_state & OK, this); -#endif } catch(const std::exception& ex) { @@ -284,14 +270,6 @@ OutgoingAsyncBase::sentImpl(bool done) _cancellationHandler = 0; } -#ifndef ICE_CPP11_MAPPING - if(done) - { - _state |= Done | OK; - } - _m.notifyAll(); -#endif - bool invoke = handleSent(done, alreadySent); if(!invoke && _doneInSent) { @@ -313,11 +291,6 @@ OutgoingAsyncBase::exceptionImpl(const Exception& ex) _cancellationHandler = 0; _observer.failed(ex.ice_id()); -#ifndef ICE_CPP11_MAPPING - _state |= Done; - _m.notifyAll(); -#endif - bool invoke = handleException(ex); if(!invoke) { @@ -337,11 +310,6 @@ OutgoingAsyncBase::responseImpl(bool ok, bool invoke) _cancellationHandler = 0; -#ifndef ICE_CPP11_MAPPING - _state |= Done; - _m.notifyAll(); -#endif - try { invoke &= handleResponse(ok); @@ -374,159 +342,6 @@ OutgoingAsyncBase::cancel(const Ice::LocalException& ex) handler->asyncRequestCanceled(ICE_SHARED_FROM_THIS, ex); } -#ifndef ICE_CPP11_MAPPING - -Int -OutgoingAsyncBase::getHash() const -{ - return static_cast(reinterpret_cast(this) >> 4); -} - -CommunicatorPtr -OutgoingAsyncBase::getCommunicator() const -{ - return 0; -} - -ConnectionPtr -OutgoingAsyncBase::getConnection() const -{ - return 0; -} - -ObjectPrxPtr -OutgoingAsyncBase::getProxy() const -{ - return 0; -} - -Ice::LocalObjectPtr -OutgoingAsyncBase::getCookie() const -{ - return _cookie; -} - -const std::string& -OutgoingAsyncBase::getOperation() const -{ - assert(false); // Must be overridden - static string empty; - return empty; -} - -bool -OutgoingAsyncBase::isCompleted() const -{ - Lock sync(_m); - return (_state & Done) > 0; -} - -void -OutgoingAsyncBase::waitForCompleted() -{ - Lock sync(_m); - while(!(_state & Done)) - { - _m.wait(); - } -} - -bool -OutgoingAsyncBase::isSent() const -{ - Lock sync(_m); - return (_state & Sent) > 0; -} - -void -OutgoingAsyncBase::waitForSent() -{ - Lock sync(_m); - while(!(_state & Sent) && !_ex.get()) - { - _m.wait(); - } -} - -bool -OutgoingAsyncBase::sentSynchronously() const -{ - return _sentSynchronously; -} - -void -OutgoingAsyncBase::throwLocalException() const -{ - Lock sync(_m); - if(_ex.get()) - { - _ex->ice_throw(); - } -} - -bool -OutgoingAsyncBase::_waitForResponse() -{ - Lock sync(_m); - if(_state & EndCalled) - { - throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, "end_ method called more than once"); - } - _state |= EndCalled; - while(!(_state & Done)) - { - _m.wait(); - } - - if(_ex.get()) - { - _ex->ice_throw(); - } - return _state & OK; -} - -Ice::InputStream* -OutgoingAsyncBase::_startReadParams() -{ - _is.startEncapsulation(); - return &_is; -} - -void -OutgoingAsyncBase::_endReadParams() -{ - _is.endEncapsulation(); -} - -void -OutgoingAsyncBase::_readEmptyParams() -{ - _is.skipEmptyEncapsulation(); -} - -void -OutgoingAsyncBase::_readParamEncaps(const ::Ice::Byte*& encaps, ::Ice::Int& sz) -{ - _is.readEncapsulation(encaps, sz); -} - -void -OutgoingAsyncBase::_throwUserException() -{ - try - { - _is.startEncapsulation(); - _is.throwException(); - } - catch(const Ice::UserException&) - { - _is.endEncapsulation(); - throw; - } -} - -#endif - void OutgoingAsyncBase::warning(const std::exception& exc) const { @@ -653,20 +468,6 @@ ProxyOutgoingAsyncBase::abort(const Ice::Exception& ex) } } -#ifndef ICE_CPP11_MAPPING -Ice::ObjectPrx -ProxyOutgoingAsyncBase::getProxy() const -{ - return _proxy; -} - -Ice::CommunicatorPtr -ProxyOutgoingAsyncBase::getCommunicator() const -{ - return _proxy->ice_getCommunicator(); -} -#endif - ProxyOutgoingAsyncBase::ProxyOutgoingAsyncBase(const ObjectPrxPtr& prx) : OutgoingAsyncBase(prx->_getReference()->getInstance()), _proxy(prx), @@ -956,7 +757,7 @@ OutgoingAsync::response() string operation; _is.read(operation, false); - IceInternal::UniquePtr ex; + unique_ptr ex; switch(replyStatus) { case replyObjectNotExist: @@ -998,7 +799,7 @@ OutgoingAsync::response() string unknown; _is.read(unknown, false); - IceInternal::UniquePtr ex; + unique_ptr ex; switch(replyStatus) { case replyUnknownException: @@ -1095,7 +896,6 @@ OutgoingAsync::invoke(const string& operation) invokeImpl(true); // userThread = true } -#ifdef ICE_CPP11_MAPPING void OutgoingAsync::invoke(const string& operation, Ice::OperationMode mode, @@ -1143,10 +943,6 @@ OutgoingAsync::throwUserException() } } -#endif - -#ifdef ICE_CPP11_MAPPING - bool LambdaInvoke::handleSent(bool, bool alreadySent) { @@ -1189,91 +985,3 @@ LambdaInvoke::handleInvokeResponse(bool ok, OutgoingAsyncBase*) const { _response(ok); } - -#else // C++98 - -namespace -{ - -// -// Dummy class derived from CallbackBase -// We use this class for the dummyCallback extern pointer in OutgoingAsync. In turn, -// this allows us to test whether the user supplied a null delegate instance to the -// generated begin_ method without having to generate a separate test to throw IllegalArgumentException -// in the inlined versions of the begin_ method. In other words, this reduces the amount of generated -// object code. -// -class DummyCallback : public CallbackBase -{ -public: - - DummyCallback() - { - } - - virtual void - completed(const Ice::AsyncResultPtr&) const - { - assert(false); - } - - virtual CallbackBasePtr - verify(const Ice::LocalObjectPtr&) - { - // - // Called by the AsyncResult constructor to verify the delegate. The dummy - // delegate is passed when the user used a begin_ method without delegate. - // By returning 0 here, we tell the AsyncResult that no delegates was - // provided. - // - return 0; - } - - virtual void - sent(const AsyncResultPtr&) const - { - assert(false); - } - - virtual bool - hasSentCallback() const - { - assert(false); - return false; - } -}; - -} - -// -// This gives a pointer value to compare against in the generated -// begin_ method to decide whether the caller passed a null pointer -// versus the generated inline version of the begin_ method having -// passed a pointer to the dummy delegate. -// -CallbackBasePtr IceInternal::dummyCallback = new DummyCallback; - -CallbackBase::~CallbackBase() -{ - // Out of line to avoid weak vtable -} - -void -CallbackBase::checkCallback(bool obj, bool cb) -{ - if(!obj) - { - throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, "callback object cannot be null"); - } - if(!cb) - { - throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, "callback cannot be null"); - } -} - -GenericCallbackBase::~GenericCallbackBase() -{ - // Out of line to avoid weak vtable -} - -#endif diff --git a/cpp/src/Ice/OutputStream.cpp b/cpp/src/Ice/OutputStream.cpp index 5505dd7509e..2c0c4da683a 100644 --- a/cpp/src/Ice/OutputStream.cpp +++ b/cpp/src/Ice/OutputStream.cpp @@ -760,11 +760,7 @@ Ice::OutputStream::write(const wstring* begin, const wstring* end) } void -#ifdef ICE_CPP11_MAPPING Ice::OutputStream::writeProxy(const shared_ptr& v) -#else -Ice::OutputStream::write(const ObjectPrx& v) -#endif { if(v) { diff --git a/cpp/src/Ice/Plugin.cpp b/cpp/src/Ice/Plugin.cpp index 54de8f87d7f..446c381f8fb 100644 --- a/cpp/src/Ice/Plugin.cpp +++ b/cpp/src/Ice/Plugin.cpp @@ -19,13 +19,6 @@ # pragma GCC diagnostic ignored "-Wshadow" #endif -#ifdef ICE_CPP11_MAPPING // C++11 mapping - -namespace -{ - -} - Ice::Plugin::~Plugin() { } @@ -33,32 +26,3 @@ Ice::Plugin::~Plugin() Ice::PluginManager::~PluginManager() { } - -#else // C++98 mapping - -namespace -{ - -} - -Ice::Plugin::~Plugin() -{ -} - -/// \cond INTERNAL -ICE_API ::Ice::LocalObject* Ice::upCast(Plugin* p) { return p; } -/// \endcond - -Ice::PluginManager::~PluginManager() -{ -} - -/// \cond INTERNAL -ICE_API ::Ice::LocalObject* Ice::upCast(PluginManager* p) { return p; } -/// \endcond - -namespace Ice -{ -} - -#endif diff --git a/cpp/src/Ice/PluginF.cpp b/cpp/src/Ice/PluginF.cpp deleted file mode 100644 index aa142d5c48e..00000000000 --- a/cpp/src/Ice/PluginF.cpp +++ /dev/null @@ -1,38 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#ifndef ICE_API_EXPORTS -# define ICE_API_EXPORTS -#endif -#include -#include -#include - -#if defined(_MSC_VER) -# pragma warning(disable:4458) // declaration of ... hides class member -#elif defined(__clang__) -# pragma clang diagnostic ignored "-Wshadow" -#elif defined(__GNUC__) -# pragma GCC diagnostic ignored "-Wshadow" -#endif - -#ifdef ICE_CPP11_MAPPING // C++11 mapping - -namespace -{ - -} - -#else // C++98 mapping - -namespace -{ - -} - -namespace Ice -{ -} - -#endif diff --git a/cpp/src/Ice/Properties.cpp b/cpp/src/Ice/Properties.cpp index 506f4283edc..c9df1e355ac 100644 --- a/cpp/src/Ice/Properties.cpp +++ b/cpp/src/Ice/Properties.cpp @@ -2,54 +2,9 @@ // Copyright (c) ZeroC, Inc. All rights reserved. // -#ifndef ICE_API_EXPORTS -# define ICE_API_EXPORTS -#endif #include -#include -#include -#include -#include -#include -#include -#include -#if defined(_MSC_VER) -# pragma warning(disable:4458) // declaration of ... hides class member -#elif defined(__clang__) -# pragma clang diagnostic ignored "-Wshadow" -#elif defined(__GNUC__) -# pragma GCC diagnostic ignored "-Wshadow" -#endif - -#ifdef ICE_CPP11_MAPPING // C++11 mapping - -namespace -{ - -} Ice::Properties::~Properties() { } - -#else // C++98 mapping - -namespace -{ - -} - -Ice::Properties::~Properties() -{ -} - -/// \cond INTERNAL -ICE_API ::Ice::LocalObject* Ice::upCast(Properties* p) { return p; } -/// \endcond - -namespace Ice -{ -} - -#endif diff --git a/cpp/src/Ice/PropertiesAdminI.cpp b/cpp/src/Ice/PropertiesAdminI.cpp index 8efac4e2cb2..969331a0c23 100644 --- a/cpp/src/Ice/PropertiesAdminI.cpp +++ b/cpp/src/Ice/PropertiesAdminI.cpp @@ -33,33 +33,21 @@ PropertiesAdminI::PropertiesAdminI(const InstancePtr& instance) : } string -#ifdef ICE_CPP11_MAPPING PropertiesAdminI::getProperty(string name, const Current&) -#else -PropertiesAdminI::getProperty(const string& name, const Current&) -#endif { Lock sync(*this); return _properties->getProperty(name); } PropertyDict -#ifdef ICE_CPP11_MAPPING PropertiesAdminI::getPropertiesForPrefix(string prefix, const Current&) -#else -PropertiesAdminI::getPropertiesForPrefix(const string& prefix, const Current&) -#endif { Lock sync(*this); return _properties->getPropertiesForPrefix(prefix); } void -#ifdef ICE_CPP11_MAPPING PropertiesAdminI::setProperties(PropertyDict props, const Current&) -#else -PropertiesAdminI::setProperties(const PropertyDict& props, const Current&) -#endif { Lock sync(*this); diff --git a/cpp/src/Ice/PropertiesAdminI.h b/cpp/src/Ice/PropertiesAdminI.h index 6546f1b4540..ec83c592a6f 100644 --- a/cpp/src/Ice/PropertiesAdminI.h +++ b/cpp/src/Ice/PropertiesAdminI.h @@ -11,10 +11,7 @@ #include #include -#ifdef ICE_CPP11_MAPPING #include -#endif - namespace IceInternal { @@ -27,15 +24,9 @@ class PropertiesAdminI final : public Ice::PropertiesAdmin, PropertiesAdminI(const InstancePtr&); -#ifdef ICE_CPP11_MAPPING std::string getProperty(std::string, const Ice::Current&) final; Ice::PropertyDict getPropertiesForPrefix(std::string, const Ice::Current&) final; void setProperties(::Ice::PropertyDict, const Ice::Current&) final; -#else - std::string getProperty(const std::string&, const Ice::Current&) final; - Ice::PropertyDict getPropertiesForPrefix(const std::string&, const Ice::Current&) final; - void setProperties(const Ice::PropertyDict&, const Ice::Current&) final; -#endif std::function addUpdateCallback(std::function) final; diff --git a/cpp/src/Ice/PropertiesF.cpp b/cpp/src/Ice/PropertiesF.cpp deleted file mode 100644 index e2daea27d12..00000000000 --- a/cpp/src/Ice/PropertiesF.cpp +++ /dev/null @@ -1,40 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#ifndef ICE_API_EXPORTS -# define ICE_API_EXPORTS -#endif -#include -#include -#include -#include -#include - -#if defined(_MSC_VER) -# pragma warning(disable:4458) // declaration of ... hides class member -#elif defined(__clang__) -# pragma clang diagnostic ignored "-Wshadow" -#elif defined(__GNUC__) -# pragma GCC diagnostic ignored "-Wshadow" -#endif - -#ifdef ICE_CPP11_MAPPING // C++11 mapping - -namespace -{ - -} - -#else // C++98 mapping - -namespace -{ - -} - -namespace Ice -{ -} - -#endif diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp index 7d5c2e83149..0fc240fc518 100644 --- a/cpp/src/Ice/Proxy.cpp +++ b/cpp/src/Ice/Proxy.cpp @@ -131,8 +131,6 @@ ProxyGetConnection::invoke(const string& operation) invokeImpl(true); // userThread = true } -#ifdef ICE_CPP11_MAPPING // C++11 mapping - namespace Ice { @@ -232,464 +230,8 @@ Ice::operator<<(ostream& os, const Ice::ObjectPrx& p) return os << p.ice_toString(); } -#else // C++98 mapping - -::Ice::ObjectPrxPtr -IceInternal::checkedCastImpl(const ObjectPrxPtr& b, const string& f, const string& typeId, const Context& context) -{ - if(b != ICE_NULLPTR) - { - ObjectPrxPtr bb = b->ice_facet(f); - try - { - if(bb->ice_isA(typeId, context)) - { - return bb; - } -#ifndef NDEBUG - else - { - assert(typeId != "::Ice::Object"); - } -#endif - } - catch(const FacetNotExistException&) - { - } - } - return ICE_NULLPTR; -} - -bool -IceProxy::Ice::Object::operator==(const Object& r) const -{ - return _reference == r._reference; -} - -bool -IceProxy::Ice::Object::operator<(const Object& r) const -{ - return _reference < r._reference; -} - -Ice::AsyncResultPtr -IceProxy::Ice::Object::_iceI_begin_ice_isA(const string& typeId, - const Context& ctx, - const ::IceInternal::CallbackBasePtr& del, - const ::Ice::LocalObjectPtr& cookie, - bool sync) -{ - _checkTwowayOnly(ice_isA_name, sync); - OutgoingAsyncPtr result = new CallbackOutgoing(this, ice_isA_name, del, cookie, sync); - try - { - result->prepare(ice_isA_name, Nonmutating, ctx); - ::Ice::OutputStream* ostr = result->startWriteParams(ICE_ENUM(FormatType, DefaultFormat)); - ostr->write(typeId, false); - result->endWriteParams(); - result->invoke(ice_isA_name); - } - catch(const Exception& ex) - { - result->abort(ex); - } - return result; -} - -bool -IceProxy::Ice::Object::end_ice_isA(const AsyncResultPtr& result) -{ - AsyncResult::_check(result, this, ice_isA_name); - bool ok = result->_waitForResponse(); - if(!ok) - { - try - { - result->_throwUserException(); - } - catch(const UserException& ex) - { - throw UnknownUserException(__FILE__, __LINE__, ex.ice_id()); - } - } - bool ret; - ::Ice::InputStream* istr = result->_startReadParams(); - istr->read(ret); - result->_endReadParams(); - return ret; -} - -AsyncResultPtr -IceProxy::Ice::Object::_iceI_begin_ice_ping(const Context& ctx, - const ::IceInternal::CallbackBasePtr& del, - const ::Ice::LocalObjectPtr& cookie, - bool sync) -{ - OutgoingAsyncPtr result = new CallbackOutgoing(this, ice_ping_name, del, cookie, sync); - try - { - result->prepare(ice_ping_name, Nonmutating, ctx); - result->writeEmptyParams(); - result->invoke(ice_ping_name); - } - catch(const Exception& ex) - { - result->abort(ex); - } - return result; -} - -void -IceProxy::Ice::Object::end_ice_ping(const AsyncResultPtr& result) -{ - _end(result, ice_ping_name); -} - -AsyncResultPtr -IceProxy::Ice::Object::_iceI_begin_ice_ids(const Context& ctx, - const ::IceInternal::CallbackBasePtr& del, - const ::Ice::LocalObjectPtr& cookie, - bool sync) -{ - _checkTwowayOnly(ice_ids_name, sync); - OutgoingAsyncPtr result = new CallbackOutgoing(this, ice_ids_name, del, cookie, sync); - try - { - result->prepare(ice_ids_name, Nonmutating, ctx); - result->writeEmptyParams(); - result->invoke(ice_ids_name); - } - catch(const Exception& ex) - { - result->abort(ex); - } - return result; -} - -vector -IceProxy::Ice::Object::end_ice_ids(const AsyncResultPtr& result) -{ - AsyncResult::_check(result, this, ice_ids_name); - bool ok = result->_waitForResponse(); - if(!ok) - { - try - { - result->_throwUserException(); - } - catch(const UserException& ex) - { - throw UnknownUserException(__FILE__, __LINE__, ex.ice_id()); - } - } - vector ret; - ::Ice::InputStream* istr = result->_startReadParams(); - istr->read(ret, false); - result->_endReadParams(); - return ret; -} - -AsyncResultPtr -IceProxy::Ice::Object::_iceI_begin_ice_id(const Context& ctx, - const ::IceInternal::CallbackBasePtr& del, - const ::Ice::LocalObjectPtr& cookie, - bool sync) -{ - _checkTwowayOnly(ice_id_name, sync); - OutgoingAsyncPtr result = new CallbackOutgoing(this, ice_id_name, del, cookie, sync); - try - { - result->prepare(ice_id_name, Nonmutating, ctx); - result->writeEmptyParams(); - result->invoke(ice_id_name); - } - catch(const Exception& ex) - { - result->abort(ex); - } - return result; -} - -string -IceProxy::Ice::Object::end_ice_id(const AsyncResultPtr& result) -{ - AsyncResult::_check(result, this, ice_id_name); - bool ok = result->_waitForResponse(); - if(!ok) - { - try - { - result->_throwUserException(); - } - catch(const UserException& ex) - { - throw UnknownUserException(__FILE__, __LINE__, ex.ice_id()); - } - } - string ret; - ::Ice::InputStream* istr = result->_startReadParams(); - istr->read(ret, false); - result->_endReadParams(); - return ret; -} - -bool -IceProxy::Ice::Object::ice_invoke(const string& operation, - OperationMode mode, - const vector& inEncaps, - vector& outEncaps, - const Context& context) -{ - pair inPair; - if(inEncaps.empty()) - { - inPair.first = inPair.second = 0; - } - else - { - inPair.first = &inEncaps[0]; - inPair.second = inPair.first + inEncaps.size(); - } - return ice_invoke(operation, mode, inPair, outEncaps, context); -} - -AsyncResultPtr -IceProxy::Ice::Object::_iceI_begin_ice_invoke(const string& operation, - OperationMode mode, - const vector& inEncaps, - const Context& ctx, - const ::IceInternal::CallbackBasePtr& del, - const ::Ice::LocalObjectPtr& cookie, - bool /*sync*/) -{ - pair inPair; - if(inEncaps.empty()) - { - inPair.first = inPair.second = 0; - } - else - { - inPair.first = &inEncaps[0]; - inPair.second = inPair.first + inEncaps.size(); - } - return _iceI_begin_ice_invoke(operation, mode, inPair, ctx, del, cookie); -} - -bool -IceProxy::Ice::Object::end_ice_invoke(vector& outEncaps, const AsyncResultPtr& result) -{ - AsyncResult::_check(result, this, ice_invoke_name); - bool ok = result->_waitForResponse(); - if(_reference->getMode() == Reference::ModeTwoway) - { - const Byte* v; - Int sz; - result->_readParamEncaps(v, sz); - vector(v, v + sz).swap(outEncaps); - } - return ok; -} - -AsyncResultPtr -IceProxy::Ice::Object::_iceI_begin_ice_invoke(const string& operation, - OperationMode mode, - const pair& inEncaps, - const Context& ctx, - const ::IceInternal::CallbackBasePtr& del, - const ::Ice::LocalObjectPtr& cookie, - bool sync) -{ - OutgoingAsyncPtr result = new CallbackOutgoing(this, ice_invoke_name, del, cookie, sync); - try - { - result->prepare(operation, mode, ctx); - result->writeParamEncaps(inEncaps.first, static_cast(inEncaps.second - inEncaps.first)); - result->invoke(operation); - } - catch(const Exception& ex) - { - result->abort(ex); - } - return result; -} - -bool -IceProxy::Ice::Object::_iceI_end_ice_invoke(pair& outEncaps, const AsyncResultPtr& result) -{ - AsyncResult::_check(result, this, ice_invoke_name); - bool ok = result->_waitForResponse(); - if(_reference->getMode() == Reference::ModeTwoway) - { - Int sz; - result->_readParamEncaps(outEncaps.first, sz); - outEncaps.second = outEncaps.first + sz; - } - return ok; -} - -::Ice::AsyncResultPtr -IceProxy::Ice::Object::_iceI_begin_ice_flushBatchRequests(const ::IceInternal::CallbackBasePtr& del, - const ::Ice::LocalObjectPtr& cookie) -{ - class ProxyFlushBatchAsyncWithCallback : public ProxyFlushBatchAsync, public CallbackCompletion - { - public: - - ProxyFlushBatchAsyncWithCallback(const ::Ice::ObjectPrx& proxy, - const CallbackBasePtr& cb, - const ::Ice::LocalObjectPtr& cookie) : - ProxyFlushBatchAsync(proxy), CallbackCompletion(cb, cookie) - { - _cookie = cookie; - } - - virtual const std::string& - getOperation() const - { - return ice_flushBatchRequests_name; - } - }; - - ProxyFlushBatchAsyncPtr result = new ProxyFlushBatchAsyncWithCallback(this, del, cookie); - try - { - result->invoke(ice_flushBatchRequests_name); - } - catch(const Exception& ex) - { - result->abort(ex); - } - return result; -} - -void -IceProxy::Ice::Object::end_ice_flushBatchRequests(const AsyncResultPtr& result) -{ - AsyncResult::_check(result, this, ice_flushBatchRequests_name); - result->_waitForResponse(); -} - -void -IceProxy::Ice::Object::_end(const ::Ice::AsyncResultPtr& result, const std::string& operation) const -{ - AsyncResult::_check(result, this, operation); - bool ok = result->_waitForResponse(); - if(_reference->getMode() == Reference::ModeTwoway) - { - if(!ok) - { - try - { - result->_throwUserException(); - } - catch(const UserException& ex) - { - throw UnknownUserException(__FILE__, __LINE__, ex.ice_id()); - } - } - result->_readEmptyParams(); - } -} - -namespace IceProxy -{ - -namespace Ice -{ - -ostream& -operator<<(ostream& os, const ::IceProxy::Ice::Object& p) -{ - return os << p.ice_toString(); -} - -} - -} - -IceProxy::Ice::Object* -IceProxy::Ice::Object::_newInstance() const -{ - return new Object; -} - -AsyncResultPtr -IceProxy::Ice::Object::_iceI_begin_ice_getConnection(const ::IceInternal::CallbackBasePtr& del, - const ::Ice::LocalObjectPtr& cookie) -{ - class ProxyGetConnectionWithCallback : public ProxyGetConnection, public CallbackCompletion - { - public: - - ProxyGetConnectionWithCallback(const ::Ice::ObjectPrx& proxy, - const ::IceInternal::CallbackBasePtr& cb, - const ::Ice::LocalObjectPtr& cookie) : - ProxyGetConnection(proxy), CallbackCompletion(cb, cookie) - { - _cookie = cookie; - } - - virtual const std::string& - getOperation() const - { - return ice_getConnection_name; - } - }; - - ProxyGetConnectionPtr result = new ProxyGetConnectionWithCallback(this, del, cookie); - try - { - result->invoke(ice_getConnection_name); - } - catch(const Exception& ex) - { - result->abort(ex); - } - return result; -} - -ConnectionPtr -IceProxy::Ice::Object::end_ice_getConnection(const AsyncResultPtr& result) -{ - AsyncResult::_check(result, this, ice_getConnection_name); - result->_waitForResponse(); - return result->getConnection(); -} - -void -IceProxy::Ice::Object::_checkTwowayOnly(const string& name, bool sync) const -{ - // - // No mutex lock necessary, there is nothing mutable in this operation. - // - if(!ice_isTwoway()) - { - if(sync) - { - throw TwowayOnlyException(__FILE__, __LINE__, name); - } - else - { - throw IceUtil::IllegalArgumentException(__FILE__, - __LINE__, - "`" + name + "' can only be called with a twoway proxy"); - } - } -} - -#endif - -#ifdef ICE_CPP11_MAPPING -# define ICE_OBJECT_PRX Ice::ObjectPrx -# define CONST_POINTER_CAST_OBJECT_PRX const_pointer_cast(shared_from_this()) -#else -# define ICE_OBJECT_PRX IceProxy::Ice::Object -# define CONST_POINTER_CAST_OBJECT_PRX ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this)) -#endif - -// -// methods common for both C++11/C++98 mappings -// +#define ICE_OBJECT_PRX Ice::ObjectPrx +#define CONST_POINTER_CAST_OBJECT_PRX const_pointer_cast(shared_from_this()) Identity ICE_OBJECT_PRX::ice_getIdentity() const @@ -710,11 +252,7 @@ ICE_OBJECT_PRX::ice_identity(const Identity& newIdentity) const } else { -#ifdef ICE_CPP11_MAPPING auto proxy = createProxy(); -#else - ObjectPrxPtr proxy = new IceProxy::Ice::Object; -#endif proxy->setup(_reference->changeIdentity(newIdentity)); return proxy; } @@ -749,11 +287,7 @@ ICE_OBJECT_PRX::ice_facet(const string& newFacet) const } else { -#ifdef ICE_CPP11_MAPPING auto proxy = createProxy(); -#else - ObjectPrx proxy = new IceProxy::Ice::Object; -#endif proxy->setup(_reference->changeFacet(newFacet)); return proxy; } @@ -826,11 +360,7 @@ ICE_OBJECT_PRX::ice_locatorCacheTimeout(Int newTimeout) const { ostringstream s; s << "invalid value passed to ice_locatorCacheTimeout: " << newTimeout; -#ifdef ICE_CPP11_MAPPING throw invalid_argument(s.str()); -#else - throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, s.str()); -#endif } if(newTimeout == _reference->getLocatorCacheTimeout()) { @@ -953,11 +483,7 @@ RouterPrxPtr ICE_OBJECT_PRX::ice_getRouter() const { RouterInfoPtr ri = _reference->getRouterInfo(); -#ifdef ICE_CPP11_MAPPING return ri ? ri->getRouter() : nullptr; -#else - return ri ? ri->getRouter() : RouterPrxPtr(); -#endif } ObjectPrxPtr @@ -980,11 +506,7 @@ LocatorPrxPtr ICE_OBJECT_PRX::ice_getLocator() const { LocatorInfoPtr ri = _reference->getLocatorInfo(); -#ifdef ICE_CPP11_MAPPING return ri ? ri->getLocator() : nullptr; -#else - return ri ? ri->getLocator() : LocatorPrxPtr(); -#endif } ObjectPrxPtr @@ -1037,11 +559,7 @@ ICE_OBJECT_PRX::ice_invocationTimeout(Int newTimeout) const { ostringstream s; s << "invalid value passed to ice_invocationTimeout: " << newTimeout; -#ifdef ICE_CPP11_MAPPING throw invalid_argument(s.str()); -#else - throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, s.str()); -#endif } if(newTimeout == _reference->getInvocationTimeout()) { @@ -1189,11 +707,7 @@ ICE_OBJECT_PRX::ice_timeout(int t) const { ostringstream s; s << "invalid value passed to ice_timeout: " << t; -#ifdef ICE_CPP11_MAPPING throw invalid_argument(s.str()); -#else - throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, s.str()); -#endif } ReferencePtr ref = _reference->changeTimeout(t); if(ref == _reference) @@ -1241,20 +755,12 @@ ICE_OBJECT_PRX::ice_fixed(const ::Ice::ConnectionPtr& connection) const { if(!connection) { -#ifdef ICE_CPP11_MAPPING throw invalid_argument("invalid null connection passed to ice_fixed"); -#else - throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, "invalid null connection passed to ice_fixed"); -#endif } ::Ice::ConnectionIPtr impl = ICE_DYNAMIC_CAST(::Ice::ConnectionI, connection); if(!impl) { -#ifdef ICE_CPP11_MAPPING throw invalid_argument("invalid connection passed to ice_fixed"); -#else - throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, "invalid connection passed to ice_fixed"); -#endif } ReferencePtr ref = _reference->changeConnection(impl); if(ref == _reference) diff --git a/cpp/src/Ice/ProxyFactory.cpp b/cpp/src/Ice/ProxyFactory.cpp index 7389f258b86..1b6e65066e5 100644 --- a/cpp/src/Ice/ProxyFactory.cpp +++ b/cpp/src/Ice/ProxyFactory.cpp @@ -80,11 +80,7 @@ IceInternal::ProxyFactory::referenceToProxy(const ReferencePtr& ref) const { if(ref) { -#ifdef ICE_CPP11_MAPPING auto proxy = createProxy(); -#else - ObjectPrx proxy = new ::IceProxy::Ice::Object(); -#endif proxy->setup(ref); return proxy; } diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp index a85c1e4df95..4737264d46e 100644 --- a/cpp/src/Ice/Reference.cpp +++ b/cpp/src/Ice/Reference.cpp @@ -1325,16 +1325,13 @@ IceInternal::RoutableReference::operator==(const Reference& r) const { return false; } -#ifdef ICE_CPP11_MAPPING + // // TODO: With C++14 we could use the version that receives four iterators and we don't need to explicitly // check the sizes are equal. // if(_endpoints.size() != rhs->_endpoints.size() || !equal(_endpoints.begin(), _endpoints.end(), rhs->_endpoints.begin(), Ice::TargetCompare, std::equal_to>())) -#else - if(_endpoints != rhs->_endpoints) -#endif { return false; } @@ -1456,12 +1453,8 @@ IceInternal::RoutableReference::operator<(const Reference& r) const { return false; } -#ifdef ICE_CPP11_MAPPING if(lexicographical_compare(_endpoints.begin(), _endpoints.end(), rhs->_endpoints.begin(), rhs->_endpoints.end(), Ice::TargetCompare, std::less>())) -#else - if(_endpoints < rhs->_endpoints) -#endif { return true; } @@ -1776,7 +1769,7 @@ IceInternal::RoutableReference::createConnection(const vector& all const vector _endpoints; const GetConnectionCallbackPtr _callback; size_t _i; - IceInternal::UniquePtr _exception; + unique_ptr _exception; }; // diff --git a/cpp/src/Ice/Reference.h b/cpp/src/Ice/Reference.h index 2a47c4a1cb5..9c070c0206f 100644 --- a/cpp/src/Ice/Reference.h +++ b/cpp/src/Ice/Reference.h @@ -39,9 +39,6 @@ class Reference : public IceUtil::Shared public: class GetConnectionCallback -#ifndef ICE_CPP11_MAPPING - : public virtual IceUtil::Shared -#endif { public: diff --git a/cpp/src/Ice/RequestHandler.cpp b/cpp/src/Ice/RequestHandler.cpp index 6d642d1df03..7a2f5290e6e 100644 --- a/cpp/src/Ice/RequestHandler.cpp +++ b/cpp/src/Ice/RequestHandler.cpp @@ -8,11 +8,6 @@ using namespace std; using namespace IceInternal; -#ifndef ICE_CPP11_MAPPING -IceUtil::Shared* IceInternal::upCast(RequestHandler* p) { return p; } -IceUtil::Shared* IceInternal::upCast(CancellationHandler* p) { return p; } -#endif - RetryException::RetryException(const Ice::LocalException& ex) { ICE_SET_EXCEPTION_FROM_CLONE(_ex, ex.ice_clone()); diff --git a/cpp/src/Ice/RequestHandler.h b/cpp/src/Ice/RequestHandler.h index d446f0cfe17..9675389594f 100644 --- a/cpp/src/Ice/RequestHandler.h +++ b/cpp/src/Ice/RequestHandler.h @@ -6,7 +6,6 @@ #define ICE_REQUEST_HANDLER_H #include -#include #include #include @@ -39,13 +38,10 @@ class RetryException private: - IceInternal::UniquePtr _ex; + std::unique_ptr _ex; }; class CancellationHandler -#ifndef ICE_CPP11_MAPPING - : public virtual IceUtil::Shared -#endif { public: diff --git a/cpp/src/Ice/RequestHandlerFactory.cpp b/cpp/src/Ice/RequestHandlerFactory.cpp index f50674d3afd..001ca416147 100644 --- a/cpp/src/Ice/RequestHandlerFactory.cpp +++ b/cpp/src/Ice/RequestHandlerFactory.cpp @@ -53,11 +53,7 @@ IceInternal::RequestHandlerFactory::getRequestHandler(const RoutableReferencePtr } if(connect) { -#ifdef ICE_CPP11_MAPPING ref->getConnection(handler); -#else - ref->getConnection(handler.get()); -#endif } return proxy->_setRequestHandler(handler->connect(proxy)); } diff --git a/cpp/src/Ice/ResponseHandler.cpp b/cpp/src/Ice/ResponseHandler.cpp deleted file mode 100644 index 252f57aee39..00000000000 --- a/cpp/src/Ice/ResponseHandler.cpp +++ /dev/null @@ -1,12 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#include - -using namespace std; -using namespace IceInternal; - -#ifndef ICE_CPP11_MAPPING -IceUtil::Shared* IceInternal::upCast(ResponseHandler* obj) { return obj; } -#endif diff --git a/cpp/src/Ice/ResponseHandler.h b/cpp/src/Ice/ResponseHandler.h index 548cc72ddc2..6eee46e6942 100644 --- a/cpp/src/Ice/ResponseHandler.h +++ b/cpp/src/Ice/ResponseHandler.h @@ -23,12 +23,7 @@ class OutputStream; namespace IceInternal { -class ResponseHandler : -#ifdef ICE_CPP11_MAPPING - public EnableSharedFromThis -#else - public virtual IceUtil::Shared -#endif +class ResponseHandler : public EnableSharedFromThis { public: diff --git a/cpp/src/Ice/RetryQueue.h b/cpp/src/Ice/RetryQueue.h index 5583f726148..a889fa3780e 100644 --- a/cpp/src/Ice/RetryQueue.h +++ b/cpp/src/Ice/RetryQueue.h @@ -17,10 +17,8 @@ namespace IceInternal { class RetryTask : public IceUtil::TimerTask, - public CancellationHandler -#ifdef ICE_CPP11_MAPPING - , public std::enable_shared_from_this -#endif + public CancellationHandler, + public std::enable_shared_from_this { public: diff --git a/cpp/src/Ice/RouterInfo.cpp b/cpp/src/Ice/RouterInfo.cpp index a1c7187c969..3207273638c 100644 --- a/cpp/src/Ice/RouterInfo.cpp +++ b/cpp/src/Ice/RouterInfo.cpp @@ -176,7 +176,6 @@ IceInternal::RouterInfo::getClientEndpoints(const GetClientEndpointsCallbackPtr& return; } -#ifdef ICE_CPP11_MAPPING RouterInfoPtr self = this; _router->getClientProxyAsync( [self, callback](const Ice::ObjectPrxPtr& proxy, Ice::optional hasRoutingTable) @@ -194,12 +193,6 @@ IceInternal::RouterInfo::getClientEndpoints(const GetClientEndpointsCallbackPtr& self->getClientProxyException(ex, callback); } }); -#else - _router->begin_getClientProxy(newCallback_Router_getClientProxy(this, - &RouterInfo::getClientProxyResponse, - &RouterInfo::getClientProxyException), - callback); -#endif } vector @@ -250,7 +243,6 @@ IceInternal::RouterInfo::addProxy(const Ice::ObjectPrxPtr& proxy, const AddProxy proxies.push_back(proxy); AddProxyCookiePtr cookie = new AddProxyCookie(callback, proxy); -#ifdef ICE_CPP11_MAPPING RouterInfoPtr self = this; _router->addProxiesAsync(proxies, [self, cookie](const Ice::ObjectProxySeq& p) @@ -268,13 +260,6 @@ IceInternal::RouterInfo::addProxy(const Ice::ObjectPrxPtr& proxy, const AddProxy self->addProxyException(ex, cookie); } }); -#else - _router->begin_addProxies(proxies, - newCallback_Router_addProxies(this, - &RouterInfo::addProxyResponse, - &RouterInfo::addProxyException), - cookie); -#endif return false; } diff --git a/cpp/src/Ice/RouterInfo.h b/cpp/src/Ice/RouterInfo.h index d4d41d7df08..3632598ab00 100644 --- a/cpp/src/Ice/RouterInfo.h +++ b/cpp/src/Ice/RouterInfo.h @@ -37,13 +37,9 @@ class RouterManager : public IceUtil::Shared, public IceUtil::Mutex private: -#ifdef ICE_CPP11_MAPPING using RouterInfoTable = std::map, RouterInfoPtr, Ice::TargetCompare, std::less>>; -#else - typedef std::map RouterInfoTable; -#endif RouterInfoTable _table; RouterInfoTable::iterator _tableHint; @@ -63,9 +59,6 @@ class RouterInfo : public IceUtil::Shared, public IceUtil::Mutex typedef IceUtil::Handle GetClientEndpointsCallbackPtr; class AddProxyCallback -#ifndef ICE_CPP11_MAPPING - : public virtual IceUtil::Shared -#endif { public: diff --git a/cpp/src/Ice/TcpEndpointI.cpp b/cpp/src/Ice/TcpEndpointI.cpp index 071944ce922..db894510150 100644 --- a/cpp/src/Ice/TcpEndpointI.cpp +++ b/cpp/src/Ice/TcpEndpointI.cpp @@ -21,10 +21,6 @@ using namespace std; using namespace Ice; using namespace IceInternal; -#ifndef ICE_CPP11_MAPPING -IceUtil::Shared* IceInternal::upCast(TcpEndpointI* p) { return p; } -#endif - extern "C" { @@ -179,11 +175,7 @@ IceInternal::TcpEndpointI::options() const } bool -#ifdef ICE_CPP11_MAPPING IceInternal::TcpEndpointI::operator==(const Endpoint& r) const -#else -IceInternal::TcpEndpointI::operator==(const LocalObject& r) const -#endif { if(!IPEndpointI::operator==(r)) { @@ -214,11 +206,7 @@ IceInternal::TcpEndpointI::operator==(const LocalObject& r) const } bool -#ifdef ICE_CPP11_MAPPING IceInternal::TcpEndpointI::operator<(const Endpoint& r) const -#else -IceInternal::TcpEndpointI::operator<(const LocalObject& r) const -#endif { const TcpEndpointI* p = dynamic_cast(&r); if(!p) diff --git a/cpp/src/Ice/TcpEndpointI.h b/cpp/src/Ice/TcpEndpointI.h index d15308f0a1a..f88494fe6cb 100644 --- a/cpp/src/Ice/TcpEndpointI.h +++ b/cpp/src/Ice/TcpEndpointI.h @@ -36,13 +36,8 @@ class TcpEndpointI : public IPEndpointI virtual AcceptorPtr acceptor(const std::string&) const; virtual std::string options() const; -#ifdef ICE_CPP11_MAPPING virtual bool operator==(const Ice::Endpoint&) const; virtual bool operator<(const Ice::Endpoint&) const; -#else - virtual bool operator==(const Ice::LocalObject&) const; - virtual bool operator<(const Ice::LocalObject&) const; -#endif TcpEndpointIPtr endpoint(const TcpAcceptorPtr&) const; using IPEndpointI::connectionId; diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp index 7324af12853..627577c9267 100644 --- a/cpp/src/Ice/ThreadPool.cpp +++ b/cpp/src/Ice/ThreadPool.cpp @@ -577,15 +577,11 @@ IceInternal::ThreadPool::dispatchFromThisThread(const DispatchWorkItemPtr& workI { try { -#ifdef ICE_CPP11_MAPPING _dispatcher([workItem]() { workItem->run(); }, workItem->getConnection()); -#else - _dispatcher->dispatch(workItem, workItem->getConnection()); -#endif } catch(const std::exception& ex) { @@ -1232,19 +1228,11 @@ IceInternal::ThreadPool::EventHandlerThread::setState(Ice::Instrumentation::Thre void IceInternal::ThreadPool::EventHandlerThread::run() { -#ifdef ICE_CPP11_MAPPING if(_pool->_instance->initializationData().threadStart) -#else - if(_pool->_instance->initializationData().threadHook) -#endif { try { -#ifdef ICE_CPP11_MAPPING _pool->_instance->initializationData().threadStart(); -#else - _pool->_instance->initializationData().threadHook->start(); -#endif } catch(const exception& ex) { @@ -1275,19 +1263,11 @@ IceInternal::ThreadPool::EventHandlerThread::run() _observer.detach(); -#ifdef ICE_CPP11_MAPPING if(_pool->_instance->initializationData().threadStop) -#else - if(_pool->_instance->initializationData().threadHook) -#endif { try { -#ifdef ICE_CPP11_MAPPING _pool->_instance->initializationData().threadStop(); -#else - _pool->_instance->initializationData().threadHook->stop(); -#endif } catch(const exception& ex) { diff --git a/cpp/src/Ice/ThreadPool.h b/cpp/src/Ice/ThreadPool.h index 73d0d4c907f..df751e6b4ce 100644 --- a/cpp/src/Ice/ThreadPool.h +++ b/cpp/src/Ice/ThreadPool.h @@ -135,11 +135,7 @@ class ThreadPool : public IceUtil::Shared, private IceUtil::Monitor, const std::shared_ptr&)> _dispatcher; -# else - const Ice::DispatcherPtr _dispatcher; -# endif #endif ThreadPoolWorkQueuePtr _workQueue; bool _destroyed; diff --git a/cpp/src/Ice/UdpEndpointI.cpp b/cpp/src/Ice/UdpEndpointI.cpp index dcbf8fe2659..6e918f97f8e 100644 --- a/cpp/src/Ice/UdpEndpointI.cpp +++ b/cpp/src/Ice/UdpEndpointI.cpp @@ -18,10 +18,6 @@ using namespace std; using namespace Ice; using namespace IceInternal; -#ifndef ICE_CPP11_MAPPING -IceUtil::Shared* IceInternal::upCast(UdpEndpointI* p) { return p; } -#endif - extern "C" { @@ -237,11 +233,7 @@ IceInternal::UdpEndpointI::options() const } bool -#ifdef ICE_CPP11_MAPPING IceInternal::UdpEndpointI::operator==(const Endpoint& r) const -#else -IceInternal::UdpEndpointI::operator==(const LocalObject& r) const -#endif { if(!IPEndpointI::operator==(r)) { @@ -283,11 +275,7 @@ IceInternal::UdpEndpointI::operator==(const LocalObject& r) const } bool -#ifdef ICE_CPP11_MAPPING IceInternal::UdpEndpointI::operator<(const Endpoint& r) const -#else -IceInternal::UdpEndpointI::operator<(const LocalObject& r) const -#endif { const UdpEndpointI* p = dynamic_cast(&r); if(!p) diff --git a/cpp/src/Ice/UdpEndpointI.h b/cpp/src/Ice/UdpEndpointI.h index 5d28160eec6..f1f55584a87 100644 --- a/cpp/src/Ice/UdpEndpointI.h +++ b/cpp/src/Ice/UdpEndpointI.h @@ -36,13 +36,8 @@ class UdpEndpointI : public IPEndpointI virtual AcceptorPtr acceptor(const std::string&) const; virtual std::string options() const; -#ifdef ICE_CPP11_MAPPING virtual bool operator==(const Ice::Endpoint&) const; virtual bool operator<(const Ice::Endpoint&) const; -#else - virtual bool operator==(const Ice::LocalObject&) const; - virtual bool operator<(const Ice::LocalObject&) const; -#endif UdpEndpointIPtr endpoint(const UdpTransceiverPtr&) const; diff --git a/cpp/src/Ice/VirtualShared.h b/cpp/src/Ice/VirtualShared.h index 9b8f4a48929..1e5e3f27bc7 100644 --- a/cpp/src/Ice/VirtualShared.h +++ b/cpp/src/Ice/VirtualShared.h @@ -5,8 +5,6 @@ #ifndef ICE_VIRTUAL_SHARED_H #define ICE_VIRTUAL_SHARED_H -#ifdef ICE_CPP11_MAPPING - namespace IceInternal { @@ -35,4 +33,3 @@ class EnableSharedFromThis : public virtual VirtualEnableSharedFromThisBase } #endif -#endif diff --git a/cpp/src/Ice/WSEndpoint.cpp b/cpp/src/Ice/WSEndpoint.cpp index 6f98cb01b66..df22af582c0 100644 --- a/cpp/src/Ice/WSEndpoint.cpp +++ b/cpp/src/Ice/WSEndpoint.cpp @@ -67,10 +67,6 @@ registerIceWS(bool loadOnInitialize) } -#ifndef ICE_CPP11_MAPPING -IceUtil::Shared* IceInternal::upCast(WSEndpoint* p) { return p; } -#endif - WSEndpointFactoryPlugin::WSEndpointFactoryPlugin(const CommunicatorPtr& communicator) { assert(communicator); @@ -378,11 +374,7 @@ IceInternal::WSEndpoint::options() const } bool -#ifdef ICE_CPP11_MAPPING IceInternal::WSEndpoint::operator==(const Endpoint& r) const -#else -IceInternal::WSEndpoint::operator==(const LocalObject& r) const -#endif { const WSEndpoint* p = dynamic_cast(&r); if(!p) @@ -409,11 +401,7 @@ IceInternal::WSEndpoint::operator==(const LocalObject& r) const } bool -#ifdef ICE_CPP11_MAPPING IceInternal::WSEndpoint::operator<(const Endpoint& r) const -#else -IceInternal::WSEndpoint::operator<(const LocalObject& r) const -#endif { const WSEndpoint* p = dynamic_cast(&r); if(!p) diff --git a/cpp/src/Ice/WSEndpoint.h b/cpp/src/Ice/WSEndpoint.h index 5264f13dbc5..f7f44665937 100644 --- a/cpp/src/Ice/WSEndpoint.h +++ b/cpp/src/Ice/WSEndpoint.h @@ -15,10 +15,7 @@ namespace IceInternal { -class WSEndpoint : public EndpointI -#ifdef ICE_CPP11_MAPPING - , public std::enable_shared_from_this -#endif +class WSEndpoint : public EndpointI, public std::enable_shared_from_this { public: @@ -52,13 +49,8 @@ class WSEndpoint : public EndpointI WSEndpointPtr endpoint(const EndpointIPtr&) const; -#ifdef ICE_CPP11_MAPPING virtual bool operator==(const Ice::Endpoint&) const; virtual bool operator<(const Ice::Endpoint&) const; -#else - virtual bool operator==(const Ice::LocalObject&) const; - virtual bool operator<(const Ice::LocalObject&) const; -#endif protected: diff --git a/cpp/src/Ice/ios/StreamAcceptor.h b/cpp/src/Ice/ios/StreamAcceptor.h index ca706cf5ea6..93b0e22d4d8 100644 --- a/cpp/src/Ice/ios/StreamAcceptor.h +++ b/cpp/src/Ice/ios/StreamAcceptor.h @@ -12,11 +12,7 @@ namespace IceObjC { class StreamEndpointI; -#ifdef ICE_CPP11_MAPPING // C++11 mapping typedef ::std::shared_ptr StreamEndpointIPtr; -#else -typedef IceUtil::Handle StreamEndpointIPtr; -#endif class StreamAcceptor : public IceInternal::Acceptor, public IceInternal::NativeInfo { diff --git a/cpp/src/Ice/ios/StreamEndpointI.cpp b/cpp/src/Ice/ios/StreamEndpointI.cpp index 60a9cf46cb7..762ad2b79ad 100644 --- a/cpp/src/Ice/ios/StreamEndpointI.cpp +++ b/cpp/src/Ice/ios/StreamEndpointI.cpp @@ -268,11 +268,7 @@ IceObjC::StreamEndpointI::options() const } bool -#ifdef ICE_CPP11_MAPPING IceObjC::StreamEndpointI::operator==(const Endpoint& r) const -#else -IceObjC::StreamEndpointI::operator==(const LocalObject& r) const -#endif { if(!IPEndpointI::operator==(r)) { @@ -304,11 +300,7 @@ IceObjC::StreamEndpointI::operator==(const LocalObject& r) const } bool -#ifdef ICE_CPP11_MAPPING IceObjC::StreamEndpointI::operator<(const Endpoint& r) const -#else -IceObjC::StreamEndpointI::operator<(const LocalObject& r) const -#endif { const StreamEndpointI* p = dynamic_cast(&r); if(!p) diff --git a/cpp/src/Ice/ios/StreamEndpointI.h b/cpp/src/Ice/ios/StreamEndpointI.h index b9333ca6106..f8d95643279 100644 --- a/cpp/src/Ice/ios/StreamEndpointI.h +++ b/cpp/src/Ice/ios/StreamEndpointI.h @@ -89,8 +89,6 @@ class StreamEndpointI : public IceInternal::IPEndpointI virtual IceInternal::AcceptorPtr acceptor(const std::string&) const; virtual std::string options() const; -#ifdef ICE_CPP11_MAPPING - std::shared_ptr shared_from_this() { return std::static_pointer_cast(IceInternal::IPEndpointI::shared_from_this()); @@ -98,10 +96,6 @@ class StreamEndpointI : public IceInternal::IPEndpointI virtual bool operator==(const Ice::Endpoint&) const; virtual bool operator<(const Ice::Endpoint&) const; -#else - virtual bool operator==(const Ice::LocalObject&) const; - virtual bool operator<(const Ice::LocalObject&) const; -#endif StreamEndpointIPtr endpoint(const StreamAcceptorPtr&) const; diff --git a/cpp/src/IceBT/ConnectionInfo.cpp b/cpp/src/IceBT/ConnectionInfo.cpp index 51700d65d1b..24daab554da 100644 --- a/cpp/src/IceBT/ConnectionInfo.cpp +++ b/cpp/src/IceBT/ConnectionInfo.cpp @@ -19,34 +19,6 @@ # pragma GCC diagnostic ignored "-Wshadow" #endif -#ifdef ICE_CPP11_MAPPING // C++11 mapping - -namespace -{ - -} - -IceBT::ConnectionInfo::~ConnectionInfo() -{ -} - -#else // C++98 mapping - -namespace -{ - -} - IceBT::ConnectionInfo::~ConnectionInfo() { } - -/// \cond INTERNAL -ICEBT_API ::Ice::LocalObject* IceBT::upCast(ConnectionInfo* p) { return p; } -/// \endcond - -namespace Ice -{ -} - -#endif diff --git a/cpp/src/IceBT/DBus.h b/cpp/src/IceBT/DBus.h index 3c64b7706fd..d96c3c109c2 100644 --- a/cpp/src/IceBT/DBus.h +++ b/cpp/src/IceBT/DBus.h @@ -507,9 +507,6 @@ class AsyncResult; typedef IceUtil::Handle AsyncResultPtr; class AsyncCallback -#ifndef ICE_CPP11_MAPPING - : public virtual IceUtil::Shared -#endif { public: @@ -541,9 +538,6 @@ typedef IceUtil::Handle ConnectionPtr; // Allows a subclass to intercept DBus messages. // class Filter -#ifndef ICE_CPP11_MAPPING - : public virtual IceUtil::Shared -#endif { public: @@ -558,9 +552,6 @@ ICE_DEFINE_PTR(FilterPtr, Filter); // Allows a subclass to receive DBus method invocations. // class Service -#ifndef ICE_CPP11_MAPPING - : public virtual IceUtil::Shared -#endif { public: diff --git a/cpp/src/IceBT/EndpointI.cpp b/cpp/src/IceBT/EndpointI.cpp index dd8b7096feb..a4f0f81a452 100644 --- a/cpp/src/IceBT/EndpointI.cpp +++ b/cpp/src/IceBT/EndpointI.cpp @@ -21,10 +21,6 @@ using namespace std; using namespace Ice; using namespace IceBT; -#ifndef ICE_CPP11_MAPPING -IceUtil::Shared* IceBT::upCast(EndpointI* p) { return p; } -#endif - IceBT::EndpointI::EndpointI(const InstancePtr& instance, const string& addr, const string& uuid, const string& name, Int channel, Int timeout, const string& connectionId, bool compress) : _instance(instance), @@ -224,11 +220,7 @@ IceBT::EndpointI::equivalent(const IceInternal::EndpointIPtr& endpoint) const } bool -#ifdef ICE_CPP11_MAPPING IceBT::EndpointI::operator==(const Ice::Endpoint& r) const -#else -IceBT::EndpointI::operator==(const Ice::LocalObject& r) const -#endif { const EndpointI* p = dynamic_cast(&r); if(!p) @@ -275,11 +267,7 @@ IceBT::EndpointI::operator==(const Ice::LocalObject& r) const } bool -#ifdef ICE_CPP11_MAPPING IceBT::EndpointI::operator<(const Ice::Endpoint& r) const -#else -IceBT::EndpointI::operator<(const Ice::LocalObject& r) const -#endif { const EndpointI* p = dynamic_cast(&r); if(!p) diff --git a/cpp/src/IceBT/EndpointI.h b/cpp/src/IceBT/EndpointI.h index 1cf7dbbce0a..4e7d466018c 100644 --- a/cpp/src/IceBT/EndpointI.h +++ b/cpp/src/IceBT/EndpointI.h @@ -16,10 +16,7 @@ namespace IceBT { -class EndpointI : public IceInternal::EndpointI -#ifdef ICE_CPP11_MAPPING - , public std::enable_shared_from_this -#endif +class EndpointI : public IceInternal::EndpointI, public std::enable_shared_from_this { public: @@ -46,13 +43,8 @@ class EndpointI : public IceInternal::EndpointI virtual std::vector expandHost(IceInternal::EndpointIPtr&) const; virtual bool equivalent(const IceInternal::EndpointIPtr&) const; -#ifdef ICE_CPP11_MAPPING virtual bool operator==(const Ice::Endpoint&) const; virtual bool operator<(const Ice::Endpoint&) const; -#else - virtual bool operator==(const Ice::LocalObject&) const; - virtual bool operator<(const Ice::LocalObject&) const; -#endif virtual Ice::Int hash() const; diff --git a/cpp/src/IceBT/EndpointInfo.cpp b/cpp/src/IceBT/EndpointInfo.cpp index 3e1b42331c7..5cba1d73c1f 100644 --- a/cpp/src/IceBT/EndpointInfo.cpp +++ b/cpp/src/IceBT/EndpointInfo.cpp @@ -19,34 +19,6 @@ # pragma GCC diagnostic ignored "-Wshadow" #endif -#ifdef ICE_CPP11_MAPPING // C++11 mapping - -namespace -{ - -} - -IceBT::EndpointInfo::~EndpointInfo() -{ -} - -#else // C++98 mapping - -namespace -{ - -} - IceBT::EndpointInfo::~EndpointInfo() { } - -/// \cond INTERNAL -ICEBT_API ::Ice::LocalObject* IceBT::upCast(EndpointInfo* p) { return p; } -/// \endcond - -namespace Ice -{ -} - -#endif diff --git a/cpp/src/IceBT/Engine.cpp b/cpp/src/IceBT/Engine.cpp index 12005078103..07161b0b3f6 100644 --- a/cpp/src/IceBT/Engine.cpp +++ b/cpp/src/IceBT/Engine.cpp @@ -225,10 +225,7 @@ ICE_DEFINE_PTR(ServerProfilePtr, ServerProfile); // Engine delegates to BluetoothService. It encapsulates a snapshot of the "objects" managed by the // DBus Bluetooth daemon. These objects include local Bluetooth adapters, paired devices, etc. // -class BluetoothService : public DBus::Filter -#ifdef ICE_CPP11_MAPPING - , public std::enable_shared_from_this -#endif +class BluetoothService : public DBus::Filter, public std::enable_shared_from_this { public: @@ -300,11 +297,7 @@ class BluetoothService : public DBus::Filter } VariantMap properties; -#ifdef ICE_CPP11_MAPPING vector> callbacks; -#else - vector callbacks; -#endif }; typedef map RemoteDeviceMap; // Key is the object path. @@ -581,11 +574,7 @@ class BluetoothService : public DBus::Filter t->start(); } -#ifdef ICE_CPP11_MAPPING void startDiscovery(const string& addr, function cb) -#else - void startDiscovery(const string& addr, const DiscoveryCallbackPtr& cb) -#endif { string path; @@ -597,11 +586,7 @@ class BluetoothService : public DBus::Filter if(p->second.getAddress() == IceUtilInternal::toUpper(addr)) { path = p->first; -#ifdef ICE_CPP11_MAPPING p->second.callbacks.push_back(move(cb)); -#else - p->second.callbacks.push_back(cb); -#endif } } } @@ -888,12 +873,7 @@ class BluetoothService : public DBus::Filter return; // Ignore devices that don't have an Address property. } -#ifdef ICE_CPP11_MAPPING vector> callbacks; -#else - vector callbacks; -#endif - { IceUtil::Monitor::Lock lock(_lock); @@ -912,7 +892,7 @@ class BluetoothService : public DBus::Filter { pm[p->first] = p->second->toString(); } -#ifdef ICE_CPP11_MAPPING + for(const auto& discovered : callbacks) { try @@ -923,28 +903,12 @@ class BluetoothService : public DBus::Filter { } } -#else - for(vector::iterator p = callbacks.begin(); p != callbacks.end(); ++p) - { - try - { - (*p)->discovered(dev.getAddress(), pm); - } - catch(...) - { - } - } -#endif } } void deviceChanged(const string& path, const VariantMap& changed, const vector& removedProps) { -#ifdef ICE_CPP11_MAPPING vector> callbacks; -#else - vector callbacks; -#endif string addr; string adapter; VariantMap props; @@ -998,7 +962,7 @@ class BluetoothService : public DBus::Filter { pm[p->first] = p->second->toString(); } -#ifdef ICE_CPP11_MAPPING + for(const auto& discovered : callbacks) { try @@ -1009,18 +973,6 @@ class BluetoothService : public DBus::Filter { } } -#else - for(vector::iterator p = callbacks.begin(); p != callbacks.end(); ++p) - { - try - { - (*p)->discovered(addr, pm); - } - catch(...) - { - } - } -#endif } } @@ -1313,19 +1265,11 @@ class BluetoothService : public DBus::Filter vector _connectThreads; bool _discovering; -#ifdef ICE_CPP11_MAPPING vector> _discoveryCallbacks; -#else - vector _discoveryCallbacks; -#endif }; } -#ifndef ICE_CPP11_MAPPING -IceUtil::Shared* IceBT::upCast(IceBT::BluetoothService* p) { return p; } -#endif - IceBT::Engine::Engine(const Ice::CommunicatorPtr& communicator) : _communicator(communicator), _initialized(false) @@ -1389,11 +1333,7 @@ IceBT::Engine::connect(const string& addr, const string& uuid, const ConnectCall } void -#ifdef ICE_CPP11_MAPPING IceBT::Engine::startDiscovery(const string& address, function cb) -#else -IceBT::Engine::startDiscovery(const string& address, const DiscoveryCallbackPtr& cb) -#endif { _service->startDiscovery(address, cb); } diff --git a/cpp/src/IceBT/Engine.h b/cpp/src/IceBT/Engine.h index 2d0287ac53d..97edae76fc6 100644 --- a/cpp/src/IceBT/Engine.h +++ b/cpp/src/IceBT/Engine.h @@ -18,9 +18,6 @@ namespace IceBT // Notifies the transport about a new incoming connection. // class ProfileCallback -#ifndef ICE_CPP11_MAPPING - : public virtual IceUtil::Shared -#endif { public: @@ -45,9 +42,6 @@ typedef IceUtil::Handle ConnectionPtr; // Callback API for an outgoing connection attempt. // class ConnectCallback -#ifndef ICE_CPP11_MAPPING - : public virtual IceUtil::Shared -#endif { public: @@ -80,11 +74,7 @@ class Engine : public IceUtil::Shared void connect(const std::string&, const std::string&, const ConnectCallbackPtr&); -#ifdef ICE_CPP11_MAPPING void startDiscovery(const std::string&, std::function); -#else - void startDiscovery(const std::string&, const DiscoveryCallbackPtr&); -#endif void stopDiscovery(const std::string&); DeviceMap getDevices() const; diff --git a/cpp/src/IceBT/EngineF.h b/cpp/src/IceBT/EngineF.h index 75054c1cd9e..aa82577b63c 100644 --- a/cpp/src/IceBT/EngineF.h +++ b/cpp/src/IceBT/EngineF.h @@ -16,12 +16,7 @@ IceUtil::Shared* upCast(Engine*); typedef IceInternal::Handle EnginePtr; class BluetoothService; -#ifdef ICE_CPP11_MAPPING using BluetoothServicePtr = ::std::shared_ptr; -#else -IceUtil::Shared* upCast(BluetoothService*); -typedef IceInternal::Handle BluetoothServicePtr; -#endif } diff --git a/cpp/src/IceBT/InstanceF.h b/cpp/src/IceBT/InstanceF.h index f9bdca08cec..8bc404f3a45 100644 --- a/cpp/src/IceBT/InstanceF.h +++ b/cpp/src/IceBT/InstanceF.h @@ -16,12 +16,7 @@ IceUtil::Shared* upCast(Instance*); typedef IceInternal::Handle InstancePtr; class EndpointI; -#ifdef ICE_CPP11_MAPPING using EndpointIPtr = ::std::shared_ptr; -#else -IceUtil::Shared* upCast(EndpointI*); -typedef IceInternal::Handle EndpointIPtr; -#endif class TransceiverI; IceUtil::Shared* upCast(TransceiverI*); diff --git a/cpp/src/IceBT/PluginI.cpp b/cpp/src/IceBT/PluginI.cpp index e65952c7ccd..0d5d99d71e9 100644 --- a/cpp/src/IceBT/PluginI.cpp +++ b/cpp/src/IceBT/PluginI.cpp @@ -81,11 +81,7 @@ IceBT::PluginI::destroy() } void -#ifdef ICE_CPP11_MAPPING IceBT::PluginI::startDiscovery(const string& address, function cb) -#else -IceBT::PluginI::startDiscovery(const string& address, const DiscoveryCallbackPtr& cb) -#endif { _engine->startDiscovery(address, cb); } diff --git a/cpp/src/IceBT/PluginI.h b/cpp/src/IceBT/PluginI.h index 682576c6e4c..3a260ba7339 100644 --- a/cpp/src/IceBT/PluginI.h +++ b/cpp/src/IceBT/PluginI.h @@ -27,12 +27,8 @@ class PluginI : public Plugin // // From IceBT::Plugin. // -#ifdef ICE_CPP11_MAPPING virtual void startDiscovery(const std::string& address, std::function); -#else - virtual void startDiscovery(const std::string&, const DiscoveryCallbackPtr&); -#endif virtual void stopDiscovery(const std::string&); virtual DeviceMap getDevices() const; diff --git a/cpp/src/IceBT/Types.cpp b/cpp/src/IceBT/Types.cpp index d3ba3c6fcc6..022981182c4 100644 --- a/cpp/src/IceBT/Types.cpp +++ b/cpp/src/IceBT/Types.cpp @@ -17,8 +17,6 @@ # pragma GCC diagnostic ignored "-Wshadow" #endif -#ifdef ICE_CPP11_MAPPING // C++11 mapping - IceBT::BluetoothException::~BluetoothException() { } @@ -29,44 +27,3 @@ IceBT::BluetoothException::ice_staticId() static const ::std::string typeId = "::IceBT::BluetoothException"; return typeId; } - -#else // C++98 mapping - -IceBT::BluetoothException::BluetoothException(const char* file, int line) : - ::Ice::LocalException(file, line) -{ -} - -IceBT::BluetoothException::BluetoothException(const char* file, int line, const ::std::string& reason) : - ::Ice::LocalException(file, line), - reason(reason) -{ -} - -IceBT::BluetoothException::~BluetoothException() -{ -} - -::std::string -IceBT::BluetoothException::ice_id() const -{ - return "::IceBT::BluetoothException"; -} - -IceBT::BluetoothException* -IceBT::BluetoothException::ice_clone() const -{ - return new BluetoothException(*this); -} - -void -IceBT::BluetoothException::ice_throw() const -{ - throw *this; -} - -namespace Ice -{ -} - -#endif diff --git a/cpp/src/IceBox/Service.cpp b/cpp/src/IceBox/Service.cpp index 7dfa1386061..4206957a6b0 100644 --- a/cpp/src/IceBox/Service.cpp +++ b/cpp/src/IceBox/Service.cpp @@ -23,8 +23,6 @@ # pragma GCC diagnostic ignored "-Wshadow" #endif -#ifdef ICE_CPP11_MAPPING // C++11 mapping - IceBox::FailureException::~FailureException() { } @@ -39,48 +37,3 @@ IceBox::FailureException::ice_staticId() IceBox::Service::~Service() { } - -#else // C++98 mapping - -IceBox::FailureException::FailureException(const char* file, int line) : - ::Ice::LocalException(file, line) -{ -} - -IceBox::FailureException::FailureException(const char* file, int line, const ::std::string& reason) : - ::Ice::LocalException(file, line), - reason(reason) -{ -} - -IceBox::FailureException::~FailureException() -{ -} - -::std::string -IceBox::FailureException::ice_id() const -{ - return "::IceBox::FailureException"; -} - -IceBox::FailureException* -IceBox::FailureException::ice_clone() const -{ - return new FailureException(*this); -} - -void -IceBox::FailureException::ice_throw() const -{ - throw *this; -} - -IceBox::Service::~Service() -{ -} - -/// \cond INTERNAL -ICEBOX_API ::Ice::LocalObject* IceBox::upCast(Service* p) { return p; } -/// \endcond - -#endif diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp index 6cdeed973cf..2c198481b5b 100644 --- a/cpp/src/IceBox/ServiceManagerI.cpp +++ b/cpp/src/IceBox/ServiceManagerI.cpp @@ -16,14 +16,7 @@ using namespace IceUtilInternal; using namespace IceBox; using namespace std; -#ifdef ICE_CPP11_MAPPING typedef IceBox::Service* (*ServiceFactory)(const shared_ptr&); -#else -// -// We copy the CommunicatorPtr to maintain compatibility with earlier releases -// -typedef IceBox::Service* (*ServiceFactory)(CommunicatorPtr); -#endif namespace { @@ -76,12 +69,6 @@ struct StartServiceInfo IceBox::ServiceManagerI::create(Ice::CommunicatorPtr communicator, int& argc, char* argv[]) { ServiceManagerIPtr ptr(new ServiceManagerI(communicator, argc, argv)); - -#ifndef ICE_CPP11_MAPPING - const_cast(ptr->_observerCompletedCB) = - newCallback(ServiceManagerIPtr(ptr->shared_from_this()), &ServiceManagerI::observerCompleted); -#endif - return ptr; } @@ -304,11 +291,7 @@ IceBox::ServiceManagerI::addObserver(ICE_IN(ServiceObserverPrxPtr) observer, con if(activeServices.size() > 0) { -#ifdef ICE_CPP11_MAPPING observer->servicesStartedAsync(activeServices, nullptr, makeObserverCompletedCallback(observer)); -#else - observer->begin_servicesStarted(activeServices, _observerCompletedCB); -#endif } } } @@ -812,26 +795,7 @@ IceBox::ServiceManagerI::stopAll() // leak detector doesn't report potential leaks, and the communicator must be destroyed before // the library is released since the library will destroy its global state. // - -#ifdef ICE_CPP11_MAPPING - info.service = 0; -#else - try - { - info.service = 0; - } - catch(const Exception& ex) - { - Warning out(_logger); - out << "ServiceManager: exception while stopping service " << info.name << ":\n"; - out << ex; - } - catch(...) - { - Warning out(_logger); - out << "ServiceManager: unknown exception while stopping service " << info.name; - } -#endif + info.service = nullptr; if(info.communicator) { removeAdminFacets("IceBox.Service." + info.name + "."); @@ -868,14 +832,8 @@ IceBox::ServiceManagerI::stopAll() _services.clear(); servicesStopped(stoppedServices, _observers); - -#ifndef ICE_CPP11_MAPPING - _observerCompletedCB = 0; // Break cyclic reference count. -#endif } -#ifdef ICE_CPP11_MAPPING - function IceBox::ServiceManagerI::makeObserverCompletedCallback(const shared_ptr& observer) { @@ -938,51 +896,6 @@ IceBox::ServiceManagerI::observerRemoved(const shared_ptr& o } } } -#else - -void -IceBox::ServiceManagerI::servicesStarted(const vector& services, const set& observers) -{ - if(services.size() > 0) - { - for(set::const_iterator p = observers.begin(); p != observers.end(); ++p) - { - (*p)->begin_servicesStarted(services, _observerCompletedCB); - } - } -} - -void -IceBox::ServiceManagerI::servicesStopped(const vector& services, const set& observers) -{ - if(services.size() > 0) - { - for(set::const_iterator p = observers.begin(); p != observers.end(); ++p) - { - (*p)->begin_servicesStopped(services, _observerCompletedCB); - } - } -} - -void -IceBox::ServiceManagerI::observerRemoved(const ServiceObserverPrx& observer, const std::exception& ex) -{ - if(_traceServiceObserver >= 1) - { - // - // CommunicatorDestroyedException may occur during shutdown. The observer notification has - // been sent, but the communicator was destroyed before the reply was received. We do not - // log a message for this exception. - // - if(dynamic_cast(&ex) == 0) - { - Trace out(_logger, "IceBox.ServiceObserver"); - out << "Removed service observer " << _communicator->proxyToString(observer) - << "\nafter catching " << ex.what(); - } - } -} -#endif Ice::PropertiesPtr IceBox::ServiceManagerI::createServiceProperties(const string& service) @@ -1017,7 +930,6 @@ IceBox::ServiceManagerI::createServiceProperties(const string& service) return properties; } -#ifdef ICE_CPP11_MAPPING void ServiceManagerI::observerCompleted(const shared_ptr& observer, exception_ptr ex) { @@ -1034,33 +946,6 @@ ServiceManagerI::observerCompleted(const shared_ptr& observe observerRemoved(found, ex); } } -#else -void -ServiceManagerI::observerCompleted(const Ice::AsyncResultPtr& result) -{ - try - { - result->throwLocalException(); - } - catch(const Ice::LocalException& ex) - { - ServiceObserverPrx observer = ServiceObserverPrx::uncheckedCast(result->getProxy()); - IceUtil::Monitor::Lock lock(*this); - - // - // It's possible to remove several times the same observer, e.g. multiple concurrent - // requests that fail - // - set::iterator p = _observers.find(observer); - if(p != _observers.end()) - { - observer = *p; - _observers.erase(p); - observerRemoved(observer, ex); - } - } -} -#endif void IceBox::ServiceManagerI::destroyServiceCommunicator(const string& service, const CommunicatorPtr& communicator) diff --git a/cpp/src/IceBox/ServiceManagerI.h b/cpp/src/IceBox/ServiceManagerI.h index 7f9ae12437b..05fc75036fb 100644 --- a/cpp/src/IceBox/ServiceManagerI.h +++ b/cpp/src/IceBox/ServiceManagerI.h @@ -40,11 +40,7 @@ class ServiceManagerI : public ServiceManager, bool start(); void stop(); -#ifdef ICE_CPP11_MAPPING void observerCompleted(const std::shared_ptr&, std::exception_ptr); -#else - void observerCompleted(const Ice::AsyncResultPtr&); -#endif private: @@ -74,13 +70,8 @@ class ServiceManagerI : public ServiceManager, void servicesStarted(const std::vector&, const std::set&); void servicesStopped(const std::vector&, const std::set&); - -#ifdef ICE_CPP11_MAPPING std::function makeObserverCompletedCallback(const std::shared_ptr&); void observerRemoved(const std::shared_ptr&, std::exception_ptr); -#else - void observerRemoved(const ServiceObserverPrx&, const std::exception&); -#endif Ice::PropertiesPtr createServiceProperties(const std::string&); void destroyServiceCommunicator(const std::string&, const Ice::CommunicatorPtr&); @@ -99,9 +90,6 @@ class ServiceManagerI : public ServiceManager, std::set _observers; int _traceServiceObserver; -#ifndef ICE_CPP11_MAPPING - ::Ice::CallbackPtr _observerCompletedCB; -#endif }; } diff --git a/cpp/src/IceDiscovery/LocatorI.cpp b/cpp/src/IceDiscovery/LocatorI.cpp index 9647b404d17..c706a557249 100644 --- a/cpp/src/IceDiscovery/LocatorI.cpp +++ b/cpp/src/IceDiscovery/LocatorI.cpp @@ -22,20 +22,12 @@ LocatorRegistryI::LocatorRegistryI(const Ice::CommunicatorPtr& com) : { } -#ifdef ICE_CPP11_MAPPING void LocatorRegistryI::setAdapterDirectProxyAsync(string adapterId, shared_ptr proxy, function response, function, const Ice::Current&) -#else -void -LocatorRegistryI::setAdapterDirectProxy_async(const AMD_LocatorRegistry_setAdapterDirectProxyPtr& cb, - const std::string& adapterId, - const ObjectPrxPtr& proxy, - const Current&) -#endif { Lock sync(*this); if(proxy) @@ -46,14 +38,9 @@ LocatorRegistryI::setAdapterDirectProxy_async(const AMD_LocatorRegistry_setAdapt { _adapters.erase(adapterId); } -#ifdef ICE_CPP11_MAPPING response(); -#else - cb->ice_response(); -#endif } -#ifdef ICE_CPP11_MAPPING void LocatorRegistryI::setReplicatedAdapterDirectProxyAsync(string adapterId, string replicaGroupId, @@ -61,15 +48,6 @@ LocatorRegistryI::setReplicatedAdapterDirectProxyAsync(string adapterId, function response, function, const Ice::Current&) -#else -void -LocatorRegistryI::setReplicatedAdapterDirectProxy_async( - const AMD_LocatorRegistry_setReplicatedAdapterDirectProxyPtr& cb, - const std::string& adapterId, - const std::string& replicaGroupId, - const ObjectPrxPtr& proxy, - const Current&) -#endif { Lock sync(*this); if(proxy) @@ -95,14 +73,9 @@ LocatorRegistryI::setReplicatedAdapterDirectProxy_async( } } } -#ifdef ICE_CPP11_MAPPING response(); -#else - cb->ice_response(); -#endif } -#ifdef ICE_CPP11_MAPPING void LocatorRegistryI::setServerProcessProxyAsync(string, shared_ptr, @@ -112,16 +85,6 @@ LocatorRegistryI::setServerProcessProxyAsync(string, { response(); } -#else -void -LocatorRegistryI::setServerProcessProxy_async(const AMD_LocatorRegistry_setServerProcessProxyPtr& cb, - const std::string&, - const ProcessPrxPtr&, - const Current&) -{ - cb->ice_response(); -} -#endif Ice::ObjectPrxPtr LocatorRegistryI::findObject(const Ice::Identity& id) const @@ -222,7 +185,6 @@ LocatorI::LocatorI(const LookupIPtr& lookup, const LocatorRegistryPrxPtr& regist { } -#ifdef ICE_CPP11_MAPPING void LocatorI::findObjectByIdAsync(Ice::Identity id, function&)> response, @@ -240,23 +202,6 @@ LocatorI::findAdapterByIdAsync(string adapterId, { _lookup->findAdapter(make_pair(response, ex), adapterId); } -#else -void -LocatorI::findObjectById_async(const AMD_Locator_findObjectByIdPtr& cb, - const Identity& id, - const Current&) const -{ - _lookup->findObject(cb, id); -} - -void -LocatorI::findAdapterById_async(const AMD_Locator_findAdapterByIdPtr& cb, - const std::string& adapterId, - const Current&) const -{ - _lookup->findAdapter(cb, adapterId); -} -#endif LocatorRegistryPrxPtr LocatorI::getRegistry(const Current&) const diff --git a/cpp/src/IceDiscovery/LocatorI.h b/cpp/src/IceDiscovery/LocatorI.h index eccf1d46811..910ce2772b0 100644 --- a/cpp/src/IceDiscovery/LocatorI.h +++ b/cpp/src/IceDiscovery/LocatorI.h @@ -19,7 +19,6 @@ class LocatorRegistryI : public Ice::LocatorRegistry, private IceUtil::Mutex LocatorRegistryI(const Ice::CommunicatorPtr&); -#ifdef ICE_CPP11_MAPPING virtual void setAdapterDirectProxyAsync(std::string, std::shared_ptr, @@ -41,20 +40,6 @@ class LocatorRegistryI : public Ice::LocatorRegistry, private IceUtil::Mutex std::function, std::function, const Ice::Current&); -#else - virtual void - setAdapterDirectProxy_async(const Ice::AMD_LocatorRegistry_setAdapterDirectProxyPtr&, const std::string&, - const Ice::ObjectPrx&, const Ice::Current&); - - virtual void - setReplicatedAdapterDirectProxy_async(const Ice::AMD_LocatorRegistry_setReplicatedAdapterDirectProxyPtr&, - const std::string&, const std::string&, const Ice::ObjectPrx&, - const Ice::Current&); - - virtual void - setServerProcessProxy_async(const Ice::AMD_LocatorRegistry_setServerProcessProxyPtr&, const std::string&, - const Ice::ProcessPrx&, const Ice::Current&); -#endif Ice::ObjectPrxPtr findObject(const Ice::Identity&) const; Ice::ObjectPrxPtr findAdapter(const std::string&, bool&) const; @@ -75,7 +60,6 @@ class LocatorI : public Ice::Locator LocatorI(const LookupIPtr&, const Ice::LocatorRegistryPrxPtr&); -#ifdef ICE_CPP11_MAPPING virtual void findObjectByIdAsync(Ice::Identity, std::function&)>, @@ -87,15 +71,7 @@ class LocatorI : public Ice::Locator std::function&)>, std::function, const Ice::Current&) const; -#else - virtual void - findObjectById_async(const Ice::AMD_Locator_findObjectByIdPtr&, const Ice::Identity&, - const Ice::Current&) const; - virtual void - findAdapterById_async(const Ice::AMD_Locator_findAdapterByIdPtr&, const std::string&, - const Ice::Current&) const; -#endif virtual Ice::LocatorRegistryPrxPtr getRegistry(const Ice::Current&) const; private: diff --git a/cpp/src/IceDiscovery/LookupI.cpp b/cpp/src/IceDiscovery/LookupI.cpp index 9dc9c436362..ef4494b5bb9 100644 --- a/cpp/src/IceDiscovery/LookupI.cpp +++ b/cpp/src/IceDiscovery/LookupI.cpp @@ -17,67 +17,6 @@ using namespace std; using namespace Ice; using namespace IceDiscovery; -#ifndef ICE_CPP11_MAPPING -namespace -{ - -class AdapterCallbackI : public IceUtil::Shared -{ -public: - - AdapterCallbackI(const LookupIPtr& lookup, const AdapterRequestPtr& request) : _lookup(lookup), _request(request) - { - } - - void - completed(const Ice::AsyncResultPtr& result) - { - try - { - result->throwLocalException(); - } - catch(const Ice::LocalException& ex) - { - _lookup->adapterRequestException(_request, ex); - } - } - -private: - - LookupIPtr _lookup; - AdapterRequestPtr _request; -}; - -class ObjectCallbackI : public IceUtil::Shared -{ -public: - - ObjectCallbackI(const LookupIPtr& lookup, const ObjectRequestPtr& request) : _lookup(lookup), _request(request) - { - } - - void - completed(const Ice::AsyncResultPtr& result) - { - try - { - result->throwLocalException(); - } - catch(const Ice::LocalException& ex) - { - _lookup->objectRequestException(_request, ex); - } - } - -private: - - LookupIPtr _lookup; - ObjectRequestPtr _request; -}; - -} -#endif - IceDiscovery::Request::Request(const LookupIPtr& lookup, int retryCount) : _lookup(lookup), _requestId(Ice::generateUUID()), _retryCount(retryCount), _lookupCount(0), _failureCount(0) { @@ -183,7 +122,6 @@ AdapterRequest::finished(const ObjectPrxPtr& proxy) void AdapterRequest::invokeWithLookup(const string& domainId, const LookupPrxPtr& lookup, const LookupReplyPrxPtr& lookupReply) { -#ifdef ICE_CPP11_MAPPING auto self = ICE_SHARED_FROM_THIS; lookup->findAdapterByIdAsync(domainId, _id, lookupReply, nullptr, [self](exception_ptr ex) { @@ -196,10 +134,6 @@ AdapterRequest::invokeWithLookup(const string& domainId, const LookupPrxPtr& loo self->_lookup->adapterRequestException(self, e); } }); -#else - lookup->begin_findAdapterById(domainId, _id, lookupReply, newCallback(new AdapterCallbackI(_lookup, this), - &AdapterCallbackI::completed)); -#endif } void @@ -222,7 +156,6 @@ ObjectRequest::response(const Ice::ObjectPrxPtr& proxy) void ObjectRequest::invokeWithLookup(const string& domainId, const LookupPrxPtr& lookup, const LookupReplyPrxPtr& lookupReply) { -#ifdef ICE_CPP11_MAPPING auto self = ICE_SHARED_FROM_THIS; lookup->findObjectByIdAsync(domainId, _id, lookupReply, nullptr, [self](exception_ptr ex) { @@ -235,11 +168,6 @@ ObjectRequest::invokeWithLookup(const string& domainId, const LookupPrxPtr& look self->_lookup->objectRequestException(self, e); } }); -#else - lookup->begin_findObjectById(domainId, _id, lookupReply, newCallback(new ObjectCallbackI(_lookup, this), - &ObjectCallbackI::completed)); - -#endif } void @@ -343,11 +271,7 @@ LookupI::findObjectById(ICE_IN(string) domainId, ICE_IN(Ice::Identity) id, ICE_I // try { -#ifdef ICE_CPP11_MAPPING reply->foundObjectByIdAsync(id, proxy); -#else - reply->begin_foundObjectById(id, proxy); -#endif } catch(const Ice::LocalException&) { @@ -374,11 +298,7 @@ LookupI::findAdapterById(ICE_IN(string) domainId, ICE_IN(string) adapterId, ICE_ // try { -#ifdef ICE_CPP11_MAPPING reply->foundAdapterByIdAsync(adapterId, proxy, isReplicaGroup); -#else - reply->begin_foundAdapterById(adapterId, proxy, isReplicaGroup); -#endif } catch(const Ice::LocalException&) { @@ -579,7 +499,6 @@ LookupReplyI::LookupReplyI(const LookupIPtr& lookup) : _lookup(lookup) { } -#ifdef ICE_CPP11_MAPPING void LookupReplyI::foundObjectById(Identity id, shared_ptr proxy, const Current& current) { @@ -592,17 +511,3 @@ LookupReplyI::foundAdapterById(string adapterId, shared_ptr proxy, bo { _lookup->foundAdapter(adapterId, current.id.name, proxy, isReplicaGroup); } -#else -void -LookupReplyI::foundObjectById(const Identity& id, const ObjectPrxPtr& proxy, const Current& current) -{ - _lookup->foundObject(id, current.id.name, proxy); -} - -void -LookupReplyI::foundAdapterById(const string& adapterId, const ObjectPrxPtr& proxy, bool isReplicaGroup, - const Current& current) -{ - _lookup->foundAdapter(adapterId, current.id.name, proxy, isReplicaGroup); -} -#endif diff --git a/cpp/src/IceDiscovery/LookupI.h b/cpp/src/IceDiscovery/LookupI.h index 3cf5996b0f5..c095ac9305a 100644 --- a/cpp/src/IceDiscovery/LookupI.h +++ b/cpp/src/IceDiscovery/LookupI.h @@ -67,11 +67,7 @@ template class RequestT : public Request { for(typename std::vector::const_iterator p = _callbacks.begin(); p != _callbacks.end(); ++p) { -#ifdef ICE_CPP11_MAPPING p->first(proxy); -#else - (*p)->ice_response(proxy); -#endif } _callbacks.clear(); } @@ -82,20 +78,12 @@ template class RequestT : public Request std::vector _callbacks; }; -#ifdef ICE_CPP11_MAPPING typedef std::pair&)>, std::function> ObjectCB; typedef std::pair&)>, std::function> AdapterCB; -#else -typedef Ice::AMD_Locator_findObjectByIdPtr ObjectCB; -typedef Ice::AMD_Locator_findAdapterByIdPtr AdapterCB; -#endif -class ObjectRequest : public RequestT -#ifdef ICE_CPP11_MAPPING - , public std::enable_shared_from_this -#endif +class ObjectRequest : public RequestT, public std::enable_shared_from_this { public: @@ -110,10 +98,7 @@ class ObjectRequest : public RequestT }; ICE_DEFINE_PTR(ObjectRequestPtr, ObjectRequest); -class AdapterRequest : public RequestT -#ifdef ICE_CPP11_MAPPING - , public std::enable_shared_from_this -#endif +class AdapterRequest : public RequestT, public std::enable_shared_from_this { public: @@ -134,11 +119,7 @@ class AdapterRequest : public RequestT // the same proxy if it's accessible through multiple network interfaces and if we // also sent the request to multiple interfaces. // -#ifdef ICE_CPP11_MAPPING std::set, Ice::TargetCompare, std::less>> _proxies; -#else - std::set _proxies; -#endif IceUtil::Time _start; IceUtil::Time _latency; }; @@ -208,13 +189,8 @@ class LookupReplyI : public LookupReply LookupReplyI(const LookupIPtr&); -#ifdef ICE_CPP11_MAPPING virtual void foundObjectById(Ice::Identity, std::shared_ptr, const Ice::Current&); virtual void foundAdapterById(std::string, std::shared_ptr, bool, const Ice::Current&); -#else - virtual void foundObjectById(const Ice::Identity&, const Ice::ObjectPrx&, const Ice::Current&); - virtual void foundAdapterById(const std::string&, const Ice::ObjectPrx&, bool, const Ice::Current&); -#endif private: diff --git a/cpp/src/IceGrid/SynchronizationException.cpp b/cpp/src/IceGrid/SynchronizationException.cpp index b58c63a9e3b..5a4eb27f089 100644 --- a/cpp/src/IceGrid/SynchronizationException.cpp +++ b/cpp/src/IceGrid/SynchronizationException.cpp @@ -6,8 +6,6 @@ #include "SynchronizationException.h" -#ifdef ICE_CPP11_MAPPING // C++11 mapping - IceGrid::SynchronizationException::~SynchronizationException() { } @@ -18,34 +16,3 @@ IceGrid::SynchronizationException::ice_staticId() static const ::std::string typeId = "::IceGrid::SynchronizationException"; return typeId; } - -#else - -IceGrid::SynchronizationException::SynchronizationException(const char* file, int line) : - ::Ice::LocalException(file, line) -{ -} - -IceGrid::SynchronizationException::~SynchronizationException() -{ -} - -::std::string -IceGrid::SynchronizationException::ice_id() const -{ - return "::IceGrid::SynchronizationException"; -} - -IceGrid::SynchronizationException* -IceGrid::SynchronizationException::ice_clone() const -{ - return new SynchronizationException(*this); -} - -void -IceGrid::SynchronizationException::ice_throw() const -{ - throw *this; -} - -#endif diff --git a/cpp/src/IceGrid/SynchronizationException.h b/cpp/src/IceGrid/SynchronizationException.h index 4f6380fcaa2..b57f7038da6 100644 --- a/cpp/src/IceGrid/SynchronizationException.h +++ b/cpp/src/IceGrid/SynchronizationException.h @@ -8,8 +8,6 @@ #include -#ifdef ICE_CPP11_MAPPING // C++11 mapping - namespace IceGrid { @@ -47,42 +45,3 @@ class SynchronizationException : public ::Ice::LocalExceptionHelper pluginFacade; -#else -RegistryPluginFacade* pluginFacade = 0; -#endif } namespace IceGrid @@ -36,17 +32,5 @@ IceGrid::getRegistryPluginFacade() void IceGrid::setRegistryPluginFacade(const RegistryPluginFacadePtr& facade) { -#ifdef ICE_CPP11_MAPPING pluginFacade = facade; -#else - if(pluginFacade) - { - pluginFacade->__decRef(); - } - pluginFacade = facade.get(); - if(pluginFacade) - { - pluginFacade->__incRef(); - } -#endif } diff --git a/cpp/src/IceIAP/ConnectionInfo.cpp b/cpp/src/IceIAP/ConnectionInfo.cpp index 406b9ae82e6..66bf669d14f 100644 --- a/cpp/src/IceIAP/ConnectionInfo.cpp +++ b/cpp/src/IceIAP/ConnectionInfo.cpp @@ -19,34 +19,6 @@ # pragma GCC diagnostic ignored "-Wshadow" #endif -#ifdef ICE_CPP11_MAPPING // C++11 mapping - -namespace -{ - -} - -IceIAP::ConnectionInfo::~ConnectionInfo() -{ -} - -#else // C++98 mapping - -namespace -{ - -} - IceIAP::ConnectionInfo::~ConnectionInfo() { } - -/// \cond INTERNAL -ICEIAP_API ::Ice::LocalObject* IceIAP::upCast(ConnectionInfo* p) { return p; } -/// \endcond - -namespace Ice -{ -} - -#endif diff --git a/cpp/src/IceIAP/EndpointI.h b/cpp/src/IceIAP/EndpointI.h index 73debbd34a0..bb76ffe44c0 100644 --- a/cpp/src/IceIAP/EndpointI.h +++ b/cpp/src/IceIAP/EndpointI.h @@ -13,16 +13,9 @@ namespace IceObjC { class iAPEndpointI; -#ifdef ICE_CPP11_MAPPING // C++11 mapping typedef ::std::shared_ptr iAPEndpointIPtr; -#else -typedef IceUtil::Handle iAPEndpointIPtr; -#endif -class iAPEndpointI : public IceInternal::EndpointI -#ifdef ICE_CPP11_MAPPING - , public std::enable_shared_from_this -#endif +class iAPEndpointI : public IceInternal::EndpointI, public std::enable_shared_from_this { public: @@ -53,13 +46,8 @@ class iAPEndpointI : public IceInternal::EndpointI virtual std::vector expandHost(IceInternal::EndpointIPtr&) const; virtual bool equivalent(const IceInternal::EndpointIPtr&) const; -#ifdef ICE_CPP11_MAPPING virtual bool operator==(const Ice::Endpoint&) const; virtual bool operator<(const Ice::Endpoint&) const; -#else - virtual bool operator==(const Ice::LocalObject&) const; - virtual bool operator<(const Ice::LocalObject&) const; -#endif virtual std::string options() const; virtual ::Ice::Int hash() const; diff --git a/cpp/src/IceIAP/EndpointI.mm b/cpp/src/IceIAP/EndpointI.mm index 50154f7909b..2cfcfe4d45a 100644 --- a/cpp/src/IceIAP/EndpointI.mm +++ b/cpp/src/IceIAP/EndpointI.mm @@ -318,11 +318,7 @@ virtual void destroy() {} } bool -#ifdef ICE_CPP11_MAPPING IceObjC::iAPEndpointI::operator==(const Ice::Endpoint& r) const -#else -IceObjC::iAPEndpointI::operator==(const Ice::LocalObject& r) const -#endif { const iAPEndpointI* p = dynamic_cast(&r); if(!p) @@ -374,11 +370,7 @@ virtual void destroy() {} } bool -#ifdef ICE_CPP11_MAPPING IceObjC::iAPEndpointI::operator<(const Ice::Endpoint& r) const -#else -IceObjC::iAPEndpointI::operator<(const Ice::LocalObject& r) const -#endif { const iAPEndpointI* p = dynamic_cast(&r); if(!p) diff --git a/cpp/src/IceIAP/EndpointInfo.cpp b/cpp/src/IceIAP/EndpointInfo.cpp index e70cc5e8fb2..0a89d8e6777 100644 --- a/cpp/src/IceIAP/EndpointInfo.cpp +++ b/cpp/src/IceIAP/EndpointInfo.cpp @@ -19,34 +19,6 @@ # pragma GCC diagnostic ignored "-Wshadow" #endif -#ifdef ICE_CPP11_MAPPING // C++11 mapping - -namespace -{ - -} - -IceIAP::EndpointInfo::~EndpointInfo() -{ -} - -#else // C++98 mapping - -namespace -{ - -} - IceIAP::EndpointInfo::~EndpointInfo() { } - -/// \cond INTERNAL -ICEIAP_API ::Ice::LocalObject* IceIAP::upCast(EndpointInfo* p) { return p; } -/// \endcond - -namespace Ice -{ -} - -#endif diff --git a/cpp/src/IceLocatorDiscovery/PluginI.cpp b/cpp/src/IceLocatorDiscovery/PluginI.cpp index ddf6b1956fe..3240508745f 100644 --- a/cpp/src/IceLocatorDiscovery/PluginI.cpp +++ b/cpp/src/IceLocatorDiscovery/PluginI.cpp @@ -17,20 +17,10 @@ namespace { class LocatorI; // Forward declaration - -#ifdef ICE_CPP11_MAPPING typedef std::pair&)>, function> AMDCallback; -#else -typedef Ice::AMD_Object_ice_invokePtr AMDCallback; -#endif -class Request : -#ifdef ICE_CPP11_MAPPING - public std::enable_shared_from_this -#else - public virtual IceUtil::Shared -#endif +class Request : public std::enable_shared_from_this { public: @@ -61,11 +51,7 @@ class Request : const Ice::Context _context; const Ice::ByteSeq _inParams; AMDCallback _amdCB; -#ifdef ICE_CPP11_MAPPING exception_ptr _exception; -#else - IceInternal::UniquePtr _exception; -#endif Ice::LocatorPrxPtr _locatorPrx; }; @@ -73,25 +59,18 @@ ICE_DEFINE_PTR(RequestPtr, Request); class LocatorI : public Ice::BlobjectArrayAsync, public IceUtil::TimerTask, - private IceUtil::Monitor -#ifdef ICE_CPP11_MAPPING - , public std::enable_shared_from_this -#endif + private IceUtil::Monitor, + public std::enable_shared_from_this { public: LocatorI(const string&, const LookupPrxPtr&, const Ice::PropertiesPtr&, const string&, const Ice::LocatorPrxPtr&); void setLookupReply(const LookupReplyPrxPtr&); -#ifdef ICE_CPP11_MAPPING virtual void ice_invokeAsync(pair, function&)>, function, const Ice::Current&); -#else - virtual void ice_invoke_async(const Ice::AMD_Object_ice_invokePtr&, const pair&, - const Ice::Current&); -#endif void foundLocator(const Ice::LocatorPrxPtr&); void invoke(const Ice::LocatorPrxPtr&, const RequestPtr&); @@ -149,7 +128,6 @@ class VoidLocatorI : public Ice::Locator { public: -#ifdef ICE_CPP11_MAPPING virtual void findObjectByIdAsync(::Ice::Identity, function&)> response, @@ -167,23 +145,6 @@ class VoidLocatorI : public Ice::Locator { response(nullptr); } -#else - virtual void - findObjectById_async(const Ice::AMD_Locator_findObjectByIdPtr& amdCB, - const Ice::Identity&, - const Ice::Current&) const - { - amdCB->ice_response(0); - } - - virtual void - findAdapterById_async(const Ice::AMD_Locator_findAdapterByIdPtr& amdCB, - const string&, - const Ice::Current&) const - { - amdCB->ice_response(0); - } -#endif virtual Ice::LocatorRegistryPrxPtr getRegistry(const Ice::Current&) const @@ -213,36 +174,6 @@ class PluginI : public Plugin Ice::LocatorPrxPtr _defaultLocator; }; -#ifndef ICE_CPP11_MAPPING - -class CallbackI : public IceUtil::Shared -{ -public: - - CallbackI(const LocatorIPtr& locator) : _locator(locator) - { - } - - void - completed(const Ice::AsyncResultPtr& result) - { - try - { - result->throwLocalException(); - } - catch(const Ice::LocalException& ex) - { - _locator->exception(ex); - } - } - -private: - - LocatorIPtr _locator; -}; - -#endif - } // @@ -385,7 +316,6 @@ PluginI::destroy() void Request::invoke(const Ice::LocatorPrxPtr& l) { -#ifdef ICE_CPP11_MAPPING if(l != _locatorPrx) { _locatorPrx = l; @@ -431,43 +361,17 @@ Request::invoke(const Ice::LocatorPrxPtr& l) assert(_exception); // Don't retry if the proxy didn't change _amdCB.second(_exception); } - -#else - if(l != _locatorPrx) - { - _locatorPrx = l; - try - { - l->begin_ice_invoke(_operation, _mode, _inParams, _context, - Ice::newCallback_Object_ice_invoke(this, &Request::response, &Request::exception)); - } - catch(const Ice::LocalException& ex) - { - exception(ex); - } - } - else - { - assert(_exception.get()); // Don't retry if the proxy didn't change - _amdCB->ice_exception(*_exception.get()); - } -#endif } void Request::response(bool ok, const pair& outParams) { -#ifdef ICE_CPP11_MAPPING _amdCB.first(ok, outParams); -#else - _amdCB->ice_response(ok, outParams); -#endif } void Request::exception(const Ice::Exception& ex) { -#ifdef ICE_CPP11_MAPPING try { ex.ice_throw(); @@ -518,37 +422,6 @@ Request::exception(const Ice::Exception& ex) _exception = current_exception(); _locator->invoke(_locatorPrx, shared_from_this()); // Retry with new locator proxy } -#else - try - { - ex.ice_throw(); - } - catch(const Ice::RequestFailedException&) - { - _amdCB->ice_exception(ex); - } - catch(const Ice::UnknownException&) - { - _amdCB->ice_exception(ex); - } - catch(const Ice::NoEndpointException&) - { - _amdCB->ice_exception(Ice::ObjectNotExistException(__FILE__, __LINE__)); - } - catch(const Ice::CommunicatorDestroyedException&) - { - _amdCB->ice_exception(Ice::ObjectNotExistException(__FILE__, __LINE__)); - } - catch(const Ice::ObjectAdapterDeactivatedException&) - { - _amdCB->ice_exception(Ice::ObjectNotExistException(__FILE__, __LINE__)); - } - catch(const Ice::Exception&) - { - _exception.reset(ex.ice_clone()); - _locator->invoke(_locatorPrx, this); // Retry with new locator proxy - } -#endif } LocatorI::LocatorI(const string& name, @@ -629,7 +502,6 @@ LocatorI::setLookupReply(const LookupReplyPrxPtr& lookupReply) } } -#ifdef ICE_CPP11_MAPPING void LocatorI::ice_invokeAsync(pair inParams, function&)> responseCB, @@ -639,15 +511,6 @@ LocatorI::ice_invokeAsync(pair inParams, invoke(nullptr, make_shared(this, current.operation, current.mode, inParams, current.ctx, make_pair(std::move(responseCB), std::move(exceptionCB)))); } -#else -void -LocatorI::ice_invoke_async(const Ice::AMD_Object_ice_invokePtr& amdCB, - const pair& inParams, - const Ice::Current& current) -{ - invoke(0, new Request(this, current.operation, current.mode, inParams, current.ctx, amdCB)); -} -#endif vector LocatorI::getLocators(const string& instanceName, const IceUtil::Time& waitTime) @@ -858,7 +721,6 @@ LocatorI::invoke(const Ice::LocatorPrxPtr& locator, const RequestPtr& request) for(vector >::const_iterator l = _lookups.begin(); l != _lookups.end(); ++l) { -#ifdef ICE_CPP11_MAPPING auto self = shared_from_this(); l->first->findLocatorAsync(_instanceName, l->second, nullptr, [self](exception_ptr ex) { @@ -871,10 +733,6 @@ LocatorI::invoke(const Ice::LocatorPrxPtr& locator, const RequestPtr& request) self->exception(e); } }); -#else - l->first->begin_findLocator(_instanceName, l->second, Ice::newCallback(new CallbackI(this), - &CallbackI::completed)); -#endif } _timer->schedule(ICE_SHARED_FROM_THIS, _timeout); } @@ -977,23 +835,18 @@ LocatorI::runTimerTask() for(vector >::const_iterator l = _lookups.begin(); l != _lookups.end(); ++l) { -#ifdef ICE_CPP11_MAPPING - auto self = shared_from_this(); - l->first->findLocatorAsync(_instanceName, l->second, nullptr, [self](exception_ptr ex) + auto self = shared_from_this(); + l->first->findLocatorAsync(_instanceName, l->second, nullptr, [self](exception_ptr ex) + { + try { - try - { - rethrow_exception(ex); - } - catch(const Ice::LocalException& e) - { - self->exception(e); - } - }); -#else - l->first->begin_findLocator(_instanceName, l->second, Ice::newCallback(new CallbackI(this), - &CallbackI::completed)); -#endif + rethrow_exception(ex); + } + catch(const Ice::LocalException& e) + { + self->exception(e); + } + }); } _timer->schedule(ICE_SHARED_FROM_THIS, _timeout); return; diff --git a/cpp/src/IcePatch2Lib/ClientUtil.cpp b/cpp/src/IcePatch2Lib/ClientUtil.cpp index f4594698a8f..f66f09aa948 100644 --- a/cpp/src/IcePatch2Lib/ClientUtil.cpp +++ b/cpp/src/IcePatch2Lib/ClientUtil.cpp @@ -245,7 +245,6 @@ PatcherI::~PatcherI() } } -#ifdef ICE_CPP11_MAPPING class GetFileInfoSeqAsyncCB { public: @@ -303,7 +302,6 @@ class GetFileInfoSeqAsyncCB std::future _fileInfoSeqFuture; bool _useSmallFileAPI; }; -#endif class PatcherGetFileInfoSeqCB : public GetFileInfoSeqCB { @@ -397,13 +395,8 @@ PatcherI::prepare() while(true) { -#ifdef ICE_CPP11_MAPPING std::shared_ptr curCB; std::shared_ptr nxtCB; -#else - AsyncResultPtr curCB; - AsyncResultPtr nxtCB; -#endif try { for(size_t node0 = 0; node0 < 256; ++node0) @@ -412,7 +405,6 @@ PatcherI::prepare() { if (!curCB) { -#ifdef ICE_CPP11_MAPPING curCB = std::make_shared(_useSmallFileAPI); if (_useSmallFileAPI) { @@ -428,12 +420,6 @@ PatcherI::prepare() [curCB](LargeFileInfoSeq fileInfoSeq) { curCB->complete(fileInfoSeq); }, [curCB](exception_ptr exception) { curCB->exception(exception); }); } -#else - assert(!nxtCB); - curCB = _useSmallFileAPI ? - _serverCompress->begin_getFileInfoSeq(static_cast(node0)) : - _serverCompress->begin_getLargeFileInfoSeq(static_cast(node0)); -#endif // ICE_CPP11_MAPPING } else { @@ -450,7 +436,6 @@ PatcherI::prepare() if(node0Nxt < 256) { -#ifdef ICE_CPP11_MAPPING nxtCB = std::make_shared(_useSmallFileAPI); if (_useSmallFileAPI) { @@ -466,15 +451,9 @@ PatcherI::prepare() [nxtCB](LargeFileInfoSeq fileInfoSeq) { nxtCB->complete(fileInfoSeq); }, [nxtCB](exception_ptr exception) { nxtCB->exception(exception); }); } -#else - nxtCB = _useSmallFileAPI ? - _serverCompress->begin_getFileInfoSeq(static_cast(node0Nxt)) : - _serverCompress->begin_getLargeFileInfoSeq(static_cast(node0Nxt)); -#endif } LargeFileInfoSeq files; -#ifdef ICE_CPP11_MAPPING if (_useSmallFileAPI) { FileInfoSeq smallFiles = curCB->getFileInfoSeq(); @@ -485,18 +464,7 @@ PatcherI::prepare() { files = curCB->getLargeFileInfoSeq(); } -#else - if(_useSmallFileAPI) - { - FileInfoSeq smallFiles = _serverCompress->end_getFileInfoSeq(curCB); - files.resize(smallFiles.size()); - transform(smallFiles.begin(), smallFiles.end(), files.begin(), toLargeFileInfo); - } - else - { - files = _serverCompress->end_getLargeFileInfoSeq(curCB); - } -#endif + sort(files.begin(), files.end(), FileInfoLess()); files.erase(unique(files.begin(), files.end(), FileInfoEqual()), files.end()); @@ -840,7 +808,6 @@ PatcherI::updateFiles(const LargeFileInfoSeq& files) return result; } -#ifdef ICE_CPP11_MAPPING class GetFileCompressedCB { public: @@ -898,7 +865,6 @@ void getFileCompressed( [cb](exception_ptr exception) { cb->exception(exception); }); } } -#endif bool PatcherI::updateFilesInternal(const LargeFileInfoSeq& files, const DecompressorPtr& decompressor) @@ -914,13 +880,8 @@ PatcherI::updateFilesInternal(const LargeFileInfoSeq& files, const DecompressorP } } -#ifdef ICE_CPP11_MAPPING shared_ptr curCB; shared_ptr nxtCB; -#else - AsyncResultPtr curCB; - AsyncResultPtr nxtCB; -#endif // ICE_CPP11_MAPPING for(LargeFileInfoSeq::const_iterator p = files.begin(); p != files.end(); ++p) { @@ -982,7 +943,6 @@ PatcherI::updateFilesInternal(const LargeFileInfoSeq& files, const DecompressorP if(!curCB) { assert(!nxtCB); -#ifdef ICE_CPP11_MAPPING curCB = std::make_shared(); getFileCompressed( _serverNoCompress, @@ -991,12 +951,6 @@ PatcherI::updateFilesInternal(const LargeFileInfoSeq& files, const DecompressorP _chunkSize, curCB, _useSmallFileAPI); -#else - - curCB = _useSmallFileAPI ? - _serverNoCompress->begin_getFileCompressed(p->path, static_cast(pos), _chunkSize) : - _serverNoCompress->begin_getLargeFileCompressed(p->path, pos, _chunkSize); -#endif // ICE_CPP11_MAPPING } else { @@ -1006,7 +960,6 @@ PatcherI::updateFilesInternal(const LargeFileInfoSeq& files, const DecompressorP if(pos + _chunkSize < p->size) { -#ifdef ICE_CPP11_MAPPING nxtCB = std::make_shared(); getFileCompressed( _serverNoCompress, @@ -1015,11 +968,6 @@ PatcherI::updateFilesInternal(const LargeFileInfoSeq& files, const DecompressorP _chunkSize, nxtCB, _useSmallFileAPI); -#else - nxtCB = _useSmallFileAPI ? - _serverNoCompress->begin_getFileCompressed(p->path, static_cast(pos + _chunkSize), _chunkSize) : - _serverNoCompress->begin_getLargeFileCompressed(p->path, pos + _chunkSize, _chunkSize); -#endif } else { @@ -1032,7 +980,6 @@ PatcherI::updateFilesInternal(const LargeFileInfoSeq& files, const DecompressorP if(q != files.end()) { -#ifdef ICE_CPP11_MAPPING nxtCB = std::make_shared(); getFileCompressed( _serverNoCompress, @@ -1041,23 +988,13 @@ PatcherI::updateFilesInternal(const LargeFileInfoSeq& files, const DecompressorP _chunkSize, nxtCB, _useSmallFileAPI); -#else - nxtCB = _useSmallFileAPI ? - _serverNoCompress->begin_getFileCompressed(q->path, 0, _chunkSize) : - _serverNoCompress->begin_getLargeFileCompressed(q->path, 0, _chunkSize); -#endif } } ByteSeq bytes; try { -#ifdef ICE_CPP11_MAPPING bytes = curCB->getFileCompressed(); -#else - bytes = _useSmallFileAPI ? _serverNoCompress->end_getFileCompressed(curCB) : - _serverNoCompress->end_getLargeFileCompressed(curCB); -#endif // ICE_CPP11_MAPPING } catch(const FileAccessException& ex) { diff --git a/cpp/src/IcePatch2Lib/Util.cpp b/cpp/src/IcePatch2Lib/Util.cpp index 73b95184a8c..d96cc0fe439 100644 --- a/cpp/src/IcePatch2Lib/Util.cpp +++ b/cpp/src/IcePatch2Lib/Util.cpp @@ -76,18 +76,10 @@ bool IcePatch2Internal::writeFileInfo(FILE* fp, const LargeFileInfo& info) { int rc = fprintf(fp, -#ifdef ICE_CPP11_MAPPING "%s\t%s\t%lld\t%d\n", -#else - "%s\t%s\t" ICE_INT64_FORMAT "\t%d\n", -#endif IceUtilInternal::escapeString( info.path, "", -#ifdef ICE_CPP11_MAPPING IceUtilInternal::ToStringMode::Compat -#else - IceUtilInternal::Compat -#endif // ICE_CPP11_MAPPING ).c_str(), bytesToString(info.checksum).c_str(), info.size, diff --git a/cpp/src/IceSSL/CertificateI.cpp b/cpp/src/IceSSL/CertificateI.cpp index 5fd374daada..0320c580231 100644 --- a/cpp/src/IceSSL/CertificateI.cpp +++ b/cpp/src/IceSSL/CertificateI.cpp @@ -55,14 +55,6 @@ CertificateReadException::ice_id() const return "::IceSSL::CertificateReadException"; } -#ifndef ICE_CPP11_MAPPING -CertificateReadException* -CertificateReadException::ice_clone() const -{ - return new CertificateReadException(*this); -} -#endif - CertificateEncodingException::CertificateEncodingException(const char* file, int line, const string& r) : IceUtil::ExceptionHelper(file, line), reason(r) @@ -75,14 +67,6 @@ CertificateEncodingException::ice_id() const return "::IceSSL::CertificateEncodingException"; } -#ifndef ICE_CPP11_MAPPING -CertificateEncodingException* -CertificateEncodingException::ice_clone() const -{ - return new CertificateEncodingException(*this); -} -#endif - ParseException::ParseException(const char* file, int line, const string& r) : IceUtil::ExceptionHelper(file, line), reason(r) @@ -95,14 +79,6 @@ ParseException::ice_id() const return "::IceSSL::ParseException"; } -#ifndef ICE_CPP11_MAPPING -ParseException* -ParseException::ice_clone() const -{ - return new ParseException(*this); -} -#endif - DistinguishedName::DistinguishedName(const string& dn) : _rdns(RFC2253::parseStrict(dn)) { unescape(); @@ -230,20 +206,12 @@ CertificateI::loadX509Extensions() const bool CertificateI::checkValidity() const { -# ifdef ICE_CPP11_MAPPING auto now = chrono::system_clock::now(); -# else - IceUtil::Time now = IceUtil::Time::now(); -# endif return now > getNotBefore() && now <= getNotAfter(); } bool -# ifdef ICE_CPP11_MAPPING CertificateI::checkValidity(const chrono::system_clock::time_point& now) const -# else -CertificateI::checkValidity(const IceUtil::Time& now) const -# endif { return now > getNotBefore() && now <= getNotAfter(); } diff --git a/cpp/src/IceSSL/CertificateI.h b/cpp/src/IceSSL/CertificateI.h index c7b617bbd45..de505c04740 100644 --- a/cpp/src/IceSSL/CertificateI.h +++ b/cpp/src/IceSSL/CertificateI.h @@ -38,12 +38,7 @@ class ICESSL_API CertificateI : public virtual IceSSL::Certificate virtual X509ExtensionPtr getX509Extension(const std::string&) const; virtual bool checkValidity() const; -# ifdef ICE_CPP11_MAPPING virtual bool checkValidity(const std::chrono::system_clock::time_point& now) const; -# else - virtual bool checkValidity(const IceUtil::Time& now) const; -# endif - virtual std::string toString() const; protected: diff --git a/cpp/src/IceSSL/ConnectionInfo.cpp b/cpp/src/IceSSL/ConnectionInfo.cpp index fe2ce274358..880ccda0820 100644 --- a/cpp/src/IceSSL/ConnectionInfo.cpp +++ b/cpp/src/IceSSL/ConnectionInfo.cpp @@ -19,34 +19,6 @@ # pragma GCC diagnostic ignored "-Wshadow" #endif -#ifdef ICE_CPP11_MAPPING // C++11 mapping - -namespace -{ - -} - -IceSSL::ConnectionInfo::~ConnectionInfo() -{ -} - -#else // C++98 mapping - -namespace -{ - -} - IceSSL::ConnectionInfo::~ConnectionInfo() { } - -/// \cond INTERNAL -ICESSL_API ::Ice::LocalObject* IceSSL::upCast(ConnectionInfo* p) { return p; } -/// \endcond - -namespace Ice -{ -} - -#endif diff --git a/cpp/src/IceSSL/ConnectionInfoF.cpp b/cpp/src/IceSSL/ConnectionInfoF.cpp deleted file mode 100644 index 61f23665a4a..00000000000 --- a/cpp/src/IceSSL/ConnectionInfoF.cpp +++ /dev/null @@ -1,38 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#ifndef ICESSL_API_EXPORTS -# define ICESSL_API_EXPORTS -#endif -#include -#include -#include - -#if defined(_MSC_VER) -# pragma warning(disable:4458) // declaration of ... hides class member -#elif defined(__clang__) -# pragma clang diagnostic ignored "-Wshadow" -#elif defined(__GNUC__) -# pragma GCC diagnostic ignored "-Wshadow" -#endif - -#ifdef ICE_CPP11_MAPPING // C++11 mapping - -namespace -{ - -} - -#else // C++98 mapping - -namespace -{ - -} - -namespace Ice -{ -} - -#endif diff --git a/cpp/src/IceSSL/EndpointI.cpp b/cpp/src/IceSSL/EndpointI.cpp index afc59b8cdba..b44936828ba 100644 --- a/cpp/src/IceSSL/EndpointI.cpp +++ b/cpp/src/IceSSL/EndpointI.cpp @@ -37,10 +37,6 @@ getIPEndpointInfo(const Ice::EndpointInfoPtr& info) } -#ifndef ICE_CPP11_MAPPING -IceUtil::Shared* IceSSL::upCast(EndpointI* p) { return p; } -#endif - IceSSL::EndpointI::EndpointI(const InstancePtr& instance, const IceInternal::EndpointIPtr& del) : _instance(instance), _delegate(del) { @@ -276,11 +272,7 @@ IceSSL::EndpointI::options() const } bool -#ifdef ICE_CPP11_MAPPING IceSSL::EndpointI::operator==(const Ice::Endpoint& r) const -#else -IceSSL::EndpointI::operator==(const Ice::LocalObject& r) const -#endif { const EndpointI* p = dynamic_cast(&r); if(!p) @@ -302,11 +294,7 @@ IceSSL::EndpointI::operator==(const Ice::LocalObject& r) const } bool -#ifdef ICE_CPP11_MAPPING IceSSL::EndpointI::operator<(const Ice::Endpoint& r) const -#else -IceSSL::EndpointI::operator<(const Ice::LocalObject& r) const -#endif { const EndpointI* p = dynamic_cast(&r); if(!p) diff --git a/cpp/src/IceSSL/EndpointI.h b/cpp/src/IceSSL/EndpointI.h index b1dbeb98d24..aec9a5bc937 100644 --- a/cpp/src/IceSSL/EndpointI.h +++ b/cpp/src/IceSSL/EndpointI.h @@ -16,10 +16,7 @@ namespace IceSSL { -class EndpointI : public IceInternal::EndpointI -#ifdef ICE_CPP11_MAPPING - , public std::enable_shared_from_this -#endif +class EndpointI : public IceInternal::EndpointI, public std::enable_shared_from_this { public: @@ -51,13 +48,8 @@ class EndpointI : public IceInternal::EndpointI EndpointIPtr endpoint(const IceInternal::EndpointIPtr&) const; -#ifdef ICE_CPP11_MAPPING virtual bool operator==(const Ice::Endpoint&) const; virtual bool operator<(const Ice::Endpoint&) const; -#else - virtual bool operator==(const Ice::LocalObject&) const; - virtual bool operator<(const Ice::LocalObject&) const; -#endif protected: diff --git a/cpp/src/IceSSL/EndpointInfo.cpp b/cpp/src/IceSSL/EndpointInfo.cpp index 02c1b7385dd..57962d77c15 100644 --- a/cpp/src/IceSSL/EndpointInfo.cpp +++ b/cpp/src/IceSSL/EndpointInfo.cpp @@ -19,20 +19,6 @@ # pragma GCC diagnostic ignored "-Wshadow" #endif -#ifdef ICE_CPP11_MAPPING // C++11 mapping - IceSSL::EndpointInfo::~EndpointInfo() { } - -#else // C++98 mapping - -IceSSL::EndpointInfo::~EndpointInfo() -{ -} - -/// \cond INTERNAL -ICESSL_API ::Ice::LocalObject* IceSSL::upCast(EndpointInfo* p) { return p; } -/// \endcond - -#endif diff --git a/cpp/src/IceSSL/InstanceF.h b/cpp/src/IceSSL/InstanceF.h index 5f9b72106da..676a0524d24 100644 --- a/cpp/src/IceSSL/InstanceF.h +++ b/cpp/src/IceSSL/InstanceF.h @@ -17,12 +17,7 @@ ICESSL_API IceUtil::Shared* upCast(Instance*); typedef IceInternal::Handle InstancePtr; class EndpointI; -#ifdef ICE_CPP11_MAPPING typedef ::std::shared_ptr EndpointIPtr; -#else -ICESSL_API IceUtil::Shared* upCast(EndpointI*); -typedef IceInternal::Handle EndpointIPtr; -#endif class AcceptorI; ICESSL_API IceUtil::Shared* upCast(AcceptorI*); diff --git a/cpp/src/IceSSL/OpenSSLCertificateI.cpp b/cpp/src/IceSSL/OpenSSLCertificateI.cpp index 23982f34326..6043b7de66c 100644 --- a/cpp/src/IceSSL/OpenSSLCertificateI.cpp +++ b/cpp/src/IceSSL/OpenSSLCertificateI.cpp @@ -149,11 +149,7 @@ class DistinguishedNameI : public IceSSL::DistinguishedName mutex globalMutex; -#ifdef ICE_CPP11_MAPPING chrono::system_clock::time_point -#else -static IceUtil::Time -#endif ASMUtcTimeToTime(const ASN1_UTCTIME* s) { struct tm tm; @@ -204,11 +200,7 @@ ASMUtcTimeToTime(const ASN1_UTCTIME* s) IceUtil::Time time = IceUtil::Time::seconds(mktime(&tm) - IceUtil::Int64(offset) * 60 + tzone); -#ifdef ICE_CPP11_MAPPING return chrono::system_clock::time_point(chrono::microseconds(time.toMicroSeconds())); -#else - return time; -#endif } class OpenSSLX509ExtensionI : public IceSSL::X509Extension @@ -246,13 +238,8 @@ class OpenSSLCertificateI : public IceSSL::OpenSSL::Certificate, virtual bool verify(const IceSSL::CertificatePtr&) const; virtual string encode() const; -# ifdef ICE_CPP11_MAPPING virtual chrono::system_clock::time_point getNotAfter() const; virtual chrono::system_clock::time_point getNotBefore() const; -# else - virtual IceUtil::Time getNotAfter() const; - virtual IceUtil::Time getNotBefore() const; -# endif virtual string getSerialNumber() const; virtual IceSSL::DistinguishedName getIssuerDN() const; virtual vector > getIssuerAlternativeNames() const; @@ -321,11 +308,7 @@ OpenSSLCertificateI::OpenSSLCertificateI(x509_st* cert) : _cert(cert) { if(!_cert) { -#ifdef ICE_CPP11_MAPPING throw invalid_argument("Invalid certificate reference"); -#else - throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, "Invalid certificate reference"); -#endif } } @@ -426,21 +409,13 @@ OpenSSLCertificateI::encode() const return result; } -# ifdef ICE_CPP11_MAPPING chrono::system_clock::time_point -# else -IceUtil::Time -# endif OpenSSLCertificateI::getNotAfter() const { return ASMUtcTimeToTime(X509_get_notAfter(_cert)); } -# ifdef ICE_CPP11_MAPPING chrono::system_clock::time_point -# else -IceUtil::Time -# endif OpenSSLCertificateI::getNotBefore() const { return ASMUtcTimeToTime(X509_get_notBefore(_cert)); diff --git a/cpp/src/IceSSL/PluginI.cpp b/cpp/src/IceSSL/PluginI.cpp index bdd3835d6fb..27853bdf16a 100644 --- a/cpp/src/IceSSL/PluginI.cpp +++ b/cpp/src/IceSSL/PluginI.cpp @@ -16,18 +16,6 @@ using namespace std; using namespace Ice; using namespace IceSSL; -#ifndef ICE_CPP11_MAPPING -CertificateVerifier::~CertificateVerifier() -{ - // Out of line to avoid weak vtable -} - -PasswordPrompt::~PasswordPrompt() -{ - // Out of line to avoid weak vtable -} -#endif - IceSSL::Plugin::~Plugin() { // Out of line to avoid weak vtable @@ -61,7 +49,6 @@ PluginI::destroy() _engine = 0; } -#ifdef ICE_CPP11_MAPPING void PluginI::setCertificateVerifier(std::function&)> verifier) { @@ -74,15 +61,7 @@ PluginI::setCertificateVerifier(std::functionsetCertificateVerifier(nullptr); } } -#else -void -PluginI::setCertificateVerifier(const CertificateVerifierPtr& verifier) -{ - _engine->setCertificateVerifier(verifier); -} -#endif -#ifdef ICE_CPP11_MAPPING void PluginI::setPasswordPrompt(std::function prompt) { @@ -95,13 +74,6 @@ PluginI::setPasswordPrompt(std::function prompt) _engine->setPasswordPrompt(nullptr); } } -#else -void -PluginI::setPasswordPrompt(const PasswordPromptPtr& prompt) -{ - _engine->setPasswordPrompt(prompt); -} -#endif extern "C" { diff --git a/cpp/src/IceSSL/PluginI.h b/cpp/src/IceSSL/PluginI.h index 6cd7973047d..5e062a625bd 100644 --- a/cpp/src/IceSSL/PluginI.h +++ b/cpp/src/IceSSL/PluginI.h @@ -47,13 +47,8 @@ class ICESSL_API PluginI : public virtual IceSSL::Plugin // // From IceSSL::Plugin. // -#ifdef ICE_CPP11_MAPPING virtual void setCertificateVerifier(std::function&)>); virtual void setPasswordPrompt(std::function); -#else - virtual void setCertificateVerifier(const CertificateVerifierPtr&); - virtual void setPasswordPrompt(const PasswordPromptPtr&); -#endif virtual CertificatePtr load(const std::string&) const = 0; virtual CertificatePtr decode(const std::string&) const = 0; diff --git a/cpp/src/IceSSL/SChannelCertificateI.cpp b/cpp/src/IceSSL/SChannelCertificateI.cpp index 16cf442634b..82ab1655d63 100644 --- a/cpp/src/IceSSL/SChannelCertificateI.cpp +++ b/cpp/src/IceSSL/SChannelCertificateI.cpp @@ -74,13 +74,8 @@ class SChannelCertificateI : public SChannel::Certificate, virtual bool verify(const CertificatePtr&) const; virtual string encode() const; -#ifdef ICE_CPP11_MAPPING virtual chrono::system_clock::time_point getNotAfter() const; virtual chrono::system_clock::time_point getNotBefore() const; -#else - virtual IceUtil::Time getNotAfter() const; - virtual IceUtil::Time getNotBefore() const; -#endif virtual string getSerialNumber() const; virtual DistinguishedName getIssuerDN() const; virtual vector > getIssuerAlternativeNames() const; @@ -142,11 +137,7 @@ loadCertificate(PCERT_SIGNED_CONTENT_INFO* cert, const string& file) loadCertificate(cert, &buffer[0], static_cast(buffer.size())); } -# ifdef ICE_CPP11_MAPPING chrono::system_clock::time_point -# else -IceUtil::Time -# endif filetimeToTime(FILETIME ftime) { Ice::Long value = 0; @@ -156,11 +147,7 @@ filetimeToTime(FILETIME ftime) IceUtil::Time time = IceUtil::Time::milliSeconds((value / TICKS_PER_MSECOND) - MSECS_TO_EPOCH); -# ifdef ICE_CPP11_MAPPING return chrono::system_clock::time_point(chrono::microseconds(time.toMicroSeconds())); -# else - return time; -# endif } string @@ -311,11 +298,7 @@ SChannelCertificateI::SChannelCertificateI(CERT_SIGNED_CONTENT_INFO* cert) : { if(!_cert) { -#ifdef ICE_CPP11_MAPPING throw invalid_argument("Invalid certificate reference"); -#else - throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, "Invalid certificate reference"); -#endif } try @@ -471,21 +454,13 @@ SChannelCertificateI::encode() const return s; } -# ifdef ICE_CPP11_MAPPING chrono::system_clock::time_point -# else -IceUtil::Time -# endif SChannelCertificateI::getNotAfter() const { return filetimeToTime(_certInfo->NotAfter); } -# ifdef ICE_CPP11_MAPPING chrono::system_clock::time_point -# else -IceUtil::Time -# endif SChannelCertificateI::getNotBefore() const { return filetimeToTime(_certInfo->NotBefore); diff --git a/cpp/src/IceSSL/SecureTransportCertificateI.cpp b/cpp/src/IceSSL/SecureTransportCertificateI.cpp index 3692f400aaf..9c30635958b 100644 --- a/cpp/src/IceSSL/SecureTransportCertificateI.cpp +++ b/cpp/src/IceSSL/SecureTransportCertificateI.cpp @@ -263,13 +263,8 @@ class SecureTransportCertificateI final : public IceSSL::SecureTransport::Certif virtual bool verify(const IceSSL::CertificatePtr&) const; virtual string encode() const; -#ifdef ICE_CPP11_MAPPING virtual chrono::system_clock::time_point getNotAfter() const; virtual chrono::system_clock::time_point getNotBefore() const; -#else - virtual IceUtil::Time getNotAfter() const; - virtual IceUtil::Time getNotBefore() const; -#endif virtual string getSerialNumber() const; virtual DistinguishedName getIssuerDN() const; @@ -398,11 +393,7 @@ getX509AltName(SecCertificateRef cert, CFTypeRef key) return pairs; } -#ifdef ICE_CPP11_MAPPING chrono::system_clock::time_point -#else -IceUtil::Time -#endif getX509Date(SecCertificateRef cert, CFTypeRef key) { assert(key == kSecOIDX509V1ValidityNotAfter || key == kSecOIDX509V1ValidityNotBefore); @@ -416,11 +407,7 @@ getX509Date(SecCertificateRef cert, CFTypeRef key) IceUtil::Time time = IceUtil::Time::secondsDouble(kCFAbsoluteTimeIntervalSince1970 + seconds); -#ifdef ICE_CPP11_MAPPING return chrono::system_clock::time_point(chrono::microseconds(time.toMicroSeconds())); -#else - return time; -#endif } string @@ -439,11 +426,7 @@ SecureTransportCertificateI::SecureTransportCertificateI(SecCertificateRef cert) { if(!_cert) { -#ifdef ICE_CPP11_MAPPING throw invalid_argument("Invalid certificate reference"); -#else - throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, "Invalid certificate reference"); -#endif } } @@ -624,11 +607,7 @@ SecureTransportCertificateI::encode() const #endif } -#ifdef ICE_CPP11_MAPPING chrono::system_clock::time_point -#else -IceUtil::Time -#endif SecureTransportCertificateI::getNotAfter() const { #ifdef ICE_USE_SECURE_TRANSPORT_IOS @@ -638,11 +617,7 @@ SecureTransportCertificateI::getNotAfter() const #endif } -#ifdef ICE_CPP11_MAPPING chrono::system_clock::time_point -#else -IceUtil::Time -#endif SecureTransportCertificateI::getNotBefore() const { #ifdef ICE_USE_SECURE_TRANSPORT_IOS diff --git a/cpp/src/IceSSL/Util.cpp b/cpp/src/IceSSL/Util.cpp index 2494517dec4..32166ff7fd3 100644 --- a/cpp/src/IceSSL/Util.cpp +++ b/cpp/src/IceSSL/Util.cpp @@ -45,7 +45,6 @@ IceSSL::fromCFString(CFStringRef v) #endif -#ifdef ICE_CPP11_MAPPING IceSSL::CertificateVerifier::CertificateVerifier(std::function&)> v) : _verify(std::move(v)) { @@ -67,7 +66,6 @@ IceSSL::PasswordPrompt::getPassword() { return _prompt(); } -#endif bool IceSSL::parseBytes(const string& arg, vector& buffer) diff --git a/cpp/src/IceSSL/Util.h b/cpp/src/IceSSL/Util.h index 42d232d7fb3..3cde8dad07c 100644 --- a/cpp/src/IceSSL/Util.h +++ b/cpp/src/IceSSL/Util.h @@ -35,7 +35,6 @@ toCFString(const std::string& s) } #endif -#ifdef ICE_CPP11_MAPPING // // Adapts the C++11 functions to C++98-like callbacks // @@ -64,7 +63,6 @@ class ICESSL_API PasswordPrompt std::function _prompt; }; using PasswordPromptPtr = std::shared_ptr; -#endif // // Constants for X509 certificate alt names (AltNameOther, AltNameORAddress, AltNameEDIPartyName and diff --git a/cpp/src/IceStorm/Instrumentation.cpp b/cpp/src/IceStorm/Instrumentation.cpp index ebcead87028..be2666d8f5c 100644 --- a/cpp/src/IceStorm/Instrumentation.cpp +++ b/cpp/src/IceStorm/Instrumentation.cpp @@ -20,13 +20,6 @@ # pragma GCC diagnostic ignored "-Wshadow" #endif -#ifdef ICE_CPP11_MAPPING // C++11 mapping - -namespace -{ - -} - IceStorm::Instrumentation::TopicObserver::~TopicObserver() { } @@ -42,53 +35,3 @@ IceStorm::Instrumentation::ObserverUpdater::~ObserverUpdater() IceStorm::Instrumentation::TopicManagerObserver::~TopicManagerObserver() { } - -#else // C++98 mapping - -namespace -{ - -namespace -{ - -} - -} - -IceStorm::Instrumentation::TopicObserver::~TopicObserver() -{ -} - -/// \cond INTERNAL -::Ice::LocalObject* IceStorm::Instrumentation::upCast(TopicObserver* p) { return p; } -/// \endcond - -IceStorm::Instrumentation::SubscriberObserver::~SubscriberObserver() -{ -} - -/// \cond INTERNAL -::Ice::LocalObject* IceStorm::Instrumentation::upCast(SubscriberObserver* p) { return p; } -/// \endcond - -IceStorm::Instrumentation::ObserverUpdater::~ObserverUpdater() -{ -} - -/// \cond INTERNAL -::Ice::LocalObject* IceStorm::Instrumentation::upCast(ObserverUpdater* p) { return p; } -/// \endcond - -IceStorm::Instrumentation::TopicManagerObserver::~TopicManagerObserver() -{ -} - -/// \cond INTERNAL -::Ice::LocalObject* IceStorm::Instrumentation::upCast(TopicManagerObserver* p) { return p; } -/// \endcond - -namespace Ice -{ -} - -#endif diff --git a/cpp/src/IceStorm/Instrumentation.h b/cpp/src/IceStorm/Instrumentation.h index 4702f96e517..457b321453c 100644 --- a/cpp/src/IceStorm/Instrumentation.h +++ b/cpp/src/IceStorm/Instrumentation.h @@ -5,7 +5,6 @@ #ifndef __IceStorm_Instrumentation_h__ #define __IceStorm_Instrumentation_h__ -#include #include #include #include @@ -18,15 +17,12 @@ #include #include #include -#include #include #include #include #include #include -#ifdef ICE_CPP11_MAPPING // C++11 mapping - namespace IceStorm { @@ -220,281 +216,4 @@ using TopicManagerObserverPtr = ::std::shared_ptr; } /// \endcond -#else // C++98 mapping - -namespace IceProxy -{ - -} - -namespace IceStorm -{ - -namespace Instrumentation -{ - -class TopicObserver; -/// \cond INTERNAL -::Ice::LocalObject* upCast(TopicObserver*); -/// \endcond -typedef ::IceInternal::Handle< TopicObserver> TopicObserverPtr; - -class SubscriberObserver; -/// \cond INTERNAL -::Ice::LocalObject* upCast(SubscriberObserver*); -/// \endcond -typedef ::IceInternal::Handle< SubscriberObserver> SubscriberObserverPtr; - -class ObserverUpdater; -/// \cond INTERNAL -::Ice::LocalObject* upCast(ObserverUpdater*); -/// \endcond -typedef ::IceInternal::Handle< ObserverUpdater> ObserverUpdaterPtr; - -class TopicManagerObserver; -/// \cond INTERNAL -::Ice::LocalObject* upCast(TopicManagerObserver*); -/// \endcond -typedef ::IceInternal::Handle< TopicManagerObserver> TopicManagerObserverPtr; - -} - -} - -namespace IceStorm -{ - -namespace Instrumentation -{ - -enum SubscriberState -{ - /** - * Online waiting to send events. - */ - SubscriberStateOnline, - /** - * Offline, retrying. - */ - SubscriberStateOffline, - /** - * Error state, awaiting to be destroyed. - */ - SubscriberStateError -}; - -} - -} - -namespace IceProxy -{ - -} - -namespace IceStorm -{ - -namespace Instrumentation -{ - -class TopicObserver : virtual public ::Ice::Instrumentation::Observer -{ -public: - - typedef TopicObserverPtr PointerType; - - virtual ~TopicObserver(); - - TopicObserver() = default; - TopicObserver(const TopicObserver&) = default; - TopicObserver& operator=(const TopicObserver&) = default; - - /** - * Notification of an event published on the topic by a publisher. - */ - virtual void published() = 0; - - /** - * Notification of an event forwared on the topic by another topic. - */ - virtual void forwarded() = 0; -}; - -/// \cond INTERNAL -inline bool operator==(const TopicObserver& lhs, const TopicObserver& rhs) -{ - return static_cast(lhs) == static_cast(rhs); -} - -inline bool operator<(const TopicObserver& lhs, const TopicObserver& rhs) -{ - return static_cast(lhs) < static_cast(rhs); -} -/// \endcond - -class SubscriberObserver : virtual public ::Ice::Instrumentation::Observer -{ -public: - - typedef SubscriberObserverPtr PointerType; - - virtual ~SubscriberObserver(); - - SubscriberObserver() = default; - SubscriberObserver(const SubscriberObserver&) = default; - SubscriberObserver& operator=(const SubscriberObserver&) = default; - - /** - * Notification of some events being queued. - */ - virtual void queued(::Ice::Int count) = 0; - - /** - * Notification of a some events being sent. - */ - virtual void outstanding(::Ice::Int count) = 0; - - /** - * Notification of some events being delivered. - */ - virtual void delivered(::Ice::Int count) = 0; -}; - -/// \cond INTERNAL -inline bool operator==(const SubscriberObserver& lhs, const SubscriberObserver& rhs) -{ - return static_cast(lhs) == static_cast(rhs); -} - -inline bool operator<(const SubscriberObserver& lhs, const SubscriberObserver& rhs) -{ - return static_cast(lhs) < static_cast(rhs); -} -/// \endcond - -/** - * The ObserverUpdater interface is implemented by IceStorm and an instance of this interface is provided on - * initialization to the TopicManagerObserver object. - * This interface can be used by add-ins imlementing the TopicManagerObserver interface to update the obsevers of - * observed objects. - */ -class ObserverUpdater : public virtual ::Ice::LocalObject -{ -public: - - typedef ObserverUpdaterPtr PointerType; - - virtual ~ObserverUpdater(); - - ObserverUpdater() = default; - ObserverUpdater(const ObserverUpdater&) = default; - ObserverUpdater& operator=(const ObserverUpdater&) = default; - - /** - * Update topic observers associated with each topics. - * When called, this method goes through all the topics and for each topic TopicManagerObserver::getTopicObserver - * is called. The implementation of getTopicObserver has the possibility to return an updated observer if - * necessary. - */ - virtual void updateTopicObservers() = 0; - - /** - * Update subscriber observers associated with each subscriber. - * When called, this method goes through all the subscribers and for each subscriber - * TopicManagerObserver::getSubscriberObserver is called. The implementation of getSubscriberObserver has the - * possibility to return an updated observer if necessary. - */ - virtual void updateSubscriberObservers() = 0; -}; - -/// \cond INTERNAL -inline bool operator==(const ObserverUpdater& lhs, const ObserverUpdater& rhs) -{ - return static_cast(lhs) == static_cast(rhs); -} - -inline bool operator<(const ObserverUpdater& lhs, const ObserverUpdater& rhs) -{ - return static_cast(lhs) < static_cast(rhs); -} -/// \endcond - -/** - * The topic manager observer interface used by the Ice run-time to obtain and update observers for its observeable - * objects. This interface should be implemented by add-ins that wish to observe IceStorm objects in order to collect - * statistics. - */ -class TopicManagerObserver : public virtual ::Ice::LocalObject -{ -public: - - typedef TopicManagerObserverPtr PointerType; - - virtual ~TopicManagerObserver(); - - TopicManagerObserver() = default; - TopicManagerObserver(const TopicManagerObserver&) = default; - TopicManagerObserver& operator=(const TopicManagerObserver&) = default; - - /** - * This method should return an observer for the given topic. - * @param svc The service name. - * @param name The topic name. - * @param old The previous observer, only set when updating an existing observer. - */ - virtual TopicObserverPtr getTopicObserver(const ::std::string& svc, const ::std::string& name, const TopicObserverPtr& old) = 0; - - /** - * This method should return an observer for the given subscriber. - * @param topic The name of the topic subscribed. - * @param link The proxy of the linked topic if this subscriber forwards events to a linked topic. - * @param old The previous observer, only set when updating an existing observer. - */ - virtual SubscriberObserverPtr getSubscriberObserver(const ::std::string& svc, const ::std::string& topic, const ::Ice::ObjectPrx& prx, const ::IceStorm::QoS& q, const ::IceStorm::TopicPrx& link, SubscriberState s, const SubscriberObserverPtr& old) = 0; - - /** - * IceStorm calls this method on initialization. The add-in implementing this interface can use this object to - * get IceStorm to re-obtain observers for topics and subscribers. - * @param updater The observer updater object. - */ - virtual void setObserverUpdater(const ObserverUpdaterPtr& updater) = 0; -}; - -/// \cond INTERNAL -inline bool operator==(const TopicManagerObserver& lhs, const TopicManagerObserver& rhs) -{ - return static_cast(lhs) == static_cast(rhs); -} - -inline bool operator<(const TopicManagerObserver& lhs, const TopicManagerObserver& rhs) -{ - return static_cast(lhs) < static_cast(rhs); -} -/// \endcond - -} - -} - -/// \cond STREAM -namespace Ice -{ - -template<> -struct StreamableTraits< ::IceStorm::Instrumentation::SubscriberState> -{ - static const StreamHelperCategory helper = StreamHelperCategoryEnum; - static const int minValue = 0; - static const int maxValue = 2; - static const int minWireSize = 1; - static const bool fixedLength = false; -}; - -} -/// \endcond - -#endif - -#include #endif diff --git a/cpp/src/IceStorm/SendQueueSizeMaxReached.cpp b/cpp/src/IceStorm/SendQueueSizeMaxReached.cpp index 182bc3b61b5..87ce502d1c7 100644 --- a/cpp/src/IceStorm/SendQueueSizeMaxReached.cpp +++ b/cpp/src/IceStorm/SendQueueSizeMaxReached.cpp @@ -6,8 +6,6 @@ #include "SendQueueSizeMaxReached.h" -#ifdef ICE_CPP11_MAPPING // C++11 mapping - IceStorm::SendQueueSizeMaxReached::~SendQueueSizeMaxReached() { } @@ -18,34 +16,3 @@ IceStorm::SendQueueSizeMaxReached::ice_staticId() static const ::std::string typeId = "::IceStorm::SendQueueSizeMaxReached"; return typeId; } - -#else - -IceStorm::SendQueueSizeMaxReached::SendQueueSizeMaxReached(const char* file, int line) : - ::Ice::LocalException(file, line) -{ -} - -IceStorm::SendQueueSizeMaxReached::~SendQueueSizeMaxReached() -{ -} - -::std::string -IceStorm::SendQueueSizeMaxReached::ice_id() const -{ - return "::IceStorm::SendQueueSizeMaxReached"; -} - -IceStorm::SendQueueSizeMaxReached* -IceStorm::SendQueueSizeMaxReached::ice_clone() const -{ - return new SendQueueSizeMaxReached(*this); -} - -void -IceStorm::SendQueueSizeMaxReached::ice_throw() const -{ - throw *this; -} - -#endif diff --git a/cpp/src/IceStorm/SendQueueSizeMaxReached.h b/cpp/src/IceStorm/SendQueueSizeMaxReached.h index 4b041244a08..2bbaf58d123 100644 --- a/cpp/src/IceStorm/SendQueueSizeMaxReached.h +++ b/cpp/src/IceStorm/SendQueueSizeMaxReached.h @@ -8,8 +8,6 @@ #include -#ifdef ICE_CPP11_MAPPING // C++11 mapping - namespace IceStorm { @@ -47,42 +45,3 @@ class SendQueueSizeMaxReached : public ::Ice::LocalExceptionHelper(file, line) { @@ -36,14 +28,6 @@ IceUtil::ThreadLockedException::ice_id() const return "::IceUtil::ThreadLockedException"; } -#ifndef ICE_CPP11_MAPPING -IceUtil::ThreadLockedException* -IceUtil::ThreadLockedException::ice_clone() const -{ - return new ThreadLockedException(*this); -} -#endif - IceUtil::ThreadStartedException::ThreadStartedException(const char* file, int line) : ExceptionHelper(file, line) { @@ -55,14 +39,6 @@ IceUtil::ThreadStartedException::ice_id() const return "::IceUtil::ThreadStartedException"; } -#ifndef ICE_CPP11_MAPPING -IceUtil::ThreadStartedException* -IceUtil::ThreadStartedException::ice_clone() const -{ - return new ThreadStartedException(*this); -} -#endif - IceUtil::ThreadNotStartedException::ThreadNotStartedException(const char* file, int line) : ExceptionHelper(file, line) { @@ -74,14 +50,6 @@ IceUtil::ThreadNotStartedException::ice_id() const return "::IceUtil::ThreadNotStartedException"; } -#ifndef ICE_CPP11_MAPPING -IceUtil::ThreadNotStartedException* -IceUtil::ThreadNotStartedException::ice_clone() const -{ - return new ThreadNotStartedException(*this); -} -#endif - IceUtil::BadThreadControlException::BadThreadControlException(const char* file, int line) : ExceptionHelper(file, line) { @@ -93,14 +61,6 @@ IceUtil::BadThreadControlException::ice_id() const return "::IceUtil::BadThreadControlException"; } -#ifndef ICE_CPP11_MAPPING -IceUtil::BadThreadControlException* -IceUtil::BadThreadControlException::ice_clone() const -{ - return new BadThreadControlException(*this); -} -#endif - IceUtil::InvalidTimeoutException::InvalidTimeoutException(const char* file, int line, const IceUtil::Time& timeout) : ExceptionHelper(file, line), @@ -114,14 +74,6 @@ IceUtil::InvalidTimeoutException::ice_id() const return "::IceUtil::InvalidTimeoutException"; } -#ifndef ICE_CPP11_MAPPING -IceUtil::InvalidTimeoutException* -IceUtil::InvalidTimeoutException::ice_clone() const -{ - return new InvalidTimeoutException(*this); -} -#endif - void IceUtil::InvalidTimeoutException::ice_print(ostream& os) const { diff --git a/cpp/src/IceUtil/UtilException.cpp b/cpp/src/IceUtil/UtilException.cpp index 262534ba64a..fc25fb1a882 100644 --- a/cpp/src/IceUtil/UtilException.cpp +++ b/cpp/src/IceUtil/UtilException.cpp @@ -560,14 +560,6 @@ IceUtil::Exception::what() const noexcept return ""; } -#ifndef ICE_CPP11_MAPPING -string -IceUtil::Exception::ice_name() const -{ - return ice_id().substr(2); -} -#endif - const char* IceUtil::Exception::ice_file() const { @@ -586,14 +578,11 @@ IceUtil::Exception::ice_stackTrace() const return getStackTrace(_stackFrames); } -#ifdef ICE_CPP11_MAPPING unique_ptr IceUtil::Exception::ice_clone() const { return unique_ptr(ice_cloneImpl()); } -#endif - ostream& IceUtil::operator<<(ostream& out, const IceUtil::Exception& ex) { @@ -616,14 +605,6 @@ IceUtil::NullHandleException::ice_id() const return "::IceUtil::NullHandleException"; } -#ifndef ICE_CPP11_MAPPING -IceUtil::NullHandleException* -IceUtil::NullHandleException::ice_clone() const -{ - return new NullHandleException(*this); -} -#endif - IceUtil::IllegalArgumentException::IllegalArgumentException(const char* file, int line) : ExceptionHelper(file, line) { @@ -648,14 +629,6 @@ IceUtil::IllegalArgumentException::ice_id() const return "::IceUtil::IllegalArgumentException"; } -#ifndef ICE_CPP11_MAPPING -IceUtil::IllegalArgumentException* -IceUtil::IllegalArgumentException::ice_clone() const -{ - return new IllegalArgumentException(*this); -} -#endif - string IceUtil::IllegalArgumentException::reason() const { @@ -691,14 +664,6 @@ IceUtil::IllegalConversionException::ice_id() const return "::IceUtil::IllegalConversionException"; } -#ifndef ICE_CPP11_MAPPING -IceUtil::IllegalConversionException* -IceUtil::IllegalConversionException::ice_clone() const -{ - return new IllegalConversionException(*this); -} -#endif - string IceUtil::IllegalConversionException::reason() const { @@ -727,14 +692,6 @@ IceUtil::SyscallException::ice_id() const return "::IceUtil::SyscallException"; } -#ifndef ICE_CPP11_MAPPING -IceUtil::SyscallException* -IceUtil::SyscallException::ice_clone() const -{ - return new SyscallException(*this); -} -#endif - int IceUtil::SyscallException::error() const { @@ -765,14 +722,6 @@ IceUtil::FileLockException::ice_id() const return "::IceUtil::FileLockException"; } -#ifndef ICE_CPP11_MAPPING -IceUtil::FileLockException* -IceUtil::FileLockException::ice_clone() const -{ - return new FileLockException(*this); -} -#endif - int IceUtil::FileLockException::error() const { @@ -793,11 +742,3 @@ IceUtil::OptionalNotSetException::ice_id() const { return "::IceUtil::OptionalNotSetException"; } - -#ifndef ICE_CPP11_MAPPING -IceUtil::OptionalNotSetException* -IceUtil::OptionalNotSetException::ice_clone() const -{ - return new OptionalNotSetException(*this); -} -#endif diff --git a/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj b/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj index 6c6cd503e4b..71e80c8ceea 100644 --- a/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj +++ b/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj @@ -128,7 +128,6 @@ - diff --git a/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj.filters b/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj.filters index e5e0ebdf29b..c502072cadf 100644 --- a/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj.filters +++ b/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj.filters @@ -133,9 +133,6 @@ Header Files - - Header Files - Header Files diff --git a/cpp/src/Slice/FileTracker.cpp b/cpp/src/Slice/FileTracker.cpp index 40ffd29c4be..15c6304f6ff 100644 --- a/cpp/src/Slice/FileTracker.cpp +++ b/cpp/src/Slice/FileTracker.cpp @@ -28,13 +28,8 @@ Slice::FileException::ice_print(ostream& out) const out << ": " << _reason; } -#ifdef ICE_CPP11_MAPPING Slice::FileException* Slice::FileException::ice_cloneImpl() const -#else -Slice::FileException* -Slice::FileException::ice_clone() const -#endif { return new FileException(*this); } diff --git a/cpp/src/Slice/FileTracker.h b/cpp/src/Slice/FileTracker.h index b13bf10f5b4..08a873fa157 100644 --- a/cpp/src/Slice/FileTracker.h +++ b/cpp/src/Slice/FileTracker.h @@ -17,11 +17,7 @@ class FileException : public ::IceUtil::Exception FileException(const char*, int, const std::string&); virtual std::string ice_id() const; virtual void ice_print(std::ostream&) const; -#ifdef ICE_CPP11_MAPPING virtual FileException* ice_cloneImpl() const; -#else - virtual FileException* ice_clone() const; -#endif virtual void ice_throw() const; std::string reason() const; diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp index 02262816603..4c27baf52c6 100644 --- a/cpp/src/Slice/Parser.cpp +++ b/cpp/src/Slice/Parser.cpp @@ -58,13 +58,8 @@ Slice::CompilerException::ice_print(ostream& out) const out << ": " << _reason; } -#ifdef ICE_CPP11_MAPPING Slice::CompilerException* Slice::CompilerException::ice_cloneImpl() const -#else -Slice::CompilerException* -Slice::CompilerException::ice_clone() const -#endif { return new CompilerException(*this); } diff --git a/cpp/src/Slice/Parser.h b/cpp/src/Slice/Parser.h index 2111b9ee697..b4b069ebbad 100644 --- a/cpp/src/Slice/Parser.h +++ b/cpp/src/Slice/Parser.h @@ -28,11 +28,7 @@ class CompilerException : public ::IceUtil::Exception CompilerException(const char*, int, const std::string&); virtual std::string ice_id() const; virtual void ice_print(std::ostream&) const; -#ifdef ICE_CPP11_MAPPING virtual CompilerException* ice_cloneImpl() const; -#else - virtual CompilerException* ice_clone() const; -#endif virtual void ice_throw() const; std::string reason() const; diff --git a/cpp/src/Slice/Preprocessor.cpp b/cpp/src/Slice/Preprocessor.cpp index ff758e6a263..4b040716ae4 100644 --- a/cpp/src/Slice/Preprocessor.cpp +++ b/cpp/src/Slice/Preprocessor.cpp @@ -88,13 +88,7 @@ Slice::Preprocessor::addQuotes(const string& arg) // Add quotes around the given argument to ensure that arguments // with spaces will be preserved as a single argument // - return "\"" + escapeString(arg, "", -#ifdef ICE_CPP11_MAPPING - ToStringMode::Unicode -#else - IceUtilInternal::Unicode -#endif - ) + "\""; + return "\"" + escapeString(arg, "", ToStringMode::Unicode) + "\""; } string diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 6afbbdc9b9b..2fb70c8d30b 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -933,15 +933,6 @@ Slice::Gen::generate(const UnitPtr& p) _dllExport += " "; } - H << sp; - H.zeroIndent(); - H << nl << "#ifdef ICE_CPP11_MAPPING // C++11 mapping"; - H.restoreIndent(); - - C << sp; - C.zeroIndent(); - C << nl << "#ifdef ICE_CPP11_MAPPING // C++11 mapping"; - C.restoreIndent(); { normalizeMetaData(p, true); @@ -987,95 +978,6 @@ Slice::Gen::generate(const UnitPtr& p) Cpp11CompatibilityVisitor compatibilityVisitor(H, C, _dllExport); p->visit(&compatibilityVisitor, false); } - - H << sp; - H.zeroIndent(); - H << nl << "#else // C++98 mapping"; - H.restoreIndent(); - - C << sp; - C.zeroIndent(); - C << nl << "#else // C++98 mapping"; - C.restoreIndent(); - { - normalizeMetaData(p, false); - - ProxyDeclVisitor proxyDeclVisitor(H, C, _dllExport); - p->visit(&proxyDeclVisitor, false); - - DeclVisitor objectDeclVisitor(H, C, _dllExport); - p->visit(&objectDeclVisitor, false); - - TypesVisitor typesVisitor(H, C, _dllExport); - p->visit(&typesVisitor, false); - - AsyncVisitor asyncVisitor(H, C, _dllExport); - p->visit(&asyncVisitor, false); - - AsyncImplVisitor asyncImplVisitor(H, C, _dllExport); - p->visit(&asyncImplVisitor, false); - - // - // The templates are emitted before the proxy definition - // so the derivation hierarchy is known to the proxy: - // the proxy relies on knowing the hierarchy to make the begin_ - // methods type-safe. - // - AsyncCallbackVisitor asyncCallbackVisitor(H, C, _dllExport); - p->visit(&asyncCallbackVisitor, false); - - ProxyVisitor proxyVisitor(H, C, _dllExport); - p->visit(&proxyVisitor, false); - - InterfaceVisitor interfaceVisitor(H, C, _dllExport); - p->visit(&interfaceVisitor, false); - - ValueVisitor valueVisitor(H, C, _dllExport); - p->visit(&valueVisitor, false); - - StreamVisitor streamVisitor(H, C, _dllExport); - p->visit(&streamVisitor, false); - - // - // We need to delay generating the template after the proxy - // definition, because completed calls the begin_ method in the - // proxy. - // - AsyncCallbackTemplateVisitor asyncCallbackTemplateVisitor(H, C, _dllExport); - p->visit(&asyncCallbackTemplateVisitor, false); - - if(_implCpp98) - { - implH << "\n#include <"; - if(_include.size()) - { - implH << _include << '/'; - } - implH << _base << "." << _headerExtension << ">"; - - writeExtraHeaders(implC); - - implC << "\n#include <"; - if(_include.size()) - { - implC << _include << '/'; - } - implC << _base << "I." << _implHeaderExtension << ">"; - - ImplVisitor implVisitor(implH, implC, _dllExport); - p->visit(&implVisitor, false); - } - } - - H << sp; - H.zeroIndent(); - H << nl << "#endif"; - H.restoreIndent(); - - C << sp; - C.zeroIndent(); - C << nl << "#endif"; - C.restoreIndent(); } void diff --git a/cpp/test/IceBox/admin/AllTests.cpp b/cpp/test/IceBox/admin/AllTests.cpp index cd1564cb2cf..11d827684f1 100644 --- a/cpp/test/IceBox/admin/AllTests.cpp +++ b/cpp/test/IceBox/admin/AllTests.cpp @@ -23,23 +23,14 @@ allTests(Test::TestHelper* helper) // // Test: Verify that the custom facet is present. // -#ifdef ICE_CPP11_MAPPING facet = Ice::checkedCast(admin, "TestFacet"); -#else - facet = Test::TestFacetPrx::checkedCast(admin, "TestFacet"); -#endif facet->ice_ping(); } cout << "ok" << endl; cout << "testing properties facet... " << flush; { -#ifdef ICE_CPP11_MAPPING auto pa = Ice::checkedCast(admin, "IceBox.Service.TestService.Properties"); -#else - Ice::PropertiesAdminPrx pa = - Ice::PropertiesAdminPrx::checkedCast(admin, "IceBox.Service.TestService.Properties"); -#endif // // Test: PropertiesAdmin::getProperty() // @@ -90,14 +81,8 @@ allTests(Test::TestHelper* helper) cout << "testing metrics admin facet... " << flush; { -#ifdef ICE_CPP11_MAPPING auto ma = Ice::checkedCast(admin, "IceBox.Service.TestService.Metrics"); auto pa = Ice::checkedCast(admin, "IceBox.Service.TestService.Properties"); -#else - IceMX::MetricsAdminPrx ma = IceMX::MetricsAdminPrx::checkedCast(admin, "IceBox.Service.TestService.Metrics"); - Ice::PropertiesAdminPrx pa = - Ice::PropertiesAdminPrx::checkedCast(admin, "IceBox.Service.TestService.Properties"); -#endif Ice::StringSeq views; Ice::StringSeq disabledViews; views = ma->getMetricsViewNames(disabledViews); @@ -114,11 +99,7 @@ allTests(Test::TestHelper* helper) test(views.size() == 3); // Make sure that the IceBox communicator metrics admin is a separate instance. -#ifdef ICE_CPP11_MAPPING test(Ice::checkedCast(admin, "Metrics")->getMetricsViewNames(disabledViews).empty()); -#else - test(IceMX::MetricsAdminPrx::checkedCast(admin, "Metrics")->getMetricsViewNames(disabledViews).empty()); -#endif } cout << "ok" << endl; } diff --git a/cpp/test/IceBox/admin/Service.cpp b/cpp/test/IceBox/admin/Service.cpp index dfc90e2a4a2..7275a379467 100644 --- a/cpp/test/IceBox/admin/Service.cpp +++ b/cpp/test/IceBox/admin/Service.cpp @@ -30,11 +30,7 @@ extern "C" // Factory function // ICE_DECLSPEC_EXPORT ::IceBox::Service* -#ifdef ICE_CPP11_MAPPING create(const shared_ptr& communicator) -#else -create(CommunicatorPtr communicator) -#endif { return new ServiceI(communicator); } diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp index 755fa205f4c..06152a0e18d 100644 --- a/cpp/test/IceSSL/configuration/AllTests.cpp +++ b/cpp/test/IceSSL/configuration/AllTests.cpp @@ -18,11 +18,7 @@ # endif #endif -#ifdef ICE_CPP11_MAPPING -# define ICE_TARGET_EQUAL_TO(A,B) Ice::targetEqualTo(A, B) -#else -# define ICE_TARGET_EQUAL_TO(A,B) A == B -#endif +#define ICE_TARGET_EQUAL_TO(A,B) Ice::targetEqualTo(A, B) #if defined(__APPLE__) # define ICE_USE_SECURE_TRANSPORT 1 @@ -268,9 +264,6 @@ class ImportCerts #endif class PasswordPromptI final -#ifndef ICE_CPP11_MAPPING - : public IceSSL::PasswordPrompt -#endif { public: @@ -297,9 +290,6 @@ class PasswordPromptI final ICE_DEFINE_PTR(PasswordPromptIPtr, PasswordPromptI); class CertificateVerifierI final -#ifndef ICE_CPP11_MAPPING -: public IceSSL::CertificateVerifier -#endif { public: @@ -803,11 +793,7 @@ allTests(Test::TestHelper* helper, const string& /*testDir*/, bool p12) #if !defined(__APPLE__) || TARGET_OS_IPHONE == 0 test(serverCert->checkValidity()); -# ifdef ICE_CPP11_MAPPING test(!serverCert->checkValidity(std::chrono::system_clock::time_point())); -# else - test(!serverCert->checkValidity(IceUtil::Time::seconds(0))); -# endif #endif #if defined(_WIN32) && defined(ICE_USE_OPENSSL) @@ -821,11 +807,7 @@ allTests(Test::TestHelper* helper, const string& /*testDir*/, bool p12) #if !defined(__APPLE__) || TARGET_OS_IPHONE == 0 test(caCert->checkValidity()); -# ifdef ICE_CPP11_MAPPING test(!caCert->checkValidity(std::chrono::system_clock::time_point())); -# else - test(!caCert->checkValidity(IceUtil::Time::seconds(0))); -# endif #endif test(!serverCert->verify(serverCert)); @@ -847,13 +829,8 @@ allTests(Test::TestHelper* helper, const string& /*testDir*/, bool p12) #if !defined(__APPLE__) || TARGET_OS_IPHONE == 0 test(info->certs[0]->checkValidity() && info->certs[1]->checkValidity()); -# ifdef ICE_CPP11_MAPPING test(!info->certs[0]->checkValidity(std::chrono::system_clock::time_point()) && !info->certs[1]->checkValidity(std::chrono::system_clock::time_point())); -# else - test(!info->certs[0]->checkValidity(IceUtil::Time::seconds(0)) && - !info->certs[1]->checkValidity(IceUtil::Time::seconds(0))); -# endif #endif test(info->certs.size() == 2 && @@ -1797,12 +1774,8 @@ allTests(Test::TestHelper* helper, const string& /*testDir*/, bool p12) test(plugin); CertificateVerifierIPtr verifier = ICE_MAKE_SHARED(CertificateVerifierI); -#ifdef ICE_CPP11_MAPPING plugin->setCertificateVerifier([verifier](const shared_ptr& infoP) { return verifier->verify(infoP); }); -#else - plugin->setCertificateVerifier(verifier); -#endif Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef)); test(fact); @@ -1873,12 +1846,8 @@ allTests(Test::TestHelper* helper, const string& /*testDir*/, bool p12) test(plugin); CertificateVerifierIPtr verifier = ICE_MAKE_SHARED(CertificateVerifierI); -#ifdef ICE_CPP11_MAPPING plugin->setCertificateVerifier([verifier](const shared_ptr& infoP) { return verifier->verify(infoP); }); -#else - plugin->setCertificateVerifier(verifier); -#endif Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef)); test(fact); Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1"); @@ -2385,11 +2354,7 @@ allTests(Test::TestHelper* helper, const string& /*testDir*/, bool p12) test(plugin); PasswordPromptIPtr prompt = ICE_MAKE_SHARED(PasswordPromptI, "client"); -#ifdef ICE_CPP11_MAPPING plugin->setPasswordPrompt([prompt]{ return prompt->getPassword(); }); -#else - plugin->setPasswordPrompt(prompt); -#endif pm->initializePlugins(); test(prompt->count() == 1); Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef)); @@ -2421,11 +2386,7 @@ allTests(Test::TestHelper* helper, const string& /*testDir*/, bool p12) test(plugin); prompt = ICE_MAKE_SHARED(PasswordPromptI, "invalid"); -#ifdef ICE_CPP11_MAPPING plugin->setPasswordPrompt([prompt]{ return prompt->getPassword(); }); -#else - plugin->setPasswordPrompt(prompt); -#endif try { pm->initializePlugins(); From f31f3e6f3cfebf351782865a39a287127341da55 Mon Sep 17 00:00:00 2001 From: Jose Date: Thu, 1 Feb 2024 14:24:07 +0100 Subject: [PATCH 02/17] Checkpoint --- cpp/BUILDING.md | 4 - cpp/msbuild/ice.cpp.props | 14 - .../CryptPermissionsVerifierI.cpp | 2 - cpp/test/Ice/acm/AllTests.cpp | 114 +- cpp/test/Ice/acm/TestI.cpp | 4 - cpp/test/Ice/acm/TestI.h | 4 - cpp/test/Ice/adapterDeactivation/AllTests.cpp | 16 - .../adapterDeactivation/ServantLocatorI.cpp | 4 - cpp/test/Ice/admin/AllTests.cpp | 62 - cpp/test/Ice/admin/TestI.cpp | 5 +- cpp/test/Ice/ami/AllTests.cpp | 4941 ++++------------- cpp/test/Ice/ami/TestI.cpp | 36 - cpp/test/Ice/ami/TestI.h | 8 - cpp/test/Ice/background/AllTests.cpp | 275 +- cpp/test/Ice/background/Configuration.h | 11 +- cpp/test/Ice/background/EndpointI.cpp | 8 - cpp/test/Ice/background/EndpointI.h | 10 +- cpp/test/Ice/background/Server.cpp | 23 - cpp/test/Ice/binding/AllTests.cpp | 49 - cpp/test/Ice/binding/Server.cpp | 5 +- cpp/test/Ice/binding/TestI.cpp | 10 - cpp/test/Ice/binding/TestI.h | 6 - cpp/test/Ice/custom/AllTests.cpp | 1346 +---- cpp/test/Ice/custom/CustomBuffer.h | 17 - cpp/test/Ice/custom/StringView.h | 7 - cpp/test/Ice/custom/TestAMDI.cpp | 354 -- cpp/test/Ice/custom/TestAMDI.h | 160 - cpp/test/Ice/custom/TestI.cpp | 86 - cpp/test/Ice/custom/TestI.h | 42 - cpp/test/Ice/custom/WstringAMDI.cpp | 57 - cpp/test/Ice/custom/WstringAMDI.h | 39 +- cpp/test/Ice/defaultValue/AllTests.cpp | 53 - cpp/test/Ice/dispatcher/AllTests.cpp | 40 - cpp/test/Ice/dispatcher/Client.cpp | 4 - cpp/test/Ice/dispatcher/Collocated.cpp | 4 - cpp/test/Ice/dispatcher/Dispatcher.cpp | 9 - cpp/test/Ice/dispatcher/Dispatcher.h | 16 +- cpp/test/Ice/dispatcher/Server.cpp | 4 - cpp/test/Ice/dispatcher/TestI.cpp | 4 - cpp/test/Ice/dispatcher/TestI.h | 4 - cpp/test/Ice/echo/BlobjectI.cpp | 90 - cpp/test/Ice/echo/BlobjectI.h | 7 - cpp/test/Ice/enums/AllTests.cpp | 38 - cpp/test/Ice/exceptions/AllTests.cpp | 163 - cpp/test/Ice/exceptions/TestAMDI.cpp | 213 - cpp/test/Ice/exceptions/TestAMDI.h | 51 - cpp/test/Ice/facets/AllTests.cpp | 48 - cpp/test/Ice/faultTolerance/AllTests.cpp | 39 - cpp/test/Ice/hold/AllTests.cpp | 69 - cpp/test/Ice/impl/Makefile.mk | 2 +- cpp/test/Ice/inheritance/AllTests.cpp | 156 - cpp/test/Ice/inheritance/TestI.h | 34 - cpp/test/Ice/interceptor/AMDInterceptorI.cpp | 81 - cpp/test/Ice/interceptor/AMDInterceptorI.h | 22 +- cpp/test/Ice/interceptor/MyObjectI.cpp | 166 +- cpp/test/Ice/interceptor/MyObjectI.h | 15 - cpp/test/Ice/invoke/AllTests.cpp | 424 -- cpp/test/Ice/invoke/BlobjectI.cpp | 37 - cpp/test/Ice/invoke/BlobjectI.h | 18 - cpp/test/Ice/library/Consumer.cpp | 4 - cpp/test/Ice/location/AllTests.cpp | 43 - cpp/test/Ice/location/ServerLocator.cpp | 68 - cpp/test/Ice/location/ServerLocator.h | 18 - cpp/test/Ice/metrics/AllTests.cpp | 104 +- cpp/test/Ice/metrics/TestAMDI.cpp | 46 - cpp/test/Ice/metrics/TestAMDI.h | 18 - cpp/test/Ice/objects/AllTests.cpp | 52 +- cpp/test/Ice/objects/TestI.cpp | 14 - cpp/test/Ice/objects/TestI.h | 5 - cpp/test/Ice/operations/BatchOneways.cpp | 11 - cpp/test/Ice/operations/BatchOnewaysAMI.cpp | 58 - cpp/test/Ice/operations/OnewaysAMI.cpp | 74 +- cpp/test/Ice/operations/TestAMDI.cpp | 877 --- cpp/test/Ice/operations/TestAMDI.h | 279 - cpp/test/Ice/operations/TestI.cpp | 46 - cpp/test/Ice/operations/TestI.h | 14 - cpp/test/Ice/operations/Twoways.cpp | 4 - cpp/test/Ice/operations/TwowaysAMI.cpp | 376 -- cpp/test/Ice/optional/AllTests.cpp | 106 - cpp/test/Ice/optional/StringView.h | 7 - cpp/test/Ice/optional/TestAMDI.cpp | 547 -- cpp/test/Ice/optional/TestAMDI.h | 270 - cpp/test/Ice/optional/TestI.cpp | 96 - cpp/test/Ice/optional/TestI.h | 46 - cpp/test/Ice/proxy/AllTests.cpp | 274 - cpp/test/Ice/proxy/TestAMDI.cpp | 21 - cpp/test/Ice/proxy/TestAMDI.h | 8 - cpp/test/Ice/proxy/TestI.cpp | 8 - cpp/test/Ice/proxy/TestI.h | 5 - cpp/test/Ice/retry/AllTests.cpp | 37 +- cpp/test/Ice/retry/SystemFailure.h | 7 - cpp/test/Ice/scope/AllTests.cpp | 820 +-- cpp/test/Ice/servantLocator/AllTests.cpp | 4 - cpp/test/Ice/servantLocator/TestAMDI.cpp | 112 - cpp/test/Ice/servantLocator/TestAMDI.h | 30 - cpp/test/Ice/servantLocator/TestI.h | 8 - cpp/test/Ice/services/AllTests.cpp | 34 - cpp/test/Ice/slicing/exceptions/AllTests.cpp | 414 -- cpp/test/Ice/slicing/exceptions/TestAMDI.cpp | 257 - cpp/test/Ice/slicing/exceptions/TestAMDI.h | 77 - cpp/test/Ice/slicing/objects/AllTests.cpp | 286 - cpp/test/Ice/slicing/objects/TestAMDI.cpp | 530 +- cpp/test/Ice/slicing/objects/TestAMDI.h | 76 - cpp/test/Ice/slicing/objects/TestI.cpp | 29 - cpp/test/Ice/slicing/objects/TestI.h | 15 - cpp/test/Ice/stream/Client.cpp | 57 - cpp/test/Ice/timeout/AllTests.cpp | 32 - cpp/test/Ice/udp/TestI.cpp | 4 - cpp/test/IceBox/configuration/Service.cpp | 4 - cpp/test/IceUtil/timer/Client.cpp | 4 - cpp/test/Slice/escape/Client.cpp | 43 +- cpp/test/Slice/structure/Client.cpp | 218 - cpp/test/include/TestHelper.h | 3 - cpp/test/ios/controller/Bundle/ControllerI.mm | 14 - .../project.pbxproj | 4 - .../ios/controller/Classes/ControllerView.m | 4 - matlab/config/Make.rules | 4 +- php/config/Make.rules | 2 +- python/modules/IcePy/Makefile.mk | 10 +- python/modules/IcePy/msbuild/icepy.vcxproj | 4 - ruby/src/IceRuby/Makefile.mk | 8 +- scripts/Component.py | 8 - scripts/Util.py | 13 +- swift/Rakefile | 2 - 124 files changed, 1247 insertions(+), 14956 deletions(-) diff --git a/cpp/BUILDING.md b/cpp/BUILDING.md index 3865f970c22..1906ce6a9bd 100644 --- a/cpp/BUILDING.md +++ b/cpp/BUILDING.md @@ -375,10 +375,6 @@ When compiling Ice programs, you must pass the location of the `/include` directory to the compiler with the `-I` option, and the location of the library directory with the `-L` option. -If building a C++11 program, you must define the `ICE_CPP11_MAPPING` macro -during compilation with the `-D` option (`c++ -DICE_CPP11_MAPPING`) and add the -`++11` suffix to the library name when linking (such as `-lIce++11`). - ## Creating a NuGet Package on Windows You can create a NuGet package with the following command: diff --git a/cpp/msbuild/ice.cpp.props b/cpp/msbuild/ice.cpp.props index 1b89fd52c3f..8f1fef51afd 100644 --- a/cpp/msbuild/ice.cpp.props +++ b/cpp/msbuild/ice.cpp.props @@ -138,20 +138,6 @@ - - - - ICE_CPP11_MAPPING;%(PreprocessorDefinitions) - /utf-8 %(AdditionalOptions) - - - - ICE_CPP11_MAPPING;%(PreprocessorDefinitions) - - - diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp b/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp index 8e059547828..d9539a0cda3 100644 --- a/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp +++ b/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp @@ -31,8 +31,6 @@ using namespace Ice; using namespace IceInternal; using namespace Glacier2; -#ifdef ICE_CPP11_MAPPING - namespace { diff --git a/cpp/test/Ice/acm/AllTests.cpp b/cpp/test/Ice/acm/AllTests.cpp index 40aca3ac8c6..6f3d53737b5 100644 --- a/cpp/test/Ice/acm/AllTests.cpp +++ b/cpp/test/Ice/acm/AllTests.cpp @@ -20,11 +20,8 @@ toString(int value) } class LoggerI : public Ice::Logger, - private IceUtil::Mutex -#ifdef ICE_CPP11_MAPPING - , public std::enable_shared_from_this -#endif - + private IceUtil::Mutex, + public std::enable_shared_from_this { public: @@ -113,13 +110,7 @@ class LoggerI : public Ice::Logger, }; ICE_DEFINE_PTR(LoggerIPtr, LoggerI); -class TestCase : -#ifdef ICE_CPP11_MAPPING - public enable_shared_from_this, -#else - public IceUtil::Thread, - public Ice::CloseCallback, public Ice::HeartbeatCallback, -#endif +class TestCase : public enable_shared_from_this, protected IceUtil::Monitor { public: @@ -165,19 +156,11 @@ class TestCase : _communicator->destroy(); } -#ifdef ICE_CPP11_MAPPING void join(std::thread& t) -#else - void join() -#endif { cout << "testing " << _testCaseName << "... " << flush; _logger->start(); -#ifdef ICE_CPP11_MAPPING t.join(); -#else - getThreadControl().join(); -#endif if(_msg.empty()) { cout << "ok" << endl; @@ -196,7 +179,6 @@ class TestCase : _adapter->getTestIntf()->ice_toString())); try { -#ifdef ICE_CPP11_MAPPING auto self = shared_from_this(); proxy->ice_getConnection()->setCloseCallback( [self](Ice::ConnectionPtr connection) @@ -208,10 +190,6 @@ class TestCase : { self->heartbeat(std::move(connection)); }); -#else - proxy->ice_getConnection()->setCloseCallback(ICE_SHARED_FROM_THIS); - proxy->ice_getConnection()->setHeartbeatCallback(ICE_SHARED_FROM_THIS); -#endif runTestCase(_adapter, proxy); } catch(const std::exception& ex) @@ -556,50 +534,6 @@ class SetACMTest final : public TestCase { public: -#ifndef ICE_CPP11_MAPPING - class CloseCallback : public Ice::CloseCallback, private IceUtil::Monitor - { - public: - - CloseCallback() : _called(false) - { - } - - virtual void - closed(const Ice::ConnectionPtr&) - { - Lock sync(*this); - _called = true; - notify(); - } - - void - waitCallback() - { - Lock sync(*this); - while(!_called) - { - wait(); - } - } - - private: - - bool _called; - }; - typedef IceUtil::Handle CloseCallbackPtr; - - class HeartbeatCallback : public Ice::HeartbeatCallback - { - public: - - virtual void - heartbeat(const Ice::ConnectionPtr&) - { - } - }; -#endif - SetACMTest(const RemoteCommunicatorPrxPtr& com) : TestCase("setACM/getACM", com) { setClientACM(15, 4, 0); @@ -614,15 +548,9 @@ class SetACMTest final : public TestCase con->setACM(-19, IceUtil::None, IceUtil::None); test(false); } -#ifndef ICE_CPP11_MAPPING - catch(const IceUtil::IllegalArgumentException&) - { - } -#else catch(const invalid_argument&) { } -#endif Ice::ACM acm; acm = con->getACM(); @@ -647,7 +575,6 @@ class SetACMTest final : public TestCase proxy->startHeartbeatCount(); proxy->waitForHeartbeatCount(2); -#ifdef ICE_CPP11_MAPPING auto p1 = promise(); con->setCloseCallback([&p1](shared_ptr) { @@ -674,28 +601,6 @@ class SetACMTest final : public TestCase p2.get_future().wait(); con->setHeartbeatCallback([](shared_ptr) {}); -#else - CloseCallbackPtr callback = new CloseCallback(); - con->setCloseCallback(callback); - - con->close(Ice::ICE_SCOPED_ENUM(ConnectionClose, Gracefully)); - callback->waitCallback(); - - try - { - con->throwException(); - test(false); - } - catch(const Ice::ConnectionManuallyClosedException&) - { - } - - CloseCallbackPtr callback2 = new CloseCallback(); - con->setCloseCallback(callback2); - callback2->waitCallback(); - - con->setHeartbeatCallback(new HeartbeatCallback()); -#endif } }; @@ -729,8 +634,6 @@ allTests(Test::TestHelper* helper) { (*p)->init(); } - -#ifdef ICE_CPP11_MAPPING vector> threads; for(auto p = tests.begin(); p != tests.end(); ++p) { @@ -745,16 +648,7 @@ allTests(Test::TestHelper* helper) { p->second->join(p->first); } -#else - for(vector::const_iterator p = tests.begin(); p != tests.end(); ++p) - { - (*p)->start(); - } - for(vector::const_iterator p = tests.begin(); p != tests.end(); ++p) - { - (*p)->join(); - } -#endif + for(vector::const_iterator p = tests.begin(); p != tests.end(); ++p) { (*p)->destroy(); diff --git a/cpp/test/Ice/acm/TestI.cpp b/cpp/test/Ice/acm/TestI.cpp index 3844a48dbdb..81c8c9c3abd 100644 --- a/cpp/test/Ice/acm/TestI.cpp +++ b/cpp/test/Ice/acm/TestI.cpp @@ -125,15 +125,11 @@ void TestI::startHeartbeatCount(const Ice::Current& current) { _callback = ICE_MAKE_SHARED(HeartbeatCallbackI); -#ifdef ICE_CPP11_MAPPING HeartbeatCallbackIPtr callback = _callback; current.con->setHeartbeatCallback([callback](Ice::ConnectionPtr connection) { callback->heartbeat(std::move(connection)); }); -#else - current.con->setHeartbeatCallback(_callback); -#endif } void diff --git a/cpp/test/Ice/acm/TestI.h b/cpp/test/Ice/acm/TestI.h index d0ef7af089a..92168d675cb 100644 --- a/cpp/test/Ice/acm/TestI.h +++ b/cpp/test/Ice/acm/TestI.h @@ -45,11 +45,7 @@ class TestI : public Test::TestIntf, private IceUtil::Monitor private: class HeartbeatCallbackI final : -#ifdef ICE_CPP11_MAPPING public std::enable_shared_from_this, -#else - public Ice::HeartbeatCallback, -#endif private IceUtil::Monitor { public: diff --git a/cpp/test/Ice/adapterDeactivation/AllTests.cpp b/cpp/test/Ice/adapterDeactivation/AllTests.cpp index 8a63cbc6873..53a68c393b0 100644 --- a/cpp/test/Ice/adapterDeactivation/AllTests.cpp +++ b/cpp/test/Ice/adapterDeactivation/AllTests.cpp @@ -22,11 +22,7 @@ allTests(Test::TestHelper* helper) cout << "testing checked cast... " << flush; TestIntfPrxPtr obj = ICE_CHECKED_CAST(TestIntfPrx, base); test(obj); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(obj, base)); -#else - test(obj == base); -#endif cout << "ok" << endl; { @@ -53,11 +49,7 @@ allTests(Test::TestHelper* helper) cout << "creating/activating/deactivating object adapter in one operation... " << flush; obj->transient(); -#ifdef ICE_CPP11_MAPPING obj->transientAsync().get(); -#else - obj->end_transient(obj->begin_transient()); -#endif cout << "ok" << endl; { @@ -67,11 +59,7 @@ allTests(Test::TestHelper* helper) Ice::InitializationData initData; initData.properties = communicator->getProperties()->clone(); Ice::CommunicatorHolder comm(initData); -#ifdef ICE_CPP11_MAPPING comm->stringToProxy("test:" + helper->getTestEndpoint())->ice_pingAsync(); -#else - comm->stringToProxy("test:" + helper->getTestEndpoint())->begin_ice_ping(); -#endif } cout << "ok" << endl; } @@ -137,11 +125,7 @@ allTests(Test::TestHelper* helper) adapter->setPublishedEndpoints(router->ice_getEndpoints()); test(false); } -#if defined(ICE_CPP11_MAPPING) catch(const invalid_argument&) -#else - catch(const IceUtil::IllegalArgumentException&) -#endif { // Expected. } diff --git a/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp b/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp index 76d2472f4ed..8e59117cbb6 100644 --- a/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp +++ b/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp @@ -36,11 +36,7 @@ class RouterI : public Ice::Router } virtual Ice::ObjectProxySeq -#ifdef ICE_CPP11_MAPPING addProxies(Ice::ObjectProxySeq, const Ice::Current&) -#else - addProxies(const Ice::ObjectProxySeq&, const Ice::Current&) -#endif { return Ice::ObjectProxySeq(); } diff --git a/cpp/test/Ice/admin/AllTests.cpp b/cpp/test/Ice/admin/AllTests.cpp index af1f675e752..c9a77a7cd83 100644 --- a/cpp/test/Ice/admin/AllTests.cpp +++ b/cpp/test/Ice/admin/AllTests.cpp @@ -199,7 +199,6 @@ allTests(Test::TestHelper* helper) Ice::CommunicatorHolder ich(init); testFacets(ich.communicator()); -#ifdef ICE_CPP11_MAPPING // Test move assignment on CommunicatorHolder Ice::CommunicatorHolder ich2; test(!ich2.communicator()); @@ -213,13 +212,6 @@ allTests(Test::TestHelper* helper) ich3 = ich2.release(); test(ich3.communicator()); test(!ich2.communicator()); -#else - Ice::CommunicatorHolder ich2; - test(!ich2.communicator()); - ich2 = ich.release(); - test(ich2.communicator()); - test(!ich.communicator()); -#endif } { // @@ -302,11 +294,7 @@ allTests(Test::TestHelper* helper) props["Ice.Admin.InstanceName"] = "Test"; RemoteCommunicatorPrxPtr com = factory->createCommunicator(props); Ice::ObjectPrxPtr obj = com->getAdmin(); -#ifdef ICE_CPP11_MAPPING shared_ptr proc = Ice::checkedCast(obj, "Process"); -#else - Ice::ProcessPrx proc = Ice::ProcessPrx::checkedCast(obj, "Process"); -#endif proc->shutdown(); com->waitForShutdown(); com->destroy(); @@ -323,11 +311,7 @@ allTests(Test::TestHelper* helper) props["Prop3"] = "3"; RemoteCommunicatorPrxPtr com = factory->createCommunicator(props); Ice::ObjectPrxPtr obj = com->getAdmin(); -#ifdef ICE_CPP11_MAPPING shared_ptr pa = Ice::checkedCast(obj, "Properties"); -#else - Ice::PropertiesAdminPrx pa = Ice::PropertiesAdminPrx::checkedCast(obj, "Properties"); -#endif // // Test: PropertiesAdmin::getProperty() // @@ -414,11 +398,7 @@ allTests(Test::TestHelper* helper) com->print("print"); Ice::ObjectPrxPtr obj = com->getAdmin(); -#ifdef ICE_CPP11_MAPPING shared_ptr logger = Ice::checkedCast(obj, "Logger"); -#else - Ice::LoggerAdminPrx logger = Ice::LoggerAdminPrx::checkedCast(obj, "Logger"); -#endif test(logger); string prefix; @@ -593,11 +573,7 @@ allTests(Test::TestHelper* helper) props["Ice.Admin.InstanceName"] = "Test"; RemoteCommunicatorPrxPtr com = factory->createCommunicator(props); Ice::ObjectPrxPtr obj = com->getAdmin(); -#ifdef ICE_CPP11_MAPPING shared_ptr tf = Ice::checkedCast(obj, "TestFacet"); -#else - Test::TestFacetPrx tf = Test::TestFacetPrx::checkedCast(obj, "TestFacet"); -#endif tf->op(); com->destroy(); } @@ -615,17 +591,10 @@ allTests(Test::TestHelper* helper) props["Ice.Admin.Facets"] = "Properties"; RemoteCommunicatorPrxPtr com = factory->createCommunicator(props); Ice::ObjectPrxPtr obj = com->getAdmin(); -#ifdef ICE_CPP11_MAPPING shared_ptr proc = Ice::checkedCast(obj, "Process"); test(!proc); shared_ptr tf = Ice::checkedCast(obj, "TestFacet"); test(!tf); -#else - Ice::ProcessPrx proc = Ice::ProcessPrx::checkedCast(obj, "Process"); - test(!proc); - Test::TestFacetPrx tf = Test::TestFacetPrx::checkedCast(obj, "TestFacet"); - test(!tf); -#endif com->destroy(); } { @@ -639,17 +608,10 @@ allTests(Test::TestHelper* helper) props["Ice.Admin.Facets"] = "Process"; RemoteCommunicatorPrxPtr com = factory->createCommunicator(props); Ice::ObjectPrxPtr obj = com->getAdmin(); -#ifdef ICE_CPP11_MAPPING shared_ptr pa = Ice::checkedCast(obj, "Properties"); test(!pa); shared_ptr tf = Ice::checkedCast(obj, "TestFacet"); test(!tf); -#else - Ice::PropertiesAdminPrx pa = Ice::PropertiesAdminPrx::checkedCast(obj, "Properties"); - test(!pa); - Test::TestFacetPrx tf = Test::TestFacetPrx::checkedCast(obj, "TestFacet"); - test(!tf); -#endif com->destroy(); } { @@ -663,17 +625,10 @@ allTests(Test::TestHelper* helper) props["Ice.Admin.Facets"] = "TestFacet"; RemoteCommunicatorPrxPtr com = factory->createCommunicator(props); Ice::ObjectPrxPtr obj = com->getAdmin(); -#ifdef ICE_CPP11_MAPPING shared_ptr pa = Ice::checkedCast(obj, "Properties"); test(!pa); shared_ptr proc = Ice::checkedCast(obj, "Process"); test(!proc); -#else - Ice::PropertiesAdminPrx pa = Ice::PropertiesAdminPrx::checkedCast(obj, "Properties"); - test(!pa); - Ice::ProcessPrx proc = Ice::ProcessPrx::checkedCast(obj, "Process"); - test(!proc); -#endif com->destroy(); } { @@ -687,21 +642,12 @@ allTests(Test::TestHelper* helper) props["Ice.Admin.Facets"] = "Properties TestFacet"; RemoteCommunicatorPrxPtr com = factory->createCommunicator(props); Ice::ObjectPrxPtr obj = com->getAdmin(); -#ifdef ICE_CPP11_MAPPING shared_ptr pa = Ice::checkedCast(obj, "Properties"); test(pa->getProperty("Ice.Admin.InstanceName") == "Test"); shared_ptr tf = Ice::checkedCast(obj, "TestFacet"); tf->op(); shared_ptr proc = Ice::checkedCast(obj, "Process"); test(!proc); -#else - Ice::PropertiesAdminPrx pa = Ice::PropertiesAdminPrx::checkedCast(obj, "Properties"); - test(pa->getProperty("Ice.Admin.InstanceName") == "Test"); - Test::TestFacetPrx tf = Test::TestFacetPrx::checkedCast(obj, "TestFacet"); - tf->op(); - Ice::ProcessPrx proc = Ice::ProcessPrx::checkedCast(obj, "Process"); - test(!proc); -#endif com->destroy(); } { @@ -715,19 +661,11 @@ allTests(Test::TestHelper* helper) props["Ice.Admin.Facets"] = "TestFacet, Process"; RemoteCommunicatorPrxPtr com = factory->createCommunicator(props); Ice::ObjectPrxPtr obj = com->getAdmin(); -#ifdef ICE_CPP11_MAPPING shared_ptr pa = Ice::checkedCast(obj, "Properties"); test(!pa); shared_ptr tf = Ice::checkedCast(obj, "TestFacet"); tf->op(); shared_ptr proc = Ice::checkedCast(obj, "Process"); -#else - Ice::PropertiesAdminPrx pa = Ice::PropertiesAdminPrx::checkedCast(obj, "Properties"); - test(!pa); - Test::TestFacetPrx tf = Test::TestFacetPrx::checkedCast(obj, "TestFacet"); - tf->op(); - Ice::ProcessPrx proc = Ice::ProcessPrx::checkedCast(obj, "Process"); -#endif proc->shutdown(); com->waitForShutdown(); com->destroy(); diff --git a/cpp/test/Ice/admin/TestI.cpp b/cpp/test/Ice/admin/TestI.cpp index 914c1c36005..cca195fd584 100644 --- a/cpp/test/Ice/admin/TestI.cpp +++ b/cpp/test/Ice/admin/TestI.cpp @@ -14,10 +14,7 @@ namespace // A no-op Logger, used when testing the Logger Admin // -class NullLogger : public Ice::Logger -#ifdef ICE_CPP11_MAPPING - , public std::enable_shared_from_this -#endif +class NullLogger : public Ice::Logger, public std::enable_shared_from_this { public: diff --git a/cpp/test/Ice/ami/AllTests.cpp b/cpp/test/Ice/ami/AllTests.cpp index 87b22af5178..1d4159b7e76 100644 --- a/cpp/test/Ice/ami/AllTests.cpp +++ b/cpp/test/Ice/ami/AllTests.cpp @@ -7,9 +7,7 @@ #include #include -#ifdef ICE_CPP11_MAPPING -# include -#endif +#include using namespace std; @@ -42,7 +40,6 @@ ICE_DEFINE_SHARED_PTR(PingReplyIPtr, PingReplyI); enum ThrowType { LocalException, UserException, StandardException, OtherException }; -#ifdef ICE_CPP11_MAPPING ThrowType throwEx[] = { LocalException, UserException, StandardException, OtherException }; auto thrower = [](ThrowType t) { @@ -75,2688 +72,596 @@ auto thrower = [](ThrowType t) } } }; -#else -struct Cookie : public Ice::LocalObject -{ - Cookie(int i) : val(i) - { - } - int val; -}; -typedef IceUtil::Handle CookiePtr; - -class CallbackBase : public virtual Ice::LocalObject -{ -public: - - CallbackBase() : - _called(false) - { - } - - virtual ~CallbackBase() - { - } - - void check() - { - IceUtil::Monitor::Lock sync(_m); - while(!_called) - { - _m.wait(); - } - _called = false; - } - -protected: - - void called() - { - IceUtil::Monitor::Lock sync(_m); - assert(!_called); - _called = true; - _m.notify(); - } - -private: - - IceUtil::Monitor _m; - bool _called; -}; -typedef IceUtil::Handle CallbackBasePtr; +} -class AsyncCallback : public CallbackBase +void +allTests(Test::TestHelper* helper, bool collocated) { -public: - - AsyncCallback() - { - } - - AsyncCallback(const CookiePtr& cookie) : _cookie(cookie) - { - } - - void isA(const Ice::AsyncResultPtr& result) - { - test(result->getCookie() == _cookie); - test(result->getProxy()->end_ice_isA(result)); - called(); - } - - void ping(const Ice::AsyncResultPtr& result) - { - test(result->getCookie() == _cookie); - result->getProxy()->end_ice_ping(result); - called(); - } - - void id(const Ice::AsyncResultPtr& result) - { - test(result->getCookie() == _cookie); - test(result->getProxy()->end_ice_id(result) == Test::TestIntf::ice_staticId()); - called(); - } + Ice::CommunicatorPtr communicator = helper->communicator(); + const string protocol = communicator->getProperties()->getProperty("Ice.Default.Protocol"); - void ids(const Ice::AsyncResultPtr& result) - { - test(result->getCookie() == _cookie); - test(result->getProxy()->end_ice_ids(result).size() == 2); - called(); - } + string sref = "test:" + helper->getTestEndpoint(); + auto prx = communicator->stringToProxy(sref); + test(prx); - void connection(const Ice::AsyncResultPtr& result) - { - test(result->getCookie() == _cookie); - test(result->getProxy()->end_ice_getConnection(result)); - called(); - } + auto p = Ice::uncheckedCast(prx); - void op(const Ice::AsyncResultPtr& result) - { - test(result->getCookie() == _cookie); - Test::TestIntfPrx::uncheckedCast(result->getProxy())->end_op(result); - called(); - } + sref = "testController:" + helper->getTestEndpoint(1); + prx = communicator->stringToProxy(sref); + test(prx); - void opWithResult(const Ice::AsyncResultPtr& result) - { - test(result->getCookie() == _cookie); - test(Test::TestIntfPrx::uncheckedCast(result->getProxy())->end_opWithResult(result) == 15); - called(); - } + auto testController = Ice::uncheckedCast(prx); - void opWithUE(const Ice::AsyncResultPtr& result) + Ice::Context ctx; + cout << "testing lambda API... " << flush; { - test(result->getCookie() == _cookie); - try { - Test::TestIntfPrx::uncheckedCast(result->getProxy())->end_opWithUE(result); - test(false); + p->ice_isAAsync(Test::TestIntf::ice_staticId(), nullptr); } - catch(const Test::TestIntfException&) { - called(); + promise promise; + p->ice_isAAsync(Test::TestIntf::ice_staticId(), + [&](bool value) + { + promise.set_value(value); + }); + test(promise.get_future().get()); } - catch(const Ice::Exception&) { - test(false); + promise promise; + p->ice_isAAsync(Test::TestIntf::ice_staticId(), + [&](bool value) + { + promise.set_value(value); + }, + [&](exception_ptr ex) + { + promise.set_exception(ex); + }); + test(promise.get_future().get()); } - } - void isAEx(const Ice::AsyncResultPtr& result) - { - test(result->getCookie() == _cookie); - try - { - result->getProxy()->end_ice_isA(result); - test(false); - } - catch(const Ice::NoEndpointException&) { - called(); + promise promise; + p->ice_isAAsync(Test::TestIntf::ice_staticId(), + [&](bool value) + { + promise.set_value(value); + }, + nullptr, nullptr, ctx); + test(promise.get_future().get()); } - catch(const Ice::Exception&) + { - test(false); + p->ice_pingAsync(nullptr); } - } - - void pingEx(const Ice::AsyncResultPtr& result) - { - test(result->getCookie() == _cookie); - try { - result->getProxy()->end_ice_ping(result); - test(false); + promise promise; + p->ice_pingAsync( + [&]() + { + promise.set_value(); + }); + promise.get_future().get(); } - catch(const Ice::NoEndpointException&) { - called(); + promise promise; + p->ice_pingAsync( + [&]() + { + promise.set_value(); + }, + [&](exception_ptr ex) + { + promise.set_exception(ex); + }); + promise.get_future().get(); } - catch(const Ice::Exception&) { - test(false); + promise promise; + p->ice_pingAsync( + [&]() + { + promise.set_value(); + }, + nullptr, nullptr, ctx); + promise.get_future().get(); } - } - void idEx(const Ice::AsyncResultPtr& result) - { - test(result->getCookie() == _cookie); - try { - result->getProxy()->end_ice_id(result); - test(false); + p->ice_idAsync(nullptr); } - catch(const Ice::NoEndpointException&) { - called(); + promise promise; + p->ice_idAsync( + [&](const string& id) + { + promise.set_value(id); + }); + test(promise.get_future().get() == Test::TestIntf::ice_staticId()); } - catch(const Ice::Exception&) { - test(false); + promise promise; + p->ice_idAsync( + [&](const string& id) + { + promise.set_value(id); + }, + [&](exception_ptr ex) + { + promise.set_exception(ex); + }); + test(promise.get_future().get() == Test::TestIntf::ice_staticId()); } - } - - void idsEx(const Ice::AsyncResultPtr& result) - { - test(result->getCookie() == _cookie); - try { - result->getProxy()->end_ice_ids(result); - test(false); + promise promise; + p->ice_idAsync( + [&](const string& id) + { + promise.set_value(id); + }, + nullptr, nullptr, ctx); + test(promise.get_future().get() == Test::TestIntf::ice_staticId()); } - catch(const Ice::NoEndpointException&) + { - called(); + p->ice_idsAsync(nullptr); } - catch(const Ice::Exception&) { - test(false); + promise> promise; + p->ice_idsAsync( + [&](const vector& ids) + { + promise.set_value(ids); + }); + test(promise.get_future().get().size() == 2); } - } - - void connectionEx(const Ice::AsyncResultPtr& result) - { - test(result->getCookie() == _cookie); - try { - result->getProxy()->end_ice_getConnection(result); - test(false); + promise> promise; + p->ice_idsAsync( + [&](const vector& ids) + { + promise.set_value(ids); + }, + [&](exception_ptr ex) + { + promise.set_exception(ex); + }); + test(promise.get_future().get().size() == 2); } - catch(const Ice::NoEndpointException&) { - called(); + promise> promise; + p->ice_idsAsync( + [&](const vector& ids) + { + promise.set_value(ids); + }, + nullptr, nullptr, ctx); + test(promise.get_future().get().size() == 2); } - catch(const Ice::Exception&) + + if(!collocated) { - test(false); + { + p->ice_getConnectionAsync(nullptr); + } + { + promise promise; + p->ice_getConnectionAsync( + [&](const Ice::ConnectionPtr& connection) + { + promise.set_value(connection); + }); + test(promise.get_future().get()); + } + { + promise promise; + p->ice_getConnectionAsync( + [&](const Ice::ConnectionPtr& connection) + { + promise.set_value(connection); + }, + [&](exception_ptr ex) + { + promise.set_exception(ex); + }); + test(promise.get_future().get()); + } } - } - void opEx(const Ice::AsyncResultPtr& result) - { - test(result->getCookie() == _cookie); - try { - Test::TestIntfPrx::uncheckedCast(result->getProxy())->end_op(result); - test(false); + p->opAsync(nullptr); } - catch(const Ice::NoEndpointException&) { - called(); + promise promise; + p->opAsync( + [&]() + { + promise.set_value(); + }); + promise.get_future().get(); } - catch(const Ice::Exception&) { - test(false); - } - } - -private: - - CookiePtr _cookie; -}; -typedef IceUtil::Handle AsyncCallbackPtr; - -class ResponseCallback : public CallbackBase -{ -public: - - ResponseCallback() - { - } - - void isA(bool r) - { - test(r); - called(); - } - - void ping() - { - called(); - } - - void id(const string& id) - { - test(id == Test::TestIntf::ice_staticId()); - called(); - } - - void ids(const Ice::StringSeq& ids) - { - test(ids.size() == 2); - called(); - } - - void connection(const Ice::ConnectionPtr& conn) - { - test(conn); - called(); - } - - void op() - { - called(); - } - - void opWithResult(int r) - { - test(r == 15); - called(); - } - - void opWithUE(const Ice::Exception& ex) - { - try - { - ex.ice_throw(); - test(false); + promise promise; + p->opAsync( + [&]() + { + promise.set_value(); + }, + [&](exception_ptr ex) + { + promise.set_exception(ex); + }); + promise.get_future().get(); } - catch(const Test::TestIntfException&) { - called(); + promise promise; + p->opAsync( + [&]() + { + promise.set_value(); + }, + nullptr, nullptr, ctx); + promise.get_future().get(); } - } - - void ex(const Ice::Exception&) - { - } -}; -typedef IceUtil::Handle ResponseCallbackPtr; - -class ResponseCallbackWC : public CallbackBase -{ -public: - - ResponseCallbackWC(const CookiePtr& cookie) : _cookie(cookie) - { - } - - void isA(bool r, const CookiePtr& cookie) - { - test(cookie == _cookie); - test(r); - called(); - } - - void ping(const CookiePtr& cookie) - { - test(cookie == _cookie); - called(); - } - - void id(const string& id, const CookiePtr& cookie) - { - test(cookie == _cookie); - test(id == Test::TestIntf::ice_staticId()); - called(); - } - - void ids(const Ice::StringSeq& ids, const CookiePtr& cookie) - { - test(cookie == _cookie); - test(ids.size() == 2); - called(); - } - void connection(const Ice::ConnectionPtr& conn, const CookiePtr& cookie) - { - test(conn); - test(cookie == _cookie); - called(); - } - - void op(const CookiePtr& cookie) - { - test(cookie == _cookie); - called(); - } - - void opWithResult(int r, const CookiePtr& cookie) - { - test(cookie == _cookie); - test(r == 15); - called(); - } - - void opWithUE(const Ice::Exception& ex, const CookiePtr& cookie) - { - test(cookie == _cookie); - try { - ex.ice_throw(); - test(false); + p->opWithResultAsync(nullptr); } - catch(const Test::TestIntfException&) { - called(); + promise promise; + p->opWithResultAsync( + [&](int result) + { + promise.set_value(result); + }); + test(promise.get_future().get() == 15); } - } - - void ex(const Ice::Exception&, const CookiePtr&) - { - } - -private: - - CookiePtr _cookie; -}; -typedef IceUtil::Handle ResponseCallbackWCPtr; - -class ExceptionCallback : public CallbackBase -{ -public: - - ExceptionCallback() - { - } - - void isA(bool) - { - test(false); - } - - void ping() - { - test(false); - } - - void id(const string&) - { - test(false); - } - - void ids(const Ice::StringSeq&) - { - test(false); - } - - void connection(const Ice::ConnectionPtr&) - { - test(false); - } - - void op() - { - test(false); - } - - void opWithUE(const Ice::Exception& ex) - { - test(dynamic_cast(&ex)); - called(); - } - - void ex(const Ice::Exception& ex) - { - test(dynamic_cast(&ex)); - called(); - } - - void noEx(const Ice::Exception& ex) - { - cout << ex << endl; - cout << ex.ice_stackTrace() << endl; - test(false); - } -}; -typedef IceUtil::Handle ExceptionCallbackPtr; - -class ExceptionCallbackWC : public CallbackBase -{ -public: - - ExceptionCallbackWC(const CookiePtr& cookie) : _cookie(cookie) - { - } - - void isA(bool, const CookiePtr&) - { - test(false); - } - - void ping(const CookiePtr&) - { - test(false); - } - - void id(const string&, const CookiePtr&) - { - test(false); - } - - void ids(const Ice::StringSeq&, const CookiePtr&) - { - test(false); - } - - void op(const CookiePtr&) - { - test(false); - } - - void opWithUE(const Ice::Exception& ex, const CookiePtr& cookie) - { - test(cookie == _cookie); - test(dynamic_cast(&ex)); - called(); - } - - void ex(const Ice::Exception& ex, const CookiePtr& cookie) - { - test(cookie == _cookie); - test(dynamic_cast(&ex)); - called(); - } - - void noEx(const Ice::Exception&, const CookiePtr&) - { - test(false); - } - -private: - - CookiePtr _cookie; -}; -typedef IceUtil::Handle ExceptionCallbackWCPtr; - -class SentCallback : public CallbackBase -{ -public: - - SentCallback() - { - } - - SentCallback(const CookiePtr& cookie) : _cookie(cookie) - { - } - - void isA(bool) - { - } - - void isAWC(bool, const CookiePtr&) - { - } - - void ping() - { - } - - void pingWC(const CookiePtr&) - { - } - - void id(const string&) - { - } - - void idWC(const string&, const CookiePtr&) - { - } - - void ids(const Ice::StringSeq&) - { - } - - void idsWC(const Ice::StringSeq&, const CookiePtr&) - { - } - - void opAsync(const Ice::AsyncResultPtr&) - { - } - - void op() - { - } - - void opWC(const CookiePtr&) - { - } - - void ex(const Ice::Exception&) - { - } - - void exWC(const Ice::Exception&, const CookiePtr&) - { - } - - void sentAsync(const Ice::AsyncResultPtr& result) - { - test((result->sentSynchronously() && _thread == IceUtil::ThreadControl()) || - (!result->sentSynchronously() && _thread != IceUtil::ThreadControl())); - called(); - } - - void sent(bool sentSynchronously) - { - test((sentSynchronously && _thread == IceUtil::ThreadControl()) || - (!sentSynchronously && _thread != IceUtil::ThreadControl())); - called(); - } - - void sentWC(bool sentSynchronously, const CookiePtr& cookie) - { - test((sentSynchronously && _thread == IceUtil::ThreadControl()) || - (!sentSynchronously && _thread != IceUtil::ThreadControl())); - test(cookie == _cookie); - called(); - } - -private: - - CookiePtr _cookie; - IceUtil::ThreadControl _thread; -}; -typedef IceUtil::Handle SentCallbackPtr; - -class FlushCallback : public CallbackBase -{ -public: - - FlushCallback() - { - } - - FlushCallback(const CookiePtr& cookie) : _cookie(cookie) - { - } - - void completedAsync(const Ice::AsyncResultPtr&) - { - test(false); - } - - void exception(const Ice::Exception&) - { - test(false); - } - - void exceptionWC(const Ice::Exception&, const CookiePtr&) - { - test(false); - } - - void sentAsync(const Ice::AsyncResultPtr& result) - { - test((result->sentSynchronously() && _thread == IceUtil::ThreadControl()) || - (!result->sentSynchronously() && _thread != IceUtil::ThreadControl())); - called(); - } - - void sent(bool sentSynchronously) - { - test((sentSynchronously && _thread == IceUtil::ThreadControl()) || - (!sentSynchronously && _thread != IceUtil::ThreadControl())); - called(); - } - - void sentWC(bool sentSynchronously, const CookiePtr& cookie) - { - test((sentSynchronously && _thread == IceUtil::ThreadControl()) || - (!sentSynchronously && _thread != IceUtil::ThreadControl())); - test(cookie == _cookie); - called(); - } - -private: - - CookiePtr _cookie; - IceUtil::ThreadControl _thread; -}; -typedef IceUtil::Handle FlushCallbackPtr; - -class FlushExCallback : public CallbackBase -{ -public: - - FlushExCallback() - { - } - - FlushExCallback(const CookiePtr& cookie) : _cookie(cookie) - { - } - - void completedAsync(const Ice::AsyncResultPtr& r) - { - test(r->getCookie() == _cookie); - try - { - if(r->getConnection()) - { - r->getConnection()->end_flushBatchRequests(r); - } - else - { - r->getProxy()->end_ice_flushBatchRequests(r); - } - test(false); - } - catch(const Ice::LocalException&) - { - called(); - } - } - - void exception(const Ice::Exception&) - { - called(); - } - - void exceptionWC(const Ice::Exception&, const CookiePtr& cookie) - { - test(cookie == _cookie); - called(); - } - - void sentAsync(const Ice::AsyncResultPtr&) - { - test(false); - } - - void sent(bool) - { - test(false); - } - - void sentWC(bool, const CookiePtr&) - { - test(false); - } - -private: - - CookiePtr _cookie; - IceUtil::ThreadControl _thread; -}; -typedef IceUtil::Handle FlushExCallbackPtr; - -class CloseCallback : public virtual CallbackBase, public virtual Ice::CloseCallback -{ -public: - - CloseCallback() - { - } - - virtual void closed(const Ice::ConnectionPtr&) - { - called(); - } -}; -typedef IceUtil::Handle CloseCallbackPtr; - -class Thrower : public CallbackBase -{ -public: - - Thrower(ThrowType t) - : _t(t) - { - } - - void opAsync(const Ice::AsyncResultPtr&) - { - called(); - throwEx(); - } - - void op() - { - called(); - throwEx(); - } - - void opWC(const CookiePtr&) - { - called(); - throwEx(); - } - - void noOp() - { - } - - void noOpWC(const CookiePtr&) - { - } - - void ex(const Ice::Exception&) - { - called(); - throwEx(); - } - - void exWC(const Ice::Exception&, const CookiePtr&) - { - called(); - throwEx(); - } - - void noEx(const Ice::Exception&) - { - test(false); - } - - void noExWC(const Ice::Exception&, const CookiePtr&) - { - test(false); - } - - void sent(bool) - { - called(); - throwEx(); - } - - void sentWC(bool, const CookiePtr&) - { - called(); - throwEx(); - } - -private: - - void throwEx() - { - switch(_t) - { - case LocalException: - { - throw Ice::ObjectNotExistException(__FILE__, __LINE__); - break; - } - case UserException: - { - throw Test::TestIntfException(); - break; - } - case StandardException: - { - throw ::std::bad_alloc(); - break; - } - case OtherException: - { - throw 99; - break; - } - default: - { - assert(false); - break; - } - } - } - - ThrowType _t; -}; -typedef IceUtil::Handle ThrowerPtr; -#endif - -} - -void -allTests(Test::TestHelper* helper, bool collocated) -{ - Ice::CommunicatorPtr communicator = helper->communicator(); - const string protocol = communicator->getProperties()->getProperty("Ice.Default.Protocol"); - -#ifdef ICE_CPP11_MAPPING - string sref = "test:" + helper->getTestEndpoint(); - auto prx = communicator->stringToProxy(sref); - test(prx); - - auto p = Ice::uncheckedCast(prx); - - sref = "testController:" + helper->getTestEndpoint(1); - prx = communicator->stringToProxy(sref); - test(prx); - - auto testController = Ice::uncheckedCast(prx); - - Ice::Context ctx; - cout << "testing lambda API... " << flush; - { - { - p->ice_isAAsync(Test::TestIntf::ice_staticId(), nullptr); - } - { - promise promise; - p->ice_isAAsync(Test::TestIntf::ice_staticId(), - [&](bool value) - { - promise.set_value(value); - }); - test(promise.get_future().get()); - } - { - promise promise; - p->ice_isAAsync(Test::TestIntf::ice_staticId(), - [&](bool value) - { - promise.set_value(value); - }, - [&](exception_ptr ex) - { - promise.set_exception(ex); - }); - test(promise.get_future().get()); - } - - { - promise promise; - p->ice_isAAsync(Test::TestIntf::ice_staticId(), - [&](bool value) - { - promise.set_value(value); - }, - nullptr, nullptr, ctx); - test(promise.get_future().get()); - } - - { - p->ice_pingAsync(nullptr); - } - { - promise promise; - p->ice_pingAsync( - [&]() - { - promise.set_value(); - }); - promise.get_future().get(); - } - { - promise promise; - p->ice_pingAsync( - [&]() - { - promise.set_value(); - }, - [&](exception_ptr ex) - { - promise.set_exception(ex); - }); - promise.get_future().get(); - } - { - promise promise; - p->ice_pingAsync( - [&]() - { - promise.set_value(); - }, - nullptr, nullptr, ctx); - promise.get_future().get(); - } - - { - p->ice_idAsync(nullptr); - } - { - promise promise; - p->ice_idAsync( - [&](const string& id) - { - promise.set_value(id); - }); - test(promise.get_future().get() == Test::TestIntf::ice_staticId()); - } - { - promise promise; - p->ice_idAsync( - [&](const string& id) - { - promise.set_value(id); - }, - [&](exception_ptr ex) - { - promise.set_exception(ex); - }); - test(promise.get_future().get() == Test::TestIntf::ice_staticId()); - } - { - promise promise; - p->ice_idAsync( - [&](const string& id) - { - promise.set_value(id); - }, - nullptr, nullptr, ctx); - test(promise.get_future().get() == Test::TestIntf::ice_staticId()); - } - - { - p->ice_idsAsync(nullptr); - } - { - promise> promise; - p->ice_idsAsync( - [&](const vector& ids) - { - promise.set_value(ids); - }); - test(promise.get_future().get().size() == 2); - } - { - promise> promise; - p->ice_idsAsync( - [&](const vector& ids) - { - promise.set_value(ids); - }, - [&](exception_ptr ex) - { - promise.set_exception(ex); - }); - test(promise.get_future().get().size() == 2); - } - { - promise> promise; - p->ice_idsAsync( - [&](const vector& ids) - { - promise.set_value(ids); - }, - nullptr, nullptr, ctx); - test(promise.get_future().get().size() == 2); - } - - if(!collocated) - { - { - p->ice_getConnectionAsync(nullptr); - } - { - promise promise; - p->ice_getConnectionAsync( - [&](const Ice::ConnectionPtr& connection) - { - promise.set_value(connection); - }); - test(promise.get_future().get()); - } - { - promise promise; - p->ice_getConnectionAsync( - [&](const Ice::ConnectionPtr& connection) - { - promise.set_value(connection); - }, - [&](exception_ptr ex) - { - promise.set_exception(ex); - }); - test(promise.get_future().get()); - } - } - - { - p->opAsync(nullptr); - } - { - promise promise; - p->opAsync( - [&]() - { - promise.set_value(); - }); - promise.get_future().get(); - } - { - promise promise; - p->opAsync( - [&]() - { - promise.set_value(); - }, - [&](exception_ptr ex) - { - promise.set_exception(ex); - }); - promise.get_future().get(); - } - { - promise promise; - p->opAsync( - [&]() - { - promise.set_value(); - }, - nullptr, nullptr, ctx); - promise.get_future().get(); - } - - { - p->opWithResultAsync(nullptr); - } - { - promise promise; - p->opWithResultAsync( - [&](int result) - { - promise.set_value(result); - }); - test(promise.get_future().get() == 15); - } - { - // Count copies made - class CopyCounter - { - public: - CopyCounter(int& count) : _count(count) - { - } - - CopyCounter(const CopyCounter& o) : _count(o._count) - { - _count++; - } - - CopyCounter(CopyCounter&&) = default; - - private: - int& _count; - }; - - int responseCopyCount = 0; - int errorCopyCount = 0; - int sentCopyCount = 0; - CopyCounter responseCopyCounter(responseCopyCount); - CopyCounter errorCopyCounter(errorCopyCount); - CopyCounter sentCopyCounter(sentCopyCount); - - promise promise; - p->opWithResultAsync( - [&promise, responseCopyCounter](int result) - { - promise.set_value(result); - }, - [&promise, errorCopyCounter](exception_ptr ex) - { - promise.set_exception(ex); - }, - [sentCopyCounter](bool) - { - // no-op - }); - test(promise.get_future().get() == 15); -#if ICE_CPLUSPLUS >= 201402L - // Move capture with C++14 saves one copy (see Proxy.h and OutgoingAsync.h) - test(responseCopyCount == 1); -#else - test(responseCopyCount == 2); -#endif - test(errorCopyCount == 1); - test(sentCopyCount == 1); - } - { - promise promise; - p->opWithResultAsync( - [&](int result) - { - promise.set_value(result); - }, - nullptr, nullptr, ctx); - test(promise.get_future().get() == 15); - } - - { - p->opWithUEAsync(nullptr); - } - { - promise promise; - p->opWithUEAsync( - nullptr, - [&](exception_ptr ex) - { - promise.set_exception(ex); - }); - - try - { - promise.get_future().get(); - test(false); - } - catch(const Test::TestIntfException&) - { - } - } - { - promise promise; - p->opWithUEAsync( - [&]() - { - promise.set_value(); - }, - [&](exception_ptr ex) - { - promise.set_exception(ex); - }); - - try - { - promise.get_future().get(); - test(false); - } - catch(const Test::TestIntfException&) - { - } - } - { - promise promise; - p->opWithUEAsync( - nullptr, - [&](exception_ptr ex) - { - promise.set_exception(ex); - }, - nullptr, ctx); - - try - { - promise.get_future().get(); - test(false); - } - catch(const Test::TestIntfException&) - { - } - } - - { - p->opWithResultAndUEAsync(nullptr); - } - { - promise promise; - p->opWithResultAndUEAsync( - nullptr, - [&](exception_ptr ex) - { - promise.set_exception(ex); - }); - - try - { - promise.get_future().get(); - test(false); - } - catch(const Test::TestIntfException&) - { - } - catch(const Ice::OperationNotExistException&) - { - } - } - { - promise promise; - p->opWithResultAndUEAsync( - [&](int) - { - promise.set_value(); - }, - [&](exception_ptr ex) - { - promise.set_exception(ex); - }); - - try - { - promise.get_future().get(); - test(false); - } - catch(const Test::TestIntfException&) - { - } - catch(const Ice::OperationNotExistException&) - { - } - } - { - promise promise; - p->opWithResultAndUEAsync( - nullptr, - [&](exception_ptr ex) - { - promise.set_exception(ex); - }, - nullptr, ctx); - - try - { - promise.get_future().get(); - test(false); - } - catch(const Test::TestIntfException&) - { - } - catch(const Ice::OperationNotExistException&) - { - } - } - } - cout << "ok" << endl; - - cout << "testing future API... " << flush; - { - - test(p->ice_isAAsync(Test::TestIntf::ice_staticId()).get()); - test(p->ice_isAAsync(Test::TestIntf::ice_staticId(), ctx).get()); - - p->ice_pingAsync().get(); - p->ice_pingAsync(ctx).get(); - - test(p->ice_idsAsync().get().size() == 2); - test(p->ice_idsAsync(ctx).get().size() == 2); - - if(!collocated) - { - test(p->ice_getConnectionAsync().get()); - } - - p->opAsync().get(); - p->opAsync(ctx).get(); - - test(p->opWithResultAsync().get() == 15); - test(p->opWithResultAsync(ctx).get() == 15); - - try - { - p->opWithUEAsync().get(); - test(false); - } - catch(const Test::TestIntfException&) - { - } - - try - { - p->opWithUEAsync(ctx).get(); - test(false); - } - catch(const Test::TestIntfException&) - { - } - - try - { - p->opWithResultAndUEAsync().get(); - test(false); - } - catch(const Test::TestIntfException&) - { - } - catch(const Ice::OperationNotExistException&) - { - } - - try - { - p->opWithResultAndUEAsync(ctx).get(); - test(false); - } - catch(const Test::TestIntfException&) - { - } - catch(const Ice::OperationNotExistException&) - { - } - } - cout << "ok" << endl; - - cout << "testing local exceptions with lambda API... " << flush; - { - auto indirect = Ice::uncheckedCast(p->ice_adapterId("dummy")); - - { - promise promise; - indirect->opAsync( - [&]() - { - promise.set_value(); - }, - [&](exception_ptr ex) - { - promise.set_exception(ex); - }); - try - { - promise.get_future().get(); - test(false); - } - catch(const Ice::NoEndpointException&) - { - } - } - - { - try - { - promise promise; - p->ice_oneway()->opWithResultAsync( - [&](int value) - { - promise.set_value(value); - }, - [&](exception_ptr ex) - { - promise.set_exception(ex); - }); - test(false); - } - catch(const Ice::TwowayOnlyException&) - { - } - } - - // - // Check that CommunicatorDestroyedException is raised directly. - // - if(p->ice_getConnection() && protocol != "bt") - { - Ice::InitializationData initData; - initData.properties = communicator->getProperties()->clone(); - Ice::CommunicatorPtr ic = Ice::initialize(initData); - auto obj = ic->stringToProxy(p->ice_toString()); - auto p2 = Ice::checkedCast(obj); - ic->destroy(); - - try - { - promise promise; - p2->opAsync( - [&]() - { - promise.set_value(); - }, - [&](exception_ptr ex) - { - promise.set_exception(ex); - }); - test(false); - } - catch(const Ice::CommunicatorDestroyedException&) - { - // Expected. - } - } - } - cout << "ok" << endl; - - cout << "testing local exceptions with future API... " << flush; - { - auto indirect = Ice::uncheckedCast(p->ice_adapterId("dummy")); - auto r = indirect->opAsync(); - try - { - r.get(); - test(false); - } - catch(const Ice::NoEndpointException&) - { - } - - try - { - p->ice_oneway()->opWithResultAsync().get(); - test(false); - } - catch(const Ice::TwowayOnlyException&) - { - } - - // - // Check that CommunicatorDestroyedException is raised directly. - // - if(p->ice_getConnection()) - { - Ice::InitializationData initData; - initData.properties = communicator->getProperties()->clone(); - Ice::CommunicatorPtr ic = Ice::initialize(initData); - auto obj = ic->stringToProxy(p->ice_toString()); - auto p2 = Ice::checkedCast(obj); - ic->destroy(); - - try - { - p2->opAsync(); - test(false); - } - catch(const Ice::CommunicatorDestroyedException&) - { - // Expected. - } - } - } - cout << "ok" << endl; - - cout << "testing exception callback with lambda API... " << flush; - { - auto i = Ice::uncheckedCast(p->ice_adapterId("dummy")); - - { - promise promise; - i->ice_isAAsync(Test::TestIntf::ice_staticId(), - [&](bool value) - { - promise.set_value(value); - }, - [&](exception_ptr ex) - { - promise.set_exception(ex); - }); - try - { - promise.get_future().get(); - test(false); - } - catch(const Ice::NoEndpointException&) - { - } - } - - { - promise promise; - i->opAsync( - [&]() - { - promise.set_value(); - }, - [&](exception_ptr ex) - { - promise.set_exception(ex); - }); - - try - { - promise.get_future().get(); - test(false); - } - catch(const Ice::NoEndpointException&) - { - } - } - - { - promise promise; - i->opWithUEAsync( - [&]() - { - promise.set_value(); - }, - [&](exception_ptr ex) - { - promise.set_exception(ex); - }); - - try - { - promise.get_future().get(); - test(false); - } - catch(const Ice::NoEndpointException&) - { - } - } - - // Ensures no exception is called when response is received - { - promise promise; - p->ice_isAAsync( - Test::TestIntf::ice_staticId(), - [&](bool value) - { - promise.set_value(value); - }, - [&](exception_ptr ex) - { - promise.set_exception(ex); - }); - try - { - test(promise.get_future().get()); - } - catch(...) - { - test(false); - } - } - - { - promise promise; - p->opAsync( - [&]() - { - promise.set_value(); - }, - [&](exception_ptr ex) - { - promise.set_exception(ex); - }); - try - { - promise.get_future().get(); - } - catch(...) - { - test(false); - } - } - - // If response is a user exception, it should be received. - { - promise promise; - p->opWithUEAsync( - [&]() - { - promise.set_value(); - }, - [&](exception_ptr ex) - { - promise.set_exception(ex); - }); - - try - { - promise.get_future().get(); - test(false); - } - catch(const Test::TestIntfException&) - { - } - } - } - cout << "ok" << endl; - - cout << "testing sent callback with lambda API... " << flush; - { - { - promise response; - promise sent; - - p->ice_isAAsync("", - [&](bool value) - { - response.set_value(value); - }, - [&](exception_ptr ex) - { - response.set_exception(ex); - }, - [&](bool sentAsync) - { - sent.set_value(sentAsync); - }); - - sent.get_future().get(); - response.get_future().get(); - } - - { - promise response; - promise sent; - - p->ice_pingAsync( - [&]() - { - response.set_value(); - }, - [&](exception_ptr ex) - { - response.set_exception(ex); - }, - [&](bool sentAsync) - { - sent.set_value(sentAsync); - }); - - sent.get_future().get(); - response.get_future().get(); - } - - { - promise response; - promise sent; - - p->ice_idAsync( - [&](string value) - { - response.set_value(value); - }, - [&](exception_ptr ex) - { - response.set_exception(ex); - }, - [&](bool sentAsync) - { - sent.set_value(sentAsync); - }); - - sent.get_future().get(); - response.get_future().get(); - } - - { - promise> response; - promise sent; - - p->ice_idsAsync( - [&](vector value) - { - response.set_value(value); - }, - [&](exception_ptr ex) - { - response.set_exception(ex); - }, - [&](bool sentAsync) - { - sent.set_value(sentAsync); - }); - - sent.get_future().get(); - response.get_future().get(); - } - - { - promise response; - promise sent; - - p->opAsync( - [&]() - { - response.set_value(); - }, - [&](exception_ptr ex) - { - response.set_exception(ex); - }, - [&](bool sentAsync) - { - sent.set_value(sentAsync); - }); - - sent.get_future().get(); - response.get_future().get(); - } - - vector> futures; - Ice::ByteSeq seq; - seq.resize(1024); - testController->holdAdapter(); - try - { - while(true) - { - auto s = make_shared>(); - auto f = s->get_future(); - p->opWithPayloadAsync( - seq, - [](){}, - [s](exception_ptr ex) - { - s->set_exception(ex); - }, - [s](bool value) - { - s->set_value(value); - }); - - if(f.wait_for(chrono::seconds(0)) != future_status::ready || !f.get()) - { - break; - } - futures.push_back(std::move(f)); - } - } - catch(...) - { - testController->resumeAdapter(); - throw; - } - testController->resumeAdapter(); - } - cout << "ok" << endl; - - cout << "testing unexpected exceptions from callback... " << flush; - { - auto q = Ice::uncheckedCast(p->ice_adapterId("dummy")); - - for(int i = 0; i < 4; ++i) - { - { - promise promise; - p->opAsync( - [&, i]() - { - promise.set_value(); - thrower(throwEx[i]); - }, - [&](exception_ptr) - { - test(false); - }); - - try - { - promise.get_future().get(); - } - catch(const exception& ex) - { - cerr << ex.what() << endl; - test(false); - } - } - - { - promise promise; - p->opAsync(nullptr, nullptr, - [&, i](bool) - { - promise.set_value(); - thrower(throwEx[i]); - }); - - try - { - promise.get_future().get(); - } - catch(const exception&) - { - test(false); - } - } - } - } - cout << "ok" << endl; - - cout << "testing batch requests with proxy... " << flush; - { - { - test(p->opBatchCount() == 0); - auto b1 = p->ice_batchOneway(); - b1->opBatchAsync().get(); - b1->opBatch(); - auto id = this_thread::get_id(); - promise promise; - b1->ice_flushBatchRequestsAsync( - [&](exception_ptr ex) - { - promise.set_exception(ex); - }, - [&](bool sentSynchronously) - { - test((sentSynchronously && id == this_thread::get_id()) || - (!sentSynchronously && id != this_thread::get_id())); - promise.set_value(); - }); - promise.get_future().get(); - test(p->waitForBatch(2)); - } - - if(p->ice_getConnection() && protocol != "bt") - { - test(p->opBatchCount() == 0); - auto b1 = p->ice_batchOneway(); - b1->opBatch(); - b1->ice_getConnection()->close(Ice::ICE_SCOPED_ENUM(ConnectionClose, GracefullyWithWait)); - - auto id = this_thread::get_id(); - promise promise; - b1->ice_flushBatchRequestsAsync( - [&](exception_ptr ex) - { - promise.set_exception(ex); - }, - [&](bool sentSynchronously) - { - test((sentSynchronously && id == this_thread::get_id()) || - (!sentSynchronously && id != this_thread::get_id())); - promise.set_value(); - }); - promise.get_future().get(); - test(p->waitForBatch(1)); - } - } - cout << "ok" << endl; - - if(p->ice_getConnection()) // No collocation optimization - { - cout << "testing batch requests with connection... " << flush; - { - { - test(p->opBatchCount() == 0); - auto b1 = Ice::uncheckedCast( - p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); - b1->opBatch(); - b1->opBatch(); - - auto id = this_thread::get_id(); - promise promise; - - b1->ice_getConnection()->flushBatchRequestsAsync( - Ice::CompressBatch::BasedOnProxy, - [&](exception_ptr ex) - { - promise.set_exception(ex); - }, - [&](bool sentSynchronously) - { - test((sentSynchronously && id == this_thread::get_id()) || - (!sentSynchronously && id != this_thread::get_id())); - promise.set_value(); - }); - promise.get_future().get(); - test(p->waitForBatch(2)); - } - - { - // Ensure it also works with a twoway proxy - auto id = this_thread::get_id(); - promise promise; - p->ice_getConnection()->flushBatchRequestsAsync( - Ice::CompressBatch::BasedOnProxy, - [&](exception_ptr ex) - { - promise.set_exception(ex); - }, - [&](bool sentSynchronously) - { - test((sentSynchronously && id == this_thread::get_id()) || - (!sentSynchronously && id != this_thread::get_id())); - promise.set_value(); - }); - promise.get_future().get(); - } - - if(protocol != "bt") - { - test(p->opBatchCount() == 0); - auto b1 = Ice::uncheckedCast( - p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); - b1->opBatch(); - b1->ice_getConnection()->close(Ice::ICE_SCOPED_ENUM(ConnectionClose, GracefullyWithWait)); - - promise promise; - b1->ice_getConnection()->flushBatchRequestsAsync( - Ice::CompressBatch::BasedOnProxy, - [&](exception_ptr ex) - { - promise.set_exception(std::move(ex)); - }, - [&](bool) - { - promise.set_value(); - }); - - try - { - promise.get_future().get(); - test(false); - } - catch(const Ice::LocalException&) - { - } - test(p->opBatchCount() == 0); - } - } - cout << "ok" << endl; - - cout << "testing batch requests with communicator... " << flush; - { - { - // - // 1 connection. Test future - // - test(p->opBatchCount() == 0); - auto b1 = Ice::uncheckedCast( - p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); - b1->opBatch(); - b1->opBatch(); - - communicator->flushBatchRequestsAsync(Ice::CompressBatch::BasedOnProxy).get(); - test(p->waitForBatch(2)); - } - - { - // - // 1 connection. - // - test(p->opBatchCount() == 0); - auto b1 = Ice::uncheckedCast( - p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); - b1->opBatch(); - b1->opBatch(); - - promise promise; - auto id = this_thread::get_id(); - communicator->flushBatchRequestsAsync( - Ice::CompressBatch::BasedOnProxy, - [&](exception_ptr ex) - { - promise.set_exception(std::move(ex)); - }, - [&](bool sentSynchronously) - { - test((sentSynchronously && id == this_thread::get_id()) || - (!sentSynchronously && id != this_thread::get_id())); - promise.set_value(); - }); - promise.get_future().get(); - test(p->waitForBatch(2)); - } - - if(protocol != "bt") - { - // - // Exception - 1 connection. - // - test(p->opBatchCount() == 0); - auto b1 = Ice::uncheckedCast( - p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); - b1->opBatch(); - b1->ice_getConnection()->close(Ice::ICE_SCOPED_ENUM(ConnectionClose, GracefullyWithWait)); - - promise promise; - auto id = this_thread::get_id(); - communicator->flushBatchRequestsAsync( - Ice::CompressBatch::BasedOnProxy, - [&](exception_ptr ex) - { - promise.set_exception(std::move(ex)); - }, - [&](bool sentSynchronously) - { - test((sentSynchronously && id == this_thread::get_id()) || - (!sentSynchronously && id != this_thread::get_id())); - promise.set_value(); - }); - promise.get_future().get(); // Exceptions are ignored! - test(p->opBatchCount() == 0); - } - - if(protocol != "bt") - { - // - // 2 connections. - // - test(p->opBatchCount() == 0); - auto b1 = Ice::uncheckedCast( - p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); - auto b2 = Ice::uncheckedCast( - p->ice_connectionId("2")->ice_getConnection()->createProxy( - p->ice_getIdentity())->ice_batchOneway()); - b2->ice_getConnection(); // Ensure connection is established. - b1->opBatch(); - b1->opBatch(); - b2->opBatch(); - b2->opBatch(); - - promise promise; - auto id = this_thread::get_id(); - communicator->flushBatchRequestsAsync( - Ice::CompressBatch::BasedOnProxy, - [&](exception_ptr ex) - { - promise.set_exception(std::move(ex)); - }, - [&](bool sentSynchronously) - { - test((sentSynchronously && id == this_thread::get_id()) || - (!sentSynchronously && id != this_thread::get_id())); - promise.set_value(); - }); - promise.get_future().get(); - test(p->waitForBatch(4)); - } - - if(protocol != "bt") - { - // - // 2 connections - 2 failures. - // - // The sent callback should be invoked even if all connections fail. - // - test(p->opBatchCount() == 0); - auto b1 = Ice::uncheckedCast( - p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); - auto b2 = Ice::uncheckedCast( - p->ice_connectionId("2")->ice_getConnection()->createProxy( - p->ice_getIdentity())->ice_batchOneway()); - - b2->ice_getConnection(); // Ensure connection is established. - b1->opBatch(); - b2->opBatch(); - b1->ice_getConnection()->close(Ice::ICE_SCOPED_ENUM(ConnectionClose, GracefullyWithWait)); - b2->ice_getConnection()->close(Ice::ICE_SCOPED_ENUM(ConnectionClose, GracefullyWithWait)); - - promise promise; - auto id = this_thread::get_id(); - communicator->flushBatchRequestsAsync( - Ice::CompressBatch::BasedOnProxy, - [&](exception_ptr ex) - { - promise.set_exception(std::move(ex)); - }, - [&](bool sentSynchronously) - { - test((sentSynchronously && id == this_thread::get_id()) || - (!sentSynchronously && id != this_thread::get_id())); - promise.set_value(); - }); - promise.get_future().get(); // Exceptions are ignored! - test(p->opBatchCount() == 0); - } - } - cout << "ok" << endl; - - cout << "testing cancel operations... " << flush; - { - if(p->ice_getConnection()) - { - testController->holdAdapter(); - { - promise promise; - auto cancel = p->ice_pingAsync( - [&]() - { - promise.set_value(); - }, - [&](exception_ptr ex) - { - promise.set_exception(ex); - }); - cancel(); - - try - { - promise.get_future().get(); - test(false); - } - catch(const Ice::InvocationCanceledException&) - { - } - catch(...) - { - testController->resumeAdapter(); - throw; - } - } - - { - promise promise; - auto cancel = p->ice_idAsync( - [&](string) - { - promise.set_value(); - }, - [&](exception_ptr ex) - { - promise.set_exception(ex); - }); - cancel(); - - try - { - promise.get_future().get(); - test(false); - } - catch(const Ice::InvocationCanceledException&) - { - } - catch(...) - { - testController->resumeAdapter(); - throw; - } - } - testController->resumeAdapter(); - } - } - cout << "ok" << endl; - - if(p->ice_getConnection() && protocol != "bt" && p->supportsAMD()) { - cout << "testing graceful close connection with wait... " << flush; - { - // - // Local case: begin a request, close the connection gracefully, and make sure it waits - // for the request to complete. - // - auto con = p->ice_getConnection(); - auto sc = make_shared>(); - con->setCloseCallback( - [sc](Ice::ConnectionPtr) - { - sc->set_value(); - }); - auto fc = sc->get_future(); - auto s = make_shared>(); - p->sleepAsync(100, - [s]() { s->set_value(); }, - [s](exception_ptr ex) { s->set_exception(ex); }); - auto f = s->get_future(); - // Blocks until the request completes. - con->close(Ice::ICE_SCOPED_ENUM(ConnectionClose, GracefullyWithWait)); - f.get(); // Should complete successfully. - fc.get(); - } - { - // - // Remote case. - // - Ice::ByteSeq seq; - seq.resize(1024 * 10); - for(Ice::ByteSeq::iterator q = seq.begin(); q != seq.end(); ++q) - { - *q = static_cast(IceUtilInternal::random(255)); - } - - // - // Send multiple opWithPayload, followed by a close and followed by multiple opWithPaylod. - // The goal is to make sure that none of the opWithPayload fail even if the server closes - // the connection gracefully in between. - // - - int maxQueue = 2; - bool done = false; - while(!done && maxQueue < 5000) - { - done = true; - p->ice_ping(); - vector> results; - for(int i = 0; i < maxQueue; ++i) - { - auto s = make_shared>(); - p->opWithPayloadAsync(seq, - [s]() { s->set_value(); }, - [s](exception_ptr ex) { s->set_exception(ex); }); - results.push_back(s->get_future()); - } - atomic_flag sent = ATOMIC_FLAG_INIT; - p->closeAsync(Test::CloseMode::GracefullyWithWait, nullptr, nullptr, - [&sent](bool) { sent.test_and_set(); }); - if(!sent.test_and_set()) - { - for(int i = 0; i < maxQueue; i++) - { - auto s = make_shared>(); - atomic_flag sent2 = ATOMIC_FLAG_INIT; - p->opWithPayloadAsync(seq, - [s]() { s->set_value(); }, - [s](exception_ptr ex) { s->set_exception(ex); }, - [&sent2](bool) { sent2.test_and_set(); }); - results.push_back(s->get_future()); - if(sent2.test_and_set()) - { - done = false; - maxQueue *= 2; - break; - } - } - } - else - { - maxQueue *= 2; - done = false; - } - - for(vector>::iterator r = results.begin(); r != results.end(); ++r) - { - try - { - r->get(); - } - catch(const Ice::LocalException& ex) - { - cerr << ex << endl; - test(false); - } - } - } - } - cout << "ok" << endl; - - cout << "testing graceful close connection without wait... " << flush; - { - // - // Local case: start an operation and then close the connection gracefully on the client side - // without waiting for the pending invocation to complete. There will be no retry and we expect the - // invocation to fail with ConnectionManuallyClosedException. - // - p = p->ice_connectionId("CloseGracefully"); // Start with a new connection. - auto con = p->ice_getConnection(); - auto s = make_shared>(); - auto sent = make_shared>(); - p->startDispatchAsync([s]() { s->set_value(); }, - [s](exception_ptr ex) { s->set_exception(ex); }, - [sent](bool) { sent->set_value(); }); - auto f = s->get_future(); - sent->get_future().get(); // Ensure the request was sent before we close the connection. - con->close(Ice::ConnectionClose::Gracefully); - try - { - f.get(); - test(false); - } - catch(const Ice::ConnectionManuallyClosedException& ex) - { - test(ex.graceful); - } - p->finishDispatch(); - - // - // Remote case: the server closes the connection gracefully, which means the connection - // will not be closed until all pending dispatched requests have completed. - // - con = p->ice_getConnection(); - auto sc = make_shared>(); - con->setCloseCallback( - [sc](Ice::ConnectionPtr) - { - sc->set_value(); - }); - auto fc = sc->get_future(); - s = make_shared>(); - p->sleepAsync(100, - [s]() { s->set_value(); }, - [s](exception_ptr ex) { s->set_exception(ex); }); - f = s->get_future(); - p->close(Test::CloseMode::Gracefully); // Close is delayed until sleep completes. - fc.get(); // Ensure connection was closed. - try - { - f.get(); - } - catch(const Ice::LocalException&) - { - test(false); - } - } - cout << "ok" << endl; - - cout << "testing forceful close connection... " << flush; + // Count copies made + class CopyCounter { - // - // Local case: start a lengthy operation and then close the connection forcefully on the client side. - // There will be no retry and we expect the invocation to fail with ConnectionManuallyClosedException. - // - p->ice_ping(); - auto con = p->ice_getConnection(); - auto s = make_shared>(); - auto sent = make_shared>(); - p->startDispatchAsync([s]() { s->set_value(); }, - [s](exception_ptr ex) { s->set_exception(ex); }, - [sent](bool) { sent->set_value(); }); - auto f = s->get_future(); - sent->get_future().get(); // Ensure the request was sent before we close the connection. - con->close(Ice::ConnectionClose::Forcefully); - try - { - f.get(); - test(false); - } - catch(const Ice::ConnectionManuallyClosedException& ex) + public: + CopyCounter(int& count) : _count(count) { - test(!ex.graceful); } - p->finishDispatch(); - // - // Remote case: the server closes the connection forcefully. This causes the request to fail - // with a ConnectionLostException. Since the close() operation is not idempotent, the client - // will not retry. - // - try + CopyCounter(const CopyCounter& o) : _count(o._count) { - p->close(Test::CloseMode::Forcefully); - test(false); + _count++; } - catch(const Ice::ConnectionLostException&) + + CopyCounter(CopyCounter&&) = default; + + private: + int& _count; + }; + + int responseCopyCount = 0; + int errorCopyCount = 0; + int sentCopyCount = 0; + CopyCounter responseCopyCounter(responseCopyCount); + CopyCounter errorCopyCounter(errorCopyCount); + CopyCounter sentCopyCounter(sentCopyCount); + + promise promise; + p->opWithResultAsync( + [&promise, responseCopyCounter](int result) { - // Expected. - } - } - cout << "ok" << endl; + promise.set_value(result); + }, + [&promise, errorCopyCounter](exception_ptr ex) + { + promise.set_exception(ex); + }, + [sentCopyCounter](bool) + { + // no-op + }); + test(promise.get_future().get() == 15); + test(responseCopyCount == 1); + test(errorCopyCount == 1); + test(sentCopyCount == 1); + } + { + promise promise; + p->opWithResultAsync( + [&](int result) + { + promise.set_value(result); + }, + nullptr, nullptr, ctx); + test(promise.get_future().get() == 15); } - } - - { - cout << "testing result struct... " << flush; - auto q = Ice::uncheckedCast( - communicator->stringToProxy("test2:" + helper->getTestEndpoint())); + { + p->opWithUEAsync(nullptr); + } + { + promise promise; + p->opWithUEAsync( + nullptr, + [&](exception_ptr ex) + { + promise.set_exception(ex); + }); - promise promise; - q->opAsync(1, - [&promise](int i, int j) + try + { + promise.get_future().get(); + test(false); + } + catch(const Test::TestIntfException&) + { + } + } + { + promise promise; + p->opWithUEAsync( + [&]() { - test(i == j); promise.set_value(); }, - [](exception_ptr ex) + [&](exception_ptr ex) { - try - { - rethrow_exception(ex); - } - catch(const std::exception& exc) - { - cerr << exc.what() << endl; - } - test(false); + promise.set_exception(ex); }); - promise.get_future().get(); - auto f = q->opAsync(1); - auto r = f.get(); - test(r.returnValue == r.j); - test(r.returnValue == 1); - cout << "ok" << endl; - } + try + { + promise.get_future().get(); + test(false); + } + catch(const Test::TestIntfException&) + { + } + } + { + promise promise; + p->opWithUEAsync( + nullptr, + [&](exception_ptr ex) + { + promise.set_exception(ex); + }, + nullptr, ctx); - if(p->ice_getConnection()) - { - cout << "testing bidir... " << flush; - auto adapter = communicator->createObjectAdapter(""); - auto replyI = make_shared(); - auto reply = Ice::uncheckedCast(adapter->addWithUUID(replyI)); - adapter->activate(); + try + { + promise.get_future().get(); + test(false); + } + catch(const Test::TestIntfException&) + { + } + } - p->ice_getConnection()->setAdapter(adapter); - p->pingBiDir(reply); - test(replyI->checkReceived()); - adapter->destroy(); + { + p->opWithResultAndUEAsync(nullptr); + } + { + promise promise; + p->opWithResultAndUEAsync( + nullptr, + [&](exception_ptr ex) + { + promise.set_exception(ex); + }); - cout << "ok" << endl; - } + try + { + promise.get_future().get(); + test(false); + } + catch(const Test::TestIntfException&) + { + } + catch(const Ice::OperationNotExistException&) + { + } + } + { + promise promise; + p->opWithResultAndUEAsync( + [&](int) + { + promise.set_value(); + }, + [&](exception_ptr ex) + { + promise.set_exception(ex); + }); - p->shutdown(); + try + { + promise.get_future().get(); + test(false); + } + catch(const Test::TestIntfException&) + { + } + catch(const Ice::OperationNotExistException&) + { + } + } + { + promise promise; + p->opWithResultAndUEAsync( + nullptr, + [&](exception_ptr ex) + { + promise.set_exception(ex); + }, + nullptr, ctx); -#else - string sref = "test:" + helper->getTestEndpoint(); - Ice::ObjectPrx obj = communicator->stringToProxy(sref); - test(obj); + try + { + promise.get_future().get(); + test(false); + } + catch(const Test::TestIntfException&) + { + } + catch(const Ice::OperationNotExistException&) + { + } + } + } + cout << "ok" << endl; - Test::TestIntfPrx p = Test::TestIntfPrx::uncheckedCast(obj); + cout << "testing future API... " << flush; + { - sref = "testController:" + helper->getTestEndpoint(1); - obj = communicator->stringToProxy(sref); - test(obj); + test(p->ice_isAAsync(Test::TestIntf::ice_staticId()).get()); + test(p->ice_isAAsync(Test::TestIntf::ice_staticId(), ctx).get()); - Test::TestIntfControllerPrx testController = Test::TestIntfControllerPrx::uncheckedCast(obj); + p->ice_pingAsync().get(); + p->ice_pingAsync(ctx).get(); - cout << "testing begin/end invocation... " << flush; - { - Ice::AsyncResultPtr result; - Ice::Context ctx; + test(p->ice_idsAsync().get().size() == 2); + test(p->ice_idsAsync(ctx).get().size() == 2); - result = p->begin_ice_isA(Test::TestIntf::ice_staticId()); - test(p->end_ice_isA(result)); - result = p->begin_ice_isA(Test::TestIntf::ice_staticId(), ctx); - test(p->end_ice_isA(result)); + if(!collocated) + { + test(p->ice_getConnectionAsync().get()); + } - result = p->begin_ice_ping(); - p->end_ice_ping(result); - result = p->begin_ice_ping(ctx); - p->end_ice_ping(result); + p->opAsync().get(); + p->opAsync(ctx).get(); - result = p->begin_ice_id(); - test(p->end_ice_id(result) == Test::TestIntf::ice_staticId()); - result = p->begin_ice_id(ctx); - test(p->end_ice_id(result) == Test::TestIntf::ice_staticId()); + test(p->opWithResultAsync().get() == 15); + test(p->opWithResultAsync(ctx).get() == 15); - result = p->begin_ice_ids(); - test(p->end_ice_ids(result).size() == 2); - result = p->begin_ice_ids(ctx); - test(p->end_ice_ids(result).size() == 2); + try + { + p->opWithUEAsync().get(); + test(false); + } + catch(const Test::TestIntfException&) + { + } - if(!collocated) + try + { + p->opWithUEAsync(ctx).get(); + test(false); + } + catch(const Test::TestIntfException&) { - result = p->begin_ice_getConnection(); - test(p->end_ice_getConnection(result)); } - result = p->begin_op(); - p->end_op(result); - result = p->begin_op(ctx); - p->end_op(result); - - result = p->begin_opWithResult(); - test(p->end_opWithResult(result) == 15); - result = p->begin_opWithResult(ctx); - test(p->end_opWithResult(result) == 15); - - result = p->begin_opWithUE(); try { - p->end_opWithUE(result); + p->opWithResultAndUEAsync().get(); test(false); } catch(const Test::TestIntfException&) { } - result = p->begin_opWithUE(ctx); + catch(const Ice::OperationNotExistException&) + { + } + try { - p->end_opWithUE(result); + p->opWithResultAndUEAsync(ctx).get(); test(false); } catch(const Test::TestIntfException&) { } + catch(const Ice::OperationNotExistException&) + { + } } cout << "ok" << endl; - cout << "testing async callback... " << flush; + cout << "testing local exceptions with lambda API... " << flush; { - AsyncCallbackPtr cb = new AsyncCallback(); - Ice::Context ctx; - CookiePtr cookie = new Cookie(5); - AsyncCallbackPtr cbWC = new AsyncCallback(cookie); - - p->begin_ice_isA(Test::TestIntf::ice_staticId(), Ice::newCallback(cb, &AsyncCallback::isA)); - cb->check(); - p->begin_ice_isA(Test::TestIntf::ice_staticId(), Ice::newCallback(cbWC, &AsyncCallback::isA), cookie); - cbWC->check(); - p->begin_ice_isA(Test::TestIntf::ice_staticId(), ctx, Ice::newCallback(cb, &AsyncCallback::isA)); - cb->check(); - p->begin_ice_isA(Test::TestIntf::ice_staticId(), ctx, Ice::newCallback(cbWC, &AsyncCallback::isA), cookie); - cbWC->check(); - - p->begin_ice_ping(Ice::newCallback(cb, &AsyncCallback::ping)); - cb->check(); - p->begin_ice_ping(Ice::newCallback(cbWC, &AsyncCallback::ping), cookie); - cbWC->check(); - p->begin_ice_ping(ctx, Ice::newCallback(cb, &AsyncCallback::ping)); - cb->check(); - p->begin_ice_ping(ctx, Ice::newCallback(cbWC, &AsyncCallback::ping), cookie); - cbWC->check(); - - p->begin_ice_id(Ice::newCallback(cb, &AsyncCallback::id)); - cb->check(); - p->begin_ice_id(Ice::newCallback(cbWC, &AsyncCallback::id), cookie); - cbWC->check(); - p->begin_ice_id(ctx, Ice::newCallback(cb, &AsyncCallback::id)); - cb->check(); - p->begin_ice_id(ctx, Ice::newCallback(cbWC, &AsyncCallback::id), cookie); - cbWC->check(); - - p->begin_ice_ids(Ice::newCallback(cb, &AsyncCallback::ids)); - cb->check(); - p->begin_ice_ids(Ice::newCallback(cbWC, &AsyncCallback::ids), cookie); - cbWC->check(); - p->begin_ice_ids(ctx, Ice::newCallback(cb, &AsyncCallback::ids)); - cb->check(); - p->begin_ice_ids(ctx, Ice::newCallback(cbWC, &AsyncCallback::ids), cookie); - cbWC->check(); + auto indirect = Ice::uncheckedCast(p->ice_adapterId("dummy")); - if(!collocated) { - p->begin_ice_getConnection(Ice::newCallback(cb, &AsyncCallback::connection)); - cb->check(); - p->begin_ice_getConnection(Ice::newCallback(cbWC, &AsyncCallback::connection), cookie); - cbWC->check(); + promise promise; + indirect->opAsync( + [&]() + { + promise.set_value(); + }, + [&](exception_ptr ex) + { + promise.set_exception(ex); + }); + try + { + promise.get_future().get(); + test(false); + } + catch(const Ice::NoEndpointException&) + { + } } - p->begin_op(Ice::newCallback(cb, &AsyncCallback::op)); - cb->check(); - p->begin_op(Ice::newCallback(cbWC, &AsyncCallback::op), cookie); - cbWC->check(); - p->begin_op(ctx, Ice::newCallback(cb, &AsyncCallback::op)); - cb->check(); - p->begin_op(ctx, Ice::newCallback(cbWC, &AsyncCallback::op), cookie); - cbWC->check(); - - p->begin_opWithResult(Ice::newCallback(cb, &AsyncCallback::opWithResult)); - cb->check(); - p->begin_opWithResult(Ice::newCallback(cbWC, &AsyncCallback::opWithResult), cookie); - cbWC->check(); - p->begin_opWithResult(ctx, Ice::newCallback(cb, &AsyncCallback::opWithResult)); - cb->check(); - p->begin_opWithResult(ctx, Ice::newCallback(cbWC, &AsyncCallback::opWithResult), cookie); - cbWC->check(); - - p->begin_opWithUE(Ice::newCallback(cb, &AsyncCallback::opWithUE)); - cb->check(); - p->begin_opWithUE(Ice::newCallback(cbWC, &AsyncCallback::opWithUE), cookie); - cbWC->check(); - p->begin_opWithUE(ctx, Ice::newCallback(cb, &AsyncCallback::opWithUE)); - cb->check(); - p->begin_opWithUE(ctx, Ice::newCallback(cbWC, &AsyncCallback::opWithUE), cookie); - cbWC->check(); - } - cout << "ok" << endl; - - cout << "testing response callback... " << flush; - { - ResponseCallbackPtr cb = new ResponseCallback(); - Ice::Context ctx; - CookiePtr cookie = new Cookie(5); - ResponseCallbackWCPtr cbWC = new ResponseCallbackWC(cookie); - - Ice::CallbackNC_Object_ice_isA::Exception nullEx = 0; - Ice::Callback_Object_ice_isA::Exception nullExWC = 0; - - p->begin_ice_isA(Test::TestIntf::ice_staticId(), Ice::newCallback_Object_ice_isA(cb, &ResponseCallback::isA, - nullEx)); - cb->check(); - p->begin_ice_isA(Test::TestIntf::ice_staticId(), - Ice::newCallback_Object_ice_isA(cbWC, &ResponseCallbackWC::isA, nullExWC), cookie); - cbWC->check(); - p->begin_ice_isA(Test::TestIntf::ice_staticId(), ctx, - Ice::newCallback_Object_ice_isA(cb, &ResponseCallback::isA, nullEx)); - cb->check(); - p->begin_ice_isA(Test::TestIntf::ice_staticId(), ctx, - Ice::newCallback_Object_ice_isA(cbWC, &ResponseCallbackWC::isA, nullExWC), cookie); - cbWC->check(); - - p->begin_ice_ping(Ice::newCallback_Object_ice_ping(cb, &ResponseCallback::ping, nullEx)); - cb->check(); - p->begin_ice_ping(Ice::newCallback_Object_ice_ping(cbWC, &ResponseCallbackWC::ping, nullExWC), cookie); - cbWC->check(); - p->begin_ice_ping(ctx, Ice::newCallback_Object_ice_ping(cb, &ResponseCallback::ping, nullEx)); - cb->check(); - p->begin_ice_ping(ctx, Ice::newCallback_Object_ice_ping(cbWC, &ResponseCallbackWC::ping, nullExWC), cookie); - cbWC->check(); - - p->begin_ice_id(Ice::newCallback_Object_ice_id(cb, &ResponseCallback::id, nullEx)); - cb->check(); - p->begin_ice_id(Ice::newCallback_Object_ice_id(cbWC, &ResponseCallbackWC::id, nullExWC), cookie); - cbWC->check(); - p->begin_ice_id(ctx, Ice::newCallback_Object_ice_id(cb, &ResponseCallback::id, nullEx)); - cb->check(); - p->begin_ice_id(ctx, Ice::newCallback_Object_ice_id(cbWC, &ResponseCallbackWC::id, nullExWC), cookie); - cbWC->check(); - - p->begin_ice_ids(Ice::newCallback_Object_ice_ids(cb, &ResponseCallback::ids, nullEx)); - cb->check(); - p->begin_ice_ids(Ice::newCallback_Object_ice_ids(cbWC, &ResponseCallbackWC::ids, nullExWC), cookie); - cbWC->check(); - p->begin_ice_ids(ctx, Ice::newCallback_Object_ice_ids(cb, &ResponseCallback::ids, nullEx)); - cb->check(); - p->begin_ice_ids(ctx, Ice::newCallback_Object_ice_ids(cbWC, &ResponseCallbackWC::ids, nullExWC), cookie); - cbWC->check(); - - if(!collocated) { - p->begin_ice_getConnection(Ice::newCallback_Object_ice_getConnection(cb, &ResponseCallback::connection, - nullEx)); - cb->check(); - p->begin_ice_getConnection(Ice::newCallback_Object_ice_getConnection(cbWC, &ResponseCallbackWC::connection, - nullExWC), cookie); - cbWC->check(); + try + { + promise promise; + p->ice_oneway()->opWithResultAsync( + [&](int value) + { + promise.set_value(value); + }, + [&](exception_ptr ex) + { + promise.set_exception(ex); + }); + test(false); + } + catch(const Ice::TwowayOnlyException&) + { + } } - p->begin_op(Test::newCallback_TestIntf_op(cb, &ResponseCallback::op, nullEx)); - cb->check(); - p->begin_op(Test::newCallback_TestIntf_op(cbWC, &ResponseCallbackWC::op, nullExWC), cookie); - cbWC->check(); - p->begin_op(ctx, Test::newCallback_TestIntf_op(cb, &ResponseCallback::op, nullEx)); - cb->check(); - p->begin_op(ctx, Test::newCallback_TestIntf_op(cbWC, &ResponseCallbackWC::op, nullExWC), cookie); - cbWC->check(); - - p->begin_opWithResult(Test::newCallback_TestIntf_opWithResult(cb, &ResponseCallback::opWithResult, nullEx)); - cb->check(); - p->begin_opWithResult(Test::newCallback_TestIntf_opWithResult(cbWC, &ResponseCallbackWC::opWithResult, - nullExWC), cookie); - cbWC->check(); - p->begin_opWithResult(ctx, Test::newCallback_TestIntf_opWithResult(cb, &ResponseCallback::opWithResult, - nullEx)); - cb->check(); - p->begin_opWithResult(ctx, Test::newCallback_TestIntf_opWithResult(cbWC, &ResponseCallbackWC::opWithResult, - nullExWC), cookie); - cbWC->check(); - - p->begin_opWithUE(Test::newCallback_TestIntf_opWithUE(cb, &ResponseCallback::op, &ResponseCallback::opWithUE)); - cb->check(); - p->begin_opWithUE(Test::newCallback_TestIntf_opWithUE(cbWC, &ResponseCallbackWC::op, - &ResponseCallbackWC::opWithUE), cookie); - cbWC->check(); - p->begin_opWithUE(ctx, Test::newCallback_TestIntf_opWithUE(cb, &ResponseCallback::op, - &ResponseCallback::opWithUE)); - cb->check(); - p->begin_opWithUE(ctx, Test::newCallback_TestIntf_opWithUE(cbWC, &ResponseCallbackWC::op, - &ResponseCallbackWC::opWithUE), cookie); - cbWC->check(); + // + // Check that CommunicatorDestroyedException is raised directly. + // + if(p->ice_getConnection() && protocol != "bt") + { + Ice::InitializationData initData; + initData.properties = communicator->getProperties()->clone(); + Ice::CommunicatorPtr ic = Ice::initialize(initData); + auto obj = ic->stringToProxy(p->ice_toString()); + auto p2 = Ice::checkedCast(obj); + ic->destroy(); + + try + { + promise promise; + p2->opAsync( + [&]() + { + promise.set_value(); + }, + [&](exception_ptr ex) + { + promise.set_exception(ex); + }); + test(false); + } + catch(const Ice::CommunicatorDestroyedException&) + { + // Expected. + } + } } cout << "ok" << endl; - cout << "testing local exceptions... " << flush; + cout << "testing local exceptions with future API... " << flush; { - Test::TestIntfPrx indirect = Test::TestIntfPrx::uncheckedCast(p->ice_adapterId("dummy")); - Ice::AsyncResultPtr r; - - r = indirect->begin_op(); + auto indirect = Ice::uncheckedCast(p->ice_adapterId("dummy")); + auto r = indirect->opAsync(); try { - indirect->end_op(r); + r.get(); test(false); } catch(const Ice::NoEndpointException&) @@ -2765,28 +670,28 @@ allTests(Test::TestHelper* helper, bool collocated) try { - r = p->ice_oneway()->begin_opWithResult(); + p->ice_oneway()->opWithResultAsync().get(); test(false); } - catch(const IceUtil::IllegalArgumentException&) + catch(const Ice::TwowayOnlyException&) { } // // Check that CommunicatorDestroyedException is raised directly. // - if(p->ice_getConnection() && protocol != "bt") + if(p->ice_getConnection()) { Ice::InitializationData initData; initData.properties = communicator->getProperties()->clone(); Ice::CommunicatorPtr ic = Ice::initialize(initData); - obj = ic->stringToProxy(p->ice_toString()); - Test::TestIntfPrx p2 = Test::TestIntfPrx::checkedCast(obj); + auto obj = ic->stringToProxy(p->ice_toString()); + auto p2 = Ice::checkedCast(obj); ic->destroy(); try { - p2->begin_op(); + p2->opAsync(); test(false); } catch(const Ice::CommunicatorDestroyedException&) @@ -2797,508 +702,392 @@ allTests(Test::TestHelper* helper, bool collocated) } cout << "ok" << endl; - cout << "testing local exceptions with async callback... " << flush; + cout << "testing exception callback with lambda API... " << flush; { - Test::TestIntfPrx i = Test::TestIntfPrx::uncheckedCast(p->ice_adapterId("dummy")); - AsyncCallbackPtr cb = new AsyncCallback(); - CookiePtr cookie = new Cookie(5); - AsyncCallbackPtr cbWC = new AsyncCallback(cookie); - - i->begin_ice_isA(Test::TestIntf::ice_staticId(), Ice::newCallback(cb, &AsyncCallback::isAEx)); - cb->check(); - i->begin_ice_isA(Test::TestIntf::ice_staticId(), Ice::newCallback(cbWC, &AsyncCallback::isAEx), cookie); - cbWC->check(); - - i->begin_ice_ping(Ice::newCallback(cb, &AsyncCallback::pingEx)); - cb->check(); - i->begin_ice_ping(Ice::newCallback(cbWC, &AsyncCallback::pingEx), cookie); - cbWC->check(); - - i->begin_ice_id(Ice::newCallback(cb, &AsyncCallback::idEx)); - cb->check(); - i->begin_ice_id(Ice::newCallback(cbWC, &AsyncCallback::idEx), cookie); - cbWC->check(); - - i->begin_ice_ids(Ice::newCallback(cb, &AsyncCallback::idsEx)); - cb->check(); - i->begin_ice_ids(Ice::newCallback(cbWC, &AsyncCallback::idsEx), cookie); - cbWC->check(); + auto i = Ice::uncheckedCast(p->ice_adapterId("dummy")); - if(!collocated) { - i->begin_ice_getConnection(Ice::newCallback(cb, &AsyncCallback::connectionEx)); - cb->check(); + promise promise; + i->ice_isAAsync(Test::TestIntf::ice_staticId(), + [&](bool value) + { + promise.set_value(value); + }, + [&](exception_ptr ex) + { + promise.set_exception(ex); + }); + try + { + promise.get_future().get(); + test(false); + } + catch(const Ice::NoEndpointException&) + { + } } - i->begin_op(Ice::newCallback(cb, &AsyncCallback::opEx)); - cb->check(); - i->begin_op(Ice::newCallback(cbWC, &AsyncCallback::opEx), cookie); - cbWC->check(); - } - cout << "ok" << endl; - - cout << "testing local exceptions with response callback... " << flush; - { - Test::TestIntfPrx i = Test::TestIntfPrx::uncheckedCast(p->ice_adapterId("dummy")); - ExceptionCallbackPtr cb = new ExceptionCallback(); - CookiePtr cookie = new Cookie(5); - ExceptionCallbackWCPtr cbWC = new ExceptionCallbackWC(cookie); - - i->begin_ice_isA(Test::TestIntf::ice_staticId(), - Ice::newCallback_Object_ice_isA(cb, &ExceptionCallback::isA, &ExceptionCallback::ex)); - cb->check(); - i->begin_ice_isA(Test::TestIntf::ice_staticId(), - Ice::newCallback_Object_ice_isA(cbWC, &ExceptionCallbackWC::isA, &ExceptionCallbackWC::ex), - cookie); - cbWC->check(); - - i->begin_ice_ping(Ice::newCallback_Object_ice_ping(cb, &ExceptionCallback::ping, &ExceptionCallback::ex)); - cb->check(); - i->begin_ice_ping(Ice::newCallback_Object_ice_ping(cbWC, &ExceptionCallbackWC::ping, - &ExceptionCallbackWC::ex), cookie); - cbWC->check(); - - i->begin_ice_id(Ice::newCallback_Object_ice_id(cb, &ExceptionCallback::id, &ExceptionCallback::ex)); - cb->check(); - i->begin_ice_id(Ice::newCallback_Object_ice_id(cbWC, &ExceptionCallbackWC::id, - &ExceptionCallbackWC::ex), cookie); - cbWC->check(); - - i->begin_ice_ids(Ice::newCallback_Object_ice_ids(cb, &ExceptionCallback::ids, &ExceptionCallback::ex)); - cb->check(); - i->begin_ice_ids(Ice::newCallback_Object_ice_ids(cbWC, &ExceptionCallbackWC::ids, - &ExceptionCallbackWC::ex), cookie); - cbWC->check(); - - if(!collocated) { - i->begin_ice_getConnection( - Ice::newCallback_Object_ice_getConnection(cb, &ExceptionCallback::connection, &ExceptionCallback::ex)); - cb->check(); + promise promise; + i->opAsync( + [&]() + { + promise.set_value(); + }, + [&](exception_ptr ex) + { + promise.set_exception(ex); + }); + + try + { + promise.get_future().get(); + test(false); + } + catch(const Ice::NoEndpointException&) + { + } } - i->begin_op(Test::newCallback_TestIntf_op(cb, &ExceptionCallback::op, &ExceptionCallback::ex)); - cb->check(); - i->begin_op(Test::newCallback_TestIntf_op(cbWC, &ExceptionCallbackWC::op, &ExceptionCallbackWC::ex), cookie); - cbWC->check(); - } - cout << "ok" << endl; + { + promise promise; + i->opWithUEAsync( + [&]() + { + promise.set_value(); + }, + [&](exception_ptr ex) + { + promise.set_exception(ex); + }); - cout << "testing exception callback... " << flush; - { - Test::TestIntfPrx i = Test::TestIntfPrx::uncheckedCast(p->ice_adapterId("dummy")); - ExceptionCallbackPtr cb = new ExceptionCallback(); - CookiePtr cookie = new Cookie(5); - ExceptionCallbackWCPtr cbWC = new ExceptionCallbackWC(cookie); - - i->begin_ice_isA(Test::TestIntf::ice_staticId(), - Ice::newCallback_Object_ice_isA(cb, &ExceptionCallback::ex)); - cb->check(); - i->begin_ice_isA(Test::TestIntf::ice_staticId(), - Ice::newCallback_Object_ice_isA(cbWC, &ExceptionCallbackWC::ex), cookie); - cbWC->check(); - - i->begin_op(Test::newCallback_TestIntf_op(cb, &ExceptionCallback::ex)); - cb->check(); - i->begin_op(Test::newCallback_TestIntf_op(cbWC, &ExceptionCallbackWC::ex), cookie); - cbWC->check(); - - // Operations that return a result must provide the response callback - //i->begin_opWithResult(Test::newCallback_TestIntf_opWithResult(cb, &ExceptionCallback::ex)); - //cb->check(); - //i->begin_opWithResult(Test::newCallback_TestIntf_opWithResult(cbWC, &ExceptionCallbackWC::ex), cookie); - //cbWC->check(); - - i->begin_opWithUE(Test::newCallback_TestIntf_opWithUE(cb, &ExceptionCallback::ex)); - cb->check(); - i->begin_opWithUE(Test::newCallback_TestIntf_opWithUE(cbWC, &ExceptionCallbackWC::ex), cookie); - cbWC->check(); + try + { + promise.get_future().get(); + test(false); + } + catch(const Ice::NoEndpointException&) + { + } + } // Ensures no exception is called when response is received - p->begin_ice_isA(Test::TestIntf::ice_staticId(), - Ice::newCallback_Object_ice_isA(cb, &ExceptionCallback::noEx)); - p->begin_ice_isA(Test::TestIntf::ice_staticId(), - Ice::newCallback_Object_ice_isA(cbWC, &ExceptionCallbackWC::noEx), cookie); - p->begin_op(Test::newCallback_TestIntf_op(cb, &ExceptionCallback::noEx)); - p->begin_op(Test::newCallback_TestIntf_op(cbWC, &ExceptionCallbackWC::noEx), cookie); - //p->begin_opWithResult(Test::newCallback_TestIntf_opWithResult(cb, &ExceptionCallback::noEx)); - //p->begin_opWithResult(Test::newCallback_TestIntf_opWithResult(cbWC, &ExceptionCallbackWC::noEx), cookie); - - // If response is a user exception, it should be received. - p->begin_opWithUE(Test::newCallback_TestIntf_opWithUE(cb, &ExceptionCallback::opWithUE)); - cb->check(); - - p->begin_opWithUE(Test::newCallback_TestIntf_opWithUE(cbWC, &ExceptionCallbackWC::opWithUE), cookie); - cbWC->check(); - } - cout << "ok" << endl; - - cout << "testing sent callback... " << flush; - { - SentCallbackPtr cb = new SentCallback; - CookiePtr cookie = new Cookie(4); - SentCallbackPtr cbWC = new SentCallback(cookie); - - p->begin_ice_isA("", Ice::newCallback_Object_ice_isA(cb, &SentCallback::isA, &SentCallback::ex, - &SentCallback::sent)); - cb->check(); - p->begin_ice_isA("", Ice::newCallback_Object_ice_isA(cbWC, &SentCallback::isAWC, &SentCallback::exWC, - &SentCallback::sentWC), cookie); - cbWC->check(); - - p->begin_ice_ping(Ice::newCallback_Object_ice_ping(cb, &SentCallback::ping, &SentCallback::ex, - &SentCallback::sent)); - cb->check(); - p->begin_ice_ping(Ice::newCallback_Object_ice_ping(cbWC, &SentCallback::pingWC, &SentCallback::exWC, - &SentCallback::sentWC), cookie); - cbWC->check(); - - p->begin_ice_id(Ice::newCallback_Object_ice_id(cb, &SentCallback::id, &SentCallback::ex, &SentCallback::sent)); - cb->check(); - p->begin_ice_id(Ice::newCallback_Object_ice_id(cbWC, &SentCallback::idWC, &SentCallback::exWC, - &SentCallback::sentWC), cookie); - cbWC->check(); - - p->begin_ice_ids(Ice::newCallback_Object_ice_ids(cb, &SentCallback::ids, &SentCallback::ex, - &SentCallback::sent)); - cb->check(); - p->begin_ice_ids(Ice::newCallback_Object_ice_ids(cbWC, &SentCallback::idsWC, &SentCallback::exWC, - &SentCallback::sentWC), cookie); - cbWC->check(); - - p->begin_op(Test::newCallback_TestIntf_op(cb, &SentCallback::op, &SentCallback::ex, &SentCallback::sent)); - cb->check(); - p->begin_op(Test::newCallback_TestIntf_op(cbWC, &SentCallback::opWC, &SentCallback::exWC, - &SentCallback::sentWC), cookie); - cbWC->check(); - - p->begin_op(Ice::newCallback(cb, &SentCallback::opAsync, &SentCallback::sentAsync)); - cb->check(); - p->begin_op(Ice::newCallback(cbWC, &SentCallback::opAsync, &SentCallback::sentAsync), cookie); - cbWC->check(); - - p->begin_op(Test::newCallback_TestIntf_op(cb, &SentCallback::ex, &SentCallback::sent)); - cb->check(); - p->begin_op(Test::newCallback_TestIntf_op(cbWC, &SentCallback::exWC, &SentCallback::sentWC), cookie); - cbWC->check(); - - vector cbs; - Ice::ByteSeq seq; - seq.resize(1024); - testController->holdAdapter(); - try { - cb = new SentCallback(); - while(p->begin_opWithPayload(seq, Test::newCallback_TestIntf_opWithPayload( - cb, &SentCallback::ex, &SentCallback::sent))->sentSynchronously()) + promise promise; + p->ice_isAAsync( + Test::TestIntf::ice_staticId(), + [&](bool value) + { + promise.set_value(value); + }, + [&](exception_ptr ex) + { + promise.set_exception(ex); + }); + try + { + test(promise.get_future().get()); + } + catch(...) { - cbs.push_back(cb); - cb = new SentCallback(); + test(false); } } - catch(...) + { - testController->resumeAdapter(); - throw; + promise promise; + p->opAsync( + [&]() + { + promise.set_value(); + }, + [&](exception_ptr ex) + { + promise.set_exception(ex); + }); + try + { + promise.get_future().get(); + } + catch(...) + { + test(false); + } } - testController->resumeAdapter(); - for(vector::const_iterator r = cbs.begin(); r != cbs.end(); r++) + + // If response is a user exception, it should be received. { - (*r)->check(); + promise promise; + p->opWithUEAsync( + [&]() + { + promise.set_value(); + }, + [&](exception_ptr ex) + { + promise.set_exception(ex); + }); + + try + { + promise.get_future().get(); + test(false); + } + catch(const Test::TestIntfException&) + { + } } } cout << "ok" << endl; - cout << "testing illegal arguments... " << flush; + cout << "testing sent callback with lambda API... " << flush; { - Ice::AsyncResultPtr result; + { + promise response; + promise sent; + + p->ice_isAAsync("", + [&](bool value) + { + response.set_value(value); + }, + [&](exception_ptr ex) + { + response.set_exception(ex); + }, + [&](bool sentAsync) + { + sent.set_value(sentAsync); + }); - result = p->begin_op(); - p->end_op(result); - try - { - p->end_op(result); - test(false); - } - catch(const IceUtil::IllegalArgumentException&) - { + sent.get_future().get(); + response.get_future().get(); } - result = p->begin_op(); - try - { - p->end_opWithResult(result); - test(false); - } - catch(const IceUtil::IllegalArgumentException&) { - } + promise response; + promise sent; - try - { - p->end_op(0); - test(false); - } - catch(const IceUtil::IllegalArgumentException&) - { - } + p->ice_pingAsync( + [&]() + { + response.set_value(); + }, + [&](exception_ptr ex) + { + response.set_exception(ex); + }, + [&](bool sentAsync) + { + sent.set_value(sentAsync); + }); - try - { - p->begin_op(Ice::newCallback(AsyncCallbackPtr(), &AsyncCallback::op)); - test(false); - } - catch(const IceUtil::IllegalArgumentException&) - { + sent.get_future().get(); + response.get_future().get(); } - try - { - p->begin_op(Test::newCallback_TestIntf_op(ResponseCallbackPtr(), &ResponseCallback::op, - &ResponseCallback::ex)); - test(false); - } - catch(const IceUtil::IllegalArgumentException&) { - } + promise response; + promise sent; - try - { - p->begin_op(Test::newCallback_TestIntf_op(ResponseCallbackWCPtr(), &ResponseCallbackWC::op, - &ResponseCallbackWC::ex)); - test(false); - } - catch(const IceUtil::IllegalArgumentException&) - { - } + p->ice_idAsync( + [&](string value) + { + response.set_value(value); + }, + [&](exception_ptr ex) + { + response.set_exception(ex); + }, + [&](bool sentAsync) + { + sent.set_value(sentAsync); + }); - try - { - void (AsyncCallback::*nullCallback)(const Ice::AsyncResultPtr&) = 0; - p->begin_op(Ice::newCallback(new AsyncCallback, nullCallback)); - test(false); - } - catch(const IceUtil::IllegalArgumentException&) - { + sent.get_future().get(); + response.get_future().get(); } - try - { - void (ResponseCallback::*nullCallback)() = 0; - void (ResponseCallback::*nullExCallback)(const Ice::Exception&) = 0; - p->begin_op(Test::newCallback_TestIntf_op(new ResponseCallback, nullCallback, nullExCallback)); - test(false); - } - catch(const IceUtil::IllegalArgumentException&) { - } + promise> response; + promise sent; - try - { - ResponseCallbackPtr cb = new ResponseCallback(); - p->begin_op(Test::newCallback_TestIntf_op(cb, &ResponseCallback::op, &ResponseCallback::ex), new Cookie(3)); - test(false); + p->ice_idsAsync( + [&](vector value) + { + response.set_value(value); + }, + [&](exception_ptr ex) + { + response.set_exception(ex); + }, + [&](bool sentAsync) + { + sent.set_value(sentAsync); + }); + + sent.get_future().get(); + response.get_future().get(); } - catch(const IceUtil::IllegalArgumentException&) + { + promise response; + promise sent; + + p->opAsync( + [&]() + { + response.set_value(); + }, + [&](exception_ptr ex) + { + response.set_exception(ex); + }, + [&](bool sentAsync) + { + sent.set_value(sentAsync); + }); + + sent.get_future().get(); + response.get_future().get(); } + vector> futures; + Ice::ByteSeq seq; + seq.resize(1024); + testController->holdAdapter(); try { - ResponseCallbackWCPtr cb = new ResponseCallbackWC(new Cookie(3)); - p->begin_op(Test::newCallback_TestIntf_op(cb, &ResponseCallbackWC::op, &ResponseCallbackWC::ex), - new Ice::LocalObject()); - test(false); + while(true) + { + auto s = make_shared>(); + auto f = s->get_future(); + p->opWithPayloadAsync( + seq, + [](){}, + [s](exception_ptr ex) + { + s->set_exception(ex); + }, + [s](bool value) + { + s->set_value(value); + }); + + if(f.wait_for(chrono::seconds(0)) != future_status::ready || !f.get()) + { + break; + } + futures.push_back(std::move(f)); + } } - catch(const IceUtil::IllegalArgumentException&) + catch(...) { + testController->resumeAdapter(); + throw; } + testController->resumeAdapter(); } cout << "ok" << endl; cout << "testing unexpected exceptions from callback... " << flush; { - Test::TestIntfPrx q = Test::TestIntfPrx::uncheckedCast(p->ice_adapterId("dummy")); - ThrowType throwEx[] = { LocalException, UserException, StandardException, OtherException }; - CookiePtr cookie = new Cookie(5); + auto q = Ice::uncheckedCast(p->ice_adapterId("dummy")); for(int i = 0; i < 4; ++i) { - ThrowerPtr cb = new Thrower(throwEx[i]); - - p->begin_op(Ice::newCallback(cb, &Thrower::opAsync)); - cb->check(); - - p->begin_op(Test::newCallback_TestIntf_op(cb, &Thrower::op, &Thrower::noEx)); - cb->check(); - - p->begin_op(Test::newCallback_TestIntf_op(cb, &Thrower::opWC, &Thrower::noExWC), cookie); - cb->check(); - - q->begin_op(Test::newCallback_TestIntf_op(cb, &Thrower::op, &Thrower::ex)); - cb->check(); - - q->begin_op(Test::newCallback_TestIntf_op(cb, &Thrower::opWC, &Thrower::exWC), cookie); - cb->check(); - - p->begin_op(Test::newCallback_TestIntf_op(cb, &Thrower::noOp, &Thrower::ex, &Thrower::sent)); - cb->check(); + { + promise promise; + p->opAsync( + [&, i]() + { + promise.set_value(); + thrower(throwEx[i]); + }, + [&](exception_ptr) + { + test(false); + }); - p->begin_op(Test::newCallback_TestIntf_op(cb, &Thrower::noOpWC, &Thrower::exWC, &Thrower::sentWC), cookie); - cb->check(); + try + { + promise.get_future().get(); + } + catch(const exception& ex) + { + cerr << ex.what() << endl; + test(false); + } + } - q->begin_op(Test::newCallback_TestIntf_op(cb, &Thrower::ex)); - cb->check(); + { + promise promise; + p->opAsync(nullptr, nullptr, + [&, i](bool) + { + promise.set_value(); + thrower(throwEx[i]); + }); - q->begin_op(Test::newCallback_TestIntf_op(cb, &Thrower::exWC), cookie); - cb->check(); + try + { + promise.get_future().get(); + } + catch(const exception&) + { + test(false); + } + } } } cout << "ok" << endl; cout << "testing batch requests with proxy... " << flush; { - test(p->ice_batchOneway()->begin_ice_flushBatchRequests()->sentSynchronously()); - - CookiePtr cookie = new Cookie(5); - - { - // - // AsyncResult without cookie. - // - test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = p->ice_batchOneway(); - b1->opBatch(); - b1->opBatch(); - FlushCallbackPtr cb = new FlushCallback(); - Ice::AsyncResultPtr r = b1->begin_ice_flushBatchRequests( - Ice::newCallback(cb, &FlushCallback::completedAsync, &FlushCallback::sentAsync)); - cb->check(); - test(r->isSent()); - test(r->isCompleted()); - test(p->waitForBatch(2)); - } - - { - // - // AsyncResult with cookie. - // - test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = p->ice_batchOneway(); - b1->opBatch(); - b1->opBatch(); - FlushCallbackPtr cb = new FlushCallback(cookie); - b1->begin_ice_flushBatchRequests( - Ice::newCallback(cb, &FlushCallback::completedAsync, &FlushCallback::sentAsync), cookie); - cb->check(); - test(p->waitForBatch(2)); - } - - if(p->ice_getConnection()) - { - if(protocol != "bt") - { - // - // AsyncResult exception without cookie. - // - test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = p->ice_batchOneway(); - b1->opBatch(); - b1->ice_getConnection()->close(Ice::ICE_SCOPED_ENUM(ConnectionClose, GracefullyWithWait)); - FlushCallbackPtr cb = new FlushCallback(); - Ice::AsyncResultPtr r = b1->begin_ice_flushBatchRequests( - Ice::newCallback(cb, &FlushCallback::completedAsync, &FlushCallback::sentAsync)); - cb->check(); - test(r->isSent()); - test(r->isCompleted()); - test(p->waitForBatch(1)); - } - - if(protocol != "bt") - { - // - // AsyncResult exception with cookie. - // - test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = p->ice_batchOneway(); - b1->opBatch(); - b1->ice_getConnection()->close(Ice::ICE_SCOPED_ENUM(ConnectionClose, GracefullyWithWait)); - FlushCallbackPtr cb = new FlushCallback(cookie); - b1->begin_ice_flushBatchRequests( - Ice::newCallback(cb, &FlushCallback::completedAsync, &FlushCallback::sentAsync), cookie); - cb->check(); - test(p->waitForBatch(1)); - } - } - - { - // - // Without cookie. - // - test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = p->ice_batchOneway(); - b1->opBatch(); - b1->opBatch(); - FlushCallbackPtr cb = new FlushCallback(); - Ice::AsyncResultPtr r = b1->begin_ice_flushBatchRequests( - Ice::newCallback_Object_ice_flushBatchRequests(cb, &FlushCallback::exception, &FlushCallback::sent)); - cb->check(); - test(r->isSent()); - test(r->isCompleted()); - test(p->waitForBatch(2)); - } - { - // - // With cookie. - // test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = p->ice_batchOneway(); - b1->opBatch(); + auto b1 = p->ice_batchOneway(); + b1->opBatchAsync().get(); b1->opBatch(); - FlushCallbackPtr cb = new FlushCallback(cookie); - b1->begin_ice_flushBatchRequests( - Ice::newCallback_Object_ice_flushBatchRequests(cb, &FlushCallback::exceptionWC, - &FlushCallback::sentWC), cookie); - cb->check(); + auto id = this_thread::get_id(); + promise promise; + b1->ice_flushBatchRequestsAsync( + [&](exception_ptr ex) + { + promise.set_exception(ex); + }, + [&](bool sentSynchronously) + { + test((sentSynchronously && id == this_thread::get_id()) || + (!sentSynchronously && id != this_thread::get_id())); + promise.set_value(); + }); + promise.get_future().get(); test(p->waitForBatch(2)); } if(p->ice_getConnection() && protocol != "bt") { - { - // - // Exception without cookie. - // - test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = p->ice_batchOneway(); - b1->opBatch(); - b1->ice_getConnection()->close(Ice::ICE_SCOPED_ENUM(ConnectionClose, GracefullyWithWait)); - FlushCallbackPtr cb = new FlushCallback(); - Ice::AsyncResultPtr r = b1->begin_ice_flushBatchRequests( - Ice::newCallback_Object_ice_flushBatchRequests(cb, &FlushCallback::exception, - &FlushCallback::sent)); - cb->check(); - test(r->isSent()); - test(r->isCompleted()); - test(p->waitForBatch(1)); - } + test(p->opBatchCount() == 0); + auto b1 = p->ice_batchOneway(); + b1->opBatch(); + b1->ice_getConnection()->close(Ice::ICE_SCOPED_ENUM(ConnectionClose, GracefullyWithWait)); - { - // - // Exception with cookie. - // - test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = p->ice_batchOneway(); - b1->opBatch(); - b1->ice_getConnection()->close(Ice::ICE_SCOPED_ENUM(ConnectionClose, GracefullyWithWait)); - FlushCallbackPtr cb = new FlushCallback(cookie); - b1->begin_ice_flushBatchRequests( - Ice::newCallback_Object_ice_flushBatchRequests(cb, &FlushCallback::exceptionWC, - &FlushCallback::sentWC), cookie); - cb->check(); - test(p->waitForBatch(1)); - } + auto id = this_thread::get_id(); + promise promise; + b1->ice_flushBatchRequestsAsync( + [&](exception_ptr ex) + { + promise.set_exception(ex); + }, + [&](bool sentSynchronously) + { + test((sentSynchronously && id == this_thread::get_id()) || + (!sentSynchronously && id != this_thread::get_id())); + promise.set_value(); + }); + promise.get_future().get(); + test(p->waitForBatch(1)); } } cout << "ok" << endl; @@ -3307,399 +1096,154 @@ allTests(Test::TestHelper* helper, bool collocated) { cout << "testing batch requests with connection... " << flush; { - CookiePtr cookie = new Cookie(5); - { - // - // AsyncResult without cookie. - // test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( + auto b1 = Ice::uncheckedCast( p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); b1->opBatch(); b1->opBatch(); - FlushCallbackPtr cb = new FlushCallback(); - Ice::AsyncResultPtr r = b1->ice_getConnection()->begin_flushBatchRequests( - Ice::ICE_SCOPED_ENUM(CompressBatch, BasedOnProxy), - Ice::newCallback(cb, &FlushCallback::completedAsync, &FlushCallback::sentAsync)); - cb->check(); - test(r->isSent()); - test(r->isCompleted()); - test(p->waitForBatch(2)); - // Ensure it also works with a twoway proxy - cb = new FlushCallback(); - r = p->ice_getConnection()->begin_flushBatchRequests(Ice::ICE_SCOPED_ENUM(CompressBatch, BasedOnProxy), - Ice::newCallback(cb, &FlushCallback::completedAsync, &FlushCallback::sentAsync)); - cb->check(); - test(r->isSent()); - test(r->isCompleted()); - } + auto id = this_thread::get_id(); + promise promise; - { - // - // AsyncResult with cookie. - // - test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( - p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); - b1->opBatch(); - b1->opBatch(); - FlushCallbackPtr cb = new FlushCallback(cookie); - b1->ice_getConnection()->begin_flushBatchRequests(Ice::ICE_SCOPED_ENUM(CompressBatch, BasedOnProxy), - Ice::newCallback(cb, &FlushCallback::completedAsync, &FlushCallback::sentAsync), cookie); - cb->check(); + b1->ice_getConnection()->flushBatchRequestsAsync( + Ice::CompressBatch::BasedOnProxy, + [&](exception_ptr ex) + { + promise.set_exception(ex); + }, + [&](bool sentSynchronously) + { + test((sentSynchronously && id == this_thread::get_id()) || + (!sentSynchronously && id != this_thread::get_id())); + promise.set_value(); + }); + promise.get_future().get(); test(p->waitForBatch(2)); } - if(protocol != "bt") { - // - // AsyncResult exception without cookie. - // - test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( - p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); - b1->opBatch(); - b1->ice_getConnection()->close(Ice::ICE_SCOPED_ENUM(ConnectionClose, GracefullyWithWait)); - FlushExCallbackPtr cb = new FlushExCallback(); - Ice::AsyncResultPtr r = b1->ice_getConnection()->begin_flushBatchRequests( - Ice::ICE_SCOPED_ENUM(CompressBatch, BasedOnProxy), - Ice::newCallback(cb, &FlushExCallback::completedAsync, &FlushExCallback::sentAsync)); - cb->check(); - test(!r->isSent()); - test(r->isCompleted()); - test(p->opBatchCount() == 0); + // Ensure it also works with a twoway proxy + auto id = this_thread::get_id(); + promise promise; + p->ice_getConnection()->flushBatchRequestsAsync( + Ice::CompressBatch::BasedOnProxy, + [&](exception_ptr ex) + { + promise.set_exception(ex); + }, + [&](bool sentSynchronously) + { + test((sentSynchronously && id == this_thread::get_id()) || + (!sentSynchronously && id != this_thread::get_id())); + promise.set_value(); + }); + promise.get_future().get(); } if(protocol != "bt") { - // - // AsyncResult exception with cookie. - // test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( + auto b1 = Ice::uncheckedCast( p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); b1->opBatch(); b1->ice_getConnection()->close(Ice::ICE_SCOPED_ENUM(ConnectionClose, GracefullyWithWait)); - FlushExCallbackPtr cb = new FlushExCallback(cookie); - b1->ice_getConnection()->begin_flushBatchRequests(Ice::ICE_SCOPED_ENUM(CompressBatch, BasedOnProxy), - Ice::newCallback(cb, &FlushExCallback::completedAsync, &FlushExCallback::sentAsync), cookie); - cb->check(); - test(p->opBatchCount() == 0); - } - - { - // - // Without cookie. - // - test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( - p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); - b1->opBatch(); - b1->opBatch(); - FlushCallbackPtr cb = new FlushCallback(); - Ice::AsyncResultPtr r = b1->ice_getConnection()->begin_flushBatchRequests( - Ice::ICE_SCOPED_ENUM(CompressBatch, BasedOnProxy), - Ice::newCallback_Connection_flushBatchRequests(cb, &FlushCallback::exception, - &FlushCallback::sent)); - cb->check(); - test(r->isSent()); - test(r->isCompleted()); - test(p->waitForBatch(2)); - } - - { - // - // With cookie. - // - test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( - p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); - b1->opBatch(); - b1->opBatch(); - FlushCallbackPtr cb = new FlushCallback(cookie); - b1->ice_getConnection()->begin_flushBatchRequests(Ice::ICE_SCOPED_ENUM(CompressBatch, BasedOnProxy), - Ice::newCallback_Connection_flushBatchRequests(cb, &FlushCallback::exceptionWC, - &FlushCallback::sentWC), cookie); - cb->check(); - test(p->waitForBatch(2)); - } - if(protocol != "bt") - { - // - // Exception without cookie. - // - test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( - p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); - b1->opBatch(); - b1->ice_getConnection()->close(Ice::ICE_SCOPED_ENUM(ConnectionClose, GracefullyWithWait)); - FlushExCallbackPtr cb = new FlushExCallback(); - Ice::AsyncResultPtr r = b1->ice_getConnection()->begin_flushBatchRequests( - Ice::ICE_SCOPED_ENUM(CompressBatch, BasedOnProxy), - Ice::newCallback_Connection_flushBatchRequests(cb, &FlushExCallback::exception, - &FlushExCallback::sent)); - cb->check(); - test(!r->isSent()); - test(r->isCompleted()); - test(p->opBatchCount() == 0); - } + promise promise; + b1->ice_getConnection()->flushBatchRequestsAsync( + Ice::CompressBatch::BasedOnProxy, + [&](exception_ptr ex) + { + promise.set_exception(std::move(ex)); + }, + [&](bool) + { + promise.set_value(); + }); - if(protocol != "bt") - { - // - // Exception with cookie. - // - test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( - p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); - b1->opBatch(); - b1->ice_getConnection()->close(Ice::ICE_SCOPED_ENUM(ConnectionClose, GracefullyWithWait)); - FlushExCallbackPtr cb = new FlushExCallback(cookie); - b1->ice_getConnection()->begin_flushBatchRequests(Ice::ICE_SCOPED_ENUM(CompressBatch, BasedOnProxy), - Ice::newCallback_Connection_flushBatchRequests(cb, &FlushExCallback::exceptionWC, - &FlushExCallback::sentWC), cookie); - cb->check(); + try + { + promise.get_future().get(); + test(false); + } + catch(const Ice::LocalException&) + { + } test(p->opBatchCount() == 0); } } cout << "ok" << endl; - cout << "testing batch requests with communicator... " << flush; - { - CookiePtr cookie = new Cookie(5); - - { - // - // AsyncResult without cookie - 1 connection. - // - test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( - p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); - b1->opBatch(); - b1->opBatch(); - FlushCallbackPtr cb = new FlushCallback(); - Ice::AsyncResultPtr r = communicator->begin_flushBatchRequests( - Ice::ICE_SCOPED_ENUM(CompressBatch, BasedOnProxy), - Ice::newCallback(cb, &FlushCallback::completedAsync, &FlushCallback::sentAsync)); - cb->check(); - test(r->isSent()); - test(r->isCompleted()); - test(p->waitForBatch(2)); - } - - { - // - // AsyncResult with cookie - 1 connection. - // - test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( - p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); - b1->opBatch(); - b1->opBatch(); - FlushCallbackPtr cb = new FlushCallback(cookie); - communicator->begin_flushBatchRequests(Ice::ICE_SCOPED_ENUM(CompressBatch, BasedOnProxy), - Ice::newCallback(cb, &FlushCallback::completedAsync, &FlushCallback::sentAsync), cookie); - cb->check(); - test(p->waitForBatch(2)); - } - - if(protocol != "bt") - { - // - // AsyncResult exception without cookie - 1 connection. - // - test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( - p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); - b1->opBatch(); - b1->ice_getConnection()->close(Ice::ICE_SCOPED_ENUM(ConnectionClose, GracefullyWithWait)); - FlushCallbackPtr cb = new FlushCallback(); - Ice::AsyncResultPtr r = communicator->begin_flushBatchRequests( - Ice::ICE_SCOPED_ENUM(CompressBatch, BasedOnProxy), - Ice::newCallback(cb, &FlushCallback::completedAsync, &FlushCallback::sentAsync)); - cb->check(); - test(r->isSent()); // Exceptions are ignored! - test(r->isCompleted()); - test(p->opBatchCount() == 0); - } - - if(protocol != "bt") - { - // - // AsyncResult exception with cookie - 1 connection. - // - test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( - p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); - b1->opBatch(); - b1->ice_getConnection()->close(Ice::ICE_SCOPED_ENUM(ConnectionClose, GracefullyWithWait)); - FlushCallbackPtr cb = new FlushCallback(cookie); - communicator->begin_flushBatchRequests(Ice::ICE_SCOPED_ENUM(CompressBatch, BasedOnProxy), - Ice::newCallback(cb, &FlushCallback::completedAsync, &FlushCallback::sentAsync), cookie); - cb->check(); - test(p->opBatchCount() == 0); - } - - if(protocol != "bt") - { - // - // AsyncResult - 2 connections. - // - test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( - p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); - Test::TestIntfPrx b2 = Test::TestIntfPrx::uncheckedCast( - p->ice_connectionId("2")->ice_getConnection()->createProxy( - p->ice_getIdentity())->ice_batchOneway()); - b2->ice_getConnection(); // Ensure connection is established. - b1->opBatch(); - b1->opBatch(); - b2->opBatch(); - b2->opBatch(); - FlushCallbackPtr cb = new FlushCallback(); - Ice::AsyncResultPtr r = communicator->begin_flushBatchRequests( - Ice::ICE_SCOPED_ENUM(CompressBatch, BasedOnProxy), - Ice::newCallback(cb, &FlushCallback::completedAsync, &FlushCallback::sentAsync)); - cb->check(); - test(r->isSent()); - test(r->isCompleted()); - test(p->waitForBatch(4)); - } - - if(protocol != "bt") - { - // - // AsyncResult exception - 2 connections - 1 failure. - // - // All connections should be flushed even if there are failures on some connections. - // Exceptions should not be reported. - // - test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( - p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); - Test::TestIntfPrx b2 = Test::TestIntfPrx::uncheckedCast( - p->ice_connectionId("2")->ice_getConnection()->createProxy( - p->ice_getIdentity())->ice_batchOneway()); - - b2->ice_getConnection(); // Ensure connection is established. - b1->opBatch(); - b2->opBatch(); - b1->ice_getConnection()->close(Ice::ICE_SCOPED_ENUM(ConnectionClose, GracefullyWithWait)); - FlushCallbackPtr cb = new FlushCallback(); - Ice::AsyncResultPtr r = communicator->begin_flushBatchRequests( - Ice::ICE_SCOPED_ENUM(CompressBatch, BasedOnProxy), - Ice::newCallback(cb, &FlushCallback::completedAsync, &FlushCallback::sentAsync)); - cb->check(); - test(r->isSent()); // Exceptions are ignored! - test(r->isCompleted()); - test(p->waitForBatch(1)); - } - - if(protocol != "bt") - { - // - // AsyncResult exception - 2 connections - 2 failures. - // - // The sent callback should be invoked even if all connections fail. - // - test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( - p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); - Test::TestIntfPrx b2 = Test::TestIntfPrx::uncheckedCast( - p->ice_connectionId("2")->ice_getConnection()->createProxy( - p->ice_getIdentity())->ice_batchOneway()); - - b2->ice_getConnection(); // Ensure connection is established. - b1->opBatch(); - b2->opBatch(); - b1->ice_getConnection()->close(Ice::ICE_SCOPED_ENUM(ConnectionClose, GracefullyWithWait)); - b2->ice_getConnection()->close(Ice::ICE_SCOPED_ENUM(ConnectionClose, GracefullyWithWait)); - FlushCallbackPtr cb = new FlushCallback(); - Ice::AsyncResultPtr r = communicator->begin_flushBatchRequests( - Ice::ICE_SCOPED_ENUM(CompressBatch, BasedOnProxy), - Ice::newCallback(cb, &FlushCallback::completedAsync, &FlushCallback::sentAsync)); - cb->check(); - test(r->isSent()); // Exceptions are ignored! - test(r->isCompleted()); - test(p->opBatchCount() == 0); - } - - { - // - // Without cookie - 1 connection. - // - test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( - p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); - b1->opBatch(); - b1->opBatch(); - FlushCallbackPtr cb = new FlushCallback(); - Ice::AsyncResultPtr r = communicator->begin_flushBatchRequests( - Ice::ICE_SCOPED_ENUM(CompressBatch, BasedOnProxy), - Ice::newCallback_Communicator_flushBatchRequests(cb, &FlushCallback::exception, - &FlushCallback::sent)); - cb->check(); - test(r->isSent()); - test(r->isCompleted()); - test(p->waitForBatch(2)); - } - + cout << "testing batch requests with communicator... " << flush; + { { // - // With cookie - 1 connection. + // 1 connection. Test future // test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( + auto b1 = Ice::uncheckedCast( p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); b1->opBatch(); b1->opBatch(); - FlushCallbackPtr cb = new FlushCallback(cookie); - communicator->begin_flushBatchRequests(Ice::ICE_SCOPED_ENUM(CompressBatch, BasedOnProxy), - Ice::newCallback_Communicator_flushBatchRequests(cb, &FlushCallback::exceptionWC, - &FlushCallback::sentWC), cookie); - cb->check(); + + communicator->flushBatchRequestsAsync(Ice::CompressBatch::BasedOnProxy).get(); test(p->waitForBatch(2)); } - if(protocol != "bt") { // - // Exception without cookie - 1 connection. + // 1 connection. // test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( + auto b1 = Ice::uncheckedCast( p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); b1->opBatch(); - b1->ice_getConnection()->close(Ice::ICE_SCOPED_ENUM(ConnectionClose, GracefullyWithWait)); - FlushCallbackPtr cb = new FlushCallback(); - Ice::AsyncResultPtr r = communicator->begin_flushBatchRequests( - Ice::ICE_SCOPED_ENUM(CompressBatch, BasedOnProxy), - Ice::newCallback_Communicator_flushBatchRequests(cb, &FlushCallback::exception, - &FlushCallback::sent)); - cb->check(); - test(r->isSent()); // Exceptions are ignored! - test(r->isCompleted()); - test(p->opBatchCount() == 0); + b1->opBatch(); + + promise promise; + auto id = this_thread::get_id(); + communicator->flushBatchRequestsAsync( + Ice::CompressBatch::BasedOnProxy, + [&](exception_ptr ex) + { + promise.set_exception(std::move(ex)); + }, + [&](bool sentSynchronously) + { + test((sentSynchronously && id == this_thread::get_id()) || + (!sentSynchronously && id != this_thread::get_id())); + promise.set_value(); + }); + promise.get_future().get(); + test(p->waitForBatch(2)); } if(protocol != "bt") { // - // Exception with cookie - 1 connection. + // Exception - 1 connection. // test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( + auto b1 = Ice::uncheckedCast( p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); b1->opBatch(); b1->ice_getConnection()->close(Ice::ICE_SCOPED_ENUM(ConnectionClose, GracefullyWithWait)); - FlushCallbackPtr cb = new FlushCallback(cookie); - communicator->begin_flushBatchRequests(Ice::ICE_SCOPED_ENUM(CompressBatch, BasedOnProxy), - Ice::newCallback_Communicator_flushBatchRequests(cb, &FlushCallback::exceptionWC, - &FlushCallback::sentWC), cookie); - cb->check(); + + promise promise; + auto id = this_thread::get_id(); + communicator->flushBatchRequestsAsync( + Ice::CompressBatch::BasedOnProxy, + [&](exception_ptr ex) + { + promise.set_exception(std::move(ex)); + }, + [&](bool sentSynchronously) + { + test((sentSynchronously && id == this_thread::get_id()) || + (!sentSynchronously && id != this_thread::get_id())); + promise.set_value(); + }); + promise.get_future().get(); // Exceptions are ignored! test(p->opBatchCount() == 0); } @@ -3709,40 +1253,46 @@ allTests(Test::TestHelper* helper, bool collocated) // 2 connections. // test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( + auto b1 = Ice::uncheckedCast( p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); - Test::TestIntfPrx b2 = Test::TestIntfPrx::uncheckedCast( + auto b2 = Ice::uncheckedCast( p->ice_connectionId("2")->ice_getConnection()->createProxy( p->ice_getIdentity())->ice_batchOneway()); - b2->ice_getConnection(); // Ensure connection is established. b1->opBatch(); b1->opBatch(); b2->opBatch(); b2->opBatch(); - FlushCallbackPtr cb = new FlushCallback(); - Ice::AsyncResultPtr r = communicator->begin_flushBatchRequests( - Ice::ICE_SCOPED_ENUM(CompressBatch, BasedOnProxy), - Ice::newCallback_Communicator_flushBatchRequests(cb, &FlushCallback::exception, - &FlushCallback::sent)); - cb->check(); - test(r->isSent()); - test(r->isCompleted()); + + promise promise; + auto id = this_thread::get_id(); + communicator->flushBatchRequestsAsync( + Ice::CompressBatch::BasedOnProxy, + [&](exception_ptr ex) + { + promise.set_exception(std::move(ex)); + }, + [&](bool sentSynchronously) + { + test((sentSynchronously && id == this_thread::get_id()) || + (!sentSynchronously && id != this_thread::get_id())); + promise.set_value(); + }); + promise.get_future().get(); test(p->waitForBatch(4)); } if(protocol != "bt") { // - // Exception - 2 connections - 1 failure. + // 2 connections - 2 failures. // - // All connections should be flushed even if there are failures on some connections. - // Exceptions should not be reported. + // The sent callback should be invoked even if all connections fail. // test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( + auto b1 = Ice::uncheckedCast( p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); - Test::TestIntfPrx b2 = Test::TestIntfPrx::uncheckedCast( + auto b2 = Ice::uncheckedCast( p->ice_connectionId("2")->ice_getConnection()->createProxy( p->ice_getIdentity())->ice_batchOneway()); @@ -3750,425 +1300,339 @@ allTests(Test::TestHelper* helper, bool collocated) b1->opBatch(); b2->opBatch(); b1->ice_getConnection()->close(Ice::ICE_SCOPED_ENUM(ConnectionClose, GracefullyWithWait)); - FlushCallbackPtr cb = new FlushCallback(); - Ice::AsyncResultPtr r = communicator->begin_flushBatchRequests( - Ice::ICE_SCOPED_ENUM(CompressBatch, BasedOnProxy), - Ice::newCallback_Communicator_flushBatchRequests(cb, &FlushCallback::exception, - &FlushCallback::sent)); - cb->check(); - test(r->isSent()); // Exceptions are ignored! - test(r->isCompleted()); - test(p->waitForBatch(1)); + b2->ice_getConnection()->close(Ice::ICE_SCOPED_ENUM(ConnectionClose, GracefullyWithWait)); + + promise promise; + auto id = this_thread::get_id(); + communicator->flushBatchRequestsAsync( + Ice::CompressBatch::BasedOnProxy, + [&](exception_ptr ex) + { + promise.set_exception(std::move(ex)); + }, + [&](bool sentSynchronously) + { + test((sentSynchronously && id == this_thread::get_id()) || + (!sentSynchronously && id != this_thread::get_id())); + promise.set_value(); + }); + promise.get_future().get(); // Exceptions are ignored! + test(p->opBatchCount() == 0); + } + } + cout << "ok" << endl; + + cout << "testing cancel operations... " << flush; + { + if(p->ice_getConnection()) + { + testController->holdAdapter(); + { + promise promise; + auto cancel = p->ice_pingAsync( + [&]() + { + promise.set_value(); + }, + [&](exception_ptr ex) + { + promise.set_exception(ex); + }); + cancel(); + + try + { + promise.get_future().get(); + test(false); + } + catch(const Ice::InvocationCanceledException&) + { + } + catch(...) + { + testController->resumeAdapter(); + throw; + } + } + + { + promise promise; + auto cancel = p->ice_idAsync( + [&](string) + { + promise.set_value(); + }, + [&](exception_ptr ex) + { + promise.set_exception(ex); + }); + cancel(); + + try + { + promise.get_future().get(); + test(false); + } + catch(const Ice::InvocationCanceledException&) + { + } + catch(...) + { + testController->resumeAdapter(); + throw; + } + } + testController->resumeAdapter(); + } + } + cout << "ok" << endl; + + if(p->ice_getConnection() && protocol != "bt" && p->supportsAMD()) + { + cout << "testing graceful close connection with wait... " << flush; + { + // + // Local case: begin a request, close the connection gracefully, and make sure it waits + // for the request to complete. + // + auto con = p->ice_getConnection(); + auto sc = make_shared>(); + con->setCloseCallback( + [sc](Ice::ConnectionPtr) + { + sc->set_value(); + }); + auto fc = sc->get_future(); + auto s = make_shared>(); + p->sleepAsync(100, + [s]() { s->set_value(); }, + [s](exception_ptr ex) { s->set_exception(ex); }); + auto f = s->get_future(); + // Blocks until the request completes. + con->close(Ice::ICE_SCOPED_ENUM(ConnectionClose, GracefullyWithWait)); + f.get(); // Should complete successfully. + fc.get(); + } + { + // + // Remote case. + // + Ice::ByteSeq seq; + seq.resize(1024 * 10); + for(Ice::ByteSeq::iterator q = seq.begin(); q != seq.end(); ++q) + { + *q = static_cast(IceUtilInternal::random(255)); + } + + // + // Send multiple opWithPayload, followed by a close and followed by multiple opWithPaylod. + // The goal is to make sure that none of the opWithPayload fail even if the server closes + // the connection gracefully in between. + // + + int maxQueue = 2; + bool done = false; + while(!done && maxQueue < 5000) + { + done = true; + p->ice_ping(); + vector> results; + for(int i = 0; i < maxQueue; ++i) + { + auto s = make_shared>(); + p->opWithPayloadAsync(seq, + [s]() { s->set_value(); }, + [s](exception_ptr ex) { s->set_exception(ex); }); + results.push_back(s->get_future()); + } + atomic_flag sent = ATOMIC_FLAG_INIT; + p->closeAsync(Test::CloseMode::GracefullyWithWait, nullptr, nullptr, + [&sent](bool) { sent.test_and_set(); }); + if(!sent.test_and_set()) + { + for(int i = 0; i < maxQueue; i++) + { + auto s = make_shared>(); + atomic_flag sent2 = ATOMIC_FLAG_INIT; + p->opWithPayloadAsync(seq, + [s]() { s->set_value(); }, + [s](exception_ptr ex) { s->set_exception(ex); }, + [&sent2](bool) { sent2.test_and_set(); }); + results.push_back(s->get_future()); + if(sent2.test_and_set()) + { + done = false; + maxQueue *= 2; + break; + } + } + } + else + { + maxQueue *= 2; + done = false; + } + + for(vector>::iterator r = results.begin(); r != results.end(); ++r) + { + try + { + r->get(); + } + catch(const Ice::LocalException& ex) + { + cerr << ex << endl; + test(false); + } + } + } } + cout << "ok" << endl; - if(protocol != "bt") + cout << "testing graceful close connection without wait... " << flush; { // - // Exception - 2 connections - 2 failures. - // - // The sent callback should be invoked even if all connections fail. + // Local case: start an operation and then close the connection gracefully on the client side + // without waiting for the pending invocation to complete. There will be no retry and we expect the + // invocation to fail with ConnectionManuallyClosedException. // - test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( - p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); - Test::TestIntfPrx b2 = Test::TestIntfPrx::uncheckedCast( - p->ice_connectionId("2")->ice_getConnection()->createProxy( - p->ice_getIdentity())->ice_batchOneway()); - - b2->ice_getConnection(); // Ensure connection is established. - b1->opBatch(); - b2->opBatch(); - b1->ice_getConnection()->close(Ice::ICE_SCOPED_ENUM(ConnectionClose, GracefullyWithWait)); - b2->ice_getConnection()->close(Ice::ICE_SCOPED_ENUM(ConnectionClose, GracefullyWithWait)); - FlushCallbackPtr cb = new FlushCallback(); - Ice::AsyncResultPtr r = communicator->begin_flushBatchRequests( - Ice::ICE_SCOPED_ENUM(CompressBatch, BasedOnProxy), - Ice::newCallback_Communicator_flushBatchRequests(cb, &FlushCallback::exception, - &FlushCallback::sent)); - cb->check(); - test(r->isSent()); // Exceptions are ignored! - test(r->isCompleted()); - test(p->opBatchCount() == 0); - } - } - cout << "ok" << endl; - } - cout << "testing AsyncResult operations... " << flush; - { - { - Test::TestIntfPrx indirect = Test::TestIntfPrx::uncheckedCast(p->ice_adapterId("dummy")); - Ice::AsyncResultPtr r; - r = indirect->begin_op(); - try - { - r->waitForCompleted(); - r->throwLocalException(); - test(false); - } - catch(const Ice::NoEndpointException&) - { - } - - testController->holdAdapter(); - Ice::AsyncResultPtr r1; - Ice::AsyncResultPtr r2; - try - { - r1 = p->begin_op(); - Ice::ByteSeq seq; - seq.resize(1024); - while((r2 = p->begin_opWithPayload(seq))->sentSynchronously()); - - test(r1 == r1); - test(r1 != r2); - - test(r1->getHash() == r1->getHash()); - test(r1->getHash() != r2->getHash()); - test(r1->getHash() < r2->getHash() || r2->getHash() < r1->getHash()); - - if(p->ice_getConnection()) + p = p->ice_connectionId("CloseGracefully"); // Start with a new connection. + auto con = p->ice_getConnection(); + auto s = make_shared>(); + auto sent = make_shared>(); + p->startDispatchAsync([s]() { s->set_value(); }, + [s](exception_ptr ex) { s->set_exception(ex); }, + [sent](bool) { sent->set_value(); }); + auto f = s->get_future(); + sent->get_future().get(); // Ensure the request was sent before we close the connection. + con->close(Ice::ConnectionClose::Gracefully); + try + { + f.get(); + test(false); + } + catch(const Ice::ConnectionManuallyClosedException& ex) { - test((r1->sentSynchronously() && r1->isSent() && !r1->isCompleted()) || - (!r1->sentSynchronously() && !r1->isCompleted())); + test(ex.graceful); + } + p->finishDispatch(); - test(!r2->sentSynchronously() && !r2->isCompleted()); + // + // Remote case: the server closes the connection gracefully, which means the connection + // will not be closed until all pending dispatched requests have completed. + // + con = p->ice_getConnection(); + auto sc = make_shared>(); + con->setCloseCallback( + [sc](Ice::ConnectionPtr) + { + sc->set_value(); + }); + auto fc = sc->get_future(); + s = make_shared>(); + p->sleepAsync(100, + [s]() { s->set_value(); }, + [s](exception_ptr ex) { s->set_exception(ex); }); + f = s->get_future(); + p->close(Test::CloseMode::Gracefully); // Close is delayed until sleep completes. + fc.get(); // Ensure connection was closed. + try + { + f.get(); + } + catch(const Ice::LocalException&) + { + test(false); } } - catch(...) - { - testController->resumeAdapter(); - throw; - } - testController->resumeAdapter(); - - r1->waitForSent(); - test(r1->isSent()); - - r2->waitForSent(); - test(r2->isSent()); - - r1->waitForCompleted(); - test(r1->isCompleted()); - - r2->waitForCompleted(); - test(r2->isCompleted()); - - test(r1->getOperation() == "op"); - test(r2->getOperation() == "opWithPayload"); - } - - { - Ice::AsyncResultPtr r; - - // - // Twoway - // - r = p->begin_ice_ping(); - test(r->getOperation() == "ice_ping"); - test(!r->getConnection()); // Expected - test(r->getCommunicator() == communicator); - test(r->getProxy() == p); - p->end_ice_ping(r); - - Test::TestIntfPrx p2; - - // - // Oneway - // - p2 = p->ice_oneway(); - r = p2->begin_ice_ping(); - test(r->getOperation() == "ice_ping"); - test(!r->getConnection()); // Expected - test(r->getCommunicator() == communicator); - test(r->getProxy() == p2); - - // - // Batch request via proxy - // - p2 = p->ice_batchOneway(); - p2->ice_ping(); - r = p2->begin_ice_flushBatchRequests(); - test(!r->getConnection()); // Expected - test(r->getCommunicator() == communicator); - test(r->getProxy() == p2); - p2->end_ice_flushBatchRequests(r); + cout << "ok" << endl; - if(p->ice_getConnection()) + cout << "testing forceful close connection... " << flush; { // - // Batch request via connection + // Local case: start a lengthy operation and then close the connection forcefully on the client side. + // There will be no retry and we expect the invocation to fail with ConnectionManuallyClosedException. // - Ice::ConnectionPtr con = p->ice_getConnection(); - p2 = p->ice_batchOneway(); - p2->ice_ping(); - r = con->begin_flushBatchRequests(Ice::ICE_SCOPED_ENUM(CompressBatch, BasedOnProxy)); - test(r->getConnection() == con); - test(r->getCommunicator() == communicator); - test(!r->getProxy()); // Expected - con->end_flushBatchRequests(r); + p->ice_ping(); + auto con = p->ice_getConnection(); + auto s = make_shared>(); + auto sent = make_shared>(); + p->startDispatchAsync([s]() { s->set_value(); }, + [s](exception_ptr ex) { s->set_exception(ex); }, + [sent](bool) { sent->set_value(); }); + auto f = s->get_future(); + sent->get_future().get(); // Ensure the request was sent before we close the connection. + con->close(Ice::ConnectionClose::Forcefully); + try + { + f.get(); + test(false); + } + catch(const Ice::ConnectionManuallyClosedException& ex) + { + test(!ex.graceful); + } + p->finishDispatch(); // - // Batch request via communicator + // Remote case: the server closes the connection forcefully. This causes the request to fail + // with a ConnectionLostException. Since the close() operation is not idempotent, the client + // will not retry. // - p2 = p->ice_batchOneway(); - p2->ice_ping(); - r = communicator->begin_flushBatchRequests(Ice::ICE_SCOPED_ENUM(CompressBatch, BasedOnProxy)); - test(!r->getConnection()); // Expected - test(r->getCommunicator() == communicator); - test(!r->getProxy()); // Expected - communicator->end_flushBatchRequests(r); - } - } - - if(p->ice_getConnection()) - { - testController->holdAdapter(); - - Ice::AsyncResultPtr r; - Ice::ByteSeq seq; - seq.resize(10024); - for(int i = 0; i < 200; ++i) // 2MB - { - r = p->begin_opWithPayload(seq); - } - - test(!r->isSent()); - - Ice::AsyncResultPtr r1 = p->begin_ice_ping(); - Ice::AsyncResultPtr r2 = p->begin_ice_id(); - r1->cancel(); - r2->cancel(); - try - { - p->end_ice_ping(r1); - test(false); - } - catch(const Ice::InvocationCanceledException&) - { - } - try - { - p->end_ice_id(r2); - test(false); - } - catch(const Ice::InvocationCanceledException&) - { - } - - testController->resumeAdapter(); - p->ice_ping(); - test(!r1->isSent() && r1->isCompleted()); - test(!r2->isSent() && r2->isCompleted()); - - testController->holdAdapter(); - r1 = p->begin_op(); - r2 = p->begin_ice_id(); - r1->waitForSent(); - r2->waitForSent(); - r1->cancel(); - r2->cancel(); - try - { - p->end_op(r1); - test(false); - } - catch(const Ice::InvocationCanceledException&) - { - } - try - { - p->end_ice_id(r2); - test(false); - } - catch(const Ice::InvocationCanceledException&) - { + try + { + p->close(Test::CloseMode::Forcefully); + test(false); + } + catch(const Ice::ConnectionLostException&) + { + // Expected. + } } - testController->resumeAdapter(); + cout << "ok" << endl; } } - cout << "ok" << endl; - if(p->ice_getConnection() && protocol != "bt") { - cout << "testing graceful close connection with wait... " << flush; - { - // - // Local case: begin a request, close the connection gracefully, and make sure it waits - // for the request to complete. - // - Ice::ConnectionPtr con = p->ice_getConnection(); - CloseCallbackPtr cb = new CloseCallback; - con->setCloseCallback(cb); - Ice::AsyncResultPtr r = p->begin_sleep(100); - // Blocks until the request completes. - con->close(Ice::ICE_SCOPED_ENUM(ConnectionClose, GracefullyWithWait)); - r->waitForCompleted(); // Should complete successfully. - try - { - r->throwLocalException(); - } - catch(const Ice::LocalException&) - { - test(false); - } - cb->check(); - } - { - // - // Remote case. - // - Ice::ByteSeq seq; - seq.resize(1024 * 10); - for(Ice::ByteSeq::iterator q = seq.begin(); q != seq.end(); ++q) - { - *q = static_cast(IceUtilInternal::random(255)); - } + cout << "testing result struct... " << flush; - // - // Send multiple opWithPayload, followed by a close and followed by multiple opWithPaylod. - // The goal is to make sure that none of the opWithPayload fail even if the server closes - // the connection gracefully in between. - // - int maxQueue = 2; - bool done = false; - while(!done && maxQueue < 5000) - { - done = true; - p->ice_ping(); - vector results; - for(int i = 0; i < maxQueue; ++i) - { - results.push_back(p->begin_opWithPayload(seq)); - } - if(!p->begin_close(Test::GracefullyWithWait)->isSent()) - { - for(int i = 0; i < maxQueue; i++) - { - Ice::AsyncResultPtr r = p->begin_opWithPayload(seq); - results.push_back(r); - if(r->isSent()) - { - done = false; - maxQueue *= 2; - break; - } - } - } - else - { - maxQueue *= 2; - done = false; - } + auto q = Ice::uncheckedCast( + communicator->stringToProxy("test2:" + helper->getTestEndpoint())); - for(vector::const_iterator r = results.begin(); r != results.end(); ++r) + promise promise; + q->opAsync(1, + [&promise](int i, int j) + { + test(i == j); + promise.set_value(); + }, + [](exception_ptr ex) { - (*r)->waitForCompleted(); try { - (*r)->throwLocalException(); + rethrow_exception(ex); } - catch(const Ice::LocalException&) + catch(const std::exception& exc) { - test(false); + cerr << exc.what() << endl; } - } - } - } - cout << "ok" << endl; - - cout << "testing graceful close connection without wait... " << flush; - { - // - // Local case: start an operation and then close the connection gracefully on the client side - // without waiting for the pending invocation to complete. There will be no retry and we expect the - // invocation to fail with ConnectionManuallyClosedException. - // - p = p->ice_connectionId("CloseGracefully"); // Start with a new connection. - Ice::ConnectionPtr con = p->ice_getConnection(); - Ice::AsyncResultPtr r = p->begin_startDispatch(); - r->waitForSent(); // Ensure the request was sent before we close the connection. - con->close(Ice::ICE_SCOPED_ENUM(ConnectionClose, Gracefully)); - r->waitForCompleted(); - try - { - r->throwLocalException(); - test(false); - } - catch(const Ice::ConnectionManuallyClosedException& ex) - { - test(ex.graceful); - } - p->finishDispatch(); - - // - // Remote case: the server closes the connection gracefully, which means the connection - // will not be closed until all pending dispatched requests have completed. - // - con = p->ice_getConnection(); - CloseCallbackPtr cb = new CloseCallback; - con->setCloseCallback(cb); - r = p->begin_sleep(100); - p->close(Test::Gracefully); // Close is delayed until sleep completes. - cb->check(); // Ensure connection was closed. - r->waitForCompleted(); - try - { - r->throwLocalException(); - } - catch(const Ice::LocalException&) - { - test(false); - } - } - cout << "ok" << endl; - - cout << "testing forceful close connection... " << flush; - { - // - // Local case: start an operation and then close the connection forcefully on the client side. - // There will be no retry and we expect the invocation to fail with ConnectionManuallyClosedException. - // - p->ice_ping(); - Ice::ConnectionPtr con = p->ice_getConnection(); - Ice::AsyncResultPtr r = p->begin_startDispatch(); - r->waitForSent(); // Ensure the request was sent before we close the connection. - con->close(Ice::ICE_SCOPED_ENUM(ConnectionClose, Forcefully)); - r->waitForCompleted(); - try - { - r->throwLocalException(); - test(false); - } - catch(const Ice::ConnectionManuallyClosedException& ex) - { - test(!ex.graceful); - } - p->finishDispatch(); + test(false); + }); + promise.get_future().get(); - // - // Remote case: the server closes the connection forcefully. This causes the request to fail - // with a ConnectionLostException. Since the close() operation is not idempotent, the client - // will not retry. - // - try - { - p->close(Test::Forcefully); - test(false); - } - catch(const Ice::ConnectionLostException&) - { - // Expected. - } - } + auto f = q->opAsync(1); + auto r = f.get(); + test(r.returnValue == r.j); + test(r.returnValue == 1); cout << "ok" << endl; } if(p->ice_getConnection()) { cout << "testing bidir... " << flush; - Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter(""); - PingReplyIPtr replyI = new PingReplyI(); - Test::PingReplyPrx reply = Test::PingReplyPrx::uncheckedCast(adapter->addWithUUID(replyI)); + auto adapter = communicator->createObjectAdapter(""); + auto replyI = make_shared(); + auto reply = Ice::uncheckedCast(adapter->addWithUUID(replyI)); adapter->activate(); p->ice_getConnection()->setAdapter(adapter); @@ -4180,5 +1644,4 @@ allTests(Test::TestHelper* helper, bool collocated) } p->shutdown(); -#endif } diff --git a/cpp/test/Ice/ami/TestI.cpp b/cpp/test/Ice/ami/TestI.cpp index 79820e7dae1..e0a9a591b18 100644 --- a/cpp/test/Ice/ami/TestI.cpp +++ b/cpp/test/Ice/ami/TestI.cpp @@ -100,7 +100,6 @@ TestIntfI::sleep(Ice::Int ms, const Ice::Current&) timedWait(IceUtil::Time::milliSeconds(ms)); } -#ifdef ICE_CPP11_MAPPING void TestIntfI::startDispatchAsync(std::function response, std::function, const Ice::Current&) @@ -117,25 +116,6 @@ TestIntfI::startDispatchAsync(std::function response, std::function::Lock sync(*this); - if(_shutdown) - { - // Ignore, this can occur with the forcefull connection close test, shutdown can be dispatch - // before start dispatch. - cb->ice_response(); - return; - } - else if(_pending) - { - _pending->ice_response(); - } - _pending = cb; -} -#endif void TestIntfI::finishDispatch(const Ice::Current&) @@ -147,13 +127,8 @@ TestIntfI::finishDispatch(const Ice::Current&) } else if(_pending) // Pending might not be set yet if startDispatch is dispatch out-of-order { -#ifdef ICE_CPP11_MAPPING _pending(); _pending = nullptr; -#else - _pending->ice_response(); - _pending = 0; -#endif } } @@ -164,13 +139,8 @@ TestIntfI::shutdown(const Ice::Current& current) _shutdown = true; if(_pending) { -#ifdef ICE_CPP11_MAPPING _pending(); _pending = nullptr; -#else - _pending->ice_response(); - _pending = 0; -#endif } current.adapter->getCommunicator()->shutdown(); } @@ -190,13 +160,7 @@ TestIntfI::supportsFunctionalTests(const Ice::Current&) void TestIntfI::pingBiDir(ICE_IN(Test::PingReplyPrxPtr) reply, const Ice::Current& current) { -#ifdef ICE_CPP11_MAPPING reply->ice_fixed(current.con)->replyAsync().get(); -#else - Test::PingReplyPrx fprx = reply->ice_fixed(current.con); - Ice::AsyncResultPtr result = fprx->begin_reply(); - fprx->end_reply(result); -#endif } void diff --git a/cpp/test/Ice/ami/TestI.h b/cpp/test/Ice/ami/TestI.h index 29be6e87e02..dd45b2f9995 100644 --- a/cpp/test/Ice/ami/TestI.h +++ b/cpp/test/Ice/ami/TestI.h @@ -29,12 +29,8 @@ class TestIntfI : public virtual Test::TestIntf, public IceUtil::Monitor, std::function, const Ice::Current&); -#else - virtual void startDispatch_async(const Test::AMD_TestIntf_startDispatchPtr&, const Ice::Current&); -#endif virtual void finishDispatch(const Ice::Current&); virtual void shutdown(const Ice::Current&); @@ -47,11 +43,7 @@ class TestIntfI : public virtual Test::TestIntf, public IceUtil::Monitor _pending; -#else - Test::AMD_TestIntf_startDispatchPtr _pending; -#endif }; class TestIntfControllerI : public Test::TestIntfController, IceUtil::Monitor diff --git a/cpp/test/Ice/background/AllTests.cpp b/cpp/test/Ice/background/AllTests.cpp index 1d6c51524f8..65d25cdf267 100644 --- a/cpp/test/Ice/background/AllTests.cpp +++ b/cpp/test/Ice/background/AllTests.cpp @@ -167,11 +167,7 @@ class OpThread : public IceUtil::Thread, public IceUtil::Mutex count = 0; _background->ice_twoway()->ice_ping(); } -#ifdef ICE_CPP11_MAPPING _background->opAsync(); -#else - _background->begin_op(); -#endif IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(1)); } catch(const Ice::LocalException&) @@ -216,11 +212,7 @@ allTests(Test::TestHelper* helper) BackgroundControllerPrxPtr backgroundController = ICE_UNCHECKED_CAST(BackgroundControllerPrx, obj); -#ifdef ICE_CPP11_MAPPING auto plugin = dynamic_pointer_cast(communicator->getPluginManager()->getPlugin("Test")); -#else - PluginI* plugin = dynamic_cast(communicator->getPluginManager()->getPlugin("Test").get()); -#endif assert(plugin); ConfigurationPtr configuration = plugin->getConfiguration(); @@ -273,7 +265,6 @@ allTests(Test::TestHelper* helper) obj = communicator->stringToProxy("background@Test")->ice_locator(locator); BackgroundPrxPtr bg = ICE_UNCHECKED_CAST(BackgroundPrx, obj); -#ifdef ICE_CPP11_MAPPING backgroundController->pauseCall("findAdapterById"); promise p1; @@ -292,18 +283,6 @@ allTests(Test::TestHelper* helper) f1.get(); f2.get(); -#else - backgroundController->pauseCall("findAdapterById"); - Ice::AsyncResultPtr r1 = bg->begin_op(); - Ice::AsyncResultPtr r2 = bg->begin_op(); - test(!r1->isCompleted()); - test(!r2->isCompleted()); - backgroundController->resumeCall("findAdapterById"); - bg->end_op(r1); - bg->end_op(r2); - test(r1->isCompleted()); - test(r2->isCompleted()); -#endif } cout << "ok" << endl; @@ -330,8 +309,6 @@ allTests(Test::TestHelper* helper) obj = communicator->stringToProxy("background@Test")->ice_router(router); BackgroundPrxPtr bg = ICE_UNCHECKED_CAST(BackgroundPrx, obj); test(bg->ice_getRouter()); - -#ifdef ICE_CPP11_MAPPING backgroundController->pauseCall("getClientProxy"); promise p1; @@ -350,18 +327,6 @@ allTests(Test::TestHelper* helper) f1.get(); f2.get(); -#else - backgroundController->pauseCall("getClientProxy"); - Ice::AsyncResultPtr r1 = bg->begin_op(); - Ice::AsyncResultPtr r2 = bg->begin_op(); - test(!r1->isCompleted()); - test(!r2->isCompleted()); - backgroundController->resumeCall("getClientProxy"); - bg->end_op(r1); - bg->end_op(r2); - test(r1->isCompleted()); - test(r2->isCompleted()); -#endif } cout << "ok" << endl; @@ -373,8 +338,6 @@ allTests(Test::TestHelper* helper) configuration->buffered(true); backgroundController->buffered(true); - -#ifdef ICE_CPP11_MAPPING background->opAsync(); background->ice_getCachedConnection()->close(Ice::ICE_SCOPED_ENUM(ConnectionClose, Forcefully)); background->opAsync(); @@ -402,36 +365,6 @@ allTests(Test::TestHelper* helper) { f.get(); // Ensure all the calls are completed before destroying the communicator } -#else - background->begin_op(); - background->ice_getCachedConnection()->close(Ice::ICE_SCOPED_ENUM(ConnectionClose, Forcefully)); - background->begin_op(); - - vector results; - OpAMICallbackPtr cb = new OpAMICallback(); - Callback_Background_opPtr callback = newCallback_Background_op(cb, - &OpAMICallback::responseNoOp, - &OpAMICallback::noException); - for(int i = 0; i < 10000; ++i) - { - Ice::AsyncResultPtr r = background->begin_op(callback); - results.push_back(r); - if(i % 50 == 0) - { - backgroundController->holdAdapter(); - backgroundController->resumeAdapter(); - } - if(i % 100 == 0) - { - r->waitForCompleted(); - } - } - - for(vector::const_iterator p = results.begin(); p != results.end(); ++p) - { - (*p)->waitForCompleted(); // Ensure all the calls are completed before destroying the communicator - } -#endif cout << "ok" << endl; } @@ -471,7 +404,7 @@ connectTests(const ConfigurationPtr& configuration, const Test::BackgroundPrxPtr catch(const Ice::Exception&) { } -#ifdef ICE_CPP11_MAPPING + { promise completed; promise sent; @@ -512,25 +445,7 @@ connectTests(const ConfigurationPtr& configuration, const Test::BackgroundPrxPtr test(sent.get_future().wait_for(chrono::milliseconds(0)) != future_status::ready); completed.get_future().get(); } -#else - Ice::AsyncResultPtr r = prx->begin_op(); - test(!r->sentSynchronously()); - try - { - prx->end_op(r); - test(false); - } - catch(const Ice::Exception&) - { - } - test(r->isCompleted()); - OpAMICallbackPtr cbEx = new OpAMICallback(); - r = prx->begin_op(Test::newCallback_Background_op(cbEx, &OpAMICallback::exception)); - test(!r->sentSynchronously()); - cbEx->checkException(); - test(r->isCompleted()); -#endif if(i == 0 || i == 2) { configuration->connectorsException(0); @@ -618,7 +533,6 @@ initializeTests(const ConfigurationPtr& configuration, { } -#ifdef ICE_CPP11_MAPPING promise sent; promise completed; @@ -637,25 +551,7 @@ initializeTests(const ConfigurationPtr& configuration, }); test(sent.get_future().wait_for(chrono::milliseconds(0)) != future_status::ready); completed.get_future().get(); -#else - Ice::AsyncResultPtr r = prx->begin_op(); - test(!r->sentSynchronously()); - try - { - prx->end_op(r); - test(false); - } - catch(const Ice::Exception&) - { - } - test(r->isCompleted()); - OpAMICallbackPtr cbEx = new OpAMICallback(); - r = prx->begin_op(Test::newCallback_Background_op(cbEx, &OpAMICallback::exception)); - test(!r->sentSynchronously()); - cbEx->checkException(); - test(r->isCompleted()); -#endif if(i == 0 || i == 2) { configuration->initializeException(0); @@ -879,7 +775,6 @@ validationTests(const ConfigurationPtr& configuration, { configuration->readException(new Ice::SocketException(__FILE__, __LINE__)); BackgroundPrxPtr prx = i == 0 ? background : background->ice_oneway(); -#ifdef ICE_CPP11_MAPPING promise sent; promise completed; @@ -898,19 +793,6 @@ validationTests(const ConfigurationPtr& configuration, }); test(sent.get_future().wait_for(chrono::milliseconds(0)) != future_status::ready); completed.get_future().get(); -#else - Ice::AsyncResultPtr r = prx->begin_op(); - test(!r->sentSynchronously()); - try - { - prx->end_op(r); - test(false); - } - catch(const Ice::SocketException&) - { - } - test(r->isCompleted()); -#endif configuration->readException(0); } @@ -956,7 +838,6 @@ validationTests(const ConfigurationPtr& configuration, { configuration->readReady(false); configuration->readException(new Ice::SocketException(__FILE__, __LINE__)); -#ifdef ICE_CPP11_MAPPING promise completed; background->opAsync( []() @@ -979,26 +860,12 @@ validationTests(const ConfigurationPtr& configuration, } }); completed.get_future().get(); -#else - Ice::AsyncResultPtr r = background->begin_op(); - test(!r->sentSynchronously()); - try - { - background->end_op(r); - test(false); - } - catch(const Ice::SocketException&) - { - } - test(r->isCompleted()); -#endif configuration->readException(0); configuration->readReady(true); } } ctl->holdAdapter(); // Hold to block in connection validation -#ifdef ICE_CPP11_MAPPING promise p1; promise p2; @@ -1046,16 +913,6 @@ validationTests(const ConfigurationPtr& configuration, f1.get(); f2.get(); -#else - Ice::AsyncResultPtr r = background->begin_op(); - Ice::AsyncResultPtr r2 = background->begin_op(); - test(!r->sentSynchronously() && !r2->sentSynchronously()); - test(!r->isCompleted() && !r2->isCompleted()); - ctl->resumeAdapter(); - background->end_op(r); - background->end_op(r2); - test(r->isCompleted() && r2->isCompleted()); -#endif #if defined(ICE_USE_IOCP) || defined(ICE_USE_CFSTREAM) if(background->ice_getCommunicator()->getProperties()->getProperty("Ice.Default.Protocol") != "test-ssl" && @@ -1173,11 +1030,7 @@ validationTests(const ConfigurationPtr& configuration, backgroundBatchOneway->op(); backgroundBatchOneway->op(); ctl->resumeAdapter(); -#ifdef ICE_CPP11_MAPPING backgroundBatchOneway->ice_flushBatchRequestsAsync(); -#else - backgroundBatchOneway->begin_ice_flushBatchRequests(); -#endif backgroundBatchOneway->ice_getConnection()->close(Ice::ICE_SCOPED_ENUM(ConnectionClose, GracefullyWithWait)); ctl->holdAdapter(); @@ -1186,21 +1039,7 @@ validationTests(const ConfigurationPtr& configuration, backgroundBatchOneway->opWithPayload(seq); backgroundBatchOneway->opWithPayload(seq); ctl->resumeAdapter(); -#ifdef ICE_CPP11_MAPPING backgroundBatchOneway->ice_flushBatchRequestsAsync().get(); -#else - r = backgroundBatchOneway->begin_ice_flushBatchRequests(); - // - // We can't close the connection before ensuring all the batches - // have been sent since with auto-flushing the close connection - // message might be sent once the first call opWithPayload is sent - // and before the flushBatchRequests (this would therefore result - // in the flush to report a CloseConnectionException). Instead we - // wait for the first flush to complete. - // - //backgroundBatchOneway->ice_getConnection()->close(Ice::ICE_SCOPED_ENUM(ConnectionClose, GracefullyWithWait)); - backgroundBatchOneway->end_ice_flushBatchRequests(r); -#endif backgroundBatchOneway->ice_getConnection()->close(Ice::ICE_SCOPED_ENUM(ConnectionClose, GracefullyWithWait)); } @@ -1238,7 +1077,6 @@ readWriteTests(const ConfigurationPtr& configuration, background->ice_ping(); configuration->writeException(new Ice::SocketException(__FILE__, __LINE__)); -#ifdef ICE_CPP11_MAPPING promise sent; promise completed; prx->opAsync( @@ -1267,19 +1105,6 @@ readWriteTests(const ConfigurationPtr& configuration, }); test(sent.get_future().wait_for(chrono::milliseconds(0)) != future_status::ready); completed.get_future().get(); -#else - Ice::AsyncResultPtr r = prx->begin_op(); - test(!r->sentSynchronously()); - try - { - prx->end_op(r); - test(false); - } - catch(const Ice::SocketException&) - { - } - test(r->isCompleted()); -#endif configuration->writeException(0); } @@ -1298,7 +1123,6 @@ readWriteTests(const ConfigurationPtr& configuration, background->ice_ping(); configuration->readReady(false); // Required in C# to make sure beginRead() doesn't throw too soon. configuration->readException(new Ice::SocketException(__FILE__, __LINE__)); -#ifdef ICE_CPP11_MAPPING { promise completed; background->opAsync( @@ -1323,18 +1147,6 @@ readWriteTests(const ConfigurationPtr& configuration, }); completed.get_future().get(); } -#else - Ice::AsyncResultPtr r = background->begin_op(); - try - { - background->end_op(r); - test(false); - } - catch(const Ice::SocketException&) - { - } - test(r->isCompleted()); -#endif configuration->readException(0); configuration->readReady(true); @@ -1390,7 +1202,6 @@ readWriteTests(const ConfigurationPtr& configuration, background->ice_ping(); configuration->writeReady(false); configuration->writeException(new Ice::SocketException(__FILE__, __LINE__)); -#ifdef ICE_CPP11_MAPPING promise completed; promise sent; prx->opAsync( @@ -1419,19 +1230,6 @@ readWriteTests(const ConfigurationPtr& configuration, }); test(sent.get_future().wait_for(chrono::milliseconds(0)) != future_status::ready); completed.get_future().get(); -#else - r = prx->begin_op(); - test(!r->sentSynchronously()); - try - { - prx->end_op(r); - test(false); - } - catch(const Ice::SocketException&) - { - } - test(r->isCompleted()); -#endif configuration->writeReady(true); configuration->writeException(0); } @@ -1454,7 +1252,6 @@ readWriteTests(const ConfigurationPtr& configuration, background->ice_ping(); configuration->readReady(false); configuration->readException(new Ice::SocketException(__FILE__, __LINE__)); -#ifdef ICE_CPP11_MAPPING promise completed; background->opAsync( []() @@ -1477,19 +1274,6 @@ readWriteTests(const ConfigurationPtr& configuration, } }); completed.get_future().get(); - -#else - r = background->begin_op(); - try - { - background->end_op(r); - test(false); - } - catch(const Ice::SocketException&) - { - } - test(r->isCompleted()); -#endif configuration->readReady(true); configuration->readException(0); } @@ -1499,7 +1283,6 @@ readWriteTests(const ConfigurationPtr& configuration, configuration->readReady(false); configuration->writeReady(false); configuration->readException(new Ice::SocketException(__FILE__, __LINE__)); -#ifdef ICE_CPP11_MAPPING promise completed; background->opAsync( []() @@ -1522,22 +1305,6 @@ readWriteTests(const ConfigurationPtr& configuration, } }); completed.get_future().get(); -#else - r = background->begin_op(); - // The read exception might propagate before the message send is seen as completed on IOCP. -# ifndef ICE_USE_IOCP - r->waitForSent(); -# endif - try - { - background->end_op(r); - test(false); - } - catch(const Ice::SocketException&) - { - } - test(r->isCompleted()); -#endif configuration->writeReady(true); configuration->readReady(true); configuration->readException(0); @@ -1560,8 +1327,6 @@ readWriteTests(const ConfigurationPtr& configuration, *p = static_cast(IceUtilInternal::random(255)); } -#ifdef ICE_CPP11_MAPPING - // Fill up the receive and send buffers for(int i = 0; i < 200; ++i) // 2MB { @@ -1643,44 +1408,6 @@ readWriteTests(const ConfigurationPtr& configuration, fc1.get(); fc2.get(); -#else - OpAMICallbackPtr cb = new OpAMICallback(); - Callback_Background_opWithPayloadPtr callbackWP = newCallback_Background_opWithPayload(cb, - &OpAMICallback::noResponse, - &OpAMICallback::noException); - - // Fill up the receive and send buffers - for(int i = 0; i < 200; ++i) // 2MB - { - backgroundOneway->begin_opWithPayload(seq, callbackWP); - } - - Callback_Background_opPtr callback; - cb = new OpAMICallback(); - Ice::AsyncResultPtr r1 = background->begin_op(newCallback_Background_op(cb, - &OpAMICallback::response, - &OpAMICallback::noException, - &OpAMICallback::sent)); - test(!r1->sentSynchronously() && !r1->isSent()); - - OpAMICallbackPtr cb2 = new OpAMICallback(); - Ice::AsyncResultPtr r2 = background->begin_op(newCallback_Background_op(cb2, - &OpAMICallback::response, - &OpAMICallback::noException, - &OpAMICallback::sent)); - test(!r2->sentSynchronously() && !r2->isSent()); - - test(!backgroundOneway->begin_opWithPayload(seq, callbackWP)->sentSynchronously()); - test(!backgroundOneway->begin_opWithPayload(seq, callbackWP)->sentSynchronously()); - - test(!cb->checkResponse(false)); - test(!cb2->checkResponse(false)); - ctl->resumeAdapter(); - cb->checkResponseAndSent(); - cb2->checkResponseAndSent(); - test(r1->isSent() && r1->isCompleted()); - test(r2->isSent() && r2->isCompleted()); -#endif try { diff --git a/cpp/test/Ice/background/Configuration.h b/cpp/test/Ice/background/Configuration.h index 49f2bd38660..951fc2701e1 100644 --- a/cpp/test/Ice/background/Configuration.h +++ b/cpp/test/Ice/background/Configuration.h @@ -6,7 +6,6 @@ #define TEST_CONFIGURATION_H #include -#include #include #include @@ -59,15 +58,15 @@ class TEST_API Configuration : public IceUtil::Shared, public IceUtil::Mutex private: - IceInternal::UniquePtr _connectorsException; - IceInternal::UniquePtr _connectException; + std::unique_ptr _connectorsException; + std::unique_ptr _connectException; IceInternal::SocketOperation _initializeSocketOperation; int _initializeResetCount; - IceInternal::UniquePtr _initializeException; + std::unique_ptr _initializeException; int _readReadyCount; - IceInternal::UniquePtr _readException; + std::unique_ptr _readException; int _writeReadyCount; - IceInternal::UniquePtr _writeException; + std::unique_ptr _writeException; bool _buffered; static Configuration* _instance; diff --git a/cpp/test/Ice/background/EndpointI.cpp b/cpp/test/Ice/background/EndpointI.cpp index b368ac72fa6..3ed2a5c3b53 100644 --- a/cpp/test/Ice/background/EndpointI.cpp +++ b/cpp/test/Ice/background/EndpointI.cpp @@ -263,11 +263,7 @@ EndpointI::getInfo() const noexcept } bool -#ifdef ICE_CPP11_MAPPING EndpointI::operator==(const Ice::Endpoint& r) const -#else -EndpointI::operator==(const Ice::LocalObject& r) const -#endif { const EndpointI* p = dynamic_cast(&r); if(!p) @@ -284,11 +280,7 @@ EndpointI::operator==(const Ice::LocalObject& r) const } bool -#ifdef ICE_CPP11_MAPPING EndpointI::operator<(const Ice::Endpoint& r) const -#else -EndpointI::operator<(const Ice::LocalObject& r) const -#endif { const EndpointI* p = dynamic_cast(&r); if(!p) diff --git a/cpp/test/Ice/background/EndpointI.h b/cpp/test/Ice/background/EndpointI.h index b650e7ae84a..630b00db737 100644 --- a/cpp/test/Ice/background/EndpointI.h +++ b/cpp/test/Ice/background/EndpointI.h @@ -12,10 +12,7 @@ class EndpointI; ICE_DEFINE_PTR(EndpointIPtr, EndpointI); -class EndpointI : public IceInternal::EndpointI -#ifdef ICE_CPP11_MAPPING - , public std::enable_shared_from_this -#endif +class EndpointI : public IceInternal::EndpointI, public std::enable_shared_from_this { public: @@ -46,13 +43,8 @@ class EndpointI : public IceInternal::EndpointI virtual bool datagram() const; virtual bool secure() const; -#ifdef ICE_CPP11_MAPPING virtual bool operator==(const Ice::Endpoint&) const; virtual bool operator<(const Ice::Endpoint&) const; -#else - virtual bool operator==(const Ice::LocalObject&) const; - virtual bool operator<(const Ice::LocalObject&) const; -#endif virtual int hash() const; virtual std::string options() const; diff --git a/cpp/test/Ice/background/Server.cpp b/cpp/test/Ice/background/Server.cpp index 84bc7830f03..e50a01aef7f 100644 --- a/cpp/test/Ice/background/Server.cpp +++ b/cpp/test/Ice/background/Server.cpp @@ -28,7 +28,6 @@ class LocatorI : public Ice::Locator { public: -#ifdef ICE_CPP11_MAPPING virtual void findAdapterByIdAsync(string, function&)> response, @@ -50,25 +49,7 @@ class LocatorI : public Ice::Locator Ice::CommunicatorPtr communicator = current.adapter->getCommunicator(); response(current.adapter->createDirectProxy(id)); } -#else - virtual void - findAdapterById_async(const Ice::AMD_Locator_findAdapterByIdPtr& response, const string&, - const Ice::Current& current) const - { - _controller->checkCallPause(current); - Ice::CommunicatorPtr communicator = current.adapter->getCommunicator(); - response->ice_response(current.adapter->createDirectProxy(Ice::stringToIdentity("dummy"))); - } - virtual void - findObjectById_async(const Ice::AMD_Locator_findObjectByIdPtr& response, const Ice::Identity& id, - const Ice::Current& current) const - { - _controller->checkCallPause(current); - Ice::CommunicatorPtr communicator = current.adapter->getCommunicator(); - response->ice_response(current.adapter->createDirectProxy(id)); - } -#endif virtual Ice::LocatorRegistryPrxPtr getRegistry(const Ice::Current&) const { @@ -163,11 +144,7 @@ Server::run(int argc, char** argv) Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectAdapterPtr adapter2 = communicator->createObjectAdapter("ControllerAdapter"); -#ifdef ICE_CPP11_MAPPING shared_ptr plugin = dynamic_pointer_cast(communicator->getPluginManager()->getPlugin("Test")); -#else - PluginI* plugin = dynamic_cast(communicator->getPluginManager()->getPlugin("Test").get()); -#endif assert(plugin); ConfigurationPtr configuration = plugin->getConfiguration(); BackgroundControllerIPtr backgroundController = ICE_MAKE_SHARED(BackgroundControllerI, adapter, configuration); diff --git a/cpp/test/Ice/binding/AllTests.cpp b/cpp/test/Ice/binding/AllTests.cpp index b711ef0e136..bc77b7d3d42 100644 --- a/cpp/test/Ice/binding/AllTests.cpp +++ b/cpp/test/Ice/binding/AllTests.cpp @@ -13,55 +13,10 @@ using namespace std; using namespace Test; -#ifndef ICE_CPP11_MAPPING -class GetAdapterNameCB : public IceUtil::Shared, public IceUtil::Monitor -{ -public: - - void - response(const string& name) - { - Lock sync(*this); - assert(!name.empty()); - _name = name; - notify(); - } - - void - exception(const Ice::Exception&) - { - test(false); - } - - virtual string - getResult() - { - Lock sync(*this); - while(_name.empty()) - { - wait(); - } - return _name; - } - -private: - - string _name; -}; -typedef IceUtil::Handle GetAdapterNameCBPtr; -#endif - string getAdapterNameWithAMI(const TestIntfPrxPtr& test) { -#ifdef ICE_CPP11_MAPPING return test->getAdapterNameAsync().get(); -#else - GetAdapterNameCBPtr cb = new GetAdapterNameCB(); - test->begin_getAdapterName( - newCallback_TestIntf_getAdapterName(cb, &GetAdapterNameCB::response, &GetAdapterNameCB::exception)); - return cb->getResult(); -#endif } TestIntfPrxPtr @@ -263,11 +218,7 @@ allTests(Test::TestHelper* helper) for(i = 0; i < proxies.size(); i++) { -#ifdef ICE_CPP11_MAPPING proxies[i]->getAdapterNameAsync(); -#else - proxies[i]->begin_getAdapterName(); -#endif } for(i = 0; i < proxies.size(); i++) { diff --git a/cpp/test/Ice/binding/Server.cpp b/cpp/test/Ice/binding/Server.cpp index 13129c13976..c89e41913b9 100644 --- a/cpp/test/Ice/binding/Server.cpp +++ b/cpp/test/Ice/binding/Server.cpp @@ -15,10 +15,7 @@ namespace // A no-op Logger, used when testing the Logger Admin // -class NullLogger : public Ice::Logger -#ifdef ICE_CPP11_MAPPING - , public std::enable_shared_from_this -#endif +class NullLogger : public Ice::Logger, public std::enable_shared_from_this { public: diff --git a/cpp/test/Ice/binding/TestI.cpp b/cpp/test/Ice/binding/TestI.cpp index 29a252784ec..a43519c67f7 100644 --- a/cpp/test/Ice/binding/TestI.cpp +++ b/cpp/test/Ice/binding/TestI.cpp @@ -15,13 +15,8 @@ RemoteCommunicatorI::RemoteCommunicatorI() : { } -#ifdef ICE_CPP11_MAPPING shared_ptr RemoteCommunicatorI::createObjectAdapter(string name, string endpts, const Ice::Current& current) -#else -RemoteObjectAdapterPrx -RemoteCommunicatorI::createObjectAdapter(const string& name, const string& endpts, const Current& current) -#endif { Ice::CommunicatorPtr com = current.adapter->getCommunicator(); const string defaultProtocol = com->getProperties()->getProperty("Ice.Default.Protocol"); @@ -53,13 +48,8 @@ RemoteCommunicatorI::createObjectAdapter(const string& name, const string& endpt } } -#ifdef ICE_CPP11_MAPPING void RemoteCommunicatorI::deactivateObjectAdapter(shared_ptr adapter, const Current&) -#else -void -RemoteCommunicatorI::deactivateObjectAdapter(const RemoteObjectAdapterPrx& adapter, const Current&) -#endif { adapter->deactivate(); // Collocated call } diff --git a/cpp/test/Ice/binding/TestI.h b/cpp/test/Ice/binding/TestI.h index 0a70d28ff7c..2e001b3c062 100644 --- a/cpp/test/Ice/binding/TestI.h +++ b/cpp/test/Ice/binding/TestI.h @@ -14,15 +14,9 @@ class RemoteCommunicatorI : public Test::RemoteCommunicator RemoteCommunicatorI(); -#ifdef ICE_CPP11_MAPPING virtual std::shared_ptr createObjectAdapter(std::string, std::string, const Ice::Current&); virtual void deactivateObjectAdapter(std::shared_ptr, const Ice::Current&); -#else - virtual Test::RemoteObjectAdapterPrx createObjectAdapter(const std::string&, const std::string&, - const Ice::Current&); - virtual void deactivateObjectAdapter(const Test::RemoteObjectAdapterPrx&, const Ice::Current&); -#endif virtual void shutdown(const Ice::Current&); private: diff --git a/cpp/test/Ice/custom/AllTests.cpp b/cpp/test/Ice/custom/AllTests.cpp index 7bc43af93ed..483e0385d65 100644 --- a/cpp/test/Ice/custom/AllTests.cpp +++ b/cpp/test/Ice/custom/AllTests.cpp @@ -39,529 +39,6 @@ arrayRangeEquals(pair lhs, pair rhs) } -#ifndef ICE_CPP11_MAPPING - -class CallbackBase : public IceUtil::Monitor -{ -public: - - CallbackBase() : - _called(false) - { - } - - virtual ~CallbackBase() - { - } - - void check() - { - IceUtil::Monitor::Lock sync(*this); - while(!_called) - { - wait(); - } - _called = false; - } - -protected: - - void called() - { - IceUtil::Monitor::Lock sync(*this); - assert(!_called); - _called = true; - notify(); - } - -private: - - bool _called; -}; - -class InParam : public Ice::LocalObject -{ -}; -typedef IceUtil::Handle InParamPtr; - -template -class InParamT : public InParam -{ -public: - - InParamT(const T& v) : in(v) - { - } - - T in; -}; - -template InParamPtr newInParam(const T& v) -{ - return new InParamT(v); -} - -template const T& getIn(const InParamPtr& cookie) -{ - return dynamic_cast* >(cookie.get())->in; -} - -class Callback : public CallbackBase, public IceUtil::Shared -{ -public: - - void opString(const Util::string_view& ret, - const Util::string_view& out, - const InParamPtr& cookie) - { - const Util::string_view& in = getIn(cookie); - test(out == ret); - test(in.size() == out.size()); - called(); - } - - void opDoubleArray(const ::std::pair& ret, - const ::std::pair& out, - const InParamPtr& cookie) - { - const ::std::pair& in = getIn >(cookie); - test(arrayRangeEquals(out, in)); - test(arrayRangeEquals(ret, in)); - called(); - } - - void opBoolArray(const ::std::pair& ret, - const ::std::pair& out, - const InParamPtr& cookie) - { - const ::std::pair& in = getIn >(cookie); - test(arrayRangeEquals(out, in)); - test(arrayRangeEquals(ret, in)); - called(); - } - - void opByteArray(const pair& ret, - const pair& out, - const InParamPtr& cookie) - { - const pair& in = getIn >(cookie); - test(arrayRangeEquals(out, in)); - test(arrayRangeEquals(ret, in)); - called(); - } - - void opVariableArray(const pair& ret, - const pair& out, - const InParamPtr& cookie) - { - const pair& in = - getIn >(cookie); - test(arrayRangeEquals(out, in)); - test(arrayRangeEquals(ret, in)); - called(); - } - - void opBoolRange(const pair& ret, - const pair& out, - const InParamPtr& cookie) - { - const pair& in - = getIn >(cookie); - test(equal(out.first, out.second, in.first)); - test(equal(ret.first, ret.second, in.first)); - called(); - } - - void opByteRange(const pair& ret, - const pair& out, - const InParamPtr& cookie) - { - const pair& in = - getIn >(cookie); - test(equal(out.first, out.second, in.first)); - test(equal(ret.first, ret.second, in.first)); - called(); - } - - void opVariableRange(const pair& ret, - const pair& out, - const InParamPtr& cookie) - { - const pair& in = - getIn >(cookie); - test(equal(out.first, out.second, in.first)); - test(equal(ret.first, ret.second, in.first)); - called(); - } - - void opByteRangeType(const pair& ret, - const pair& out, - const InParamPtr& cookie) - { - const pair& in = - getIn >(cookie); - test(equal(out.first, out.second, in.first)); - test(equal(ret.first, ret.second, in.first)); - called(); - } - - void opVariableRangeType(const pair::const_iterator, - deque::const_iterator>& ret, - const pair::const_iterator, - deque::const_iterator>& out, - const InParamPtr& cookie) - { - const pair::const_iterator, deque::const_iterator>& in = - getIn::const_iterator, deque::const_iterator> >(cookie); - - test(equal(out.first, out.second, in.first)); - test(equal(ret.first, ret.second, in.first)); - called(); - } - - void opBoolSeq(const deque& ret, const deque& out, const InParamPtr& cookie) - { - const deque& in = getIn >(cookie); - test(out == in); - test(ret == in); - called(); - } - - void opBoolList(const list& ret, const list& out, const InParamPtr& cookie) - { - const list& in = getIn >(cookie); - test(out == in); - test(ret == in); - called(); - } - - void opByteSeq(const deque& ret, const deque& out, const InParamPtr& cookie) - { - const deque& in = getIn< deque >(cookie); - test(out == in); - test(ret == in); - called(); - } - - void opByteList(const list& ret, const list& out, const InParamPtr& cookie) - { - const list& in = getIn >(cookie); - test(out == in); - test(ret == in); - called(); - } - - void opMyByteSeq(const MyByteSeq& ret, const MyByteSeq& out, const InParamPtr& cookie) - { - const MyByteSeq& in = getIn(cookie); - test(out == in); - test(ret == in); - called(); - } - - void opStringSeq(const deque& ret, const deque& out, const InParamPtr& cookie) - { - const deque& in = getIn >(cookie); - test(out == in); - test(ret == in); - called(); - } - - void opStringList(const list& ret, const list& out, const InParamPtr& cookie) - { - const list& in = getIn >(cookie); - test(out == in); - test(ret == in); - called(); - } - - void opFixedSeq(const deque& ret, const deque& out, const InParamPtr& cookie) - { - const deque& in = getIn >(cookie); - test(out == in); - test(ret == in); - called(); - } - - void opFixedList(const list& ret, const list& out, const InParamPtr& cookie) - { - const list& in = getIn >(cookie); - test(out == in); - test(ret == in); - called(); - } - - void opVariableSeq(const deque& ret, const deque& out, - const InParamPtr& cookie) - { - const deque& in = getIn >(cookie); - test(out == in); - test(ret == in); - called(); - } - - void opVariableList(const list& ret, const list& out, const InParamPtr& cookie) - { - const list& in = getIn >(cookie); - test(out == in); - test(ret == in); - called(); - } - - void opStringStringDictSeq(const deque& ret, const deque& out, - const InParamPtr& cookie) - { - const deque& in = getIn >(cookie); - test(out == in); - test(ret == in); - called(); - } - - void opStringStringDictList(const list& ret, const list& out, - const InParamPtr& cookie) - { - const list& in = getIn >(cookie); - test(out == in); - test(ret == in); - called(); - } - - void opESeq(const deque& ret, const deque& out, const InParamPtr& cookie) - { - const deque& in = getIn >(cookie); - test(out == in); - test(ret == in); - called(); - } - - void opEList(const list& ret, const list& out, const InParamPtr& cookie) - { - const list& in = getIn >(cookie); - test(out == in); - test(ret == in); - called(); - } - - void opDPrxSeq(const deque& ret, const deque& out, const InParamPtr& cookie) - { - const deque& in = getIn >(cookie); - test(out == in); - test(ret == in); - called(); - } - - void opDPrxList(const list& ret, const list& out, const InParamPtr& cookie) - { - const list& in = getIn >(cookie); - test(out == in); - test(ret == in); - called(); - } - - void opCSeq(const deque& ret, const deque& out, const InParamPtr& cookie) - { - const deque& in = getIn >(cookie); - test(out.size() == in.size()); - test(ret.size() == in.size()); - for(unsigned int i = 1; i < in.size(); ++i) - { - test(out[i] == out[0]); - test(ret[i] == out[i]); - } - called(); - } - - void opCList(const list& ret, const list& out, const InParamPtr& cookie) - { - const list& in = getIn >(cookie); - test(out.size() == in.size()); - test(ret.size() == in.size()); - list::const_iterator p1; - list::const_iterator p2; - for(p1 = out.begin(), p2 = ret.begin(); p1 != out.end(); ++p1, ++p2) - { - test(*p1 == *p2); - } - called(); - } - - void opClassStruct(const ::Test::ClassStructPtr& ret, - const ::Test::ClassStructPtr& cs1, - const ::Test::ClassStructSeq& seq, - const InParamPtr& cookie) - { - pair< ::Test::ClassStructPtr, ::Test::ClassStructSeq> in = - getIn >(cookie); - test(ret == in.first); - test(cs1 == in.first); - test(seq == in.second); - called(); - } - - void opString(const wstring& ret, const wstring& out, const InParamPtr& cookie) - { - const wstring& in = getIn(cookie); - test(out == in); - test(ret == in); - called(); - } - - void opOutArrayByteSeq(const ::std::pair& data, const InParamPtr& cookie) - { - const Test::ByteSeq& in = getIn(cookie); - Test::ByteSeq out(data.first, data.second); - Test::ByteSeq::const_iterator p1; - Test::ByteSeq::const_iterator p2; - - for(p1 = out.begin(), p2 = in.begin(); p1 != out.end(); ++p1, ++p2) - { - test(*p1 == *p2); - } - called(); - } - - void opOutRangeByteSeq(const ::std::pair< ::Test::ByteSeq::const_iterator, ::Test::ByteSeq::const_iterator>& data, - const InParamPtr& cookie) - { - const Test::ByteSeq& in = getIn(cookie); - Test::ByteSeq out(data.first, data.second); - Test::ByteSeq::const_iterator p1; - Test::ByteSeq::const_iterator p2; - - for(p1 = out.begin(), p2 = in.begin(); p1 != out.end(); ++p1, ++p2) - { - test(*p1 == *p2); - } - called(); - } - - void opIntStringDict(const Test::IntStringDict& ret, const Test::IntStringDict& out, const InParamPtr& cookie) - { - const Test::IntStringDict& in = getIn(cookie); - - test(ret == in); - test(out == in); - called(); - } - - void opVarDict(const Test::CustomMap& ret, - const Test::CustomMap& out, const InParamPtr& cookie) - { - const Test::CustomMap& in = getIn >(cookie); - - test(out == in); - test(ret.size() == 1000); - - for(Test::CustomMap::const_iterator i = ret.begin(); i != ret.end(); ++i) - { - test(i->second == i->first * i->first); - } - - called(); - } - - void opCustomIntStringDict(const map& ret, const map& out, const InParamPtr& cookie) - { - const map& in = getIn >(cookie); - - test(out.size() == in.size()); - test(ret == out); - - for(map::const_iterator p = in.begin(); p != in.end(); ++p) - { - map::const_iterator q = out.find(p->first); - test(q != out.end()); - test(q->second.size() == p->second.size()); - } - - called(); - } - - void throwExcept1(const Ice::AsyncResultPtr& result) - { - InParamPtr inParam = InParamPtr::dynamicCast(result->getCookie()); - const wstring& in = getIn(inParam); - try - { - Test1::WstringClassPrx t = Test1::WstringClassPrx::uncheckedCast(result->getProxy()); - t->end_throwExcept(result); - } - catch(const Test1::WstringException& e) - { - test(e.reason == in); - called(); - } - catch(...) - { - test(false); - } - } - - void throwExcept1(const Ice::Exception& ex, const wstring& in) - { - try - { - ex.ice_throw(); - } - catch(const Test1::WstringException& e) - { - test(e.reason == in); - called(); - } - catch(...) - { - test(false); - } - } - - void throwExcept2(const Ice::AsyncResultPtr& result) - { - InParamPtr inParam = InParamPtr::dynamicCast(result->getCookie()); - const wstring& in = getIn(inParam); - try - { - Test2::WstringClassPrx t = Test2::WstringClassPrx::uncheckedCast(result->getProxy()); - t->end_throwExcept(result); - } - catch(const Test2::WstringException& e) - { - test(e.reason == in); - called(); - } - catch(...) - { - test(false); - } - } - - void throwExcept2(const Ice::Exception& ex, const wstring& in) - { - try - { - ex.ice_throw(); - } - catch(const Test2::WstringException& e) - { - test(e.reason == in); - called(); - } - catch(...) - { - test(false); - } - } - - void - noEx(const Ice::Exception& ex, const InParamPtr&) - { - cerr << ex << endl; - test(false); - } -}; -typedef IceUtil::Handle CallbackPtr; - -#endif - Test::TestIntfPrxPtr allTests(Test::TestHelper* helper) { @@ -577,11 +54,7 @@ allTests(Test::TestHelper* helper) Test::TestIntfPrxPtr t = ICE_CHECKED_CAST(Test::TestIntfPrx, base); test(t); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(t, base)); -#else - test(t == base); -#endif cout << "ok" << endl; cout << "testing ice_id and ice_ids with string converter... " << flush; @@ -597,19 +70,7 @@ allTests(Test::TestHelper* helper) string ret = t->opString(in, out); test(ret == out); -#ifdef ICE_CPP11_MAPPING test(ret == in); -#else - // - // When a parameter is mapped as a string_view on both sides, - // no conversion occurs, and all is good - // However, when a parameter is mapped as a string on one side and - // as a string_view on the other (e.g. sync invocation implemented with AMD) - // the string converter converts the string but not the string_view, - // and we have a mismatch - // - test(ret.size() == in.size()); -#endif } cout << "ok" << endl; @@ -706,12 +167,7 @@ allTests(Test::TestHelper* helper) in[3] = false; in[4] = true; Test::BoolSeq out; -#ifdef ICE_CPP11_MAPPING Test::BoolSeq ret = t->opBoolRange(in, out); -#else - pair inPair(in.begin(), in.end()); - Test::BoolSeq ret = t->opBoolRange(inPair, out); -#endif test(out == in); test(ret == in); } @@ -724,12 +180,7 @@ allTests(Test::TestHelper* helper) in.push_back('4'); in.push_back('5'); Test::ByteList out; -#ifdef ICE_CPP11_MAPPING Test::ByteList ret = t->opByteRange(in, out); -#else - pair inPair(in.begin(), in.end()); - Test::ByteList ret = t->opByteRange(inPair, out); -#endif test(out == in); test(ret == in); } @@ -748,12 +199,7 @@ allTests(Test::TestHelper* helper) v.s = "STRINGS."; in.push_back(v); Test::VariableList out; -#ifdef ICE_CPP11_MAPPING Test::VariableList ret = t->opVariableRange(in, out); -#else - pair inPair(in.begin(), in.end()); - Test::VariableList ret = t->opVariableRange(inPair, out); -#endif test(out == in); test(ret == in); } @@ -766,12 +212,7 @@ allTests(Test::TestHelper* helper) in.push_back('4'); in.push_back('5'); Test::ByteList out; -#ifdef ICE_CPP11_MAPPING Test::ByteList ret = t->opByteRangeType(in, out); -#else - pair inPair(in.begin(), in.end()); - Test::ByteList ret = t->opByteRangeType(inPair, out); -#endif test(out == in); test(ret == in); } @@ -796,13 +237,7 @@ allTests(Test::TestHelper* helper) in.push_back(v); inSeq.push_back(v); Test::VariableList out; -#ifdef ICE_CPP11_MAPPING Test::VariableList ret = t->opVariableRangeType(in, out); -#else - pair::const_iterator, deque::const_iterator> - inPair(inSeq.begin(), inSeq.end()); - Test::VariableList ret = t->opVariableRangeType(inPair, out); -#endif test(out == in); test(ret == in); } @@ -1040,7 +475,6 @@ allTests(Test::TestHelper* helper) deque out; deque ret = t->opDPrxSeq(in, out); -#ifdef ICE_CPP11_MAPPING auto op = out.begin(); auto rp = ret.begin(); @@ -1049,10 +483,6 @@ allTests(Test::TestHelper* helper) test(Ice::targetEqualTo(*op++, i)); test(Ice::targetEqualTo(*rp++, i)); } -#else - test(out == in); - test(ret == in); -#endif } { @@ -1065,7 +495,6 @@ allTests(Test::TestHelper* helper) list out; list ret = t->opDPrxList(in, out); -#ifdef ICE_CPP11_MAPPING auto op = out.begin(); auto rp = ret.begin(); @@ -1074,10 +503,6 @@ allTests(Test::TestHelper* helper) test(Ice::targetEqualTo(*op++, i)); test(Ice::targetEqualTo(*rp++, i)); } -#else - test(out == in); - test(ret == in); -#endif } { @@ -1179,11 +604,7 @@ allTests(Test::TestHelper* helper) for(std::map::const_iterator p = idict.begin(); p != idict.end(); ++p) { -#ifdef ICE_CPP11_MAPPING test(out[p->first] == p->second.to_string()); -#else - test(out[p->first].size() == p->second.size()); -#endif } } @@ -1235,21 +656,9 @@ allTests(Test::TestHelper* helper) cout << "testing alternate strings with AMI... " << flush; { Util::string_view in = "HELLO WORLD!"; - -#ifdef ICE_CPP11_MAPPING - auto r = t->opStringAsync(in).get(); test(r.returnValue == r.outString); test(r.returnValue == in); - -#else - Ice::AsyncResultPtr r = t->begin_opString(in); - string out; - string ret = t->end_opString(out, r); - - test(ret == out); - test(ret.size() == in.size()); -#endif } cout << "ok" << endl; @@ -1268,18 +677,9 @@ allTests(Test::TestHelper* helper) inArray[i] = in[i]; } pair inPair(inArray, inArray + 5); - -#ifdef ICE_CPP11_MAPPING auto r = t->opDoubleArrayAsync(inPair).get(); test(r.outSeq == in); test(r.returnValue == in); -#else - Test::DoubleSeq out; - Ice::AsyncResultPtr r = t->begin_opDoubleArray(inPair); - Test::DoubleSeq ret = t->end_opDoubleArray(out, r); - test(out == in); - test(ret == in); -#endif } { @@ -1296,18 +696,9 @@ allTests(Test::TestHelper* helper) } pair inPair(inArray, inArray + 5); -#ifdef ICE_CPP11_MAPPING auto r = t->opBoolArrayAsync(inPair).get(); test(r.outSeq == in); test(r.returnValue == in); -#else - - Test::BoolSeq out; - Ice::AsyncResultPtr r = t->begin_opBoolArray(inPair); - Test::BoolSeq ret = t->end_opBoolArray(out, r); - test(out == in); - test(ret == in); -#endif } { @@ -1325,17 +716,9 @@ allTests(Test::TestHelper* helper) in.push_back(inArray[4]); pair inPair(inArray, inArray + 5); -#ifdef ICE_CPP11_MAPPING auto r = t->opByteArrayAsync(inPair).get(); test(r.outSeq == in); test(r.returnValue == in); -#else - Test::ByteList out; - Ice::AsyncResultPtr r = t->begin_opByteArray(inPair); - Test::ByteList ret = t->end_opByteArray(out, r); - test(out == in); - test(ret == in); -#endif } { @@ -1353,17 +736,9 @@ allTests(Test::TestHelper* helper) in.push_back(inArray[4]); pair inPair(inArray, inArray + 5); -#ifdef ICE_CPP11_MAPPING auto r = t->opVariableArrayAsync(inPair).get(); test(r.outSeq == in); test(r.returnValue == in); -#else - Test::VariableList out; - Ice::AsyncResultPtr r = t->begin_opVariableArray(inPair); - Test::VariableList ret = t->end_opVariableArray(out, r); - test(out == in); - test(ret == in); -#endif } { @@ -1373,18 +748,9 @@ allTests(Test::TestHelper* helper) in[2] = true; in[3] = false; in[4] = true; -#ifdef ICE_CPP11_MAPPING auto r = t->opBoolRangeAsync(in).get(); test(r.outSeq == in); test(r.returnValue == in); -#else - pair inPair(in.begin(), in.end()); - Test::BoolSeq out; - Ice::AsyncResultPtr r = t->begin_opBoolRange(inPair); - Test::BoolSeq ret = t->end_opBoolRange(out, r); - test(out == in); - test(ret == in); -#endif } { @@ -1395,18 +761,9 @@ allTests(Test::TestHelper* helper) in.push_back('4'); in.push_back('5'); -#ifdef ICE_CPP11_MAPPING auto r = t->opByteRangeAsync(in).get(); test(r.outSeq == in); test(r.returnValue == in); -#else - pair inPair(in.begin(), in.end()); - Test::ByteList out; - Ice::AsyncResultPtr r = t->begin_opByteRange(inPair); - Test::ByteList ret = t->end_opByteRange(out, r); - test(out == in); - test(ret == in); -#endif } { @@ -1422,19 +779,9 @@ allTests(Test::TestHelper* helper) in.push_back(v); v.s = "STRINGS."; in.push_back(v); - -#ifdef ICE_CPP11_MAPPING auto r = t->opVariableRangeAsync(in).get(); test(r.outSeq == in); test(r.returnValue == in); -#else - pair inPair(in.begin(), in.end()); - Test::VariableList out; - Ice::AsyncResultPtr r = t->begin_opVariableRange(inPair); - Test::VariableList ret = t->end_opVariableRange(out, r); - test(out == in); - test(ret == in); -#endif } { @@ -1444,18 +791,9 @@ allTests(Test::TestHelper* helper) in.push_back('3'); in.push_back('4'); in.push_back('5'); -#ifdef ICE_CPP11_MAPPING auto r = t->opByteRangeTypeAsync(in).get(); test(r.outSeq == in); test(r.returnValue == in); -#else - pair inPair(in.begin(), in.end()); - Test::ByteList out; - Ice::AsyncResultPtr r = t->begin_opByteRangeType(inPair); - Test::ByteList ret = t->end_opByteRangeType(out, r); - test(out == in); - test(ret == in); -#endif } { @@ -1478,19 +816,9 @@ allTests(Test::TestHelper* helper) in.push_back(v); inSeq.push_back(v); -#ifdef ICE_CPP11_MAPPING auto r = t->opVariableRangeTypeAsync(in).get(); test(r.outSeq == in); test(r.returnValue == in); -#else - pair::const_iterator, deque::const_iterator> - inPair(inSeq.begin(), inSeq.end()); - Test::VariableList out; - Ice::AsyncResultPtr r = t->begin_opVariableRangeType(inPair); - Test::VariableList ret = t->end_opVariableRangeType(out, r); - test(out == in); - test(ret == in); -#endif } { @@ -1501,17 +829,9 @@ allTests(Test::TestHelper* helper) in[3] = false; in[4] = true; -#ifdef ICE_CPP11_MAPPING auto r = t->opBoolSeqAsync(in).get(); test(r.outSeq == in); test(r.returnValue == in); -#else - deque out; - Ice::AsyncResultPtr r = t->begin_opBoolSeq(in); - deque ret = t->end_opBoolSeq(out, r); - test(out == in); - test(ret == in); -#endif } { @@ -1522,17 +842,9 @@ allTests(Test::TestHelper* helper) in.push_back(false); in.push_back(true); -#ifdef ICE_CPP11_MAPPING auto r = t->opBoolListAsync(in).get(); test(r.outSeq == in); test(r.returnValue == in); -#else - list out; - Ice::AsyncResultPtr r = t->begin_opBoolList(in); - list ret = t->end_opBoolList(out, r); - test(out == in); - test(ret == in); -#endif } { @@ -1543,17 +855,9 @@ allTests(Test::TestHelper* helper) in[3] = '4'; in[4] = '5'; -#ifdef ICE_CPP11_MAPPING auto r = t->opByteSeqAsync(in).get(); test(r.outSeq == in); test(r.returnValue == in); -#else - deque< ::Ice::Byte> out; - Ice::AsyncResultPtr r = t->begin_opByteSeq(in); - deque< ::Ice::Byte> ret = t->end_opByteSeq(out, r); - test(out == in); - test(ret == in); -#endif } { @@ -1564,17 +868,9 @@ allTests(Test::TestHelper* helper) in.push_back('4'); in.push_back('5'); -#ifdef ICE_CPP11_MAPPING auto r = t->opByteListAsync(in).get(); test(r.outSeq == in); test(r.returnValue == in); -#else - list< ::Ice::Byte> out; - Ice::AsyncResultPtr r = t->begin_opByteList(in); - list< ::Ice::Byte> ret = t->end_opByteList(out, r); - test(out == in); - test(ret == in); -#endif } { @@ -1585,17 +881,9 @@ allTests(Test::TestHelper* helper) *p = static_cast('1' + i++); } -#ifdef ICE_CPP11_MAPPING auto r = t->opMyByteSeqAsync(in).get(); test(r.outSeq == in); test(r.returnValue == in); -#else - MyByteSeq out; - Ice::AsyncResultPtr r = t->begin_opMyByteSeq(in); - MyByteSeq ret = t->end_opMyByteSeq(out, r); - test(out == in); - test(ret == in); -#endif } { @@ -1606,17 +894,9 @@ allTests(Test::TestHelper* helper) in[3] = "SHORT"; in[4] = "STRINGS."; -#ifdef ICE_CPP11_MAPPING auto r = t->opStringSeqAsync(in).get(); test(r.outSeq == in); test(r.returnValue == in); -#else - deque out; - Ice::AsyncResultPtr r = t->begin_opStringSeq(in); - deque ret = t->end_opStringSeq(out, r); - test(out == in); - test(ret == in); -#endif } { @@ -1627,17 +907,9 @@ allTests(Test::TestHelper* helper) in.push_back("SHORT"); in.push_back("STRINGS."); -#ifdef ICE_CPP11_MAPPING auto r = t->opStringListAsync(in).get(); test(r.outSeq == in); test(r.returnValue == in); -#else - list out; - Ice::AsyncResultPtr r = t->begin_opStringList(in); - list ret = t->end_opStringList(out, r); - test(out == in); - test(ret == in); -#endif } { @@ -1648,17 +920,9 @@ allTests(Test::TestHelper* helper) in[3].s = 4; in[4].s = 5; -#ifdef ICE_CPP11_MAPPING auto r = t->opFixedSeqAsync(in).get(); test(r.outSeq == in); test(r.returnValue == in); -#else - deque out; - Ice::AsyncResultPtr r = t->begin_opFixedSeq(in); - deque ret = t->end_opFixedSeq(out, r); - test(out == in); - test(ret == in); -#endif } { @@ -1669,17 +933,9 @@ allTests(Test::TestHelper* helper) (*p).s = num++; } -#ifdef ICE_CPP11_MAPPING auto r = t->opFixedListAsync(in).get(); test(r.outSeq == in); test(r.returnValue == in); -#else - list out; - Ice::AsyncResultPtr r = t->begin_opFixedList(in); - list ret = t->end_opFixedList(out, r); - test(out == in); - test(ret == in); -#endif } { @@ -1690,17 +946,9 @@ allTests(Test::TestHelper* helper) in[3].s = "SHORT"; in[4].s = "STRINGS."; -#ifdef ICE_CPP11_MAPPING auto r = t->opVariableSeqAsync(in).get(); test(r.outSeq == in); test(r.returnValue == in); -#else - deque out; - Ice::AsyncResultPtr r = t->begin_opVariableSeq(in); - deque ret = t->end_opVariableSeq(out, r); - test(out == in); - test(ret == in); -#endif } { @@ -1717,17 +965,9 @@ allTests(Test::TestHelper* helper) v.s = "STRINGS."; in.push_back(v); -#ifdef ICE_CPP11_MAPPING auto r = t->opVariableListAsync(in).get(); test(r.outSeq == in); test(r.returnValue == in); -#else - list out; - Ice::AsyncResultPtr r = t->begin_opVariableList(in); - list ret = t->end_opVariableList(out, r); - test(out == in); - test(ret == in); -#endif } { @@ -1738,17 +978,9 @@ allTests(Test::TestHelper* helper) in[3]["D"] = "D"; in[4]["E"] = "E"; -#ifdef ICE_CPP11_MAPPING auto r = t->opStringStringDictSeqAsync(in).get(); test(r.outSeq == in); test(r.returnValue == in); -#else - deque out; - Ice::AsyncResultPtr r = t->begin_opStringStringDictSeq(in); - deque ret = t->end_opStringStringDictSeq(out, r); - test(out == in); - test(ret == in); -#endif } { @@ -1765,17 +997,9 @@ allTests(Test::TestHelper* helper) ssd["E"] = "E"; in.push_back(ssd); -#ifdef ICE_CPP11_MAPPING auto r = t->opStringStringDictListAsync(in).get(); test(r.outSeq == in); test(r.returnValue == in); -#else - list out; - Ice::AsyncResultPtr r = t->begin_opStringStringDictList(in); - list ret = t->end_opStringStringDictList(out, r); - test(out == in); - test(ret == in); -#endif } { @@ -1786,17 +1010,9 @@ allTests(Test::TestHelper* helper) in[3] = Test:: ICE_ENUM(E, E1); in[4] = Test:: ICE_ENUM(E, E3); -#ifdef ICE_CPP11_MAPPING auto r = t->opESeqAsync(in).get(); test(r.outSeq == in); test(r.returnValue == in); -#else - deque out; - Ice::AsyncResultPtr r = t->begin_opESeq(in); - deque ret = t->end_opESeq(out, r); - test(out == in); - test(ret == in); -#endif } { @@ -1807,17 +1023,9 @@ allTests(Test::TestHelper* helper) in.push_back(Test:: ICE_ENUM(E, E1)); in.push_back(Test:: ICE_ENUM(E, E3)); -#ifdef ICE_CPP11_MAPPING auto r = t->opEListAsync(in).get(); test(r.outSeq == in); test(r.returnValue == in); -#else - list out; - Ice::AsyncResultPtr r = t->begin_opEList(in); - list ret = t->end_opEList(out, r); - test(out == in); - test(ret == in); -#endif } { @@ -1828,7 +1036,6 @@ allTests(Test::TestHelper* helper) in[3] = ICE_UNCHECKED_CAST(Test::DPrx, communicator->stringToProxy("C4:" + endp + " -t 10003")); in[4] = ICE_UNCHECKED_CAST(Test::DPrx, communicator->stringToProxy("C5:" + endp + " -t 10004")); -#ifdef ICE_CPP11_MAPPING auto r = t->opDPrxSeqAsync(in).get(); test(r.outSeq.size() == in.size()); @@ -1842,13 +1049,6 @@ allTests(Test::TestHelper* helper) test(Ice::targetEqualTo(*op++, i)); test(Ice::targetEqualTo(*rp++, i)); } -#else - deque out; - Ice::AsyncResultPtr r = t->begin_opDPrxSeq(in); - deque ret = t->end_opDPrxSeq(out, r); - test(out == in); - test(ret == in); -#endif } { @@ -1859,7 +1059,6 @@ allTests(Test::TestHelper* helper) in.push_back(ICE_UNCHECKED_CAST(Test::DPrx, communicator->stringToProxy("C4:" + endp + " -t 10003"))); in.push_back(ICE_UNCHECKED_CAST(Test::DPrx, communicator->stringToProxy("C5:" + endp + " -t 10004"))); -#ifdef ICE_CPP11_MAPPING auto r = t->opDPrxListAsync(in).get(); test(r.outSeq.size() == in.size()); @@ -1873,13 +1072,6 @@ allTests(Test::TestHelper* helper) test(Ice::targetEqualTo(*op++, i)); test(Ice::targetEqualTo(*rp++, i)); } -#else - list out; - Ice::AsyncResultPtr r = t->begin_opDPrxList(in); - list ret = t->end_opDPrxList(out, r); - test(out == in); - test(ret == in); -#endif } { @@ -1890,7 +1082,6 @@ allTests(Test::TestHelper* helper) in[3] = in[0]; in[4] = in[0]; -#ifdef ICE_CPP11_MAPPING auto r = t->opCSeqAsync(in).get(); test(r.outSeq.size() == in.size()); test(r.returnValue.size() == in.size()); @@ -1901,18 +1092,6 @@ allTests(Test::TestHelper* helper) test(o == r.outSeq[0]); test(*rp++ == o); } -#else - deque out; - Ice::AsyncResultPtr r = t->begin_opCSeq(in); - deque ret = t->end_opCSeq(out, r); - test(out.size() == in.size()); - test(ret.size() == in.size()); - for(unsigned int i = 1; i < in.size(); ++i) - { - test(out[i] == out[0]); - test(ret[i] == out[i]); - } -#endif } { @@ -1923,24 +1102,10 @@ allTests(Test::TestHelper* helper) in.push_back(ICE_MAKE_SHARED(Test::C)); in.push_back(ICE_MAKE_SHARED(Test::C)); -#ifdef ICE_CPP11_MAPPING auto r = t->opCListAsync(in).get(); test(r.outSeq.size() == in.size()); test(r.returnValue.size() == in.size()); test(r.outSeq == r.returnValue); -#else - list out; - Ice::AsyncResultPtr r = t->begin_opCList(in); - list ret = t->end_opCList(out, r); - test(out.size() == in.size()); - test(ret.size() == in.size()); - list::const_iterator p1; - list::const_iterator p2; - for(p1 = out.begin(), p2 = ret.begin(); p1 != out.end(); ++p1, ++p2) - { - test(*p1 == *p2); - } -#endif } { @@ -1950,25 +1115,9 @@ allTests(Test::TestHelper* helper) in.push_back('3'); in.push_back('4'); -#ifdef ICE_CPP11_MAPPING auto r = t->opOutArrayByteSeqAsync(in).get(); test(r.size() == in.size()); test(r == in); -#else - Ice::AsyncResultPtr r = t->begin_opOutArrayByteSeq(in); - - Test::ByteSeq out; - t->end_opOutArrayByteSeq(out, r); - - test(out.size() == in.size()); - Test::ByteSeq::const_iterator p1; - Test::ByteSeq::const_iterator p2; - - for(p1 = out.begin(), p2 = in.begin(); p1 != out.end(); ++p1, ++p2) - { - test(*p1 == *p2); - } -#endif } { @@ -1978,25 +1127,9 @@ allTests(Test::TestHelper* helper) in.push_back('3'); in.push_back('4'); -#ifdef ICE_CPP11_MAPPING auto r = t->opOutRangeByteSeqAsync(in).get(); test(r.size() == in.size()); test(r == in); -#else - Ice::AsyncResultPtr r = t->begin_opOutRangeByteSeq(in); - - Test::ByteSeq out; - t->end_opOutRangeByteSeq(out, r); - - test(out.size() == in.size()); - Test::ByteSeq::const_iterator p1; - Test::ByteSeq::const_iterator p2; - - for(p1 = out.begin(), p2 = in.begin(); p1 != out.end(); ++p1, ++p2) - { - test(*p1 == *p2); - } -#endif } } cout << "ok" << endl; @@ -2005,8 +1138,6 @@ allTests(Test::TestHelper* helper) { Util::string_view in = "HELLO WORLD!"; -#ifdef ICE_CPP11_MAPPING - promise done; t->opStringAsync(in, @@ -2022,14 +1153,6 @@ allTests(Test::TestHelper* helper) }); test(done.get_future().get()); -#else - CallbackPtr cb = new Callback(); - - Test::Callback_TestIntf_opStringPtr callback = - Test::newCallback_TestIntf_opString(cb, &Callback::opString, &Callback::noEx); - t->begin_opString(in, callback, newInParam(in)); - cb->check(); -#endif } cout << "ok" << endl; @@ -2049,8 +1172,6 @@ allTests(Test::TestHelper* helper) } pair inPair(inArray, inArray + 5); -#ifdef ICE_CPP11_MAPPING - promise done; t->opDoubleArrayAsync(inPair, @@ -2067,13 +1188,6 @@ allTests(Test::TestHelper* helper) }); test(done.get_future().get()); -#else - CallbackPtr cb = new Callback(); - Test::Callback_TestIntf_opDoubleArrayPtr callback = - Test::newCallback_TestIntf_opDoubleArray(cb, &Callback::opDoubleArray, &Callback::noEx); - t->begin_opDoubleArray(inPair, callback, newInParam(inPair)); - cb->check(); -#endif } { @@ -2090,8 +1204,6 @@ allTests(Test::TestHelper* helper) } pair inPair(inArray, inArray + 5); -#ifdef ICE_CPP11_MAPPING - promise done; t->opBoolArrayAsync(inPair, @@ -2108,13 +1220,6 @@ allTests(Test::TestHelper* helper) }); test(done.get_future().get()); -#else - CallbackPtr cb = new Callback(); - Test::Callback_TestIntf_opBoolArrayPtr callback = - Test::newCallback_TestIntf_opBoolArray(cb, &Callback::opBoolArray, &Callback::noEx); - t->begin_opBoolArray(inPair, callback, newInParam(inPair)); - cb->check(); -#endif } { @@ -2126,8 +1231,6 @@ allTests(Test::TestHelper* helper) in[4] = '5'; pair inPair(in, in + 5); -#ifdef ICE_CPP11_MAPPING - promise done; t->opByteArrayAsync(inPair, @@ -2144,14 +1247,6 @@ allTests(Test::TestHelper* helper) }); test(done.get_future().get()); -#else - - CallbackPtr cb = new Callback(); - Test::Callback_TestIntf_opByteArrayPtr callback = - Test::newCallback_TestIntf_opByteArray(cb, &Callback::opByteArray, &Callback::noEx); - t->begin_opByteArray(inPair, callback, newInParam(inPair)); - cb->check(); -#endif } { @@ -2169,8 +1264,6 @@ allTests(Test::TestHelper* helper) in.push_back(inArray[4]); pair inPair(inArray, inArray + 5); -#ifdef ICE_CPP11_MAPPING - promise done; t->opVariableArrayAsync(inPair, @@ -2187,13 +1280,6 @@ allTests(Test::TestHelper* helper) }); test(done.get_future().get()); -#else - CallbackPtr cb = new Callback(); - Test::Callback_TestIntf_opVariableArrayPtr callback = - Test::newCallback_TestIntf_opVariableArray(cb, &Callback::opVariableArray, &Callback::noEx); - t->begin_opVariableArray(inPair, callback, newInParam(inPair)); - cb->check(); -#endif } { @@ -2204,8 +1290,6 @@ allTests(Test::TestHelper* helper) in[3] = false; in[4] = true; -#ifdef ICE_CPP11_MAPPING - promise done; t->opBoolRangeAsync(in, @@ -2221,15 +1305,6 @@ allTests(Test::TestHelper* helper) }); test(done.get_future().get()); -#else - pair inPair(in.begin(), in.end()); - - CallbackPtr cb = new Callback(); - Test::Callback_TestIntf_opBoolRangePtr callback = - Test::newCallback_TestIntf_opBoolRange(cb, &Callback::opBoolRange, &Callback::noEx); - t->begin_opBoolRange(inPair, callback, newInParam(inPair)); - cb->check(); -#endif } { @@ -2240,8 +1315,6 @@ allTests(Test::TestHelper* helper) in.push_back('4'); in.push_back('5'); -#ifdef ICE_CPP11_MAPPING - promise done; t->opByteRangeAsync(in, @@ -2257,14 +1330,6 @@ allTests(Test::TestHelper* helper) }); test(done.get_future().get()); -#else - pair inPair(in.begin(), in.end()); - CallbackPtr cb = new Callback(); - Test::Callback_TestIntf_opByteRangePtr callback = - Test::newCallback_TestIntf_opByteRange(cb, &Callback::opByteRange, &Callback::noEx); - t->begin_opByteRange(inPair, callback, newInParam(inPair)); - cb->check(); -#endif } { @@ -2281,8 +1346,6 @@ allTests(Test::TestHelper* helper) v.s = "STRINGS."; in.push_back(v); -#ifdef ICE_CPP11_MAPPING - promise done; t->opVariableRangeAsync(in, @@ -2298,14 +1361,6 @@ allTests(Test::TestHelper* helper) }); test(done.get_future().get()); -#else - pair inPair(in.begin(), in.end()); - CallbackPtr cb = new Callback(); - Test::Callback_TestIntf_opVariableRangePtr callback = - Test::newCallback_TestIntf_opVariableRange(cb, &Callback::opVariableRange, &Callback::noEx); - t->begin_opVariableRange(inPair, callback, newInParam(inPair)); - cb->check(); -#endif } { @@ -2316,8 +1371,6 @@ allTests(Test::TestHelper* helper) in.push_back('4'); in.push_back('5'); -#ifdef ICE_CPP11_MAPPING - promise done; t->opByteRangeTypeAsync(in, @@ -2333,14 +1386,6 @@ allTests(Test::TestHelper* helper) }); test(done.get_future().get()); -#else - pair inPair(in.begin(), in.end()); - CallbackPtr cb = new Callback(); - Test::Callback_TestIntf_opByteRangeTypePtr callback = - Test::newCallback_TestIntf_opByteRangeType(cb, &Callback::opByteRangeType, &Callback::noEx); - t->begin_opByteRangeType(inPair, callback, newInParam(inPair)); - cb->check(); -#endif } { @@ -2362,8 +1407,6 @@ allTests(Test::TestHelper* helper) v.s = "STRINGS."; in.push_back(v); inSeq.push_back(v); -#ifdef ICE_CPP11_MAPPING - promise done; t->opVariableRangeTypeAsync(in, @@ -2379,15 +1422,6 @@ allTests(Test::TestHelper* helper) }); test(done.get_future().get()); -#else - pair::const_iterator, deque::const_iterator> inPair(inSeq.begin(), - inSeq.end()); - CallbackPtr cb = new Callback(); - Test::Callback_TestIntf_opVariableRangeTypePtr callback = - Test::newCallback_TestIntf_opVariableRangeType(cb, &Callback::opVariableRangeType, &Callback::noEx); - t->begin_opVariableRangeType(inPair, callback, newInParam(inPair)); - cb->check(); -#endif } { @@ -2398,8 +1432,6 @@ allTests(Test::TestHelper* helper) in[3] = false; in[4] = true; -#ifdef ICE_CPP11_MAPPING - promise done; t->opBoolSeqAsync(in, @@ -2415,13 +1447,6 @@ allTests(Test::TestHelper* helper) }); test(done.get_future().get()); -#else - CallbackPtr cb = new Callback(); - Test::Callback_TestIntf_opBoolSeqPtr callback = - Test::newCallback_TestIntf_opBoolSeq(cb, &Callback::opBoolSeq, &Callback::noEx); - t->begin_opBoolSeq(in, callback, newInParam(in)); - cb->check(); -#endif } { @@ -2432,8 +1457,6 @@ allTests(Test::TestHelper* helper) in.push_back(false); in.push_back(true); -#ifdef ICE_CPP11_MAPPING - promise done; t->opBoolListAsync(in, @@ -2449,13 +1472,6 @@ allTests(Test::TestHelper* helper) }); test(done.get_future().get()); -#else - CallbackPtr cb = new Callback(); - Test::Callback_TestIntf_opBoolListPtr callback = - Test::newCallback_TestIntf_opBoolList(cb, &Callback::opBoolList, &Callback::noEx); - t->begin_opBoolList(in, callback, newInParam(in)); - cb->check(); -#endif } { @@ -2466,8 +1482,6 @@ allTests(Test::TestHelper* helper) in[3] = '4'; in[4] = '5'; -#ifdef ICE_CPP11_MAPPING - promise done; t->opByteSeqAsync(in, @@ -2483,13 +1497,6 @@ allTests(Test::TestHelper* helper) }); test(done.get_future().get()); -#else - CallbackPtr cb = new Callback(); - Test::Callback_TestIntf_opByteSeqPtr callback = - Test::newCallback_TestIntf_opByteSeq(cb, &Callback::opByteSeq, &Callback::noEx); - t->begin_opByteSeq(in, callback, newInParam(in)); - cb->check(); -#endif } { @@ -2500,8 +1507,6 @@ allTests(Test::TestHelper* helper) in.push_back('4'); in.push_back('5'); -#ifdef ICE_CPP11_MAPPING - promise done; t->opByteListAsync(in, @@ -2517,14 +1522,6 @@ allTests(Test::TestHelper* helper) }); test(done.get_future().get()); -#else - - CallbackPtr cb = new Callback(); - Test::Callback_TestIntf_opByteListPtr callback = - Test::newCallback_TestIntf_opByteList(cb, &Callback::opByteList, &Callback::noEx); - t->begin_opByteList(in, callback, newInParam(in)); - cb->check(); -#endif } { @@ -2535,8 +1532,6 @@ allTests(Test::TestHelper* helper) *p = static_cast('1' + i++); } -#ifdef ICE_CPP11_MAPPING - promise done; t->opMyByteSeqAsync(in, @@ -2552,13 +1547,6 @@ allTests(Test::TestHelper* helper) }); test(done.get_future().get()); -#else - CallbackPtr cb = new Callback(); - Test::Callback_TestIntf_opMyByteSeqPtr callback = - Test::newCallback_TestIntf_opMyByteSeq(cb, &Callback::opMyByteSeq, &Callback::noEx); - t->begin_opMyByteSeq(in, callback, newInParam(in)); - cb->check(); -#endif } { @@ -2569,8 +1557,6 @@ allTests(Test::TestHelper* helper) in[3] = "SHORT"; in[4] = "STRINGS."; -#ifdef ICE_CPP11_MAPPING - promise done; t->opStringSeqAsync(in, @@ -2586,13 +1572,6 @@ allTests(Test::TestHelper* helper) }); test(done.get_future().get()); -#else - CallbackPtr cb = new Callback(); - Test::Callback_TestIntf_opStringSeqPtr callback = - Test::newCallback_TestIntf_opStringSeq(cb, &Callback::opStringSeq, &Callback::noEx); - t->begin_opStringSeq(in, callback, newInParam(in)); - cb->check(); -#endif } { @@ -2603,8 +1582,6 @@ allTests(Test::TestHelper* helper) in.push_back("SHORT"); in.push_back("STRINGS."); -#ifdef ICE_CPP11_MAPPING - promise done; t->opStringListAsync(in, @@ -2620,13 +1597,6 @@ allTests(Test::TestHelper* helper) }); test(done.get_future().get()); -#else - CallbackPtr cb = new Callback(); - Test::Callback_TestIntf_opStringListPtr callback = - Test::newCallback_TestIntf_opStringList(cb, &Callback::opStringList, &Callback::noEx); - t->begin_opStringList(in, callback, newInParam(in)); - cb->check(); -#endif } { @@ -2637,8 +1607,6 @@ allTests(Test::TestHelper* helper) in[3].s = 4; in[4].s = 5; -#ifdef ICE_CPP11_MAPPING - promise done; t->opFixedSeqAsync(in, @@ -2654,13 +1622,6 @@ allTests(Test::TestHelper* helper) }); test(done.get_future().get()); -#else - CallbackPtr cb = new Callback(); - Test::Callback_TestIntf_opFixedSeqPtr callback = - Test::newCallback_TestIntf_opFixedSeq(cb, &Callback::opFixedSeq, &Callback::noEx); - t->begin_opFixedSeq(in, callback, newInParam(in)); - cb->check(); -#endif } { @@ -2671,8 +1632,6 @@ allTests(Test::TestHelper* helper) (*p).s = num++; } -#ifdef ICE_CPP11_MAPPING - promise done; t->opFixedListAsync(in, @@ -2688,13 +1647,6 @@ allTests(Test::TestHelper* helper) }); test(done.get_future().get()); -#else - CallbackPtr cb = new Callback(); - Test::Callback_TestIntf_opFixedListPtr callback = - Test::newCallback_TestIntf_opFixedList(cb, &Callback::opFixedList, &Callback::noEx); - t->begin_opFixedList(in, callback, newInParam(in)); - cb->check(); -#endif } { @@ -2705,8 +1657,6 @@ allTests(Test::TestHelper* helper) in[3].s = "SHORT"; in[4].s = "STRINGS."; -#ifdef ICE_CPP11_MAPPING - promise done; t->opVariableSeqAsync(in, @@ -2722,13 +1672,6 @@ allTests(Test::TestHelper* helper) }); test(done.get_future().get()); -#else - CallbackPtr cb = new Callback(); - Test::Callback_TestIntf_opVariableSeqPtr callback = - Test::newCallback_TestIntf_opVariableSeq(cb, &Callback::opVariableSeq, &Callback::noEx); - t->begin_opVariableSeq(in, callback, newInParam(in)); - cb->check(); -#endif } { @@ -2745,8 +1688,6 @@ allTests(Test::TestHelper* helper) v.s = "STRINGS."; in.push_back(v); -#ifdef ICE_CPP11_MAPPING - promise done; t->opVariableListAsync(in, @@ -2762,13 +1703,6 @@ allTests(Test::TestHelper* helper) }); test(done.get_future().get()); -#else - CallbackPtr cb = new Callback(); - Test::Callback_TestIntf_opVariableListPtr callback = - Test::newCallback_TestIntf_opVariableList(cb, &Callback::opVariableList, &Callback::noEx); - t->begin_opVariableList(in, callback, newInParam(in)); - cb->check(); -#endif } { @@ -2779,8 +1713,6 @@ allTests(Test::TestHelper* helper) in[3]["D"] = "D"; in[4]["E"] = "E"; -#ifdef ICE_CPP11_MAPPING - promise done; t->opStringStringDictSeqAsync(in, @@ -2796,13 +1728,6 @@ allTests(Test::TestHelper* helper) }); test(done.get_future().get()); -#else - CallbackPtr cb = new Callback(); - Test::Callback_TestIntf_opStringStringDictSeqPtr callback = - Test::newCallback_TestIntf_opStringStringDictSeq(cb, &Callback::opStringStringDictSeq, &Callback::noEx); - t->begin_opStringStringDictSeq(in, callback, newInParam(in)); - cb->check(); -#endif } { @@ -2819,8 +1744,6 @@ allTests(Test::TestHelper* helper) ssd["E"] = "E"; in.push_back(ssd); -#ifdef ICE_CPP11_MAPPING - promise done; t->opStringStringDictListAsync(in, @@ -2836,13 +1759,6 @@ allTests(Test::TestHelper* helper) }); test(done.get_future().get()); -#else - CallbackPtr cb = new Callback(); - Test::Callback_TestIntf_opStringStringDictListPtr callback = - Test::newCallback_TestIntf_opStringStringDictList(cb, &Callback::opStringStringDictList, &Callback::noEx); - t->begin_opStringStringDictList(in, callback, newInParam(in)); - cb->check(); -#endif } { @@ -2853,8 +1769,6 @@ allTests(Test::TestHelper* helper) in[3] = Test:: ICE_ENUM(E, E1); in[4] = Test:: ICE_ENUM(E, E3); -#ifdef ICE_CPP11_MAPPING - promise done; t->opESeqAsync(in, @@ -2870,13 +1784,6 @@ allTests(Test::TestHelper* helper) }); test(done.get_future().get()); -#else - CallbackPtr cb = new Callback(); - Test::Callback_TestIntf_opESeqPtr callback = - Test::newCallback_TestIntf_opESeq(cb, &Callback::opESeq, &Callback::noEx); - t->begin_opESeq(in, callback, newInParam(in)); - cb->check(); -#endif } { @@ -2887,8 +1794,6 @@ allTests(Test::TestHelper* helper) in.push_back(Test:: ICE_ENUM(E, E1)); in.push_back(Test:: ICE_ENUM(E, E3)); -#ifdef ICE_CPP11_MAPPING - promise done; t->opEListAsync(in, @@ -2904,13 +1809,6 @@ allTests(Test::TestHelper* helper) }); test(done.get_future().get()); -#else - CallbackPtr cb = new Callback(); - Test::Callback_TestIntf_opEListPtr callback = - Test::newCallback_TestIntf_opEList(cb, &Callback::opEList, &Callback::noEx); - t->begin_opEList(in, callback, newInParam(in)); - cb->check(); -#endif } { @@ -2921,8 +1819,6 @@ allTests(Test::TestHelper* helper) in[3] = ICE_UNCHECKED_CAST(Test::DPrx, communicator->stringToProxy("C4:" + endp + " -t 10003")); in[4] = ICE_UNCHECKED_CAST(Test::DPrx, communicator->stringToProxy("C5:" + endp + " -t 10004")); -#ifdef ICE_CPP11_MAPPING - promise done; t->opDPrxSeqAsync(in, @@ -2944,13 +1840,6 @@ allTests(Test::TestHelper* helper) }); test(done.get_future().get()); -#else - CallbackPtr cb = new Callback(); - Test::Callback_TestIntf_opDPrxSeqPtr callback = - Test::newCallback_TestIntf_opDPrxSeq(cb, &Callback::opDPrxSeq, &Callback::noEx); - t->begin_opDPrxSeq(in, callback, newInParam(in)); - cb->check(); -#endif } { @@ -2961,8 +1850,6 @@ allTests(Test::TestHelper* helper) in.push_back(ICE_UNCHECKED_CAST(Test::DPrx, communicator->stringToProxy("C4:" + endp + " -t 10003"))); in.push_back(ICE_UNCHECKED_CAST(Test::DPrx, communicator->stringToProxy("C5:" + endp + " -t 10004"))); -#ifdef ICE_CPP11_MAPPING - promise done; t->opDPrxListAsync(in, @@ -2984,13 +1871,6 @@ allTests(Test::TestHelper* helper) }); test(done.get_future().get()); -#else - CallbackPtr cb = new Callback(); - Test::Callback_TestIntf_opDPrxListPtr callback = - Test::newCallback_TestIntf_opDPrxList(cb, &Callback::opDPrxList, &Callback::noEx); - t->begin_opDPrxList(in, callback, newInParam(in)); - cb->check(); -#endif } { @@ -3001,8 +1881,6 @@ allTests(Test::TestHelper* helper) in[3] = in[0]; in[4] = in[0]; -#ifdef ICE_CPP11_MAPPING - promise done; t->opCSeqAsync(in, @@ -3018,12 +1896,6 @@ allTests(Test::TestHelper* helper) }); test(done.get_future().get()); -#else - CallbackPtr cb = new Callback(); - Test::Callback_TestIntf_opCSeqPtr callback = Test::newCallback_TestIntf_opCSeq(cb, &Callback::opCSeq, &Callback::noEx); - t->begin_opCSeq(in, callback, newInParam(in)); - cb->check(); -#endif } { @@ -3034,8 +1906,6 @@ allTests(Test::TestHelper* helper) in.push_back(ICE_MAKE_SHARED(Test::C)); in.push_back(ICE_MAKE_SHARED(Test::C)); -#ifdef ICE_CPP11_MAPPING - promise done; t->opCListAsync(in, @@ -3051,13 +1921,6 @@ allTests(Test::TestHelper* helper) }); test(done.get_future().get()); -#else - CallbackPtr cb = new Callback(); - Test::Callback_TestIntf_opCListPtr callback = - Test::newCallback_TestIntf_opCList(cb, &Callback::opCList, &Callback::noEx); - t->begin_opCList(in, callback, newInParam(in)); - cb->check(); -#endif } { @@ -3067,8 +1930,6 @@ allTests(Test::TestHelper* helper) in.push_back('3'); in.push_back('4'); -#ifdef ICE_CPP11_MAPPING - promise done; t->opOutArrayByteSeqAsync(in, @@ -3084,14 +1945,6 @@ allTests(Test::TestHelper* helper) }); test(done.get_future().get()); -#else - CallbackPtr cb = new Callback(); - Test::Callback_TestIntf_opOutArrayByteSeqPtr callback = Test::newCallback_TestIntf_opOutArrayByteSeq(cb, - &Callback::opOutArrayByteSeq, &Callback::noEx); - - t->begin_opOutArrayByteSeq(in, callback, newInParam(in)); - cb->check(); -#endif } { @@ -3101,8 +1954,6 @@ allTests(Test::TestHelper* helper) in.push_back('3'); in.push_back('4'); -#ifdef ICE_CPP11_MAPPING - promise done; t->opOutRangeByteSeqAsync(in, @@ -3117,14 +1968,6 @@ allTests(Test::TestHelper* helper) }); test(done.get_future().get()); -#else - CallbackPtr cb = new Callback(); - Test::Callback_TestIntf_opOutRangeByteSeqPtr callback = Test::newCallback_TestIntf_opOutRangeByteSeq(cb, - &Callback::opOutRangeByteSeq, &Callback::noEx); - - t->begin_opOutRangeByteSeq(in, callback, newInParam(in)); - cb->check(); -#endif } cout << "ok" << endl; @@ -3139,19 +1982,9 @@ allTests(Test::TestHelper* helper) idict[3] = "THREE"; idict[-1] = "MINUS ONE"; -#ifdef ICE_CPP11_MAPPING auto r = t->opIntStringDictAsync(idict).get(); test(r.odict == idict); test(r.returnValue == idict); -#else - Test::IntStringDict out; - out[5] = "FIVE"; - - Ice::AsyncResultPtr r = t->begin_opIntStringDict(idict); - Test::IntStringDict ret = t->end_opIntStringDict(out, r); - test(out == idict); - test(ret == idict); -#endif } { @@ -3162,7 +1995,6 @@ allTests(Test::TestHelper* helper) idict["THREE"] = 3; idict["MINUS ONE"] = -1; -#ifdef ICE_CPP11_MAPPING auto r = t->opVarDictAsync(idict).get(); test(r.odict == idict); test(r.returnValue.size() == 1000); @@ -3170,20 +2002,6 @@ allTests(Test::TestHelper* helper) { test(i.second == i.first * i.first); } -#else - Test::CustomMap out; - out["FIVE"] = 5; - - Ice::AsyncResultPtr r = t->begin_opVarDict(idict); - Test::CustomMap ret = t->end_opVarDict(out, r); - - test(out == idict); - test(ret.size() == 1000); - for(Test::CustomMap::const_iterator i = ret.begin(); i != ret.end(); ++i) - { - test(i->second == i->first * i->first); - } -#endif } { @@ -3194,7 +2012,6 @@ allTests(Test::TestHelper* helper) idict[3] = "THREE"; idict[-1] = "MINUS ONE"; -#ifdef ICE_CPP11_MAPPING auto r = t->opCustomIntStringDictAsync(idict).get(); test(r.odict.size() == idict.size()); @@ -3204,22 +2021,6 @@ allTests(Test::TestHelper* helper) { test(r.odict[i.first] == i.second); } -#else - Test::IntStringDict out; - out[5] = "FIVE"; - - Ice::AsyncResultPtr r = t->begin_opCustomIntStringDict(idict); - Test::IntStringDict ret = t->end_opCustomIntStringDict(out, r); - - test(out.size() == idict.size()); - test(out == ret); - for(std::map::const_iterator p = idict.begin(); - p != idict.end(); ++p) - { - test(out[p->first].size() == p->second.size()); - // test(out[p->first] == p->second.to_string()); does not always work due to string converter - } -#endif } } @@ -3235,7 +2036,6 @@ allTests(Test::TestHelper* helper) idict[3] = "THREE"; idict[-1] = "MINUS ONE"; -#ifdef ICE_CPP11_MAPPING promise done; t->opIntStringDictAsync(idict, @@ -3251,14 +2051,6 @@ allTests(Test::TestHelper* helper) }); test(done.get_future().get()); - -#else - CallbackPtr cb = new Callback(); - Test::Callback_TestIntf_opIntStringDictPtr callback = - Test::newCallback_TestIntf_opIntStringDict(cb, &Callback::opIntStringDict, &Callback::noEx); - t->begin_opIntStringDict(idict, callback, newInParam(idict)); - cb->check(); -#endif } { @@ -3269,7 +2061,6 @@ allTests(Test::TestHelper* helper) idict["THREE"] = 3; idict["MINUS ONE"] = -1; -#ifdef ICE_CPP11_MAPPING promise done; t->opVarDictAsync(idict, @@ -3289,15 +2080,6 @@ allTests(Test::TestHelper* helper) }); test(done.get_future().get()); - -#else - - CallbackPtr cb = new Callback(); - Test::Callback_TestIntf_opVarDictPtr callback = - Test::newCallback_TestIntf_opVarDict(cb, &Callback::opVarDict, &Callback::noEx); - t->begin_opVarDict(idict, callback, newInParam(idict)); - cb->check(); -#endif } { @@ -3308,7 +2090,6 @@ allTests(Test::TestHelper* helper) idict[3] = "THREE"; idict[-1] = "MINUS ONE"; -#ifdef ICE_CPP11_MAPPING promise done; t->opCustomIntStringDictAsync(idict, @@ -3328,60 +2109,11 @@ allTests(Test::TestHelper* helper) }); test(done.get_future().get()); -#else - CallbackPtr cb = new Callback(); - Test::Callback_TestIntf_opCustomIntStringDictPtr callback = - Test::newCallback_TestIntf_opCustomIntStringDict(cb, &Callback::opCustomIntStringDict, &Callback::noEx); - t->begin_opCustomIntStringDict(idict, callback, newInParam(idict)); - cb->check(); -#endif } } cout << "ok" << endl; -#ifndef ICE_CPP11_MAPPING - - cout << "testing class mapped structs ... " << flush; - Test::ClassStructPtr cs = new Test::ClassStruct(); - cs->y = 10; - cs->other = new Test::ClassOtherStruct; - cs->other->x = 20; - cs->otherSeq.push_back(new Test::ClassOtherStruct); - cs->otherSeq[0]->x = 30; - cs->otherSeq.push_back(new Test::ClassOtherStruct); - cs->otherSeq[1]->x = 40; - Test::ClassStructSeq csseq1; - csseq1.push_back(cs); - Test::ClassStructPtr cs2; - Test::ClassStructSeq csseq2; - Test::ClassStructPtr cs3 = t->opClassStruct(cs, csseq1, cs2, csseq2); - assert(cs3 == cs); - assert(csseq1.size() == csseq2.size()); - assert(csseq1[0] == csseq2[0]); - cout << "ok" << endl; - - cout << "testing class mapped structs with AMI... " << flush; - { - cs2 = 0; - csseq2.clear(); - Ice::AsyncResultPtr r = t->begin_opClassStruct(cs, csseq1); - cs3 = t->end_opClassStruct(cs2, csseq2, r); - assert(cs3 == cs); - assert(csseq1.size() == csseq2.size()); - assert(csseq1[0] == csseq2[0]); - } - { - CallbackPtr cb = new Callback(); - Test::Callback_TestIntf_opClassStructPtr callback = - Test::newCallback_TestIntf_opClassStruct(cb, &Callback::opClassStruct, &Callback::noEx); - t->begin_opClassStruct(cs, csseq1, callback, newInParam(make_pair(cs, csseq1))); - cb->check(); - } - cout << "ok" << endl; - -#endif - cout << "testing wstring... " << flush; Test1::WstringSeq wseq1; @@ -3415,20 +2147,12 @@ allTests(Test::TestHelper* helper) test(ret == wstr); { -#ifdef ICE_CPP11_MAPPING auto r = wsc1->opStringAsync(wstr).get(); test(r.s2 == wstr); test(r.returnValue == wstr); -#else - Ice::AsyncResultPtr r = wsc1->begin_opString(wstr); - ret = wsc1->end_opString(out, r); - test(out == wstr); - test(ret == wstr); -#endif } - { -#ifdef ICE_CPP11_MAPPING + { promise done; wsc1->opStringAsync(wstr, @@ -3444,12 +2168,6 @@ allTests(Test::TestHelper* helper) }); test(done.get_future().get()); -#else - CallbackPtr cb = new Callback(); - wsc1->begin_opString(wstr, Test1::newCallback_WstringClass_opString(cb, &Callback::opString, &Callback::noEx), - newInParam(wstr)); - cb->check(); -#endif } ret = wsc2->opString(wstr, out); @@ -3457,20 +2175,12 @@ allTests(Test::TestHelper* helper) test(ret == wstr); { -#ifdef ICE_CPP11_MAPPING auto r = wsc2->opStringAsync(wstr).get(); test(r.s2 == wstr); test(r.returnValue == wstr); -#else - Ice::AsyncResultPtr r = wsc2->begin_opString(wstr); - ret = wsc2->end_opString(out, r); - test(out == wstr); - test(ret == wstr); -#endif } - { -#ifdef ICE_CPP11_MAPPING + { promise done; wsc2->opStringAsync(wstr, @@ -3486,12 +2196,6 @@ allTests(Test::TestHelper* helper) }); test(done.get_future().get()); -#else - CallbackPtr cb = new Callback(); - wsc2->begin_opString(wstr, Test2::newCallback_WstringClass_opString(cb, &Callback::opString, - &Callback::noEx), newInParam(wstr)); - cb->check(); -#endif } Test1::WstringStruct wss1; @@ -3518,8 +2222,6 @@ allTests(Test::TestHelper* helper) } { -#ifdef ICE_CPP11_MAPPING - auto f = wsc1->throwExceptAsync(wstr); try { @@ -3530,23 +2232,9 @@ allTests(Test::TestHelper* helper) { test(ex.reason == wstr); } -#else - Ice::AsyncResultPtr r = wsc1->begin_throwExcept(wstr); - try - { - wsc1->end_throwExcept(r); - test(false); - } - catch(const Test1::WstringException& ex) - { - test(ex.reason == wstr); - } -#endif } - { - -#ifdef ICE_CPP11_MAPPING + { promise done; wsc1->throwExceptAsync(wstr, @@ -3572,11 +2260,6 @@ allTests(Test::TestHelper* helper) }); test(done.get_future().get()); -#else - CallbackPtr cb = new Callback(); - wsc1->begin_throwExcept(wstr, Ice::newCallback(cb, &Callback::throwExcept1), newInParam(wstr)); - cb->check(); -#endif } try @@ -3589,9 +2272,6 @@ allTests(Test::TestHelper* helper) } { - -#ifdef ICE_CPP11_MAPPING - auto f = wsc2->throwExceptAsync(wstr); try { @@ -3602,22 +2282,9 @@ allTests(Test::TestHelper* helper) { test(ex.reason == wstr); } -#else - Ice::AsyncResultPtr r = wsc2->begin_throwExcept(wstr); - try - { - wsc2->end_throwExcept(r); - test(false); - } - catch(const Test2::WstringException& ex) - { - test(ex.reason == wstr); - } -#endif } - { -#ifdef ICE_CPP11_MAPPING + { promise done; wsc2->throwExceptAsync(wstr, @@ -3643,11 +2310,6 @@ allTests(Test::TestHelper* helper) }); test(done.get_future().get()); -#else - CallbackPtr cb = new Callback(); - wsc2->begin_throwExcept(wstr, Ice::newCallback(cb, &Callback::throwExcept2), newInParam(wstr)); - cb->check(); -#endif } cout << "ok" << endl; diff --git a/cpp/test/Ice/custom/CustomBuffer.h b/cpp/test/Ice/custom/CustomBuffer.h index 71e54746be9..09b44e96151 100644 --- a/cpp/test/Ice/custom/CustomBuffer.h +++ b/cpp/test/Ice/custom/CustomBuffer.h @@ -161,7 +161,6 @@ struct StreamHelper< ::Test::CustomBuffer, StreamHelperCategorySequence> template static inline void read(S* stream, ::Test::CustomBuffer& v) { -#ifdef ICE_CPP11_MAPPING std::pair a; stream->read(a); size_t count = static_cast(a.second - a.first); @@ -178,22 +177,6 @@ struct StreamHelper< ::Test::CustomBuffer, StreamHelperCategorySequence> { v.set(0, 0); } -#else - IceUtil::ScopedArray p; - std::pair a; - stream->read(a, p); - T* b = p.release(); - size_t count = static_cast(a.second - a.first); - if(b == 0 && count > 0) - { - b = new T[count]; - for(size_t i = 0; i < count; ++i) - { - b[i] = a.first[i]; - } - } - v.set(b, count); -#endif } }; diff --git a/cpp/test/Ice/custom/StringView.h b/cpp/test/Ice/custom/StringView.h index c202d3ce8d7..1cc456fc65c 100644 --- a/cpp/test/Ice/custom/StringView.h +++ b/cpp/test/Ice/custom/StringView.h @@ -147,14 +147,7 @@ struct StreamHelper template static inline void write(S* stream, const Util::string_view& v) { -#ifdef ICE_CPP11_MAPPING stream->write(v.data(), v.size()); -#else - // - // In C++98, for consistency with the read, we don't string-convert - // - stream->write(v.data(), v.size(), false); -#endif } template static inline void diff --git a/cpp/test/Ice/custom/TestAMDI.cpp b/cpp/test/Ice/custom/TestAMDI.cpp index 92091a2c0ee..1dafed06bb3 100644 --- a/cpp/test/Ice/custom/TestAMDI.cpp +++ b/cpp/test/Ice/custom/TestAMDI.cpp @@ -5,8 +5,6 @@ #include #include -#ifdef ICE_CPP11_MAPPING - void TestIntfI::opDoubleArrayAsync(std::pair in, std::function response, @@ -339,355 +337,3 @@ TestIntfI::shutdownAsync(std::function response, current.adapter->getCommunicator()->shutdown(); response(); } - -#else - -void -TestIntfI::opDoubleArray_async(const Test::AMD_TestIntf_opDoubleArrayPtr& opDoubleArrayCB, - const std::pair& inSeq, - const Ice::Current&) -{ - Test::DoubleSeq outSeq(inSeq.first, inSeq.second); - opDoubleArrayCB->ice_response(outSeq, outSeq); -} - -void -TestIntfI::opBoolArray_async(const Test::AMD_TestIntf_opBoolArrayPtr& opBoolArrayCB, - const std::pair& inSeq, - const Ice::Current&) -{ - Test::BoolSeq outSeq(inSeq.first, inSeq.second); - opBoolArrayCB->ice_response(outSeq, outSeq); -} - -void -TestIntfI::opByteArray_async(const Test::AMD_TestIntf_opByteArrayPtr& opByteArrayCB, - const std::pair& inSeq, - const Ice::Current&) -{ - opByteArrayCB->ice_response(inSeq, inSeq); -} - -void -TestIntfI::opVariableArray_async(const Test::AMD_TestIntf_opVariableArrayPtr& opVariableArrayCB, - const std::pair& inSeq, - const Ice::Current&) -{ - Test::VariableList outSeq(inSeq.first, inSeq.second); - opVariableArrayCB->ice_response(outSeq, outSeq); -} - -void -TestIntfI::opBoolRange_async(const Test::AMD_TestIntf_opBoolRangePtr& opBoolRangeCB, - const std::pair& inSeq, - const Ice::Current&) -{ - Test::BoolSeq outSeq(inSeq.first, inSeq.second); - opBoolRangeCB->ice_response(outSeq, outSeq); -} - -void -TestIntfI::opByteRange_async(const Test::AMD_TestIntf_opByteRangePtr& opByteRangeCB, - const std::pair& inSeq, - const Ice::Current&) -{ - opByteRangeCB->ice_response(inSeq, inSeq); -} - -void -TestIntfI::opVariableRange_async(const Test::AMD_TestIntf_opVariableRangePtr& opVariableRangeCB, - const std::pair& inSeq, - const Ice::Current&) -{ - Test::VariableList outSeq(inSeq.first, inSeq.second); - opVariableRangeCB->ice_response(outSeq, outSeq); -} - -void -TestIntfI::opByteRangeType_async(const Test::AMD_TestIntf_opByteRangeTypePtr& opByteRangeTypeCB, - const std::pair& inSeq, - const Ice::Current&) -{ - Test::ByteList outSeq(inSeq.first, inSeq.second); - opByteRangeTypeCB->ice_response(outSeq, outSeq); -} - -void -TestIntfI::opVariableRangeType_async(const Test::AMD_TestIntf_opVariableRangeTypePtr& opVariableRangeTypeCB, - const std::pair::const_iterator, - std::deque::const_iterator>& inSeq, - const Ice::Current&) -{ - Test::VariableList outSeq; - for(std::deque::const_iterator p = inSeq.first; p != inSeq.second; ++p) - { - outSeq.push_back(*p); - } - opVariableRangeTypeCB->ice_response(outSeq, outSeq); -} - -void -TestIntfI::opBoolSeq_async(const Test::AMD_TestIntf_opBoolSeqPtr& opBoolSeqCB, - const std::deque& inSeq, - const Ice::Current&) -{ - std::deque outSeq(inSeq); - opBoolSeqCB->ice_response(outSeq, outSeq); -} - -void -TestIntfI::opBoolList_async(const Test::AMD_TestIntf_opBoolListPtr& opBoolListCB, - const Test::BoolList& inSeq, - const Ice::Current&) -{ - Test::BoolList outSeq(inSeq); - opBoolListCB->ice_response(outSeq, outSeq); -} - -void -TestIntfI::opByteSeq_async(const Test::AMD_TestIntf_opByteSeqPtr& opByteSeqCB, - const std::deque& inSeq, - const Ice::Current&) -{ - std::deque outSeq(inSeq); - opByteSeqCB->ice_response(outSeq, outSeq); -} - -void -TestIntfI::opByteList_async(const Test::AMD_TestIntf_opByteListPtr& opByteListCB, - const Test::ByteList& inSeq, - const Ice::Current&) -{ - Test::ByteList outSeq(inSeq); - opByteListCB->ice_response(outSeq, outSeq); -} - -void -TestIntfI::opMyByteSeq_async(const Test::AMD_TestIntf_opMyByteSeqPtr& opMyByteSeqCB, - const MyByteSeq& inSeq, - const Ice::Current&) -{ - MyByteSeq outSeq(inSeq); - opMyByteSeqCB->ice_response(outSeq, outSeq); -} - -void -TestIntfI::opString_async(const Test::AMD_TestIntf_opStringPtr& opStringCB, - const Util::string_view& inString, - const Ice::Current&) -{ - opStringCB->ice_response(inString, inString); -} - -void -TestIntfI::opStringSeq_async(const Test::AMD_TestIntf_opStringSeqPtr& opStringSeqCB, - const std::deque& inSeq, - const Ice::Current&) -{ - std::deque outSeq(inSeq); - opStringSeqCB->ice_response(outSeq, outSeq); -} - -void -TestIntfI::opStringList_async(const Test::AMD_TestIntf_opStringListPtr& opStringListCB, - const Test::StringList& inSeq, - const Ice::Current&) -{ - Test::StringList outSeq(inSeq); - opStringListCB->ice_response(outSeq, outSeq); -} - -void -TestIntfI::opFixedSeq_async(const Test::AMD_TestIntf_opFixedSeqPtr& opFixedSeqCB, - const std::deque& inSeq, - const Ice::Current&) -{ - std::deque outSeq(inSeq); - opFixedSeqCB->ice_response(outSeq, outSeq); -} - -void -TestIntfI::opFixedList_async(const Test::AMD_TestIntf_opFixedListPtr& opFixedListCB, - const Test::FixedList& inSeq, - const Ice::Current&) -{ - Test::FixedList outSeq(inSeq); - opFixedListCB->ice_response(outSeq, outSeq); -} - -void -TestIntfI::opVariableSeq_async(const Test::AMD_TestIntf_opVariableSeqPtr& opVariableSeqCB, - const std::deque& inSeq, - const Ice::Current&) -{ - std::deque outSeq(inSeq); - opVariableSeqCB->ice_response(outSeq, outSeq); -} - -void -TestIntfI::opVariableList_async(const Test::AMD_TestIntf_opVariableListPtr& opVariableListCB, - const Test::VariableList& inSeq, - const Ice::Current&) -{ - Test::VariableList outSeq(inSeq); - opVariableListCB->ice_response(outSeq, outSeq); -} - -void -TestIntfI::opStringStringDictSeq_async(const Test::AMD_TestIntf_opStringStringDictSeqPtr& opStringStringDictSeqCB, - const std::deque& inSeq, - const Ice::Current&) -{ - std::deque outSeq(inSeq); - opStringStringDictSeqCB->ice_response(outSeq, outSeq); -} - -void -TestIntfI::opStringStringDictList_async(const Test::AMD_TestIntf_opStringStringDictListPtr& opStringStringDictListCB, - const Test::StringStringDictList& inSeq, - const Ice::Current&) -{ - Test::StringStringDictList outSeq(inSeq); - opStringStringDictListCB->ice_response(outSeq, outSeq); -} - -void -TestIntfI::opESeq_async(const Test::AMD_TestIntf_opESeqPtr& opESeqCB, - const std::deque& inSeq, - const Ice::Current&) -{ - std::deque outSeq(inSeq); - opESeqCB->ice_response(outSeq, outSeq); -} - -void -TestIntfI::opEList_async(const Test::AMD_TestIntf_opEListPtr& opEListCB, - const Test::EList& inSeq, - const Ice::Current&) -{ - Test::EList outSeq(inSeq); - opEListCB->ice_response(outSeq, outSeq); -} - -void -TestIntfI::opDPrxSeq_async(const Test::AMD_TestIntf_opDPrxSeqPtr& opDPrxSeqCB, - const std::deque& inSeq, - const Ice::Current&) -{ - std::deque outSeq(inSeq); - opDPrxSeqCB->ice_response(outSeq, outSeq); -} - -void -TestIntfI::opDPrxList_async(const Test::AMD_TestIntf_opDPrxListPtr& opDPrxListCB, - const Test::DPrxList& inSeq, - const Ice::Current&) -{ - Test::DPrxList outSeq(inSeq); - opDPrxListCB->ice_response(outSeq, outSeq); -} - -void -TestIntfI::opCSeq_async(const Test::AMD_TestIntf_opCSeqPtr& opCSeqCB, - const std::deque& inSeq, - const Ice::Current&) -{ - std::deque outSeq(inSeq); - opCSeqCB->ice_response(outSeq, outSeq); -} - -void -TestIntfI::opCList_async(const Test::AMD_TestIntf_opCListPtr& opCListCB, - const Test::CList& inSeq, - const Ice::Current&) -{ - Test::CList outSeq(inSeq); - opCListCB->ice_response(outSeq, outSeq); -} - -void -TestIntfI::opClassStruct_async(const Test::AMD_TestIntf_opClassStructPtr& cb, - const Test::ClassStructPtr& inS, - const Test::ClassStructSeq& inSeq, - const Ice::Current&) -{ - cb->ice_response(inS, inS, inSeq); -} - -void -TestIntfI::opOutArrayByteSeq_async(const Test::AMD_TestIntf_opOutArrayByteSeqPtr& cb, - const Test::ByteSeq& inS, - const Ice::Current&) -{ - cb->ice_response(std::pair(&inS[0], &inS[0] + inS.size())); -} - -void -TestIntfI::opOutRangeByteSeq_async(const Test::AMD_TestIntf_opOutRangeByteSeqPtr& cb, - const Test::ByteSeq& inS, - const Ice::Current&) -{ - cb->ice_response(std::pair(inS.begin(), inS.end())); -} - -void -TestIntfI::opIntStringDict_async(const Test::AMD_TestIntf_opIntStringDictPtr& cb, - const Test::IntStringDict& inDict, - const Ice::Current&) -{ - cb->ice_response(inDict, inDict); -} - -void -TestIntfI::opVarDict_async(const Test::AMD_TestIntf_opVarDictPtr& cb, - const Test::CustomMap& inDict, - const Ice::Current&) -{ - Test::CustomMap result; - for(Ice::Long i = 0; i < 1000; ++i) - { - result[i] = i*i; - } - cb->ice_response(result, inDict); -} - -void -TestIntfI::opCustomIntStringDict_async(const Test::AMD_TestIntf_opCustomIntStringDictPtr& cb, - const std::map& data, - const Ice::Current&) -{ - cb->ice_response(data, data); -} - -void -TestIntfI::opShortBuffer_async(const Test::AMD_TestIntf_opShortBufferPtr& cb, const Test::ShortBuffer& inS, - const Ice::Current&) -{ - cb->ice_response(inS, inS); -} - -void -TestIntfI::opBoolBuffer_async(const Test::AMD_TestIntf_opBoolBufferPtr& cb, const Test::CustomBuffer& inS, - const Ice::Current&) -{ - cb->ice_response(inS, inS); -} - -void -TestIntfI::opBufferStruct_async(const Test::AMD_TestIntf_opBufferStructPtr& cb, - const Test::BufferStruct& s, const Ice::Current&) -{ - cb->ice_response(s); -} - -void -TestIntfI::shutdown_async(const Test::AMD_TestIntf_shutdownPtr& shutdownCB, - const Ice::Current& current) -{ - current.adapter->getCommunicator()->shutdown(); - shutdownCB->ice_response(); -} -#endif diff --git a/cpp/test/Ice/custom/TestAMDI.h b/cpp/test/Ice/custom/TestAMDI.h index 1a29ce971af..6a6ee9a6415 100644 --- a/cpp/test/Ice/custom/TestAMDI.h +++ b/cpp/test/Ice/custom/TestAMDI.h @@ -10,9 +10,6 @@ class TestIntfI : public virtual Test::TestIntf { public: - -#ifdef ICE_CPP11_MAPPING - void opDoubleArrayAsync(std::pair, std::function, std::function, const Ice::Current&) override; @@ -179,163 +176,6 @@ class TestIntfI : public virtual Test::TestIntf void shutdownAsync(std::function, std::function, const Ice::Current&) override; - -#else - virtual void opDoubleArray_async(const Test::AMD_TestIntf_opDoubleArrayPtr&, - const std::pair&, - const Ice::Current&); - - virtual void opBoolArray_async(const Test::AMD_TestIntf_opBoolArrayPtr&, - const std::pair&, - const Ice::Current&); - - virtual void opByteArray_async(const Test::AMD_TestIntf_opByteArrayPtr&, - const std::pair&, - const Ice::Current&); - - virtual void opVariableArray_async(const Test::AMD_TestIntf_opVariableArrayPtr&, - const std::pair&, - const Ice::Current&); - - virtual void opBoolRange_async(const Test::AMD_TestIntf_opBoolRangePtr&, - const std::pair&, - const Ice::Current&); - - virtual void opByteRange_async(const Test::AMD_TestIntf_opByteRangePtr&, - const std::pair&, - const Ice::Current&); - - virtual void opVariableRange_async(const Test::AMD_TestIntf_opVariableRangePtr&, - const std::pair&, - const Ice::Current&); - - virtual void opByteRangeType_async(const Test::AMD_TestIntf_opByteRangeTypePtr&, - const std::pair&, - const Ice::Current&); - - virtual void opVariableRangeType_async(const Test::AMD_TestIntf_opVariableRangeTypePtr&, - const std::pair::const_iterator, - std::deque::const_iterator>&, - const Ice::Current&); - - virtual void opBoolSeq_async(const Test::AMD_TestIntf_opBoolSeqPtr&, - const std::deque&, - const Ice::Current&); - - virtual void opBoolList_async(const Test::AMD_TestIntf_opBoolListPtr&, - const Test::BoolList&, - const Ice::Current&); - - virtual void opByteSeq_async(const Test::AMD_TestIntf_opByteSeqPtr&, - const std::deque&, - const Ice::Current&); - - virtual void opByteList_async(const Test::AMD_TestIntf_opByteListPtr&, - const Test::ByteList&, - const Ice::Current&); - - virtual void opMyByteSeq_async(const Test::AMD_TestIntf_opMyByteSeqPtr&, - const MyByteSeq&, - const Ice::Current&); - - virtual void opString_async(const Test::AMD_TestIntf_opStringPtr&, - const Util::string_view&, - const Ice::Current&); - - virtual void opStringSeq_async(const Test::AMD_TestIntf_opStringSeqPtr&, - const std::deque&, - const Ice::Current&); - - virtual void opStringList_async(const Test::AMD_TestIntf_opStringListPtr&, - const Test::StringList&, - const Ice::Current&); - - virtual void opFixedSeq_async(const Test::AMD_TestIntf_opFixedSeqPtr&, - const std::deque&, - const Ice::Current&); - - virtual void opFixedList_async(const Test::AMD_TestIntf_opFixedListPtr&, - const Test::FixedList&, - const Ice::Current&); - - virtual void opVariableSeq_async(const Test::AMD_TestIntf_opVariableSeqPtr&, - const std::deque&, - const Ice::Current&); - - virtual void opVariableList_async(const Test::AMD_TestIntf_opVariableListPtr&, - const Test::VariableList&, - const Ice::Current&); - - virtual void opStringStringDictSeq_async(const Test::AMD_TestIntf_opStringStringDictSeqPtr&, - const std::deque&, - const Ice::Current&); - - virtual void opStringStringDictList_async(const Test::AMD_TestIntf_opStringStringDictListPtr&, - const Test::StringStringDictList&, - const Ice::Current&); - - virtual void opESeq_async(const Test::AMD_TestIntf_opESeqPtr&, - const std::deque&, - const Ice::Current&); - - virtual void opEList_async(const Test::AMD_TestIntf_opEListPtr&, - const Test::EList&, - const Ice::Current&); - - virtual void opDPrxSeq_async(const Test::AMD_TestIntf_opDPrxSeqPtr&, - const std::deque&, - const Ice::Current&); - - virtual void opDPrxList_async(const Test::AMD_TestIntf_opDPrxListPtr&, - const Test::DPrxList&, - const Ice::Current&); - - virtual void opCSeq_async(const Test::AMD_TestIntf_opCSeqPtr&, - const std::deque&, - const Ice::Current&); - - virtual void opCList_async(const Test::AMD_TestIntf_opCListPtr&, - const Test::CList&, - const Ice::Current&); - - virtual void opClassStruct_async(const ::Test::AMD_TestIntf_opClassStructPtr&, - const ::Test::ClassStructPtr&, - const ::Test::ClassStructSeq&, - const ::Ice::Current&); - - virtual void opOutArrayByteSeq_async(const ::Test::AMD_TestIntf_opOutArrayByteSeqPtr&, - const ::Test::ByteSeq&, - const ::Ice::Current&); - - virtual void opOutRangeByteSeq_async(const ::Test::AMD_TestIntf_opOutRangeByteSeqPtr&, - const ::Test::ByteSeq&, - const ::Ice::Current&); - - virtual void opIntStringDict_async(const ::Test::AMD_TestIntf_opIntStringDictPtr&, - const ::Test::IntStringDict&, - const ::Ice::Current&); - - virtual void opVarDict_async(const ::Test::AMD_TestIntf_opVarDictPtr&, - const ::Test::CustomMap&, - const ::Ice::Current&); - - virtual void opCustomIntStringDict_async(const ::Test::AMD_TestIntf_opCustomIntStringDictPtr&, - const std::map&, - const Ice::Current&); - - virtual void opShortBuffer_async(const ::Test::AMD_TestIntf_opShortBufferPtr&, - const Test::ShortBuffer&, const Ice::Current&); - - virtual void opBoolBuffer_async(const ::Test::AMD_TestIntf_opBoolBufferPtr&, - const Test::CustomBuffer&, const Ice::Current&); - - virtual void opBufferStruct_async(const ::Test::AMD_TestIntf_opBufferStructPtr&, const Test::BufferStruct&, - const Ice::Current&); - - virtual void shutdown_async(const Test::AMD_TestIntf_shutdownPtr&, - const Ice::Current&); -#endif }; #endif diff --git a/cpp/test/Ice/custom/TestI.cpp b/cpp/test/Ice/custom/TestI.cpp index 7507868fbd1..e5bff6091ca 100644 --- a/cpp/test/Ice/custom/TestI.cpp +++ b/cpp/test/Ice/custom/TestI.cpp @@ -41,8 +41,6 @@ TestIntfI::opVariableArray(ICE_IN(std::pair& inSeq, - Test::BoolSeq& outSeq, - const Ice::Current&) -{ - Test::BoolSeq(inSeq.first, inSeq.second).swap(outSeq); - return outSeq; -} - -Test::ByteList -TestIntfI::opByteRange(const std::pair& inSeq, - Test::ByteList& outSeq, - const Ice::Current&) -{ - Test::ByteList(inSeq.first, inSeq.second).swap(outSeq); - return outSeq; -} - -Test::VariableList -TestIntfI::opVariableRange( - const std::pair& inSeq, - Test::VariableList& outSeq, - const Ice::Current&) -{ - Test::VariableList(inSeq.first, inSeq.second).swap(outSeq); - return outSeq; -} - -Test::ByteList -TestIntfI::opByteRangeType(const std::pair& inSeq, - Test::ByteList& outSeq, - const Ice::Current&) -{ - Test::ByteList(inSeq.first, inSeq.second).swap(outSeq); - return outSeq; -} - -Test::VariableList -TestIntfI::opVariableRangeType( - const std::pair::const_iterator, std::deque::const_iterator>& inSeq, - Test::VariableList& outSeq, - const Ice::Current&) -{ - for(std::deque::const_iterator p = inSeq.first; p != inSeq.second; ++p) - { - outSeq.push_back(*p); - } - return outSeq; -} - -#endif - std::deque TestIntfI::opBoolSeq(ICE_IN(std::deque) inSeq, std::deque& outSeq, @@ -169,27 +113,12 @@ TestIntfI::opBoolDequeListArray(ICE_IN(::std::pair*, cons return outSeq; } -#ifdef ICE_CPP11_MAPPING Test::BoolDequeList TestIntfI::opBoolDequeListRange(Test::BoolDequeList inSeq, Test::BoolDequeList& outSeq, const ::Ice::Current&) { outSeq.swap(inSeq); return outSeq; } -#else -::Test::BoolDequeList -TestIntfI::opBoolDequeListRange(const ::std::pair< ::Test::BoolDequeList::const_iterator, - ::Test::BoolDequeList::const_iterator>& inSeq, - ::Test::BoolDequeList& outSeq, - const ::Ice::Current&) -{ - for(::Test::BoolDequeList::const_iterator p = inSeq.first; p != inSeq.second; ++p) - { - outSeq.push_back(*p); - } - return outSeq; -} -#endif std::deque< ::Ice::Byte> TestIntfI::opByteSeq(ICE_IN(std::deque< ::Ice::Byte>) inSeq, @@ -353,7 +282,6 @@ TestIntfI::opCList(ICE_IN(std::list< ::Test::CPtr>) inSeq, return inSeq; } -#ifdef ICE_CPP11_MAPPING Test::ClassStruct TestIntfI::opClassStruct(Test::ClassStruct inS, Test::ClassStructSeq inSeq, @@ -366,20 +294,6 @@ TestIntfI::opClassStruct(Test::ClassStruct inS, return inS; } -#else -::Test::ClassStructPtr -TestIntfI::opClassStruct(const ::Test::ClassStructPtr& inS, - const ::Test::ClassStructSeq& inSeq, - ::Test::ClassStructPtr& out, - ::Test::ClassStructSeq& outSeq, - const Ice::Current&) -{ - outSeq = inSeq; - out = inS; - return inS; -} -#endif - void TestIntfI::opOutArrayByteSeq(ICE_IN(Test::ByteSeq) data, Test::ByteSeq& copy, const Ice::Current&) { diff --git a/cpp/test/Ice/custom/TestI.h b/cpp/test/Ice/custom/TestI.h index 058072d43c1..8e07fe9c387 100644 --- a/cpp/test/Ice/custom/TestI.h +++ b/cpp/test/Ice/custom/TestI.h @@ -27,7 +27,6 @@ class TestIntfI : public virtual Test::TestIntf Test::VariableList&, const Ice::Current&); -#ifdef ICE_CPP11_MAPPING virtual Test::BoolSeq opBoolRange(Test::BoolSeq, Test::BoolSeq&, const Ice::Current&); virtual Test::ByteList opByteRange(Test::ByteList, Test::ByteList&, const Ice::Current&); @@ -40,30 +39,6 @@ class TestIntfI : public virtual Test::TestIntf virtual Test::VariableList opVariableRangeType(Test::VariableList, Test::VariableList&, const Ice::Current&); -#else - virtual Test::BoolSeq opBoolRange(const std::pair&, - Test::BoolSeq&, - const Ice::Current&); - - virtual Test::ByteList opByteRange(const std::pair&, - Test::ByteList&, - const Ice::Current&); - - virtual Test::VariableList - opVariableRange(const std::pair&, - Test::VariableList&, - const Ice::Current&); - - virtual Test::ByteList opByteRangeType(const std::pair&, - Test::ByteList&, - const Ice::Current&); - - virtual Test::VariableList - opVariableRangeType(const std::pair::const_iterator, std::deque::const_iterator>&, - Test::VariableList&, - const Ice::Current&); -#endif - virtual std::deque opBoolSeq(ICE_IN(std::deque), std::deque&, const Ice::Current&); @@ -80,18 +55,9 @@ class TestIntfI : public virtual Test::TestIntf ::Test::BoolDequeList&, const ::Ice::Current&); -#ifdef ICE_CPP11_MAPPING virtual ::Test::BoolDequeList opBoolDequeListRange(::Test::BoolDequeList, ::Test::BoolDequeList&, const ::Ice::Current&); -#else - virtual ::Test::BoolDequeList opBoolDequeListRange( - const ::std::pair< ::Test::BoolDequeList::const_iterator, ::Test::BoolDequeList::const_iterator>&, - ::Test::BoolDequeList&, - const ::Ice::Current&); - -#endif - virtual std::deque< ::Ice::Byte> opByteSeq(ICE_IN(std::deque< ::Ice::Byte>), std::deque< ::Ice::Byte>&, const Ice::Current&); @@ -164,19 +130,11 @@ class TestIntfI : public virtual Test::TestIntf std::list< ::Test::CPtr>&, const Ice::Current&); -#ifdef ICE_CPP11_MAPPING virtual Test::ClassStruct opClassStruct(Test::ClassStruct, Test::ClassStructSeq, Test::ClassStruct& out, Test::ClassStructSeq& outSeq, const Ice::Current&); -#else - virtual ::Test::ClassStructPtr opClassStruct(const ::Test::ClassStructPtr&, - const ::Test::ClassStructSeq&, - ::Test::ClassStructPtr& out, - ::Test::ClassStructSeq& outSeq, - const Ice::Current&); -#endif virtual void opOutArrayByteSeq(ICE_IN(Test::ByteSeq), Test::ByteSeq&, const Ice::Current&); diff --git a/cpp/test/Ice/custom/WstringAMDI.cpp b/cpp/test/Ice/custom/WstringAMDI.cpp index 24b44670a30..a58a8a80125 100644 --- a/cpp/test/Ice/custom/WstringAMDI.cpp +++ b/cpp/test/Ice/custom/WstringAMDI.cpp @@ -4,8 +4,6 @@ #include -#ifdef ICE_CPP11_MAPPING - void Test1::WstringClassI::opStringAsync(std::wstring in, std::function response, @@ -56,58 +54,3 @@ Test2::WstringClassI::throwExceptAsync(std::wstring in, Test2::WstringException ex(in); error(std::make_exception_ptr(ex)); } - -#else - -void -Test1::WstringClassI::opString_async(const Test1::AMD_WstringClass_opStringPtr& opStringCB, - const ::std::wstring& s1, - const Ice::Current&) -{ - opStringCB->ice_response(s1, s1); -} - -void -Test1::WstringClassI::opStruct_async(const Test1::AMD_WstringClass_opStructPtr& opStructCB, - const Test1::WstringStruct& s1, - const Ice::Current&) -{ - opStructCB->ice_response(s1, s1); -} - -void -Test1::WstringClassI::throwExcept_async(const Test1::AMD_WstringClass_throwExceptPtr& throwExceptCB, - const ::std::wstring& reason, - const Ice::Current&) -{ - Test1::WstringException ex; - ex.reason = reason; - throwExceptCB->ice_exception(ex); -} - -void -Test2::WstringClassI::opString_async(const Test2::AMD_WstringClass_opStringPtr& opStringCB, - const ::std::wstring& s1, - const Ice::Current&) -{ - opStringCB->ice_response(s1, s1); -} - -void -Test2::WstringClassI::opStruct_async(const Test2::AMD_WstringClass_opStructPtr& opStructCB, - const Test2::WstringStruct& s1, - const Ice::Current&) -{ - opStructCB->ice_response(s1, s1); -} - -void -Test2::WstringClassI::throwExcept_async(const Test2::AMD_WstringClass_throwExceptPtr& throwExceptCB, - const ::std::wstring& reason, - const Ice::Current&) -{ - Test2::WstringException ex; - ex.reason = reason; - throwExceptCB->ice_exception(ex); -} -#endif diff --git a/cpp/test/Ice/custom/WstringAMDI.h b/cpp/test/Ice/custom/WstringAMDI.h index a6268130b52..981574f7e57 100644 --- a/cpp/test/Ice/custom/WstringAMDI.h +++ b/cpp/test/Ice/custom/WstringAMDI.h @@ -10,7 +10,6 @@ namespace Test1 { -#ifdef ICE_CPP11_MAPPING class WstringClassI : public virtual WstringClass { public: @@ -27,29 +26,12 @@ class WstringClassI : public virtual WstringClass std::function, std::function, const Ice::Current&) override; }; -#else -class WstringClassI : public virtual WstringClass -{ -public: - - virtual void opString_async(const ::Test1::AMD_WstringClass_opStringPtr&, - const std::wstring&, - const Ice::Current&); - - virtual void opStruct_async(const ::Test1::AMD_WstringClass_opStructPtr&, - const ::Test1::WstringStruct&, - const Ice::Current&); - virtual void throwExcept_async(const ::Test1::AMD_WstringClass_throwExceptPtr&, - const std::wstring&, - const Ice::Current&); -}; -#endif } namespace Test2 { -#ifdef ICE_CPP11_MAPPING + class WstringClassI : public virtual WstringClass { public: @@ -67,25 +49,6 @@ class WstringClassI : public virtual WstringClass std::function, const Ice::Current&) override; }; -#else -class WstringClassI : public virtual WstringClass -{ -public: - - virtual void opString_async(const ::Test2::AMD_WstringClass_opStringPtr&, - const std::wstring&, - const Ice::Current&); - - virtual void opStruct_async(const ::Test2::AMD_WstringClass_opStructPtr&, - const ::Test2::WstringStruct&, - const Ice::Current&); - - virtual void throwExcept_async(const ::Test2::AMD_WstringClass_throwExceptPtr&, - const std::wstring&, - const Ice::Current&); -}; -#endif - } #endif diff --git a/cpp/test/Ice/defaultValue/AllTests.cpp b/cpp/test/Ice/defaultValue/AllTests.cpp index 65fe014a735..8945070a6cc 100644 --- a/cpp/test/Ice/defaultValue/AllTests.cpp +++ b/cpp/test/Ice/defaultValue/AllTests.cpp @@ -25,21 +25,12 @@ allTests() test(v.f == static_cast(5.1)); test(v.d == 6.2); test(v.str == "foo \\ \"bar\n \r\n\t\v\f\a\b? \007 \x07"); -#ifdef ICE_CPP11_MAPPING test(v.c1 == Color::red); test(v.c2 == Color::green); test(v.c3 == Color::blue); test(v.nc1 == Nested::Color::red); test(v.nc2 == Nested::Color::green); test(v.nc3 == Nested::Color::blue); -#else - test(v.c1 == red); - test(v.c2 == green); - test(v.c3 == blue); - test(v.nc1 == Nested::red); - test(v.nc2 == Nested::green); - test(v.nc3 == Nested::blue); -#endif test(v.noDefault.empty()); test(v.zeroI == 0); test(v.zeroL == 0); @@ -74,7 +65,6 @@ allTests() } { -#ifdef ICE_CPP11_MAPPING Struct3 v; test(!v.boolFalse); test(v.boolTrue); @@ -98,31 +88,6 @@ allTests() test(v.zeroDotF == 0); test(v.zeroD == 0); test(v.zeroDotD == 0); -#else - Struct3Ptr v = new Struct3; - test(!v->boolFalse); - test(v->boolTrue); - test(v->b == 1); - test(v->s == 2); - test(v->i == 3); - test(v->l == 4); - test(v->f == static_cast(5.1)); - test(v->d == 6.2); - test(v->str == "foo \\ \"bar\n \r\n\t\v\f\a\b? \007 \x07"); - test(v->c1 == red); - test(v->c2 == green); - test(v->c3 == blue); - test(v->nc1 == Nested::red); - test(v->nc2 == Nested::green); - test(v->nc3 == Nested::blue); - test(v->noDefault.empty()); - test(v->zeroI == 0); - test(v->zeroL == 0); - test(v->zeroF == 0); - test(v->zeroDotF == 0); - test(v->zeroD == 0); - test(v->zeroDotD == 0); -#endif } { @@ -157,21 +122,12 @@ allTests() test(v->d == 6.2); test(v->str == "foo \\ \"bar\n \r\n\t\v\f\a\b? \007 \x07"); test(v->noDefault.empty()); -#ifdef ICE_CPP11_MAPPING test(v->c1 == Color::red); test(v->c2 == Color::green); test(v->c3 == Color::blue); test(v->nc1 == Nested::Color::red); test(v->nc2 == Nested::Color::green); test(v->nc3 == Nested::Color::blue); -#else - test(v->c1 == red); - test(v->c2 == green); - test(v->c3 == blue); - test(v->nc1 == Nested::red); - test(v->nc2 == Nested::green); - test(v->nc3 == Nested::blue); -#endif test(v->zeroI == 0); test(v->zeroL == 0); test(v->zeroF == 0); @@ -212,21 +168,12 @@ allTests() test(v.d == 6.2); test(v.str == "foo \\ \"bar\n \r\n\t\v\f\a\b? \007 \x07"); test(v.noDefault.empty()); -#ifdef ICE_CPP11_MAPPING test(v.c1 == Color::red); test(v.c2 == Color::green); test(v.c3 == Color::blue); test(v.nc1 == Nested::Color::red); test(v.nc2 == Nested::Color::green); test(v.nc3 == Nested::Color::blue); -#else - test(v.c1 == red); - test(v.c2 == green); - test(v.c3 == blue); - test(v.nc1 == Nested::red); - test(v.nc2 == Nested::green); - test(v.nc3 == Nested::blue); -#endif test(v.zeroI == 0); test(v.zeroL == 0); test(v.zeroF == 0); diff --git a/cpp/test/Ice/dispatcher/AllTests.cpp b/cpp/test/Ice/dispatcher/AllTests.cpp index 04fe52b423c..05ab338a41e 100644 --- a/cpp/test/Ice/dispatcher/AllTests.cpp +++ b/cpp/test/Ice/dispatcher/AllTests.cpp @@ -14,9 +14,6 @@ namespace { class Callback -#ifndef ICE_CPP11_MAPPING - : public IceUtil::Shared -#endif { public: @@ -128,7 +125,6 @@ allTests(Test::TestHelper* helper) p->op(); CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opAsync( [cb]() { @@ -230,42 +226,6 @@ allTests(Test::TestHelper* helper) { c->get_future().get(); } -#else - Test::Callback_TestIntf_opPtr callback = Test::newCallback_TestIntf_op(cb, - &Callback::response, - &Callback::exception); - p->begin_op(callback); - cb->check(); - - Test::TestIntfPrx i = p->ice_adapterId("dummy"); - i->begin_op(callback); - cb->check(); - - { - // - // Expect InvocationTimeoutException. - // - Test::TestIntfPrx to = p->ice_invocationTimeout(10); - to->begin_sleep(500, Test::newCallback_TestIntf_sleep(cb, &Callback::responseEx, &Callback::exceptionEx)); - cb->check(); - } - - testController->holdAdapter(); - - Test::Callback_TestIntf_opWithPayloadPtr callback2 = - Test::newCallback_TestIntf_opWithPayload(cb, &Callback::payload, &Callback::ignoreEx, &Callback::sent); - - Ice::ByteSeq seq; - seq.resize(1024); // Make sure the request doesn't compress too well. - for(Ice::ByteSeq::iterator q = seq.begin(); q != seq.end(); ++q) - { - *q = static_cast(IceUtilInternal::random(255)); - } - Ice::AsyncResultPtr result; - while((result = p->begin_opWithPayload(seq, callback2))->sentSynchronously()); - testController->resumeAdapter(); - result->waitForCompleted(); -#endif } cout << "ok" << endl; diff --git a/cpp/test/Ice/dispatcher/Client.cpp b/cpp/test/Ice/dispatcher/Client.cpp index 219b5b19710..11fd6011afc 100644 --- a/cpp/test/Ice/dispatcher/Client.cpp +++ b/cpp/test/Ice/dispatcher/Client.cpp @@ -27,15 +27,11 @@ Client::run(int argc, char** argv) // initData.properties->setProperty("Ice.TCP.SndSize", "50000"); -#ifdef ICE_CPP11_MAPPING IceUtil::Handle dispatcher = new Dispatcher; initData.dispatcher = [=](function call, const shared_ptr& conn) { dispatcher->dispatch(make_shared(call), conn); }; -#else - initData.dispatcher = new Dispatcher(); -#endif // The communicator must be destroyed before the dispatcher is terminated. { Ice::CommunicatorHolder communicator = initialize(argc, argv, initData); diff --git a/cpp/test/Ice/dispatcher/Collocated.cpp b/cpp/test/Ice/dispatcher/Collocated.cpp index 52fda1a572c..578ff088e73 100644 --- a/cpp/test/Ice/dispatcher/Collocated.cpp +++ b/cpp/test/Ice/dispatcher/Collocated.cpp @@ -21,15 +21,11 @@ Collocated::run(int argc, char** argv) { Ice::InitializationData initData; initData.properties = createTestProperties(argc, argv); -#ifdef ICE_CPP11_MAPPING IceUtil::Handle dispatcher = new Dispatcher; initData.dispatcher = [=](function call, const shared_ptr& conn) { dispatcher->dispatch(make_shared(call), conn); }; -#else - initData.dispatcher = new Dispatcher(); -#endif Ice::CommunicatorHolder communicator = initialize(argc, argv, initData); communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint()); diff --git a/cpp/test/Ice/dispatcher/Dispatcher.cpp b/cpp/test/Ice/dispatcher/Dispatcher.cpp index aacac27056d..66c09aa83a6 100644 --- a/cpp/test/Ice/dispatcher/Dispatcher.cpp +++ b/cpp/test/Ice/dispatcher/Dispatcher.cpp @@ -37,13 +37,8 @@ Dispatcher::isDispatcherThread() return IceUtil::ThreadControl() == _instance->getThreadControl(); } -#ifdef ICE_CPP11_MAPPING void Dispatcher::dispatch(const shared_ptr& call, const shared_ptr&) -#else -void -Dispatcher::dispatch(const Ice::DispatcherCallPtr& call, const Ice::ConnectionPtr&) -#endif { Lock sync(*this); _calls.push_back(call); @@ -58,11 +53,7 @@ Dispatcher::run() { while(true) { -#ifdef ICE_CPP11_MAPPING shared_ptr call; -#else - Ice::DispatcherCallPtr call; -#endif { Lock sync(*this); diff --git a/cpp/test/Ice/dispatcher/Dispatcher.h b/cpp/test/Ice/dispatcher/Dispatcher.h index 9f5e7de3672..a07b14c2849 100644 --- a/cpp/test/Ice/dispatcher/Dispatcher.h +++ b/cpp/test/Ice/dispatcher/Dispatcher.h @@ -13,7 +13,6 @@ #include -#ifdef ICE_CPP11_MAPPING class DispatcherCall { public: @@ -32,23 +31,14 @@ class DispatcherCall std::function _call; }; -#endif -class Dispatcher : -#ifndef ICE_CPP11_MAPPING - public Ice::Dispatcher, -#endif -public IceUtil::Thread, public IceUtil::Monitor +class Dispatcher : public IceUtil::Thread, public IceUtil::Monitor { public: Dispatcher(); -#ifdef ICE_CPP11_MAPPING void dispatch(const std::shared_ptr&, const std::shared_ptr&); -#else - virtual void dispatch(const Ice::DispatcherCallPtr&, const Ice::ConnectionPtr&); -#endif void run(); @@ -58,11 +48,7 @@ public IceUtil::Thread, public IceUtil::Monitor private: static IceUtil::Handle _instance; -#ifdef ICE_CPP11_MAPPING std::deque> _calls; -#else - std::deque _calls; -#endif bool _terminated; }; diff --git a/cpp/test/Ice/dispatcher/Server.cpp b/cpp/test/Ice/dispatcher/Server.cpp index 712e237677d..04b4dd9ab2e 100644 --- a/cpp/test/Ice/dispatcher/Server.cpp +++ b/cpp/test/Ice/dispatcher/Server.cpp @@ -27,15 +27,11 @@ Server::run(int argc, char** argv) // initData.properties->setProperty("Ice.TCP.RcvSize", "50000"); -#ifdef ICE_CPP11_MAPPING IceUtil::Handle dispatcher = new Dispatcher; initData.dispatcher = [=](function call, const shared_ptr& conn) { dispatcher->dispatch(make_shared(call), conn); }; -#else - initData.dispatcher = new Dispatcher(); -#endif // The communicator must be destroyed before the dispatcher is terminated. { Ice::CommunicatorHolder communicator = initialize(argc, argv, initData); diff --git a/cpp/test/Ice/dispatcher/TestI.cpp b/cpp/test/Ice/dispatcher/TestI.cpp index c6afa5ab403..ad90cc9dd98 100644 --- a/cpp/test/Ice/dispatcher/TestI.cpp +++ b/cpp/test/Ice/dispatcher/TestI.cpp @@ -23,11 +23,7 @@ TestIntfI::sleep(Ice::Int to, const Ice::Current&) } void -#ifdef ICE_CPP11_MAPPING TestIntfI::opWithPayload(Ice::ByteSeq, const Ice::Current&) -#else -TestIntfI::opWithPayload(const Ice::ByteSeq&, const Ice::Current&) -#endif { test(Dispatcher::isDispatcherThread()); } diff --git a/cpp/test/Ice/dispatcher/TestI.h b/cpp/test/Ice/dispatcher/TestI.h index 972fdadda0a..19f25607329 100644 --- a/cpp/test/Ice/dispatcher/TestI.h +++ b/cpp/test/Ice/dispatcher/TestI.h @@ -17,11 +17,7 @@ class TestIntfI : public virtual Test::TestIntf virtual void op(const Ice::Current&); virtual void sleep(Ice::Int, const Ice::Current&); -#ifdef ICE_CPP11_MAPPING virtual void opWithPayload(Ice::ByteSeq, const Ice::Current&); -#else - virtual void opWithPayload(const Ice::ByteSeq&, const Ice::Current&); -#endif virtual void shutdown(const Ice::Current&); }; diff --git a/cpp/test/Ice/echo/BlobjectI.cpp b/cpp/test/Ice/echo/BlobjectI.cpp index 320f01b63db..e32a83f0d9c 100644 --- a/cpp/test/Ice/echo/BlobjectI.cpp +++ b/cpp/test/Ice/echo/BlobjectI.cpp @@ -7,42 +7,6 @@ using namespace std; -#ifndef ICE_CPP11_MAPPING -class Callback : public IceUtil::Shared -{ -public: - - Callback(const Ice::AMD_Object_ice_invokePtr& cb, bool twoway) : - _cb(cb), _twoway(twoway) - { - } - - void response(bool ok, const vector& encaps) - { - _cb->ice_response(ok, encaps); - } - - void exception(const Ice::Exception& ex) - { - _cb->ice_exception(ex); - } - - void sent(bool) - { - if(!_twoway) - { - _cb->ice_response(true, vector()); - } - } - -private: - - Ice::AMD_Object_ice_invokePtr _cb; - bool _twoway; -}; -typedef IceUtil::Handle CallbackPtr; -#endif - BlobjectI::BlobjectI() : _startBatch(false) { @@ -71,7 +35,6 @@ BlobjectI::flushBatch() _batchProxy = 0; } -#ifdef ICE_CPP11_MAPPING void BlobjectI::ice_invokeAsync(std::vector inEncaps, std::function&)> response, @@ -123,59 +86,6 @@ BlobjectI::ice_invokeAsync(std::vector inEncaps, obj->ice_invokeAsync(current.operation, current.mode, inEncaps, response, ex, nullptr, current.ctx); } } -#else -void -BlobjectI::ice_invoke_async(const Ice::AMD_Object_ice_invokePtr& amdCb, const vector& inEncaps, - const Ice::Current& current) -{ - Ice::ConnectionPtr connection = getConnection(current); - const bool twoway = current.requestId > 0; - Ice::ObjectPrx obj = connection->createProxy(current.id); - if(!twoway) - { - if(_startBatch) - { - _startBatch = false; - _batchProxy = obj->ice_batchOneway(); - } - if(_batchProxy) - { - obj = _batchProxy; - } - - if(!current.facet.empty()) - { - obj = obj->ice_facet(current.facet); - } - - if(_batchProxy) - { - vector out; - obj->ice_invoke(current.operation, current.mode, inEncaps, out, current.ctx); - amdCb->ice_response(true, vector()); - } - else - { - CallbackPtr cb = new Callback(amdCb, false); - Ice::Callback_Object_ice_invokePtr del = - Ice::newCallback_Object_ice_invoke(cb, &Callback::response, &Callback::exception, &Callback::sent); - obj->ice_oneway()->begin_ice_invoke(current.operation, current.mode, inEncaps, current.ctx, del); - } - } - else - { - if(!current.facet.empty()) - { - obj = obj->ice_facet(current.facet); - } - - CallbackPtr cb = new Callback(amdCb, true); - Ice::Callback_Object_ice_invokePtr del = - Ice::newCallback_Object_ice_invoke(cb, &Callback::response, &Callback::exception, &Callback::sent); - obj->begin_ice_invoke(current.operation, current.mode, inEncaps, current.ctx, del); - } -} -#endif Ice::ConnectionPtr BlobjectI::getConnection(const Ice::Current& current) diff --git a/cpp/test/Ice/echo/BlobjectI.h b/cpp/test/Ice/echo/BlobjectI.h index 8f01aa62821..f035699b1c0 100644 --- a/cpp/test/Ice/echo/BlobjectI.h +++ b/cpp/test/Ice/echo/BlobjectI.h @@ -17,18 +17,11 @@ class BlobjectI : public Ice::BlobjectAsync, private IceUtil::Monitor, std::function&)>, std::function, const Ice::Current&) override; -#else - virtual void ice_invoke_async(const Ice::AMD_Object_ice_invokePtr&, const std::vector&, - const Ice::Current&); -#endif - private: Ice::ConnectionPtr getConnection(const Ice::Current&); diff --git a/cpp/test/Ice/enums/AllTests.cpp b/cpp/test/Ice/enums/AllTests.cpp index 251a665864a..9594e349ef2 100644 --- a/cpp/test/Ice/enums/AllTests.cpp +++ b/cpp/test/Ice/enums/AllTests.cpp @@ -64,44 +64,6 @@ allTests(Test::TestHelper* helper) cout << "ok" << endl; -#ifndef ICE_CPP11_MAPPING - cout << "testing enum streaming... " << flush; - - Ice::ByteSeq bytes; - - const bool encoding_1_0 = communicator->getProperties()->getProperty("Ice.Default.EncodingVersion") == "1.0"; - - { - Ice::OutputStream out(communicator); - out.write(ICE_ENUM(ByteEnum, benum11)); - out.finished(bytes); - test(bytes.size() == 1); // ByteEnum should require one byte - } - - { - Ice::OutputStream out(communicator); - out.write(ICE_ENUM(ShortEnum, senum11)); - out.finished(bytes); - test(bytes.size() == (encoding_1_0 ? size_t(2) : size_t(5))); - } - - { - Ice::OutputStream out(communicator); - out.write(ICE_ENUM(IntEnum, ienum11)); - out.finished(bytes); - test(bytes.size() == (encoding_1_0 ? size_t(4) : size_t(5))); - } - - { - Ice::OutputStream out(communicator); - out.write(ICE_ENUM(SimpleEnum, blue)); - out.finished(bytes); - test(bytes.size() == 1); // SimpleEnum should require one byte - } - - cout << "ok" << endl; -#endif - cout << "testing enum operations... " << flush; ByteEnum byteEnum; diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp index 4e413a439a3..f8bf2445e57 100644 --- a/cpp/test/Ice/exceptions/AllTests.cpp +++ b/cpp/test/Ice/exceptions/AllTests.cpp @@ -648,11 +648,7 @@ allTests(Test::TestHelper* helper) cout << "testing checked cast... " << flush; ThrowerPrxPtr thrower = ICE_CHECKED_CAST(ThrowerPrx, base); test(thrower); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(thrower, base)); -#else - test(thrower == base); -#endif cout << "ok" << endl; cout << "catching exact types... " << flush; @@ -1002,11 +998,7 @@ allTests(Test::TestHelper* helper) try { -#ifdef ICE_CPP11_MAPPING ThrowerPrxPtr thrower2 = Ice::uncheckedCast(thrower, "no such facet"); -#else - ThrowerPrxPtr thrower2 = ThrowerPrx::uncheckedCast(thrower, "no such facet"); -#endif try { thrower2->ice_ping(); @@ -1119,7 +1111,6 @@ allTests(Test::TestHelper* helper) cout << "ok" << endl; cout << "catching exact types with new AMI mapping... " << flush; -#ifdef ICE_CPP11_MAPPING { auto f = thrower->throwAasAAsync(1); try @@ -1323,54 +1314,9 @@ allTests(Test::TestHelper* helper) }); sent.get_future().get(); // Wait for sent } -#else - { - CallbackPtr cb = new Callback; - Callback_Thrower_throwAasAPtr callback = - newCallback_Thrower_throwAasA(cb, &Callback::response, &Callback::exception_AasA); - thrower->begin_throwAasA(1, callback); - cb->check(); - } - { - CallbackPtr cb = new Callback; - Callback_Thrower_throwAorDasAorDPtr callback = - newCallback_Thrower_throwAorDasAorD(cb, &Callback::response, &Callback::exception_AorDasAorD); - thrower->begin_throwAorDasAorD(1, callback); - cb->check(); - } - { - CallbackPtr cb = new Callback; - Callback_Thrower_throwAorDasAorDPtr callback = - newCallback_Thrower_throwAorDasAorD(cb, &Callback::response, &Callback::exception_AorDasAorD); - thrower->begin_throwAorDasAorD(-1, callback); - cb->check(); - } - { - CallbackPtr cb = new Callback; - Callback_Thrower_throwBasBPtr callback = - newCallback_Thrower_throwBasB(cb, &Callback::response, &Callback::exception_BasB); - thrower->begin_throwBasB(1, 2, callback); - cb->check(); - } - { - CallbackPtr cb = new Callback; - Callback_Thrower_throwCasCPtr callback = - newCallback_Thrower_throwCasC(cb, &Callback::response, &Callback::exception_CasC); - thrower->begin_throwCasC(1, 2, 3, callback); - cb->check(); - } - { - CallbackPtr cb = new Callback; - Callback_Thrower_throwModAPtr callback = - newCallback_Thrower_throwModA(cb, &Callback::response, &Callback::exception_ModA); - thrower->begin_throwModA(1, 2, callback); - cb->check(); - } -#endif cout << "ok" << endl; cout << "catching derived types with new AMI mapping... " << flush; -#ifdef ICE_CPP11_MAPPING { auto f = thrower->throwBasAAsync(1, 2); try @@ -1423,37 +1369,11 @@ allTests(Test::TestHelper* helper) test(false); } } -#else - { - CallbackPtr cb = new Callback; - Callback_Thrower_throwBasAPtr callback = - newCallback_Thrower_throwBasA(cb, &Callback::response, &Callback::exception_BasA); - thrower->begin_throwBasA(1, 2, callback); - cb->check(); - } - - { - CallbackPtr cb = new Callback; - Callback_Thrower_throwCasAPtr callback = - newCallback_Thrower_throwCasA(cb, &Callback::response, &Callback::exception_CasA); - thrower->begin_throwCasA(1, 2, 3, callback); - cb->check(); - } - - { - CallbackPtr cb = new Callback; - Callback_Thrower_throwCasBPtr callback = - newCallback_Thrower_throwCasB(cb, &Callback::response, &Callback::exception_CasB); - thrower->begin_throwCasB(1, 2, 3, callback); - cb->check(); - } -#endif cout << "ok" << endl; if(thrower->supportsUndeclaredExceptions()) { cout << "catching unknown user exception with new AMI mapping... " << flush; -#ifdef ICE_CPP11_MAPPING { auto f = thrower->throwUndeclaredAAsync(1); try @@ -1506,38 +1426,11 @@ allTests(Test::TestHelper* helper) test(false); } } -#else - { - CallbackPtr cb = new Callback; - Callback_Thrower_throwUndeclaredAPtr callback = - newCallback_Thrower_throwUndeclaredA(cb, &Callback::response, &Callback::exception_UndeclaredA); - thrower->begin_throwUndeclaredA(1, callback); - cb->check(); - } - - { - CallbackPtr cb = new Callback; - Callback_Thrower_throwUndeclaredBPtr callback = - newCallback_Thrower_throwUndeclaredB(cb, &Callback::response, &Callback::exception_UndeclaredB); - thrower->begin_throwUndeclaredB(1, 2, callback); - cb->check(); - } - - { - CallbackPtr cb = new Callback; - Callback_Thrower_throwUndeclaredCPtr callback = - newCallback_Thrower_throwUndeclaredC(cb, &Callback::response, &Callback::exception_UndeclaredC); - thrower->begin_throwUndeclaredC(1, 2, 3, callback); - cb->check(); - } -#endif cout << "ok" << endl; } cout << "catching object not exist exception with new AMI mapping... " << flush; - { -#ifdef ICE_CPP11_MAPPING id = Ice::stringToIdentity("does not exist"); shared_ptr thrower2 = Ice::uncheckedCast(thrower->ice_identity(id)); auto f = thrower2->throwAasAAsync(1); @@ -1553,15 +1446,6 @@ allTests(Test::TestHelper* helper) { test(false); } -#else - id = Ice::stringToIdentity("does not exist"); - ThrowerPrx thrower2 = ThrowerPrx::uncheckedCast(thrower->ice_identity(id)); - CallbackPtr cb = new Callback(communicator); - Callback_Thrower_throwAasAPtr callback = - newCallback_Thrower_throwAasA(cb, &Callback::response, &Callback::exception_AasAObjectNotExist); - thrower2->begin_throwAasA(1, callback); - cb->check(); -#endif } cout << "ok" << endl; @@ -1569,7 +1453,6 @@ allTests(Test::TestHelper* helper) cout << "catching facet not exist exception with new AMI mapping... " << flush; { -#ifdef ICE_CPP11_MAPPING shared_ptr thrower2 = Ice::uncheckedCast(thrower, "no such facet"); auto f = thrower2->throwAasAAsync(1); try @@ -1580,14 +1463,6 @@ allTests(Test::TestHelper* helper) { test(ex.facet == "no such facet"); } -#else - ThrowerPrx thrower2 = ThrowerPrx::uncheckedCast(thrower, "no such facet"); - CallbackPtr cb = new Callback; - Callback_Thrower_throwAasAPtr callback = - newCallback_Thrower_throwAasA(cb, &Callback::response, &Callback::exception_AasAFacetNotExist); - thrower2->begin_throwAasA(1, callback); - cb->check(); -#endif } cout << "ok" << endl; @@ -1595,7 +1470,6 @@ allTests(Test::TestHelper* helper) cout << "catching operation not exist exception with new AMI mapping... " << flush; { -#ifdef ICE_CPP11_MAPPING shared_ptr thrower4 = Ice::uncheckedCast(thrower); auto f = thrower4->noSuchOperationAsync(); try @@ -1610,21 +1484,11 @@ allTests(Test::TestHelper* helper) { test(false); } -#else - CallbackPtr cb = new Callback; - Callback_WrongOperation_noSuchOperationPtr callback = - newCallback_WrongOperation_noSuchOperation(cb, &Callback::response, - &Callback::exception_noSuchOperation); - WrongOperationPrx thrower4 = WrongOperationPrx::uncheckedCast(thrower); - thrower4->begin_noSuchOperation(callback); - cb->check(); -#endif } cout << "ok" << endl; cout << "catching unknown local exception with new AMI mapping... " << flush; -#ifdef ICE_CPP11_MAPPING { auto f = thrower->throwLocalExceptionAsync(); try @@ -1659,30 +1523,11 @@ allTests(Test::TestHelper* helper) test(false); } } -#else - { - CallbackPtr cb = new Callback; - Callback_Thrower_throwLocalExceptionPtr callback = - newCallback_Thrower_throwLocalException(cb, &Callback::response, &Callback::exception_LocalException); - thrower->begin_throwLocalException(callback); - cb->check(); - } - - { - CallbackPtr cb = new Callback; - Callback_Thrower_throwLocalExceptionIdempotentPtr callback = - newCallback_Thrower_throwLocalExceptionIdempotent(cb, &Callback::response, - &Callback::exception_LocalException); - thrower->begin_throwLocalExceptionIdempotent(callback); - cb->check(); - } -#endif cout << "ok" << endl; cout << "catching unknown non-Ice exception with new AMI mapping... " << flush; { -#ifdef ICE_CPP11_MAPPING auto f = thrower->throwNonIceExceptionAsync(); try { @@ -1696,14 +1541,6 @@ allTests(Test::TestHelper* helper) { test(false); } - -#else - CallbackPtr cb = new Callback; - Callback_Thrower_throwNonIceExceptionPtr callback = - newCallback_Thrower_throwNonIceException(cb, &Callback::response, &Callback::exception_NonIceException); - thrower->begin_throwNonIceException(callback); - cb->check(); -#endif } cout << "ok" << endl; diff --git a/cpp/test/Ice/exceptions/TestAMDI.cpp b/cpp/test/Ice/exceptions/TestAMDI.cpp index ad38caee9bc..42e087f9f1f 100644 --- a/cpp/test/Ice/exceptions/TestAMDI.cpp +++ b/cpp/test/Ice/exceptions/TestAMDI.cpp @@ -23,7 +23,6 @@ ThrowerI::ThrowerI() { } -#ifdef ICE_CPP11_MAPPING void ThrowerI::shutdownAsync(function response, function, @@ -372,215 +371,3 @@ ThrowerI::throwFAsync(function, exception(current_exception()); } } - -#else - -void -ThrowerI::shutdown_async(const AMD_Thrower_shutdownPtr& cb, - const Ice::Current& current) -{ - current.adapter->getCommunicator()->shutdown(); - cb->ice_response(); -} - -void -ThrowerI::supportsUndeclaredExceptions_async(const AMD_Thrower_supportsUndeclaredExceptionsPtr& cb, - const Ice::Current&) -{ - cb->ice_response(true); -} - -void -ThrowerI::supportsAssertException_async(const AMD_Thrower_supportsAssertExceptionPtr& cb, - const Ice::Current&) -{ - cb->ice_response(false); -} - -void -ThrowerI::throwAasA_async(const AMD_Thrower_throwAasAPtr& cb, - Ice::Int a, const Ice::Current&) -{ - A ex; - ex.aMem = a; - cb->ice_exception(ex); -} - -void -ThrowerI::throwAorDasAorD_async(const AMD_Thrower_throwAorDasAorDPtr& cb, - Ice::Int a, const Ice::Current&) -{ - if(a > 0) - { - A ex; - ex.aMem = a; - cb->ice_exception(ex); - } - else - { - D ex; - ex.dMem = a; - cb->ice_exception(ex); - } -} - -void -ThrowerI::throwBasA_async(const AMD_Thrower_throwBasAPtr& /*cb*/, - Ice::Int a, Ice::Int b, const Ice::Current&) -{ - B ex; - ex.aMem = a; - ex.bMem = b; - throw ex; - //cb->ice_exception(ex); -} - -void -ThrowerI::throwCasA_async(const AMD_Thrower_throwCasAPtr& cb, - Ice::Int a, Ice::Int b, Ice::Int c, const Ice::Current&) -{ - C ex; - ex.aMem = a; - ex.bMem = b; - ex.cMem = c; - cb->ice_exception(ex); -} - -void -ThrowerI::throwBasB_async(const AMD_Thrower_throwBasBPtr& /*cb*/, - Ice::Int a, Ice::Int b, const Ice::Current&) -{ - B ex; - ex.aMem = a; - ex.bMem = b; - throw ex; - //cb->ice_exception(ex); -} - -void -ThrowerI::throwCasB_async(const AMD_Thrower_throwCasBPtr& cb, - Ice::Int a, Ice::Int b, Ice::Int c, const Ice::Current&) -{ - C ex; - ex.aMem = a; - ex.bMem = b; - ex.cMem = c; - cb->ice_exception(ex); -} - -void -ThrowerI::throwCasC_async(const AMD_Thrower_throwCasCPtr& cb, - Ice::Int a, Ice::Int b, Ice::Int c, const Ice::Current&) -{ - C ex; - ex.aMem = a; - ex.bMem = b; - ex.cMem = c; - cb->ice_exception(ex); -} - -void -ThrowerI::throwModA_async(const AMD_Thrower_throwModAPtr& /*cb*/, - Ice::Int a, Ice::Int a2, const Ice::Current&) -{ - Mod::A ex; - ex.aMem = a; - ex.a2Mem = a2; - throw ex; -} - -void -ThrowerI::throwUndeclaredA_async(const AMD_Thrower_throwUndeclaredAPtr& cb, - Ice::Int a, const Ice::Current&) -{ - A ex; - ex.aMem = a; - cb->ice_exception(ex); -} - -void -ThrowerI::throwUndeclaredB_async(const AMD_Thrower_throwUndeclaredBPtr& /*cb*/, - Ice::Int a, Ice::Int b, const Ice::Current&) -{ - B ex; - ex.aMem = a; - ex.bMem = b; - throw ex; - //cb->ice_exception(ex); -} - -void -ThrowerI::throwUndeclaredC_async(const AMD_Thrower_throwUndeclaredCPtr& cb, - Ice::Int a, Ice::Int b, Ice::Int c, const Ice::Current&) -{ - C ex; - ex.aMem = a; - ex.bMem = b; - ex.cMem = c; - cb->ice_exception(ex); -} - -void -ThrowerI::throwLocalException_async(const AMD_Thrower_throwLocalExceptionPtr& cb, - const Ice::Current&) -{ - cb->ice_exception(Ice::TimeoutException(__FILE__, __LINE__)); -} - -void -ThrowerI::throwNonIceException_async(const AMD_Thrower_throwNonIceExceptionPtr&, - const Ice::Current&) -{ - throw int(12345); -} - -void -ThrowerI::throwAssertException_async(const AMD_Thrower_throwAssertExceptionPtr&, - const Ice::Current&) -{ - assert(false); // Not supported in C++. -} - -void -ThrowerI::throwMemoryLimitException_async(const AMD_Thrower_throwMemoryLimitExceptionPtr& cb, - const Ice::ByteSeq&, const Ice::Current&) -{ - cb->ice_response(Ice::ByteSeq(1024 * 20)); // 20 KB. -} - -void -ThrowerI::throwLocalExceptionIdempotent_async(const AMD_Thrower_throwLocalExceptionIdempotentPtr& cb, - const Ice::Current&) -{ - cb->ice_exception(Ice::TimeoutException(__FILE__, __LINE__)); -} - -void -ThrowerI::throwAfterResponse_async(const AMD_Thrower_throwAfterResponsePtr& cb, const Ice::Current&) -{ - cb->ice_response(); - - throw std::string(); -} - -void -ThrowerI::throwAfterException_async(const AMD_Thrower_throwAfterExceptionPtr& cb, const Ice::Current&) -{ - cb->ice_exception(A(12345)); - - throw std::string(); -} - -void -ThrowerI::throwE_async(const Test::AMD_Thrower_throwEPtr& cb, const Ice::Current&) -{ - cb->ice_exception(E("E")); -} - -void -ThrowerI::throwF_async(const Test::AMD_Thrower_throwFPtr& cb, const Ice::Current&) -{ - cb->ice_exception(F("F")); -} - -#endif diff --git a/cpp/test/Ice/exceptions/TestAMDI.h b/cpp/test/Ice/exceptions/TestAMDI.h index d362f5bd548..88682161ddf 100644 --- a/cpp/test/Ice/exceptions/TestAMDI.h +++ b/cpp/test/Ice/exceptions/TestAMDI.h @@ -16,7 +16,6 @@ class ThrowerI : public Test::Thrower ThrowerI(); -#ifdef ICE_CPP11_MAPPING virtual void shutdownAsync(std::function, std::function, const Ice::Current&); @@ -120,56 +119,6 @@ class ThrowerI : public Test::Thrower virtual void throwFAsync(std::function, std::function, const Ice::Current&); -#else - virtual void shutdown_async(const Test::AMD_Thrower_shutdownPtr&, - const Ice::Current&); - virtual void supportsUndeclaredExceptions_async(const Test::AMD_Thrower_supportsUndeclaredExceptionsPtr&, - const Ice::Current&); - virtual void supportsAssertException_async(const Test::AMD_Thrower_supportsAssertExceptionPtr&, - const Ice::Current&); - - virtual void throwAasA_async(const Test::AMD_Thrower_throwAasAPtr&, - Ice::Int, const Ice::Current&); - virtual void throwAorDasAorD_async(const Test::AMD_Thrower_throwAorDasAorDPtr&, - Ice::Int, const Ice::Current&); - virtual void throwBasA_async(const Test::AMD_Thrower_throwBasAPtr&, - Ice::Int, Ice::Int, const Ice::Current&); - virtual void throwCasA_async(const Test::AMD_Thrower_throwCasAPtr&, - Ice::Int, Ice::Int, Ice::Int, const Ice::Current&); - virtual void throwBasB_async(const Test::AMD_Thrower_throwBasBPtr&, - Ice::Int, Ice::Int, const Ice::Current&); - virtual void throwCasB_async(const Test::AMD_Thrower_throwCasBPtr&, - Ice::Int, Ice::Int, Ice::Int, const Ice::Current&); - virtual void throwCasC_async(const Test::AMD_Thrower_throwCasCPtr&, - Ice::Int, Ice::Int, Ice::Int, const Ice::Current&); - - virtual void throwModA_async(const Test::AMD_Thrower_throwModAPtr&, - Ice::Int, Ice::Int, const Ice::Current&); - - virtual void throwUndeclaredA_async(const Test::AMD_Thrower_throwUndeclaredAPtr&, - Ice::Int, const Ice::Current&); - virtual void throwUndeclaredB_async(const Test::AMD_Thrower_throwUndeclaredBPtr&, - Ice::Int, Ice::Int, const Ice::Current&); - virtual void throwUndeclaredC_async(const Test::AMD_Thrower_throwUndeclaredCPtr&, - Ice::Int, Ice::Int, Ice::Int, const Ice::Current&); - virtual void throwLocalException_async(const Test::AMD_Thrower_throwLocalExceptionPtr&, - const Ice::Current&); - virtual void throwNonIceException_async(const Test::AMD_Thrower_throwNonIceExceptionPtr&, - const Ice::Current&); - virtual void throwAssertException_async(const Test::AMD_Thrower_throwAssertExceptionPtr&, - const Ice::Current&); - virtual void throwMemoryLimitException_async(const Test::AMD_Thrower_throwMemoryLimitExceptionPtr&, - const Ice::ByteSeq&, const Ice::Current&); - - virtual void throwLocalExceptionIdempotent_async(const Test::AMD_Thrower_throwLocalExceptionIdempotentPtr&, - const Ice::Current&); - - virtual void throwAfterResponse_async(const Test::AMD_Thrower_throwAfterResponsePtr&, const Ice::Current&); - virtual void throwAfterException_async(const Test::AMD_Thrower_throwAfterExceptionPtr&, const Ice::Current&); - - virtual void throwE_async(const Test::AMD_Thrower_throwEPtr&, const Ice::Current&); - virtual void throwF_async(const Test::AMD_Thrower_throwFPtr&, const Ice::Current&); -#endif }; #endif diff --git a/cpp/test/Ice/facets/AllTests.cpp b/cpp/test/Ice/facets/AllTests.cpp index d779f87d6a2..dd38a6d0c5a 100644 --- a/cpp/test/Ice/facets/AllTests.cpp +++ b/cpp/test/Ice/facets/AllTests.cpp @@ -121,82 +121,46 @@ allTests(Test::TestHelper* helper) cout << "testing unchecked cast... " << flush; Ice::ObjectPrxPtr prx = ICE_UNCHECKED_CAST(Ice::ObjectPrx, db); test(prx->ice_getFacet().empty()); -#ifdef ICE_CPP11_MAPPING prx = Ice::uncheckedCast(db, "facetABCD"); -#else - prx = Ice::ObjectPrx::uncheckedCast(db, "facetABCD"); -#endif test(prx->ice_getFacet() == "facetABCD"); Ice::ObjectPrxPtr prx2 = ICE_UNCHECKED_CAST(Ice::ObjectPrx, prx); test(prx2->ice_getFacet() == "facetABCD"); -#ifdef ICE_CPP11_MAPPING shared_ptr prx3 = Ice::uncheckedCast(prx, ""); -#else - Ice::ObjectPrx prx3 = Ice::ObjectPrx::uncheckedCast(prx, ""); -#endif test(prx3->ice_getFacet().empty()); DPrxPtr d = ICE_UNCHECKED_CAST(Test::DPrx, db); test(d->ice_getFacet().empty()); -#ifdef ICE_CPP11_MAPPING shared_ptr df = Ice::uncheckedCast(db, "facetABCD"); -#else - DPrx df = Test::DPrx::uncheckedCast(db, "facetABCD"); -#endif test(df->ice_getFacet() == "facetABCD"); DPrxPtr df2 = ICE_UNCHECKED_CAST(Test::DPrx, df); test(df2->ice_getFacet() == "facetABCD"); -#ifdef ICE_CPP11_MAPPING shared_ptr df3 = Ice::uncheckedCast(df, ""); -#else - DPrx df3 = Test::DPrx::uncheckedCast(df, ""); -#endif test(df3->ice_getFacet().empty()); cout << "ok" << endl; cout << "testing checked cast... " << flush; prx = ICE_CHECKED_CAST(Ice::ObjectPrx, db); test(prx->ice_getFacet().empty()); -#ifdef ICE_CPP11_MAPPING prx = Ice::checkedCast(db, "facetABCD"); -#else - prx = Ice::ObjectPrx::checkedCast(db, "facetABCD"); -#endif test(prx->ice_getFacet() == "facetABCD"); prx2 = ICE_CHECKED_CAST(Ice::ObjectPrx, prx); test(prx2->ice_getFacet() == "facetABCD"); -#ifdef ICE_CPP11_MAPPING prx3 = Ice::checkedCast(prx, ""); -#else - prx3 = Ice::ObjectPrx::checkedCast(prx, ""); -#endif test(prx3->ice_getFacet().empty()); d = ICE_CHECKED_CAST(Test::DPrx, db); test(d->ice_getFacet().empty()); -#ifdef ICE_CPP11_MAPPING df = Ice::checkedCast(db, "facetABCD"); -#else - df = Test::DPrx::checkedCast(db, "facetABCD"); -#endif test(df->ice_getFacet() == "facetABCD"); df2 = ICE_CHECKED_CAST(Test::DPrx, df); test(df2->ice_getFacet() == "facetABCD"); -#ifdef ICE_CPP11_MAPPING df3 = Ice::checkedCast(df, ""); -#else - df3 = Test::DPrx::checkedCast(df, ""); -#endif test(df3->ice_getFacet().empty()); cout << "ok" << endl; cout << "testing non-facets A, B, C, and D... " << flush; d = ICE_CHECKED_CAST(DPrx, db); test(d); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(d, db)); -#else - test(d == db); -#endif test(d->callA() == "A"); test(d->callB() == "B"); test(d->callC() == "C"); @@ -204,11 +168,7 @@ allTests(Test::TestHelper* helper) cout << "ok" << endl; cout << "testing facets A, B, C, and D... " << flush; -#ifdef ICE_CPP11_MAPPING df = Ice::checkedCast(d, "facetABCD"); -#else - df = DPrx::checkedCast(d, "facetABCD"); -#endif test(df); test(df->callA() == "A"); test(df->callB() == "B"); @@ -217,22 +177,14 @@ allTests(Test::TestHelper* helper) cout << "ok" << endl; cout << "testing facets E and F... " << flush; -#ifdef ICE_CPP11_MAPPING auto ff = Ice::checkedCast(d, "facetEF"); -#else - FPrx ff = FPrx::checkedCast(d, "facetEF"); -#endif test(ff); test(ff->callE() == "E"); test(ff->callF() == "F"); cout << "ok" << endl; cout << "testing facet G... " << flush; -#ifdef ICE_CPP11_MAPPING auto gf = Ice::checkedCast(ff, "facetGH"); -#else - GPrx gf = GPrx::checkedCast(ff, "facetGH"); -#endif test(gf); test(gf->callG() == "G"); cout << "ok" << endl; diff --git a/cpp/test/Ice/faultTolerance/AllTests.cpp b/cpp/test/Ice/faultTolerance/AllTests.cpp index 70c075f8b63..e2cc723f7c3 100644 --- a/cpp/test/Ice/faultTolerance/AllTests.cpp +++ b/cpp/test/Ice/faultTolerance/AllTests.cpp @@ -121,11 +121,7 @@ allTests(Test::TestHelper* helper, const vector& ports) cout << "testing checked cast... " << flush; TestIntfPrxPtr obj = ICE_CHECKED_CAST(TestIntfPrx, base); test(obj); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(obj, base)); -#else - test(obj == base); -#endif cout << "ok" << endl; int oldPid = 0; @@ -149,7 +145,6 @@ allTests(Test::TestHelper* helper, const vector& ports) else { cout << "testing server #" << i << " with AMI... " << flush; -#ifdef ICE_CPP11_MAPPING try { int pid = obj->pidAsync().get(); @@ -161,15 +156,6 @@ allTests(Test::TestHelper* helper, const vector& ports) { test(false); } -#else - CallbackPtr cb = new Callback(); - obj->begin_pid(newCallback_TestIntf_pid(cb, &Callback::opPidI, &Callback::exception)); - cb->check(); - int pid = cb->pid(); - test(pid != oldPid); - cout << "ok" << endl; - oldPid = pid; -#endif } if(j == 0) @@ -182,7 +168,6 @@ allTests(Test::TestHelper* helper, const vector& ports) } else { -#ifdef ICE_CPP11_MAPPING cout << "shutting down server #" << i << " with AMI... " << flush; try { @@ -193,13 +178,6 @@ allTests(Test::TestHelper* helper, const vector& ports) test(false); } cout << "ok" << endl; -#else - cout << "shutting down server #" << i << " with AMI... " << flush; - CallbackPtr cb = new Callback; - obj->begin_shutdown(newCallback_TestIntf_shutdown(cb, &Callback::opShutdownI, &Callback::exception)); - cb->check(); - cout << "ok" << endl; -#endif } } else if(j == 1 || i + 1 > ports.size()) @@ -223,7 +201,6 @@ allTests(Test::TestHelper* helper, const vector& ports) } else { -#ifdef ICE_CPP11_MAPPING cout << "aborting server #" << i << " with AMI... " << flush; try { @@ -234,13 +211,6 @@ allTests(Test::TestHelper* helper, const vector& ports) { } cout << "ok" << endl; -#else - cout << "aborting server #" << i << " with AMI... " << flush; - CallbackPtr cb = new Callback; - obj->begin_abort(newCallback_TestIntf_abort(cb, &Callback::response, &Callback::exceptAbortI)); - cb->check(); - cout << "ok" << endl; -#endif } } else if(j == 2 || j == 3) @@ -264,7 +234,6 @@ allTests(Test::TestHelper* helper, const vector& ports) } else { -#ifdef ICE_CPP11_MAPPING cout << "aborting server #" << i << " and #" << i + 1 << " with idempotent AMI call... " << flush; try { @@ -275,14 +244,6 @@ allTests(Test::TestHelper* helper, const vector& ports) { } cout << "ok" << endl; -#else - cout << "aborting server #" << i << " and #" << i + 1 << " with idempotent AMI call... " << flush; - CallbackPtr cb = new Callback; - obj->begin_idempotentAbort(newCallback_TestIntf_idempotentAbort(cb, &Callback::response, - &Callback::exceptAbortI)); - cb->check(); - cout << "ok" << endl; -#endif } ++i; diff --git a/cpp/test/Ice/hold/AllTests.cpp b/cpp/test/Ice/hold/AllTests.cpp index bd2fd671e2f..37767e2b516 100644 --- a/cpp/test/Ice/hold/AllTests.cpp +++ b/cpp/test/Ice/hold/AllTests.cpp @@ -88,19 +88,11 @@ allTests(Test::TestHelper* helper) cout << "testing checked cast... " << flush; HoldPrxPtr hold = ICE_CHECKED_CAST(HoldPrx, base); test(hold); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(hold, base)); -#else - test(hold == base); -#endif HoldPrxPtr holdSerialized = ICE_CHECKED_CAST(HoldPrx, baseSerialized); test(holdSerialized); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(holdSerialized, baseSerialized)); -#else - test(holdSerialized == baseSerialized); -#endif cout << "ok" << endl; cout << "changing state between active and hold rapidly... " << flush; @@ -126,7 +118,6 @@ allTests(Test::TestHelper* helper) { ConditionPtr cond = new Condition(true); int value = 0; -#ifdef ICE_CPP11_MAPPING shared_ptr> completed; while(cond->value()) { @@ -167,31 +158,6 @@ allTests(Test::TestHelper* helper) } test(value > 100000 || !cond->value()); completed->get_future().get(); -#else - - Ice::AsyncResultPtr result; - while(cond->value()) - { - result = hold->begin_set(value + 1, - static_cast(IceUtilInternal::random(5)), - newCallback_Hold_set(new SetCB(cond, value), &SetCB::response, &SetCB::exception)); - ++value; - if(value % 100 == 0) - { - result->waitForSent(); - } - - if(value > 1000000) - { - // Don't continue, it's possible that out-of-order dispatch doesn't occur - // after 100000 iterations and we don't want the test to last for too long - // when this occurs. - break; - } - } - test(value > 100000 || !cond->value()); - result->waitForCompleted(); -#endif } cout << "ok" << endl; @@ -199,7 +165,6 @@ allTests(Test::TestHelper* helper) { ConditionPtr cond = new Condition(true); int value = 0; -#ifdef ICE_CPP11_MAPPING shared_ptr> completed; while(value < 3000 && cond->value()) { @@ -231,23 +196,6 @@ allTests(Test::TestHelper* helper) sent->get_future().get(); } } -#else - Ice::AsyncResultPtr result; - while(value < 3000 && cond->value()) - { - result = holdSerialized->begin_set(value + 1, - static_cast(IceUtilInternal::random(1)), - newCallback_Hold_set(new SetCB(cond, value), - &SetCB::response, - &SetCB::exception)); - ++value; - if(value % 100 == 0) - { - result->waitForSent(); - } - } - result->waitForCompleted(); -#endif test(cond->value()); for(int i = 0; i < 10000; ++i) { @@ -265,7 +213,6 @@ allTests(Test::TestHelper* helper) { int value = 0; holdSerialized->set(value, 0); -#ifdef ICE_CPP11_MAPPING shared_ptr> completed; for(int i = 0; i < 10000; ++i) { @@ -289,22 +236,6 @@ allTests(Test::TestHelper* helper) } } completed->get_future().get(); -#else - Ice::AsyncResultPtr result; - for(int i = 0; i < 10000; ++i) - { - // Create a new proxy for each request - result = holdSerialized->ice_oneway()->begin_setOneway(value + 1, value); - ++value; - if((i % 100) == 0) - { - result->waitForSent(); - holdSerialized->ice_ping(); // Ensure everything's dispatched - holdSerialized->ice_getConnection()->close(Ice::ICE_SCOPED_ENUM(ConnectionClose, GracefullyWithWait)); - } - } - result->waitForCompleted(); -#endif } cout << "ok" << endl; diff --git a/cpp/test/Ice/impl/Makefile.mk b/cpp/test/Ice/impl/Makefile.mk index d3843d4906d..41b3c431cff 100644 --- a/cpp/test/Ice/impl/Makefile.mk +++ b/cpp/test/Ice/impl/Makefile.mk @@ -23,7 +23,7 @@ $$($5_objdir)/$$($2_impl)I.cpp: $1/$$($2_impl).ice $(slice2cpp_path) $(E) "Compiling $$< implementation" $(Q)$(MKDIR) -p $$(*D) $(Q)$(RM) $$(*).h $$(*).cpp - $(Q)$(slice2cpp_path) $$($2_sliceflags) $$(if $$(filter cpp11-%,$4),--impl-c++11,--impl-c++98) --output-dir $$(*D) $$< + $(Q)$(slice2cpp_path) $$($2_sliceflags) --impl-c++11 --output-dir $$(*D) $$< # Prevents warning if multiple configurations refer to $$($5_objdir)/$$($2_impl)I.cpp $1_impls += $$($5_objdir)/$$($2_impl)I.cpp diff --git a/cpp/test/Ice/inheritance/AllTests.cpp b/cpp/test/Ice/inheritance/AllTests.cpp index 75d6bd620ff..eed53de29e6 100644 --- a/cpp/test/Ice/inheritance/AllTests.cpp +++ b/cpp/test/Ice/inheritance/AllTests.cpp @@ -22,11 +22,7 @@ allTests(Test::TestHelper* helper) cout << "testing checked cast... " << flush; InitialPrxPtr initial = ICE_CHECKED_CAST(InitialPrx, base); test(initial); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(initial, base)); -#else - test(initial == base); -#endif cout << "ok" << endl; cout << "getting proxies for interface hierarchy... " << flush; @@ -34,19 +30,11 @@ allTests(Test::TestHelper* helper) MB::IB1PrxPtr ib1 = initial->ib1op(); MB::IB2PrxPtr ib2 = initial->ib2op(); MA::ICPrxPtr ic = initial->icop(); -#ifdef ICE_CPP11_MAPPING test(!Ice::targetEqualTo(ia, ib1)); test(!Ice::targetEqualTo(ia, ib2)); test(!Ice::targetEqualTo(ia, ic)); test(!Ice::targetEqualTo(ib1, ic)); test(!Ice::targetEqualTo(ib2, ic)); -#else - test(ia != ib1); - test(ia != ib2); - test(ia != ic); - test(ib1 != ic); - test(ib2 != ic); -#endif cout << "ok" << endl; cout << "invoking proxy operations on interface hierarchy... " << flush; @@ -56,255 +44,111 @@ allTests(Test::TestHelper* helper) MA::ICPrxPtr ico; iao = ia->iaop(ia); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(iao, ia)); -#else - test(iao == ia); -#endif iao = ia->iaop(ib1); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(iao, ib1)); -#else - test(iao == ib1); -#endif iao = ia->iaop(ib2); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(iao, ib2)); -#else - test(iao == ib2); -#endif iao = ia->iaop(ic); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(iao, ic)); -#else - test(iao == ic); -#endif iao = ib1->iaop(ia); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(iao, ia)); -#else - test(iao == ia); -#endif iao = ib1->iaop(ib1); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(iao, ib1)); -#else - test(iao == ib1); -#endif iao = ib1->iaop(ib2); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(iao, ib2)); -#else - test(iao == ib2); -#endif iao = ib1->iaop(ic); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(iao, ic)); -#else - test(iao == ic); -#endif iao = ib2->iaop(ia); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(iao, ia)); -#else - test(iao == ia); -#endif iao = ib2->iaop(ib1); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(iao, ib1)); -#else - test(iao == ib1); -#endif iao = ib2->iaop(ib2); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(iao, ib2)); -#else - test(iao == ib2); -#endif iao = ib2->iaop(ic); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(iao, ic)); -#else - test(iao == ic); -#endif iao = ic->iaop(ia); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(iao, ia)); -#else - test(iao == ia); -#endif iao = ic->iaop(ib1); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(iao, ib1)); -#else - test(iao == ib1); -#endif iao = ic->iaop(ib2); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(iao, ib2)); -#else - test(iao == ib2); -#endif iao = ic->iaop(ic); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(iao, ic)); -#else - test(iao == ic); -#endif iao = ib1->ib1op(ib1); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(iao, ib1)); -#else - test(iao == ib1); -#endif ib1o = ib1->ib1op(ib1); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(ib1o, ib1)); -#else - test(ib1o == ib1); -#endif iao = ib1->ib1op(ic); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(iao, ic)); -#else - test(iao == ic); -#endif ib1o = ib1->ib1op(ic); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(ib1o, ic)); -#else - test(ib1o == ic); -#endif iao = ic->ib1op(ib1); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(iao, ib1)); -#else - test(iao == ib1); -#endif ib1o = ic->ib1op(ib1); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(ib1o, ib1)); -#else - test(ib1o == ib1); -#endif iao = ic->ib1op(ic); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(iao, ic)); -#else - test(iao == ic); -#endif ib1o = ic->ib1op(ic); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(ib1o, ic)); -#else - test(ib1o == ic); -#endif iao = ib2->ib2op(ib2); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(iao, ib2)); -#else - test(iao == ib2); -#endif ib2o = ib2->ib2op(ib2); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(ib2o, ib2)); -#else - test(ib2o == ib2); -#endif iao = ib2->ib2op(ic); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(iao, ic)); -#else - test(iao == ic); -#endif ib2o = ib2->ib2op(ic); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(ib2o, ic)); -#else - test(ib2o == ic); -#endif iao = ic->ib2op(ib2); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(iao, ib2)); -#else - test(iao == ib2); -#endif ib2o = ic->ib2op(ib2); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(ib2o, ib2)); -#else - test(ib2o == ib2); -#endif iao = ic->ib2op(ic); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(iao, ic)); -#else - test(iao == ic); -#endif ib2o = ic->ib2op(ic); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(ib2o, ic)); -#else - test(ib2o == ic); -#endif iao = ic->icop(ic); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(iao, ic)); -#else - test(iao == ic); -#endif ib1o = ic->icop(ic); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(ib1o, ic)); -#else - test(ib1o == ic); -#endif ib2o = ic->icop(ic); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(ib2o, ic)); -#else - test(ib2o == ic); -#endif ico = ic->icop(ic); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(ico, ic)); -#else - test(ico == ic); -#endif cout << "ok" << endl; diff --git a/cpp/test/Ice/inheritance/TestI.h b/cpp/test/Ice/inheritance/TestI.h index f6d7adfb204..79128c88504 100644 --- a/cpp/test/Ice/inheritance/TestI.h +++ b/cpp/test/Ice/inheritance/TestI.h @@ -28,8 +28,6 @@ class InitialI : public Test::Initial Test::MA::ICPrxPtr _ic; }; -#ifdef ICE_CPP11_MAPPING - class IAI : public virtual Test::MA::IA { public: @@ -59,36 +57,4 @@ class ICI : public virtual Test::MA::IC, public virtual IB1I, public virtual IB2 virtual std::shared_ptr icop(std::shared_ptr, const Ice::Current&); }; -#else - -class IAI : public virtual Test::MA::IA -{ -public: - - virtual Test::MA::IAPrx iaop(const Test::MA::IAPrx&, const Ice::Current&); -}; - -class IB1I : public virtual Test::MB::IB1, public virtual IAI -{ -public: - - virtual Test::MB::IB1Prx ib1op(const Test::MB::IB1Prx&, const Ice::Current&); -}; - -class IB2I : public virtual Test::MB::IB2, public virtual IAI -{ -public: - - virtual Test::MB::IB2Prx ib2op(const Test::MB::IB2Prx&, const Ice::Current&); -}; - -class ICI : public virtual Test::MA::IC, public virtual IB1I, public virtual IB2I -{ -public: - - virtual Test::MA::ICPrx icop(const Test::MA::ICPrx&, const Ice::Current&); -}; - -#endif - #endif diff --git a/cpp/test/Ice/interceptor/AMDInterceptorI.cpp b/cpp/test/Ice/interceptor/AMDInterceptorI.cpp index 782f3ab4b44..777b60c4bf5 100644 --- a/cpp/test/Ice/interceptor/AMDInterceptorI.cpp +++ b/cpp/test/Ice/interceptor/AMDInterceptorI.cpp @@ -11,50 +11,12 @@ using namespace std; AMDInterceptorI::AMDInterceptorI(const Ice::ObjectPtr& servant) : InterceptorI(servant) -#ifndef ICE_CPP11_MAPPING - , _defaultCb(new DispatchInterceptorAsyncCallbackI(*this)) -#endif { } bool AMDInterceptorI::dispatch(Ice::Request& request) { -#ifndef ICE_CPP11_MAPPING - class CallbackI : public Ice::DispatchInterceptorAsyncCallback - { - public: - CallbackI() : _count(0) - { - } - - virtual bool response() - { - return false; - } - - virtual bool exception(const std::exception& ex) - { - test(_count++ == 0); // Ensure it's only called once - test(dynamic_cast(&ex) != 0); - return false; - } - - virtual bool exception() - { - // - // Unexpected - // - test(false); - return false; - } - - private: - - int _count; - }; -#endif - Ice::Current& current = const_cast(request.getCurrent()); Ice::Context::const_iterator p = current.ctx.find("raiseBeforeDispatch"); @@ -80,7 +42,6 @@ AMDInterceptorI::dispatch(Ice::Request& request) { for(int i = 0; i < 10; ++i) { -#ifdef ICE_CPP11_MAPPING _lastStatus = _servant->ice_dispatch(request, nullptr, [](exception_ptr ex) { try { @@ -95,9 +56,6 @@ AMDInterceptorI::dispatch(Ice::Request& request) } return false; }); -#else - _lastStatus = _servant->ice_dispatch(request, new CallbackI()); -#endif test(!_lastStatus); } @@ -113,7 +71,6 @@ AMDInterceptorI::dispatch(Ice::Request& request) _servant->ice_dispatch(request); } -#ifdef ICE_CPP11_MAPPING _lastStatus = _servant->ice_dispatch(request, []() { return true; }, [this](exception_ptr ex) { try { @@ -129,9 +86,6 @@ AMDInterceptorI::dispatch(Ice::Request& request) } return true; }); -#else - _lastStatus = _servant->ice_dispatch(request, _defaultCb); -#endif p = current.ctx.find("raiseAfterDispatch"); if(p != current.ctx.end()) @@ -174,38 +128,3 @@ AMDInterceptorI::clear() IceUtil::Mutex::Lock lock(_mutex); _exception.reset(); } - -#ifndef ICE_CPP11_MAPPING -DispatchInterceptorAsyncCallbackI::DispatchInterceptorAsyncCallbackI(AMDInterceptorI& interceptor) : - _interceptor(interceptor) -{ -} - -bool -DispatchInterceptorAsyncCallbackI::response() -{ - return true; -} - -bool -DispatchInterceptorAsyncCallbackI::exception(const std::exception& ex) -{ - // - // Only Ice exceptions are raised by this test - // - const IceUtil::Exception& ue = dynamic_cast(ex); - _interceptor.setException(ue); - return true; - -} - -bool -DispatchInterceptorAsyncCallbackI::exception() -{ - // - // Unexpected - // - test(false); - return true; -} -#endif diff --git a/cpp/test/Ice/interceptor/AMDInterceptorI.h b/cpp/test/Ice/interceptor/AMDInterceptorI.h index ba7fabfdc76..23153ec2ba5 100644 --- a/cpp/test/Ice/interceptor/AMDInterceptorI.h +++ b/cpp/test/Ice/interceptor/AMDInterceptorI.h @@ -7,7 +7,6 @@ #include #include -#include class AMDInterceptorI : public InterceptorI { @@ -24,29 +23,10 @@ class AMDInterceptorI : public InterceptorI private: -#ifndef ICE_CPP11_MAPPING - Ice::DispatchInterceptorAsyncCallbackPtr _defaultCb; -#endif - IceInternal::UniquePtr _exception; + std::unique_ptr _exception; IceUtil::Mutex _mutex; }; ICE_DEFINE_SHARED_PTR(AMDInterceptorIPtr, AMDInterceptorI); -#ifndef ICE_CPP11_MAPPING -class DispatchInterceptorAsyncCallbackI : public Ice::DispatchInterceptorAsyncCallback -{ -public: - - DispatchInterceptorAsyncCallbackI(AMDInterceptorI&); - - virtual bool response(); - virtual bool exception(const std::exception&); - virtual bool exception(); - -private: - AMDInterceptorI& _interceptor; -}; -#endif - #endif diff --git a/cpp/test/Ice/interceptor/MyObjectI.cpp b/cpp/test/Ice/interceptor/MyObjectI.cpp index 148abf0d8c6..4a954d0d064 100644 --- a/cpp/test/Ice/interceptor/MyObjectI.cpp +++ b/cpp/test/Ice/interceptor/MyObjectI.cpp @@ -7,9 +7,7 @@ #include #include -#ifdef ICE_CPP11_MAPPING -# include -#endif +#include using namespace IceUtil; using namespace std; @@ -25,19 +23,11 @@ MySystemException::ice_id() const return "::MySystemException"; } -#ifdef ICE_CPP11_MAPPING IceUtil::Exception* MySystemException::ice_cloneImpl() const { return new MySystemException(*this); } -#else -MySystemException* -MySystemException::ice_clone() const -{ - return new MySystemException(*this); -} -#endif void MySystemException::ice_throw() const @@ -81,7 +71,6 @@ MyObjectI::badSystemAdd(int, int, const Ice::Current&) throw MySystemException(__FILE__, __LINE__); } -#ifdef ICE_CPP11_MAPPING void MyObjectI::amdAddAsync(int x, int y, @@ -211,156 +200,3 @@ MyObjectI::amdBadSystemAddAsync(int, }); t.detach(); } -#else -void -MyObjectI::amdAdd_async(const Test::AMD_MyObject_amdAddPtr& cb, int x, int y, const Ice::Current& current) -{ - class ThreadI : public Thread - { - public: - - ThreadI(const Test::AMD_MyObject_amdAddPtr& cb, int x, int y, bool retry) : - _cb(cb), - _x(x), - _y(y), - _retry(retry) - { - } - - void run() - { - ThreadControl::sleep(Time::milliSeconds(10)); - try - { - _cb->ice_response(_x + _y); - } - catch(const Ice::ResponseSentException&) - { - test(_retry); - } - } - private: - Test::AMD_MyObject_amdAddPtr _cb; - int _x; - int _y; - bool _retry; - }; - - Ice::Context::const_iterator p = current.ctx.find("retry"); - bool retry = p != current.ctx.end(); - ThreadPtr thread = new ThreadI(cb, x, y, retry); - thread->start().detach(); -} - -void -MyObjectI::amdAddWithRetry_async(const Test::AMD_MyObject_amdAddWithRetryPtr& cb, int x, int y, const Ice::Current& current) -{ - class ThreadI : public Thread - { - public: - - ThreadI(const Test::AMD_MyObject_amdAddWithRetryPtr& cb, int x, int y) : - _cb(cb), - _x(x), - _y(y) - { - } - - void run() - { - ThreadControl::sleep(Time::milliSeconds(10)); - _cb->ice_response(_x + _y); - } - private: - Test::AMD_MyObject_amdAddWithRetryPtr _cb; - int _x; - int _y; - }; - - ThreadPtr thread = new ThreadI(cb, x, y); - thread->start().detach(); - - Ice::Context::const_iterator p = current.ctx.find("retry"); - - if(p == current.ctx.end() || p->second != "no") - { - cb->ice_exception(MyRetryException()); - } -} - -void -MyObjectI::amdBadAdd_async(const Test::AMD_MyObject_amdBadAddPtr& cb, int, int, const Ice::Current&) -{ - class ThreadI : public Thread - { - public: - - ThreadI(const Test::AMD_MyObject_amdBadAddPtr& cb) : - _cb(cb) - { - } - - void run() - { - ThreadControl::sleep(Time::milliSeconds(10)); - Test::InvalidInputException e; - _cb->ice_exception(e); - } - private: - Test::AMD_MyObject_amdBadAddPtr _cb; - }; - - ThreadPtr thread = new ThreadI(cb); - thread->start().detach(); -} - -void -MyObjectI::amdNotExistAdd_async(const Test::AMD_MyObject_amdNotExistAddPtr& cb, int, int, const Ice::Current&) -{ - class ThreadI : public Thread - { - public: - - ThreadI(const Test::AMD_MyObject_amdNotExistAddPtr& cb) : - _cb(cb) - { - } - - void run() - { - ThreadControl::sleep(Time::milliSeconds(10)); - _cb->ice_exception(Ice::ObjectNotExistException(__FILE__, __LINE__)); - } - private: - Test::AMD_MyObject_amdNotExistAddPtr _cb; - }; - - ThreadPtr thread = new ThreadI(cb); - thread->start().detach(); -} - -void -MyObjectI::amdBadSystemAdd_async(const Test::AMD_MyObject_amdBadSystemAddPtr& cb, int, int, const Ice::Current&) -{ - class ThreadI : public Thread - { - public: - - ThreadI(const Test::AMD_MyObject_amdBadSystemAddPtr& cb) : - _cb(cb) - { - } - - void run() - { - ThreadControl::sleep(Time::milliSeconds(10)); - _cb->ice_exception(MySystemException(__FILE__, __LINE__)); - } - private: - Test::AMD_MyObject_amdBadSystemAddPtr _cb; - }; - - ThreadPtr thread = new ThreadI(cb); - thread->start().detach(); -} -#endif diff --git a/cpp/test/Ice/interceptor/MyObjectI.h b/cpp/test/Ice/interceptor/MyObjectI.h index 2cd05d17b35..ca69d3e4a42 100644 --- a/cpp/test/Ice/interceptor/MyObjectI.h +++ b/cpp/test/Ice/interceptor/MyObjectI.h @@ -24,17 +24,11 @@ class MySystemException : public Ice::SystemException virtual std::string ice_id() const; -#ifndef ICE_CPP11_MAPPING - virtual MySystemException* ice_clone() const; -#endif virtual void ice_throw() const; -#ifdef ICE_CPP11_MAPPING - protected: virtual IceUtil::Exception* ice_cloneImpl() const; -#endif }; class MyObjectI : public Test::MyObject @@ -46,20 +40,11 @@ class MyObjectI : public Test::MyObject virtual int badAdd(int, int, const Ice::Current&); virtual int notExistAdd(int, int, const Ice::Current&); virtual int badSystemAdd(int, int, const Ice::Current&); - -#ifdef ICE_CPP11_MAPPING virtual void amdAddAsync(int, int, std::function, std::function, const Ice::Current&); virtual void amdAddWithRetryAsync(int, int, std::function, std::function, const Ice::Current&); virtual void amdBadAddAsync(int, int, std::function, std::function, const Ice::Current&); virtual void amdNotExistAddAsync(int, int, std::function, std::function, const Ice::Current&); virtual void amdBadSystemAddAsync(int, int, std::function, std::function, const Ice::Current&); -#else - virtual void amdAdd_async(const Test::AMD_MyObject_amdAddPtr&, int, int, const Ice::Current&); - virtual void amdAddWithRetry_async(const Test::AMD_MyObject_amdAddWithRetryPtr&, int, int, const Ice::Current&); - virtual void amdBadAdd_async(const Test::AMD_MyObject_amdBadAddPtr&, int, int, const Ice::Current&); - virtual void amdNotExistAdd_async(const Test::AMD_MyObject_amdNotExistAddPtr&, int, int, const Ice::Current&); - virtual void amdBadSystemAdd_async(const Test::AMD_MyObject_amdBadSystemAddPtr&, int, int, const Ice::Current&); -#endif }; #endif diff --git a/cpp/test/Ice/invoke/AllTests.cpp b/cpp/test/Ice/invoke/AllTests.cpp index 66058b20230..d70b74c3484 100644 --- a/cpp/test/Ice/invoke/AllTests.cpp +++ b/cpp/test/Ice/invoke/AllTests.cpp @@ -10,274 +10,6 @@ using namespace std; static string testString = "This is a test string"; -#ifndef ICE_CPP11_MAPPING -class Cookie : public Ice::LocalObject -{ -public: - - string getString() - { - return testString; - } -}; -typedef IceUtil::Handle CookiePtr; - -class CallbackBase : public IceUtil::Monitor -{ -public: - - CallbackBase() : - _called(false) - { - } - - virtual ~CallbackBase() - { - } - - void check() - { - IceUtil::Monitor::Lock sync(*this); - while(!_called) - { - wait(); - } - _called = false; - } - -protected: - - void called() - { - IceUtil::Monitor::Lock sync(*this); - assert(!_called); - _called = true; - notify(); - } - -private: - - bool _called; -}; - -class Callback : public IceUtil::Shared, public CallbackBase -{ -public: - - Callback(const Ice::CommunicatorPtr& communicator, bool useCookie) : - _communicator(communicator), - _useCookie(useCookie) - { - } - - void opString(const Ice::AsyncResultPtr& result) - { - string cmp = testString; - if(_useCookie) - { - CookiePtr cookie = CookiePtr::dynamicCast(result->getCookie()); - cmp = cookie->getString(); - } - - Ice::ByteSeq outParams; - if(result->getProxy()->end_ice_invoke(outParams, result)) - { - Ice::InputStream in(_communicator, result->getProxy()->ice_getEncodingVersion(), outParams); - in.startEncapsulation(); - string s; - in.read(s); - test(s == cmp); - in.read(s); - test(s == cmp); - in.endEncapsulation(); - called(); - } - else - { - test(false); - } - } - - void opException(const Ice::AsyncResultPtr& result) - { - if(_useCookie) - { - CookiePtr cookie = CookiePtr::dynamicCast(result->getCookie()); - test(cookie->getString() == testString); - } - - Ice::ByteSeq outParams; - if(result->getProxy()->end_ice_invoke(outParams, result)) - { - test(false); - } - else - { - Ice::InputStream in(_communicator, result->getProxy()->ice_getEncodingVersion(), outParams); - in.startEncapsulation(); - try - { - in.throwException(); - } - catch(const Test::MyException&) - { - in.endEncapsulation(); - called(); - } - catch(...) - { - test(false); - } - } - } - - void opStringNC(bool ok, const Ice::ByteSeq& outParams) - { - if(ok) - { - Ice::InputStream in(_communicator, outParams); - in.startEncapsulation(); - string s; - in.read(s); - test(s == testString); - in.read(s); - test(s == testString); - in.endEncapsulation(); - called(); - } - else - { - test(false); - } - } - - void opStringPairNC(bool ok, const pair& outParams) - { - if(ok) - { - Ice::InputStream in(_communicator, outParams); - in.startEncapsulation(); - string s; - in.read(s); - test(s == testString); - in.read(s); - test(s == testString); - in.endEncapsulation(); - called(); - } - else - { - test(false); - } - } - - void opStringWC(bool ok, const Ice::ByteSeq& outParams, const CookiePtr& cookie) - { - if(ok) - { - Ice::InputStream in(_communicator, outParams); - in.startEncapsulation(); - string s; - in.read(s); - test(s == cookie->getString()); - in.read(s); - test(s == cookie->getString()); - in.endEncapsulation(); - called(); - } - else - { - test(false); - } - } - - void opExceptionNC(bool ok, const Ice::ByteSeq& outParams) - { - if(ok) - { - test(false); - } - else - { - Ice::InputStream in(_communicator, outParams); - in.startEncapsulation(); - try - { - in.throwException(); - } - catch(const Test::MyException&) - { - in.endEncapsulation(); - called(); - } - catch(...) - { - test(false); - } - } - } - - void opExceptionPairNC(bool ok, const pair& outParams) - { - if(ok) - { - test(false); - } - else - { - Ice::InputStream in(_communicator, outParams); - in.startEncapsulation(); - try - { - in.throwException(); - } - catch(const Test::MyException&) - { - in.endEncapsulation(); - called(); - } - catch(...) - { - test(false); - } - } - } - - void opExceptionWC(bool ok, const Ice::ByteSeq& outParams, const CookiePtr& cookie) - { - test(cookie->getString() == testString); - if(ok) - { - test(false); - } - else - { - Ice::InputStream in(_communicator, outParams); - in.startEncapsulation(); - try - { - in.throwException(); - } - catch(const Test::MyException&) - { - in.endEncapsulation(); - called(); - } - catch(...) - { - test(false); - } - } - } - -private: - - Ice::CommunicatorPtr _communicator; - bool _useCookie; -}; -typedef IceUtil::Handle CallbackPtr; -#endif - Test::MyClassPrxPtr allTests(Test::TestHelper* helper) { @@ -383,8 +115,6 @@ allTests(Test::TestHelper* helper) cout << "ok" << endl; cout << "testing asynchronous ice_invoke... " << flush; -#ifdef ICE_CPP11_MAPPING - { Ice::ByteSeq inEncaps; batchOneway->ice_invokeAsync("opOneway", Ice::ICE_ENUM(OperationMode, Normal), inEncaps, @@ -623,160 +353,6 @@ allTests(Test::TestHelper* helper) test(false); } } - -#else - void (::Callback::*nullEx)(const Ice::Exception&) = 0; - void (::Callback::*nullExWC)(const Ice::Exception&, const CookiePtr&) = 0; - - { - Ice::ByteSeq inEncaps, outEncaps; - test(batchOneway->end_ice_invoke(outEncaps, batchOneway->begin_ice_invoke("opOneway", Ice::ICE_ENUM(OperationMode, Normal), inEncaps))); - test(batchOneway->end_ice_invoke(outEncaps, batchOneway->begin_ice_invoke("opOneway", Ice::ICE_ENUM(OperationMode, Normal), inEncaps))); - test(batchOneway->end_ice_invoke(outEncaps, batchOneway->begin_ice_invoke("opOneway", Ice::ICE_ENUM(OperationMode, Normal), inEncaps))); - test(batchOneway->end_ice_invoke(outEncaps, batchOneway->begin_ice_invoke("opOneway", Ice::ICE_ENUM(OperationMode, Normal), inEncaps))); - batchOneway->ice_flushBatchRequests(); - } - - { - CookiePtr cookie = new Cookie(); - - Ice::ByteSeq inEncaps, outEncaps; - Ice::AsyncResultPtr result = oneway->begin_ice_invoke("opOneway", Ice::Normal, inEncaps); - if(!oneway->end_ice_invoke(outEncaps, result)) - { - test(false); - } - - Ice::OutputStream out(communicator); - out.startEncapsulation(); - out.write(testString); - out.endEncapsulation(); - out.finished(inEncaps); - - // begin_ice_invoke with no callback - result = cl->begin_ice_invoke("opString", Ice::Normal, inEncaps); - if(cl->end_ice_invoke(outEncaps, result)) - { - Ice::InputStream in(communicator, out.getEncoding(), outEncaps); - in.startEncapsulation(); - string s; - in.read(s); - test(s == testString); - in.read(s); - test(s == testString); - in.endEncapsulation(); - } - else - { - test(false); - } - - // begin_ice_invoke with no callback and array mapping - pair inPair(&inEncaps[0], &inEncaps[0] + inEncaps.size()); - result = cl->begin_ice_invoke("opString", Ice::Normal, inPair); - if(cl->end_ice_invoke(outEncaps, result)) - { - Ice::InputStream in(communicator, out.getEncoding(), outEncaps); - in.startEncapsulation(); - string s; - in.read(s); - test(s == testString); - in.read(s); - test(s == testString); - in.endEncapsulation(); - } - else - { - test(false); - } - - // begin_ice_invoke with Callback - ::CallbackPtr cb = new ::Callback(communicator, false); - cl->begin_ice_invoke("opString", Ice::Normal, inEncaps, Ice::newCallback(cb, &Callback::opString)); - cb->check(); - - // begin_ice_invoke with Callback and Cookie - cb = new ::Callback(communicator, true); - cl->begin_ice_invoke("opString", Ice::Normal, inEncaps, Ice::newCallback(cb, &Callback::opString), cookie); - cb->check(); - - // begin_ice_invoke with Callback_Object_ice_invoke - cb = new ::Callback(communicator, false); - Ice::Callback_Object_ice_invokePtr d = Ice::newCallback_Object_ice_invoke(cb, &Callback::opStringNC, nullEx); - cl->begin_ice_invoke("opString", Ice::Normal, inEncaps, d); - cb->check(); - - // begin_ice_invoke with Callback_Object_ice_invoke with Cookie - cb = new ::Callback(communicator, false); - d = Ice::newCallback_Object_ice_invoke(cb, &Callback::opStringWC, nullExWC); - cl->begin_ice_invoke("opString", Ice::Normal, inEncaps, d, cookie); - cb->check(); - - // begin_ice_invoke with Callback_Object_ice_invoke and array mapping - cb = new ::Callback(communicator, false); - d = Ice::newCallback_Object_ice_invoke(cb, &Callback::opStringNC, nullEx); - cl->begin_ice_invoke("opString", Ice::Normal, inPair, d); - cb->check(); - - // begin_ice_invoke with Callback_Object_ice_invoke and array mapping with Cookie - cb = new ::Callback(communicator, false); - d = Ice::newCallback_Object_ice_invoke(cb, &Callback::opStringWC, nullExWC); - cl->begin_ice_invoke("opString", Ice::Normal, inPair, d, cookie); - cb->check(); - } - - { - CookiePtr cookie = new Cookie(); - Ice::ByteSeq inEncaps, outEncaps; - - // begin_ice_invoke with no callback - Ice::AsyncResultPtr result = cl->begin_ice_invoke("opException", Ice::Normal, inEncaps); - if(cl->end_ice_invoke(outEncaps, result)) - { - test(false); - } - else - { - Ice::InputStream in(communicator, cl->ice_getEncodingVersion(), outEncaps); - in.startEncapsulation(); - try - { - in.throwException(); - } - catch(const Test::MyException&) - { - } - catch(...) - { - test(false); - } - in.endEncapsulation(); - } - - // begin_ice_invoke with Callback - ::CallbackPtr cb = new ::Callback(communicator, false); - cl->begin_ice_invoke("opException", Ice::Normal, inEncaps, Ice::newCallback(cb, &Callback::opException)); - cb->check(); - - // begin_ice_invoke with Callback and Cookie - cb = new ::Callback(communicator, true); - cl->begin_ice_invoke("opException", Ice::Normal, inEncaps, Ice::newCallback(cb, &Callback::opException), - cookie); - cb->check(); - - // begin_ice_invoke with Callback_Object_ice_invoke - cb = new ::Callback(communicator, false); - Ice::Callback_Object_ice_invokePtr d = Ice::newCallback_Object_ice_invoke(cb, &Callback::opExceptionNC, nullEx); - cl->begin_ice_invoke("opException", Ice::Normal, inEncaps, d); - cb->check(); - - // begin_ice_invoke with Callback_Object_ice_invoke with Cookie - cb = new ::Callback(communicator, false); - d = Ice::newCallback_Object_ice_invoke(cb, &Callback::opExceptionWC, nullExWC); - cl->begin_ice_invoke("opException", Ice::Normal, inEncaps, d, cookie); - cb->check(); - } -#endif cout << "ok" << endl; return cl; } diff --git a/cpp/test/Ice/invoke/BlobjectI.cpp b/cpp/test/Ice/invoke/BlobjectI.cpp index 903984aefa1..f8ab646109e 100644 --- a/cpp/test/Ice/invoke/BlobjectI.cpp +++ b/cpp/test/Ice/invoke/BlobjectI.cpp @@ -93,7 +93,6 @@ BlobjectArrayI::ice_invoke(ICE_IN(pair) inEn return invokeInternal(in, outEncaps, current); } -#ifdef ICE_CPP11_MAPPING void BlobjectAsyncI::ice_invokeAsync(vector inEncaps, function&)> response, @@ -115,11 +114,7 @@ BlobjectArrayAsyncI::ice_invokeAsync(pair in Ice::InputStream in(current.adapter->getCommunicator(), inEncaps); vector outEncaps; bool ok = invokeInternal(in, outEncaps, current); -#if defined(_MSC_VER) pair outPair(static_cast(nullptr), static_cast(nullptr)); -#else - pair outPair(0, 0); -#endif if(outEncaps.size() != 0) { outPair.first = &outEncaps[0]; @@ -127,35 +122,3 @@ BlobjectArrayAsyncI::ice_invokeAsync(pair in } response(ok, outPair); } -#else -void -BlobjectAsyncI::ice_invoke_async(const Ice::AMD_Object_ice_invokePtr& cb, const vector& inEncaps, - const Ice::Current& current) -{ - Ice::InputStream in(current.adapter->getCommunicator(), current.encoding, inEncaps); - vector outEncaps; - bool ok = invokeInternal(in, outEncaps, current); - cb->ice_response(ok, outEncaps); -} - -void -BlobjectArrayAsyncI::ice_invoke_async(const Ice::AMD_Object_ice_invokePtr& cb, - const pair& inEncaps, - const Ice::Current& current) -{ - Ice::InputStream in(current.adapter->getCommunicator(), current.encoding, inEncaps); - vector outEncaps; - bool ok = invokeInternal(in, outEncaps, current); -#if defined(_MSC_VER) - pair outPair(static_cast(nullptr), static_cast(nullptr)); -#else - pair outPair(0, 0); -#endif - if(outEncaps.size() != 0) - { - outPair.first = &outEncaps[0]; - outPair.second = &outEncaps[0] + outEncaps.size(); - } - cb->ice_response(ok, outPair); -} -#endif diff --git a/cpp/test/Ice/invoke/BlobjectI.h b/cpp/test/Ice/invoke/BlobjectI.h index 2dd4a79bdf8..a2d7170fec6 100644 --- a/cpp/test/Ice/invoke/BlobjectI.h +++ b/cpp/test/Ice/invoke/BlobjectI.h @@ -22,7 +22,6 @@ class BlobjectArrayI : public Ice::BlobjectArray const Ice::Current&); }; -#ifdef ICE_CPP11_MAPPING class BlobjectAsyncI : public Ice::BlobjectAsync { public: @@ -42,22 +41,5 @@ class BlobjectArrayAsyncI : public Ice::BlobjectArrayAsync std::function, const Ice::Current&); }; -#else -class BlobjectAsyncI : public Ice::BlobjectAsync -{ -public: - - virtual void ice_invoke_async(const Ice::AMD_Object_ice_invokePtr&, const std::vector&, - const Ice::Current&); -}; - -class BlobjectArrayAsyncI : public Ice::BlobjectArrayAsync -{ -public: - - virtual void ice_invoke_async(const Ice::AMD_Object_ice_invokePtr&, - const std::pair&, const Ice::Current&); -}; -#endif #endif diff --git a/cpp/test/Ice/library/Consumer.cpp b/cpp/test/Ice/library/Consumer.cpp index f7877d831c6..cef03892da0 100644 --- a/cpp/test/Ice/library/Consumer.cpp +++ b/cpp/test/Ice/library/Consumer.cpp @@ -25,11 +25,7 @@ consume(const Ice::ObjectPtr& o, const Ice::ObjectPrxPtr& p) Test::MyInterfacePtr servant = ICE_DYNAMIC_CAST(Test::MyInterface, o); test(servant); -#ifdef ICE_CPP11_MAPPING auto proxy = dynamic_pointer_cast(p); -#else - Test::MyInterfacePrx proxy = dynamic_cast(p.get()); -#endif test(proxy); proxy->op(false); diff --git a/cpp/test/Ice/location/AllTests.cpp b/cpp/test/Ice/location/AllTests.cpp index 2a8f19e8d75..c5b0f325e1f 100644 --- a/cpp/test/Ice/location/AllTests.cpp +++ b/cpp/test/Ice/location/AllTests.cpp @@ -323,7 +323,6 @@ allTests(Test::TestHelper* helper, const string& ref) test(++count == locator->getRequestCount()); int i; -#ifdef ICE_CPP11_MAPPING list> results; for(i = 0; i < 1000; i++) { @@ -387,48 +386,6 @@ allTests(Test::TestHelper* helper, const string& ref) { cout << "queuing = " << locator->getRequestCount() - count; } -#else - list results; - AMICallbackPtr cb = new AMICallback; - for(i = 0; i < 1000; i++) - { - Ice::AsyncResultPtr result = hello->begin_sayHello( - newCallback_Hello_sayHello(cb, &AMICallback::response1, &AMICallback::exception1)); - results.push_back(result); - } - while(!results.empty()) - { - Ice::AsyncResultPtr result = results.front(); - results.pop_front(); - result->waitForCompleted(); - } - - test(locator->getRequestCount() > count && locator->getRequestCount() < count + 999); - if(locator->getRequestCount() > count + 800) - { - cout << "queuing = " << locator->getRequestCount() - count; - } - count = locator->getRequestCount(); - hello = hello->ice_adapterId("unknown"); - for(i = 0; i < 1000; i++) - { - Ice::AsyncResultPtr result = hello->begin_sayHello( - newCallback_Hello_sayHello(cb, &AMICallback::response2, &AMICallback::exception2)); - results.push_back(result); - } - while(!results.empty()) - { - Ice::AsyncResultPtr result = results.front(); - results.pop_front(); - result->waitForCompleted(); - } - // Take into account the retries. - test(locator->getRequestCount() > count && locator->getRequestCount() < count + 1999); - if(locator->getRequestCount() > count + 800) - { - cout << "queuing = " << locator->getRequestCount() - count; - } -#endif cout << "ok" << endl; cout << "testing adapter locator cache... " << flush; diff --git a/cpp/test/Ice/location/ServerLocator.cpp b/cpp/test/Ice/location/ServerLocator.cpp index 2d44ad0c7e4..4152fdb80cb 100644 --- a/cpp/test/Ice/location/ServerLocator.cpp +++ b/cpp/test/Ice/location/ServerLocator.cpp @@ -13,18 +13,11 @@ ServerLocatorRegistry::ServerLocatorRegistry() { } -#ifdef ICE_CPP11_MAPPING void ServerLocatorRegistry::setAdapterDirectProxyAsync(string adapter, ::shared_ptr<::Ice::ObjectPrx> object, function response, function, const ::Ice::Current&) -#else -void -ServerLocatorRegistry::setAdapterDirectProxy_async(const Ice::AMD_LocatorRegistry_setAdapterDirectProxyPtr& cb, - const std::string& adapter, const ::Ice::ObjectPrx& object, - const ::Ice::Current&) -#endif { if(!object) { @@ -34,26 +27,14 @@ ServerLocatorRegistry::setAdapterDirectProxy_async(const Ice::AMD_LocatorRegistr { _adapters[adapter] = object; } -#ifdef ICE_CPP11_MAPPING response(); -#else - cb->ice_response(); -#endif } -#ifdef ICE_CPP11_MAPPING void ServerLocatorRegistry::setReplicatedAdapterDirectProxyAsync(string adapter, string replicaGroup, shared_ptr object, function response, function, const ::Ice::Current&) -#else -void -ServerLocatorRegistry::setReplicatedAdapterDirectProxy_async( - const Ice::AMD_LocatorRegistry_setReplicatedAdapterDirectProxyPtr& cb, - const string& adapter, const string& replicaGroup, const ::Ice::ObjectPrx& object, - const ::Ice::Current&) -#endif { if(!object) { @@ -65,14 +46,9 @@ ServerLocatorRegistry::setReplicatedAdapterDirectProxy_async( _adapters[adapter] = object; _adapters[replicaGroup] = object; } -#ifdef ICE_CPP11_MAPPING response(); -#else - cb->ice_response(); -#endif } -#ifdef ICE_CPP11_MAPPING void ServerLocatorRegistry::setServerProcessProxyAsync(string, shared_ptr, @@ -88,20 +64,6 @@ ServerLocatorRegistry::addObject(shared_ptr object, const ::Ice: { addObject(object); } -#else -void -ServerLocatorRegistry::setServerProcessProxy_async(const Ice::AMD_LocatorRegistry_setServerProcessProxyPtr& cb, - const string&, const Ice::ProcessPrx&, const ::Ice::Current&) -{ - cb->ice_response(); -} - -void -ServerLocatorRegistry::addObject(const Ice::ObjectPrx& object, const ::Ice::Current&) -{ - addObject(object); -} -#endif Ice::ObjectPrxPtr ServerLocatorRegistry::getAdapter(const string& adapter) const @@ -139,30 +101,19 @@ ServerLocator::ServerLocator(const ServerLocatorRegistryPtr& registry, const ::I { } -#ifdef ICE_CPP11_MAPPING void ServerLocator::findObjectByIdAsync(::Ice::Identity id, function&)> response, function, const ::Ice::Current&) const -#else -void -ServerLocator::findObjectById_async(const Ice::AMD_Locator_findObjectByIdPtr& response, const Ice::Identity& id, - const Ice::Current&) const -#endif { ++const_cast(_requestCount); // We add a small delay to make sure locator request queuing gets tested when // running the test on a fast machine IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(1)); -#ifdef ICE_CPP11_MAPPING response(_registry->getObject(id)); -#else - response->ice_response(_registry->getObject(id)); -#endif } -#ifdef ICE_CPP11_MAPPING void ServerLocator::findAdapterByIdAsync(string id, function&)> response, @@ -182,25 +133,6 @@ ServerLocator::findAdapterByIdAsync(string id, IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(1)); response(_registry->getAdapter(id)); } -#else -void -ServerLocator::findAdapterById_async(const Ice::AMD_Locator_findAdapterByIdPtr& response, const string& id, - const Ice::Current& current) const -{ - ++const_cast(_requestCount); - if(id == "TestAdapter10" || id == "TestAdapter10-2") - { - test(current.encoding == Ice::Encoding_1_0); - response->ice_response(_registry->getAdapter("TestAdapter")); - return; - } - - // We add a small delay to make sure locator request queuing gets tested when - // running the test on a fast machine - IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(1)); - response->ice_response(_registry->getAdapter(id)); -} -#endif Ice::LocatorRegistryPrxPtr ServerLocator::getRegistry(const ::Ice::Current&) const diff --git a/cpp/test/Ice/location/ServerLocator.h b/cpp/test/Ice/location/ServerLocator.h index 264e554f346..5454a2e95f7 100644 --- a/cpp/test/Ice/location/ServerLocator.h +++ b/cpp/test/Ice/location/ServerLocator.h @@ -15,7 +15,6 @@ class ServerLocatorRegistry : public Test::TestLocatorRegistry ServerLocatorRegistry(); -#ifdef ICE_CPP11_MAPPING virtual void setAdapterDirectProxyAsync(std::string, std::shared_ptr<::Ice::ObjectPrx>, std::function, std::function, @@ -30,16 +29,6 @@ class ServerLocatorRegistry : public Test::TestLocatorRegistry std::function, const ::Ice::Current&); void addObject(std::shared_ptr<::Ice::ObjectPrx>, const ::Ice::Current&); -#else - virtual void setAdapterDirectProxy_async(const Ice::AMD_LocatorRegistry_setAdapterDirectProxyPtr&, - const ::std::string&, const ::Ice::ObjectPrx&, const ::Ice::Current&); - virtual void setReplicatedAdapterDirectProxy_async( - const Ice::AMD_LocatorRegistry_setReplicatedAdapterDirectProxyPtr&, - const std::string&, const ::std::string&, const ::Ice::ObjectPrx&, const ::Ice::Current&); - virtual void setServerProcessProxy_async(const Ice::AMD_LocatorRegistry_setServerProcessProxyPtr&, - const ::std::string&, const ::Ice::ProcessPrx&, const ::Ice::Current&); - void addObject(const ::Ice::ObjectPrx&, const ::Ice::Current&); -#endif // // Internal method @@ -61,7 +50,6 @@ class ServerLocator : public Test::TestLocator ServerLocator(const ::ServerLocatorRegistryPtr&, const ::Ice::LocatorRegistryPrxPtr&); -#ifdef ICE_CPP11_MAPPING virtual void findObjectByIdAsync(::Ice::Identity, std::function&)>, std::function, @@ -71,13 +59,7 @@ class ServerLocator : public Test::TestLocator std::function&)>, std::function, const ::Ice::Current&) const; -#else - virtual void findObjectById_async(const ::Ice::AMD_Locator_findObjectByIdPtr&, const ::Ice::Identity&, - const ::Ice::Current&) const; - virtual void findAdapterById_async(const ::Ice::AMD_Locator_findAdapterByIdPtr&, const ::std::string&, - const ::Ice::Current&) const; -#endif virtual ::Ice::LocatorRegistryPrxPtr getRegistry(const ::Ice::Current&) const; virtual int getRequestCount(const Ice::Current&) const; diff --git a/cpp/test/Ice/metrics/AllTests.cpp b/cpp/test/Ice/metrics/AllTests.cpp index 3bfefe9d5a4..5fce47b4f71 100644 --- a/cpp/test/Ice/metrics/AllTests.cpp +++ b/cpp/test/Ice/metrics/AllTests.cpp @@ -1113,7 +1113,6 @@ allTests(Test::TestHelper* helper, const CommunicatorObserverIPtr& obsv) CallbackBasePtr cb = new Callback(); metrics->op(); -#ifdef ICE_CPP11_MAPPING metrics->opAsync().get(); metrics->opAsync( @@ -1137,10 +1136,6 @@ allTests(Test::TestHelper* helper, const CommunicatorObserverIPtr& obsv) test(false); } }); -#else - metrics->end_op(metrics->begin_op()); - metrics->begin_op(newCallback_Metrics_op(cb, &CallbackBase::response, &CallbackBase::exception)); -#endif cb->waitForResponse(); // User exception @@ -1154,7 +1149,6 @@ allTests(Test::TestHelper* helper, const CommunicatorObserverIPtr& obsv) { } -#ifdef ICE_CPP11_MAPPING try { metrics->opWithUserExceptionAsync().get(); @@ -1188,19 +1182,6 @@ allTests(Test::TestHelper* helper, const CommunicatorObserverIPtr& obsv) test(false); } }); -#else - try - { - metrics->end_opWithUserException(metrics->begin_opWithUserException()); - test(false); - } - catch(const Test::UserEx&) - { - } - - metrics->begin_opWithUserException( - newCallback_Metrics_opWithUserException(cb, &CallbackBase::response, &CallbackBase::exception)); -#endif cb->waitForResponse(); // Request failed exception @@ -1214,7 +1195,6 @@ allTests(Test::TestHelper* helper, const CommunicatorObserverIPtr& obsv) { } -#ifdef ICE_CPP11_MAPPING try { metrics->opWithRequestFailedExceptionAsync().get(); @@ -1244,19 +1224,6 @@ allTests(Test::TestHelper* helper, const CommunicatorObserverIPtr& obsv) test(false); } }); -#else - try - { - metrics->end_opWithRequestFailedException(metrics->begin_opWithRequestFailedException()); - test(false); - } - catch(const Ice::RequestFailedException&) - { - } - - metrics->begin_opWithRequestFailedException( - newCallback_Metrics_opWithRequestFailedException(cb, &CallbackBase::response, &CallbackBase::exception)); -#endif cb->waitForResponse(); // Local exception @@ -1270,7 +1237,6 @@ allTests(Test::TestHelper* helper, const CommunicatorObserverIPtr& obsv) { } -#ifdef ICE_CPP11_MAPPING try { metrics->opWithLocalExceptionAsync().get(); @@ -1300,19 +1266,6 @@ allTests(Test::TestHelper* helper, const CommunicatorObserverIPtr& obsv) test(false); } }); -#else - try - { - metrics->end_opWithLocalException(metrics->begin_opWithLocalException()); - test(false); - } - catch(const Ice::LocalException&) - { - } - - metrics->begin_opWithLocalException( - newCallback_Metrics_opWithLocalException(cb, &CallbackBase::response, &CallbackBase::exception)); -#endif cb->waitForResponse(); // Unknown exception @@ -1326,7 +1279,6 @@ allTests(Test::TestHelper* helper, const CommunicatorObserverIPtr& obsv) { } -#ifdef ICE_CPP11_MAPPING try { metrics->opWithUnknownExceptionAsync().get(); @@ -1356,19 +1308,6 @@ allTests(Test::TestHelper* helper, const CommunicatorObserverIPtr& obsv) test(false); } }); -#else - try - { - metrics->end_opWithUnknownException(metrics->begin_opWithUnknownException()); - test(false); - } - catch(const Ice::UnknownException&) - { - } - - metrics->begin_opWithUnknownException( - newCallback_Metrics_opWithUnknownException(cb, &CallbackBase::response, &CallbackBase::exception)); -#endif cb->waitForResponse(); // Fail @@ -1383,7 +1322,7 @@ allTests(Test::TestHelper* helper, const CommunicatorObserverIPtr& obsv) catch(const Ice::ConnectionLostException&) { } -#ifdef ICE_CPP11_MAPPING + try { metrics->failAsync().get(); @@ -1413,18 +1352,6 @@ allTests(Test::TestHelper* helper, const CommunicatorObserverIPtr& obsv) test(false); } }); -#else - try - { - metrics->end_fail(metrics->begin_fail()); - test(false); - } - catch(const Ice::ConnectionLostException&) - { - } - - metrics->begin_fail(newCallback_Metrics_fail(cb, &CallbackBase::response, &CallbackBase::exception)); -#endif cb->waitForResponse(); } map = toMap(clientMetrics->getMetricsView("View", timestamp)["Invocation"]); @@ -1514,7 +1441,6 @@ allTests(Test::TestHelper* helper, const CommunicatorObserverIPtr& obsv) cb = new Callback(); MetricsPrxPtr metricsOneway = metrics->ice_oneway(); metricsOneway->op(); -#ifdef ICE_CPP11_MAPPING metricsOneway->opAsync().get(); promise sent; metricsOneway->opAsync( @@ -1539,10 +1465,6 @@ allTests(Test::TestHelper* helper, const CommunicatorObserverIPtr& obsv) }, [&](bool) { sent.set_value(); }); sent.get_future().get(); -#else - metricsOneway->end_op(metricsOneway->begin_op()); - metricsOneway->begin_op(newCallback_Metrics_op(cb, &CallbackBase::response, &CallbackBase::exception))->waitForSent(); -#endif map = toMap(clientMetrics->getMetricsView("View", timestamp)["Invocation"]); test(map.size() == 1); @@ -1564,13 +1486,8 @@ allTests(Test::TestHelper* helper, const CommunicatorObserverIPtr& obsv) MetricsPrxPtr metricsBatchOneway = metrics->ice_batchOneway(); metricsBatchOneway->op(); -#ifdef ICE_CPP11_MAPPING metricsBatchOneway->opAsync().get(); metricsBatchOneway->opAsync([cb]() {}, [cb](exception_ptr) {}); -#else - metricsBatchOneway->end_op(metricsBatchOneway->begin_op()); - metricsBatchOneway->begin_op(newCallback_Metrics_op(cb, &CallbackBase::response, &CallbackBase::exception))->waitForCompleted(); -#endif map = toMap(clientMetrics->getMetricsView("View", timestamp)["Invocation"]); test(map.size() == 1); @@ -1593,14 +1510,8 @@ allTests(Test::TestHelper* helper, const CommunicatorObserverIPtr& obsv) metricsBatchOneway->op(); metricsBatchOneway->ice_flushBatchRequests(); -#ifdef ICE_CPP11_MAPPING metricsBatchOneway->ice_flushBatchRequestsAsync().get(); metricsBatchOneway->ice_flushBatchRequestsAsync([cb](exception_ptr) {}); -#else - metricsBatchOneway->end_ice_flushBatchRequests(metricsBatchOneway->begin_ice_flushBatchRequests()); - metricsBatchOneway->begin_ice_flushBatchRequests( - Ice::newCallback_Object_ice_flushBatchRequests(cb, &CallbackBase::exception))->waitForCompleted(); -#endif map = toMap(clientMetrics->getMetricsView("View", timestamp)["Invocation"]); test(map.size() == 2); @@ -1622,14 +1533,8 @@ allTests(Test::TestHelper* helper, const CommunicatorObserverIPtr& obsv) metricsBatchOneway->op(); con->flushBatchRequests(ICE_SCOPED_ENUM(Ice::CompressBatch, No)); -#ifdef ICE_CPP11_MAPPING con->flushBatchRequestsAsync(ICE_SCOPED_ENUM(Ice::CompressBatch, No)).get(); con->flushBatchRequestsAsync(ICE_SCOPED_ENUM(Ice::CompressBatch, No), [cb](exception_ptr) {}); -#else - con->end_flushBatchRequests(con->begin_flushBatchRequests(ICE_SCOPED_ENUM(Ice::CompressBatch, No))); - con->begin_flushBatchRequests(ICE_SCOPED_ENUM(Ice::CompressBatch, No), - Ice::newCallback_Connection_flushBatchRequests(cb, &CallbackBase::exception))->waitForCompleted(); -#endif map = toMap(clientMetrics->getMetricsView("View", timestamp)["Invocation"]); test(map.size() == 3); @@ -1641,16 +1546,9 @@ allTests(Test::TestHelper* helper, const CommunicatorObserverIPtr& obsv) metricsBatchOneway->op(); communicator->flushBatchRequests(ICE_SCOPED_ENUM(Ice::CompressBatch, No)); -#ifdef ICE_CPP11_MAPPING communicator->flushBatchRequestsAsync(ICE_SCOPED_ENUM(Ice::CompressBatch, No)).get(); communicator->flushBatchRequestsAsync(ICE_SCOPED_ENUM(Ice::CompressBatch, No), [cb](exception_ptr) {}); -#else - communicator->end_flushBatchRequests( - communicator->begin_flushBatchRequests(ICE_SCOPED_ENUM(Ice::CompressBatch, No))); - communicator->begin_flushBatchRequests(ICE_SCOPED_ENUM(Ice::CompressBatch, No), - Ice::newCallback_Communicator_flushBatchRequests(cb, &CallbackBase::exception))->waitForCompleted(); -#endif map = toMap(clientMetrics->getMetricsView("View", timestamp)["Invocation"]); test(map.size() == 2); diff --git a/cpp/test/Ice/metrics/TestAMDI.cpp b/cpp/test/Ice/metrics/TestAMDI.cpp index 2292193071e..b86658c2a59 100644 --- a/cpp/test/Ice/metrics/TestAMDI.cpp +++ b/cpp/test/Ice/metrics/TestAMDI.cpp @@ -7,7 +7,6 @@ using namespace std; -#ifdef ICE_CPP11_MAPPING void MetricsI::opAsync(function response, function, const Ice::Current&) { @@ -72,51 +71,6 @@ MetricsI::opByteSAsync(Test::ByteSeq, function response, functionice_response(); -} - -void -MetricsI::fail_async(const Test::AMD_Metrics_failPtr& cb, const Ice::Current& current) -{ - current.con->close(Ice::ICE_SCOPED_ENUM(ConnectionClose, Forcefully)); - cb->ice_response(); -} - -void -MetricsI::opWithUserException_async(const Test::AMD_Metrics_opWithUserExceptionPtr& cb, const Ice::Current&) -{ - cb->ice_exception(Test::UserEx()); -} - -void -MetricsI::opWithRequestFailedException_async(const Test::AMD_Metrics_opWithRequestFailedExceptionPtr& cb, - const Ice::Current&) -{ - cb->ice_exception(Ice::ObjectNotExistException(__FILE__, __LINE__)); -} - -void -MetricsI::opWithLocalException_async(const Test::AMD_Metrics_opWithLocalExceptionPtr& cb, const Ice::Current&) -{ - cb->ice_exception(Ice::SyscallException(__FILE__, __LINE__)); -} - -void -MetricsI::opWithUnknownException_async(const Test::AMD_Metrics_opWithUnknownExceptionPtr&, const Ice::Current&) -{ - throw "Test"; -} - -void -MetricsI::opByteS_async(const Test::AMD_Metrics_opByteSPtr& cb, const Test::ByteSeq&, const Ice::Current&) -{ - cb->ice_response(); -} -#endif Ice::ObjectPrxPtr MetricsI::getAdmin(const Ice::Current& current) diff --git a/cpp/test/Ice/metrics/TestAMDI.h b/cpp/test/Ice/metrics/TestAMDI.h index 4468386930b..2d554d489e8 100644 --- a/cpp/test/Ice/metrics/TestAMDI.h +++ b/cpp/test/Ice/metrics/TestAMDI.h @@ -11,7 +11,6 @@ class MetricsI : public Test::Metrics { public: -#ifdef ICE_CPP11_MAPPING virtual void opAsync(std::function, std::function, const Ice::Current&); virtual void failAsync(std::function, std::function, const Ice::Current&); @@ -30,23 +29,6 @@ class MetricsI : public Test::Metrics virtual void opByteSAsync(Test::ByteSeq, std::function, std::function, const Ice::Current&); -#else - virtual void op_async(const Test::AMD_Metrics_opPtr&, const Ice::Current&); - - virtual void fail_async(const Test::AMD_Metrics_failPtr&, const Ice::Current&); - - virtual void opWithUserException_async(const Test::AMD_Metrics_opWithUserExceptionPtr&, const Ice::Current&); - - virtual void opWithRequestFailedException_async(const Test::AMD_Metrics_opWithRequestFailedExceptionPtr&, - const Ice::Current&); - - virtual void opWithLocalException_async(const Test::AMD_Metrics_opWithLocalExceptionPtr&, const Ice::Current&); - - virtual void opWithUnknownException_async(const Test::AMD_Metrics_opWithUnknownExceptionPtr&, const Ice::Current&); - - virtual void opByteS_async(const Test::AMD_Metrics_opByteSPtr&, const Test::ByteSeq&, const Ice::Current&); -#endif - virtual Ice::ObjectPrxPtr getAdmin(const Ice::Current&); virtual void shutdown(const Ice::Current&); diff --git a/cpp/test/Ice/objects/AllTests.cpp b/cpp/test/Ice/objects/AllTests.cpp index bd637f6ac4d..b9f8250c929 100644 --- a/cpp/test/Ice/objects/AllTests.cpp +++ b/cpp/test/Ice/objects/AllTests.cpp @@ -95,11 +95,7 @@ allTests(Test::TestHelper* helper) cout << "testing checked cast... " << flush; InitialPrxPtr initial = ICE_CHECKED_CAST(InitialPrx, base); test(initial); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(initial, base)); -#else - test(initial == base); -#endif cout << "ok" << endl; cout << "testing constructor, copy constructor, and assignment operator... " << flush; @@ -114,21 +110,17 @@ allTests(Test::TestHelper* helper) test(ba2->theS.str == "hello"); test(ba2->str == "hi"); -#ifdef ICE_CPP11_MAPPING test(*ba1 < *ba2); test(*ba2 > *ba1); test(*ba1 != *ba2); -#endif *ba1 = *ba2; test(ba1->theS.str == "hello"); test(ba1->str == "hi"); -#ifdef ICE_CPP11_MAPPING test(*ba1 == *ba2); test(*ba1 >= *ba2); test(*ba1 <= *ba2); -#endif BasePtr bp1 = ICE_MAKE_SHARED(Base); *bp1 = *ba2; @@ -167,19 +159,12 @@ allTests(Test::TestHelper* helper) cout << "checking consistency... " << flush; test(b1 != b2); -#ifdef ICE_CPP11_MAPPING test(b1 != dynamic_pointer_cast(c)); test(b1 != dynamic_pointer_cast(d)); test(b2 != dynamic_pointer_cast(c)); test(b2 != dynamic_pointer_cast(d)); test(c != dynamic_pointer_cast(d)); -#else - test(b1 != BPtr::dynamicCast(c)); - test(b1 != BPtr::dynamicCast(d)); - test(b2 != BPtr::dynamicCast(c)); - test(b2 != BPtr::dynamicCast(d)); - test(c != CPtr::dynamicCast(d)); -#endif + test(b1->theB == b1); test(b1->theC == ICE_NULLPTR); test(ICE_DYNAMIC_CAST(B, b1->theA)); @@ -192,13 +177,9 @@ allTests(Test::TestHelper* helper) test(b1->postUnmarshalInvoked); test(b1->theA->preMarshalInvoked); test(b1->theA->postUnmarshalInvoked); -#ifdef ICE_CPP11_MAPPING test(dynamic_pointer_cast(b1->theA)->theC->preMarshalInvoked); test(dynamic_pointer_cast(b1->theA)->theC->postUnmarshalInvoked); -#else - test(BPtr::dynamicCast(b1->theA)->theC->preMarshalInvoked); - test(BPtr::dynamicCast(b1->theA)->theC->postUnmarshalInvoked); -#endif + // More tests possible for b2 and d, but I think this is already sufficient. test(b2->theA == b2); test(d->theC == ICE_NULLPTR); @@ -218,7 +199,6 @@ allTests(Test::TestHelper* helper) cout << "ok" << endl; cout << "checking consistency... " << flush; -#ifdef ICE_CPP11_MAPPING test(b1 != b2); test(b1 != dynamic_pointer_cast(c)); test(b1 != dynamic_pointer_cast(d)); @@ -235,24 +215,7 @@ allTests(Test::TestHelper* helper) test(d->theA == dynamic_pointer_cast(b1)); test(d->theB == dynamic_pointer_cast(b2)); test(d->theC == nullptr); -#else - test(b1 != b2); - test(b1 != BPtr::dynamicCast(c)); - test(b1 != BPtr::dynamicCast(d)); - test(b2 != BPtr::dynamicCast(c)); - test(b2 != BPtr::dynamicCast(d)); - test(c != CPtr::dynamicCast(d)); - test(b1->theA == b2); - test(b1->theB == b1); - test(b1->theC == ICE_NULLPTR); - test(b2->theA == b2); - test(b2->theB == b1); - test(b2->theC == c); - test(c->theB == b2); - test(d->theA == b1); - test(d->theB == b2); - test(d->theC == ICE_NULLPTR); -#endif + test(d->preMarshalInvoked); test(d->postUnmarshalInvoked); test(d->theA->preMarshalInvoked); @@ -271,11 +234,6 @@ allTests(Test::TestHelper* helper) EIPtr e = ICE_DYNAMIC_CAST(EI, initial->getE()); FIPtr f = ICE_DYNAMIC_CAST(FI, initial->getF()); -#ifndef ICE_CPP11_MAPPING - test(e->checkValues()); - test(f->checkValues()); - test(ICE_DYNAMIC_CAST(EI, f->e2)->checkValues()); -#endif cout << "ok" << endl; cout << "getting K... " << flush; @@ -418,11 +376,7 @@ allTests(Test::TestHelper* helper) b1 = initial->getMB(); test(b1 && b1->theB == b1); clear(b1); -#ifdef ICE_CPP11_MAPPING b1 = initial->getAMDMBAsync().get(); -#else - b1 = initial->end_getAMDMB(initial->begin_getAMDMB()); -#endif test(b1 && b1->theB == b1); clear(b1); cout << "ok" << endl; diff --git a/cpp/test/Ice/objects/TestI.cpp b/cpp/test/Ice/objects/TestI.cpp index 582c1168f6c..6610e7614c3 100644 --- a/cpp/test/Ice/objects/TestI.cpp +++ b/cpp/test/Ice/objects/TestI.cpp @@ -191,7 +191,6 @@ InitialI::acceptsClassCycles(const Ice::Current& c) return c.adapter->getCommunicator()->getProperties()->getPropertyAsInt("Ice.AcceptClassCycles") > 0; } -#ifdef ICE_CPP11_MAPPING InitialI::GetMBMarshaledResult InitialI::getMB(const Ice::Current& current) { @@ -205,19 +204,6 @@ InitialI::getAMDMBAsync(function response, { response(GetAMDMBMarshaledResult(_b1, current)); } -#else -Test::BPtr -InitialI::getMB(const Ice::Current&) -{ - return _b1; -} - -void -InitialI::getAMDMB_async(const Test::AMD_Initial_getAMDMBPtr& cb, const Ice::Current&) -{ - cb->ice_response(_b1); -} -#endif void InitialI::getAll(BPtr& b1, BPtr& b2, CPtr& c, DPtr& d, const Ice::Current&) diff --git a/cpp/test/Ice/objects/TestI.h b/cpp/test/Ice/objects/TestI.h index 5d91ca0387e..8f025e7ee98 100644 --- a/cpp/test/Ice/objects/TestI.h +++ b/cpp/test/Ice/objects/TestI.h @@ -74,15 +74,10 @@ class InitialI : public Test::Initial virtual void setCycle(ICE_IN(Test::RecursivePtr), const Ice::Current&); virtual bool acceptsClassCycles(const Ice::Current&); -#ifdef ICE_CPP11_MAPPING virtual GetMBMarshaledResult getMB(const Ice::Current&); virtual void getAMDMBAsync(std::function, std::function, const Ice::Current&); -#else - virtual Test::BPtr getMB(const Ice::Current&); - virtual void getAMDMB_async(const Test::AMD_Initial_getAMDMBPtr&, const Ice::Current&); -#endif virtual void getAll(Test::BPtr&, Test::BPtr&, Test::CPtr&, Test::DPtr&, const Ice::Current&); diff --git a/cpp/test/Ice/operations/BatchOneways.cpp b/cpp/test/Ice/operations/BatchOneways.cpp index bd0bac9e9cd..895cbb09362 100644 --- a/cpp/test/Ice/operations/BatchOneways.cpp +++ b/cpp/test/Ice/operations/BatchOneways.cpp @@ -12,9 +12,6 @@ namespace { class BatchRequestInterceptorI final -#ifndef ICE_CPP11_MAPPING - : public Ice::BatchRequestInterceptor -#endif { public: @@ -37,11 +34,7 @@ class BatchRequestInterceptorI final if(_size + request.getSize() > 25000) { -#ifdef ICE_CPP11_MAPPING request.getProxy()->ice_flushBatchRequestsAsync(); -#else - request.getProxy()->begin_ice_flushBatchRequests(); -#endif _size = 18; // header } @@ -154,14 +147,10 @@ batchOneways(const Test::MyClassPrxPtr& p) initData.properties = p->ice_getCommunicator()->getProperties()->clone(); BatchRequestInterceptorIPtr interceptor = ICE_MAKE_SHARED(BatchRequestInterceptorI); -#if defined(ICE_CPP11_MAPPING) initData.batchRequestInterceptor = [=](const Ice::BatchRequest& request, int countP, int size) { interceptor->enqueue(request, countP, size); }; -#else - initData.batchRequestInterceptor = interceptor; -#endif Ice::CommunicatorPtr ic = Ice::initialize(initData); Test::MyClassPrxPtr batch4 = diff --git a/cpp/test/Ice/operations/BatchOnewaysAMI.cpp b/cpp/test/Ice/operations/BatchOnewaysAMI.cpp index 9684545a6ac..5318ac7053a 100644 --- a/cpp/test/Ice/operations/BatchOnewaysAMI.cpp +++ b/cpp/test/Ice/operations/BatchOnewaysAMI.cpp @@ -90,8 +90,6 @@ batchOnewaysAMI(const Test::MyClassPrxPtr& p) { const Test::ByteS bs1(10 * 1024); Test::MyClassPrxPtr batch = ICE_UNCHECKED_CAST(Test::MyClassPrx, p->ice_batchOneway()); -#ifdef ICE_CPP11_MAPPING - promise prom; batch->ice_flushBatchRequestsAsync(nullptr, [&](bool sentSynchronously) @@ -147,60 +145,4 @@ batchOnewaysAMI(const Test::MyClassPrxPtr& p) batch->ice_pingAsync(); batch->ice_flushBatchRequestsAsync().get(); batch->ice_pingAsync(); -#else - batch->end_ice_flushBatchRequests(batch->begin_ice_flushBatchRequests()); // Empty flush - - test(batch->begin_ice_flushBatchRequests()->isSent()); // Empty flush - test(batch->begin_ice_flushBatchRequests()->isCompleted()); // Empty flush - test(batch->begin_ice_flushBatchRequests()->sentSynchronously()); // Empty flush - - for(int i = 0; i < 30; ++i) - { - batch->begin_opByteSOneway(bs1, Test::newCallback_MyClass_opByteSOneway(new Callback_ByteSOneway(), - &Callback_ByteSOneway::response, - &Callback_ByteSOneway::exception)); - } - - int count = 0; - while(count < 27) // 3 * 9 requests auto-flushed. - { - count += p->opByteSOnewayCallCount(); - IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(10)); - } - - if(batch->ice_getConnection() && - p->ice_getCommunicator()->getProperties()->getProperty("Ice.Default.Protocol") != "bt") - { - Test::MyClassPrx batch1 = Test::MyClassPrx::uncheckedCast(p->ice_batchOneway()); - Test::MyClassPrx batch2 = Test::MyClassPrx::uncheckedCast(p->ice_batchOneway()); - - batch1->end_ice_ping(batch1->begin_ice_ping()); - batch2->end_ice_ping(batch2->begin_ice_ping()); - batch1->end_ice_flushBatchRequests(batch1->begin_ice_flushBatchRequests()); - batch1->ice_getConnection()->close(Ice::ICE_SCOPED_ENUM(ConnectionClose, GracefullyWithWait)); - batch1->end_ice_ping(batch1->begin_ice_ping()); - batch2->end_ice_ping(batch2->begin_ice_ping()); - - batch1->ice_getConnection(); - batch2->ice_getConnection(); - - batch1->end_ice_ping(batch1->begin_ice_ping()); - batch1->ice_getConnection()->close(Ice::ICE_SCOPED_ENUM(ConnectionClose, GracefullyWithWait)); - - batch1->end_ice_ping(batch1->begin_ice_ping()); - batch2->end_ice_ping(batch2->begin_ice_ping()); - } - - Ice::Identity identity; - identity.name = "invalid"; - Ice::ObjectPrx batch3 = batch->ice_identity(identity); - batch3->begin_ice_ping(); - batch3->end_ice_flushBatchRequests(batch3->begin_ice_flushBatchRequests()); - - // Make sure that a bogus batch request doesn't cause troubles to other ones. - batch3->begin_ice_ping(); - batch->begin_ice_ping(); - batch->end_ice_flushBatchRequests(batch->begin_ice_flushBatchRequests()); - batch->begin_ice_ping(); -#endif } diff --git a/cpp/test/Ice/operations/OnewaysAMI.cpp b/cpp/test/Ice/operations/OnewaysAMI.cpp index bd3fc9241f7..0e26e1c693a 100644 --- a/cpp/test/Ice/operations/OnewaysAMI.cpp +++ b/cpp/test/Ice/operations/OnewaysAMI.cpp @@ -12,9 +12,6 @@ namespace { class CallbackBase -#ifndef ICE_CPP11_MAPPING -: public Ice::LocalObject -#endif { public: @@ -82,7 +79,6 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr& proxy) { CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->ice_pingAsync( nullptr, [](exception_ptr) @@ -93,33 +89,20 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr& proxy) { cb->sent(sent); }); -#else - Ice::Callback_Object_ice_pingPtr callback = - Ice::newCallback_Object_ice_ping(cb, &Callback::noException, &Callback::sent); - p->begin_ice_ping(callback); -#endif cb->check(); } { try { -#ifdef ICE_CPP11_MAPPING p->ice_isAAsync(Test::MyClass::ice_staticId(), [&](bool) { test(false); }); -#else - p->begin_ice_isA(Test::MyClass::ice_staticId()); -#endif test(false); } -#ifdef ICE_CPP11_MAPPING catch(const Ice::TwowayOnlyException&) -#else - catch(const IceUtil::IllegalArgumentException&) -#endif { } } @@ -127,22 +110,14 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr& proxy) { try { -#ifdef ICE_CPP11_MAPPING p->ice_idAsync( [&](string) { test(false); }); -#else - p->begin_ice_id(); -#endif test(false); } -#ifdef ICE_CPP11_MAPPING catch(const Ice::TwowayOnlyException&) -#else - catch(const IceUtil::IllegalArgumentException&) -#endif { } } @@ -150,28 +125,19 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr& proxy) { try { -#ifdef ICE_CPP11_MAPPING p->ice_idsAsync( [&](vector) { }); -#else - p->begin_ice_ids(); -#endif test(false); } -#ifdef ICE_CPP11_MAPPING catch(const Ice::TwowayOnlyException&) -#else - catch(const IceUtil::IllegalArgumentException&) -#endif { } } { CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opVoidAsync( nullptr, [](exception_ptr) @@ -182,17 +148,11 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr& proxy) { cb->sent(sent); }); -#else - Test::Callback_MyClass_opVoidPtr callback = - Test::newCallback_MyClass_opVoid(cb, &Callback::noException, &Callback::sent); - p->begin_opVoid(callback); -#endif cb->check(); } { CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opIdempotentAsync( nullptr, [](exception_ptr) @@ -203,17 +163,11 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr& proxy) { cb->sent(sent); }); -#else - Test::Callback_MyClass_opIdempotentPtr callback = - Test::newCallback_MyClass_opIdempotent(cb, &Callback::noException, &Callback::sent); - p->begin_opIdempotent(callback); -#endif cb->check(); } { CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opNonmutatingAsync( nullptr, [](exception_ptr) @@ -224,37 +178,24 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr& proxy) { cb->sent(sent); }); -#else - Test::Callback_MyClass_opNonmutatingPtr callback = - Test::newCallback_MyClass_opNonmutating(cb, &Callback::noException, &Callback::sent); - p->begin_opNonmutating(callback); -#endif cb->check(); } { try { -#ifdef ICE_CPP11_MAPPING p->opByteAsync(Ice::Byte(0xff), Ice::Byte(0x0f), [](Ice::Byte, Ice::Byte) { test(false); }); -#else - p->begin_opByte(Ice::Byte(0xff), Ice::Byte(0x0f)); -#endif test(false); } -#ifdef ICE_CPP11_MAPPING catch(const Ice::TwowayOnlyException&) -#else - catch(const IceUtil::IllegalArgumentException&) -#endif { } } -#ifdef ICE_CPP11_MAPPING + { CallbackPtr cb = ICE_MAKE_SHARED(Callback); p->ice_pingAsync(nullptr, @@ -282,11 +223,7 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr& proxy) p->ice_isAAsync(Test::MyClass::ice_staticId()); test(false); } -#ifdef ICE_CPP11_MAPPING catch(const Ice::TwowayOnlyException&) -#else - catch(const IceUtil::IllegalArgumentException&) -#endif { } } @@ -297,11 +234,7 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr& proxy) p->ice_idAsync(); test(false); } -#ifdef ICE_CPP11_MAPPING catch(const Ice::TwowayOnlyException&) -#else - catch(const IceUtil::IllegalArgumentException&) -#endif { } } @@ -312,13 +245,8 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr& proxy) p->ice_idsAsync(); test(false); } -#ifdef ICE_CPP11_MAPPING catch(const Ice::TwowayOnlyException&) -#else - catch(const IceUtil::IllegalArgumentException&) -#endif { } } -#endif } diff --git a/cpp/test/Ice/operations/TestAMDI.cpp b/cpp/test/Ice/operations/TestAMDI.cpp index e9da28e9101..5e9b09e71d9 100644 --- a/cpp/test/Ice/operations/TestAMDI.cpp +++ b/cpp/test/Ice/operations/TestAMDI.cpp @@ -46,8 +46,6 @@ MyDerivedClassI::ice_id(const Ice::Current& current) const return Test::MyDerivedClass::ice_id(current); } -#ifdef ICE_CPP11_MAPPING - class Thread_opVoid : public IceUtil::Thread { public: @@ -1031,878 +1029,3 @@ MyDerivedClassI::opMDict2Async(Test::StringStringD p1, { response(OpMDict2MarshaledResult(p1, p1, current)); } - -#else - -class Thread_opVoid : public IceUtil::Thread -{ -public: - - Thread_opVoid(const Test::AMD_MyClass_opVoidPtr& cb) : - _cb(cb) - { - } - - virtual void run() - { - _cb->ice_response(); - } - -private: - - const Test::AMD_MyClass_opVoidPtr _cb; -}; - -void -MyDerivedClassI::shutdown_async(const Test::AMD_MyClass_shutdownPtr& cb, const Ice::Current& current) -{ - { - IceUtil::Mutex::Lock sync(_opVoidMutex); - if(_opVoidThread) - { - _opVoidThread->getThreadControl().join(); - _opVoidThread = 0; - } - } - - current.adapter->getCommunicator()->shutdown(); - cb->ice_response(); -} - -void -MyDerivedClassI::supportsCompress_async(const Test::AMD_MyClass_supportsCompressPtr& cb, - const Ice::Current&) -{ -#if defined(ICE_OS_UWP) - cb->ice_response(false); -#else - cb->ice_response(true); -#endif -} - -void -MyDerivedClassI::opVoid_async(const Test::AMD_MyClass_opVoidPtr& cb, const Ice::Current& current) -{ - test(current.mode == ICE_ENUM(OperationMode, Normal)); - - IceUtil::Mutex::Lock sync(_opVoidMutex); - if(_opVoidThread) - { - _opVoidThread->getThreadControl().join(); - _opVoidThread = 0; - } - - _opVoidThread = new Thread_opVoid(cb); - _opVoidThread->start(); -} - -void -MyDerivedClassI::opByte_async(const Test::AMD_MyClass_opBytePtr& cb, - Ice::Byte p1, - Ice::Byte p2, - const Ice::Current&) -{ - cb->ice_response(p1, p1 ^ p2); -} - -void -MyDerivedClassI::opBool_async(const Test::AMD_MyClass_opBoolPtr& cb, - bool p1, - bool p2, - const Ice::Current&) -{ - cb->ice_response(p2, p1); -} - -void -MyDerivedClassI::opShortIntLong_async(const Test::AMD_MyClass_opShortIntLongPtr& cb, - Ice::Short p1, - Ice::Int p2, - Ice::Long p3, - const Ice::Current&) -{ - cb->ice_response(p3, p1, p2, p3); -} - -void -MyDerivedClassI::opFloatDouble_async(const Test::AMD_MyClass_opFloatDoublePtr& cb, - Ice::Float p1, - Ice::Double p2, - const Ice::Current&) -{ - cb->ice_response(p2, p1, p2); -} - -void -MyDerivedClassI::opString_async(const Test::AMD_MyClass_opStringPtr& cb, - const std::string& p1, - const std::string& p2, - const Ice::Current&) -{ - cb->ice_response(p1 + " " + p2, p2 + " " + p1); -} - -void -MyDerivedClassI::opMyEnum_async(const Test::AMD_MyClass_opMyEnumPtr& cb, - Test::MyEnum p1, - const Ice::Current&) -{ - cb->ice_response(ICE_ENUM(MyEnum, enum3), p1); -} - -void -MyDerivedClassI::opMyClass_async(const Test::AMD_MyClass_opMyClassPtr& cb, - const Test::MyClassPrxPtr& p1, - const Ice::Current& current) -{ - Test::MyClassPrxPtr p2 = p1; - Test::MyClassPrxPtr p3 = ICE_UNCHECKED_CAST( - Test::MyClassPrx, current.adapter->createProxy( - stringToIdentity("noSuchIdentity"))); - cb->ice_response(ICE_UNCHECKED_CAST(Test::MyClassPrx, current.adapter->createProxy(current.id)), p2, p3); -} - -void -MyDerivedClassI::opStruct_async(const Test::AMD_MyClass_opStructPtr& cb, - const Test::Structure& p1, - const Test::Structure& p2, - const Ice::Current&) -{ - Test::Structure p3 = p1; - p3.s.s = "a new string"; - cb->ice_response(p2, p3); -} - -void -MyDerivedClassI::opByteS_async(const Test::AMD_MyClass_opByteSPtr& cb, - const Test::ByteS& p1, - const Test::ByteS& p2, - const Ice::Current&) -{ - Test::ByteS p3; - p3.resize(p1.size()); - std::reverse_copy(p1.begin(), p1.end(), p3.begin()); - Test::ByteS r = p1; - std::copy(p2.begin(), p2.end(), std::back_inserter(r)); - cb->ice_response(r, p3); -} - -void -MyDerivedClassI::opBoolS_async(const Test::AMD_MyClass_opBoolSPtr& cb, - const Test::BoolS& p1, - const Test::BoolS& p2, - const Ice::Current&) -{ - Test::BoolS p3 = p1; - std::copy(p2.begin(), p2.end(), std::back_inserter(p3)); - Test::BoolS r; - r.resize(p1.size()); - std::reverse_copy(p1.begin(), p1.end(), r.begin()); - cb->ice_response(r, p3); -} - -void -MyDerivedClassI::opShortIntLongS_async(const Test::AMD_MyClass_opShortIntLongSPtr& cb, - const Test::ShortS& p1, - const Test::IntS& p2, - const Test::LongS& p3, - const Ice::Current&) -{ - Test::ShortS p4 = p1; - Test::IntS p5; - p5.resize(p2.size()); - std::reverse_copy(p2.begin(), p2.end(), p5.begin()); - Test::LongS p6 = p3; - std::copy(p3.begin(), p3.end(), std::back_inserter(p6)); - cb->ice_response(p3, p4, p5, p6); -} - -void -MyDerivedClassI::opFloatDoubleS_async(const Test::AMD_MyClass_opFloatDoubleSPtr& cb, - const Test::FloatS& p1, - const Test::DoubleS& p2, - const Ice::Current&) -{ - Test::FloatS p3 = p1; - Test::DoubleS p4; - p4.resize(p2.size()); - std::reverse_copy(p2.begin(), p2.end(), p4.begin()); - Test::DoubleS r = p2; - std::copy(p1.begin(), p1.end(), std::back_inserter(r)); - cb->ice_response(r, p3, p4); -} - -void -MyDerivedClassI::opStringS_async(const Test::AMD_MyClass_opStringSPtr& cb, - const Test::StringS& p1, - const Test::StringS& p2, - const Ice::Current&) -{ - Test::StringS p3 = p1; - std::copy(p2.begin(), p2.end(), std::back_inserter(p3)); - Test::StringS r; - r.resize(p1.size()); - std::reverse_copy(p1.begin(), p1.end(), r.begin()); - cb->ice_response(r, p3); -} - -void -MyDerivedClassI::opByteSS_async(const Test::AMD_MyClass_opByteSSPtr& cb, - const Test::ByteSS& p1, - const Test::ByteSS& p2, - const Ice::Current&) -{ - Test::ByteSS p3; - p3.resize(p1.size()); - std::reverse_copy(p1.begin(), p1.end(), p3.begin()); - Test::ByteSS r = p1; - std::copy(p2.begin(), p2.end(), std::back_inserter(r)); - cb->ice_response(r, p3); -} - -void -MyDerivedClassI::opBoolSS_async(const Test::AMD_MyClass_opBoolSSPtr& cb, - const Test::BoolSS& p1, - const Test::BoolSS& p2, - const Ice::Current&) -{ - Test::BoolSS p3 = p1; - std::copy(p2.begin(), p2.end(), std::back_inserter(p3)); - Test::BoolSS r; - r.resize(p1.size()); - std::reverse_copy(p1.begin(), p1.end(), r.begin()); - cb->ice_response(r, p3); -} - -void -MyDerivedClassI::opShortIntLongSS_async(const Test::AMD_MyClass_opShortIntLongSSPtr& cb, - const Test::ShortSS& p1, - const Test::IntSS& p2, - const Test::LongSS& p3, - const Ice::Current&) -{ - Test::ShortSS p4 = p1; - Test::IntSS p5; - p5.resize(p2.size()); - std::reverse_copy(p2.begin(), p2.end(), p5.begin()); - Test::LongSS p6 = p3; - std::copy(p3.begin(), p3.end(), std::back_inserter(p6)); - cb->ice_response(p3, p4, p5, p6); -} - -void -MyDerivedClassI::opFloatDoubleSS_async(const Test::AMD_MyClass_opFloatDoubleSSPtr& cb, - const Test::FloatSS& p1, - const Test::DoubleSS& p2, - const Ice::Current&) -{ - Test::FloatSS p3 = p1; - Test::DoubleSS p4; - p4.resize(p2.size()); - std::reverse_copy(p2.begin(), p2.end(), p4.begin()); - Test::DoubleSS r = p2; - std::copy(p2.begin(), p2.end(), std::back_inserter(r)); - cb->ice_response(r, p3, p4); -} - -void -MyDerivedClassI::opStringSS_async(const Test::AMD_MyClass_opStringSSPtr& cb, - const Test::StringSS& p1, - const Test::StringSS& p2, - const Ice::Current&) -{ - Test::StringSS p3 = p1; - std::copy(p2.begin(), p2.end(), std::back_inserter(p3)); - Test::StringSS r; - r.resize(p2.size()); - std::reverse_copy(p2.begin(), p2.end(), r.begin()); - cb->ice_response(r, p3); -} - -void -MyDerivedClassI::opStringSSS_async(const Test::AMD_MyClass_opStringSSSPtr& cb, - const Test::StringSSS& p1, - const Test::StringSSS& p2, - const Ice::Current&) -{ - Test::StringSSS p3 = p1; - std::copy(p2.begin(), p2.end(), std::back_inserter(p3)); - Test::StringSSS r; - r.resize(p2.size()); - std::reverse_copy(p2.begin(), p2.end(), r.begin()); - cb->ice_response(r, p3); -} - -void -MyDerivedClassI::opByteBoolD_async(const Test::AMD_MyClass_opByteBoolDPtr& cb, - const Test::ByteBoolD& p1, - const Test::ByteBoolD& p2, - const Ice::Current&) -{ - Test::ByteBoolD p3 = p1; - Test::ByteBoolD r = p1; - std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end())); - cb->ice_response(r, p3); -} - -void -MyDerivedClassI::opShortIntD_async(const Test::AMD_MyClass_opShortIntDPtr& cb, - const Test::ShortIntD& p1, - const Test::ShortIntD& p2, - const Ice::Current&) -{ - Test::ShortIntD p3 = p1; - Test::ShortIntD r = p1; - std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end())); - cb->ice_response(r, p3); -} - -void -MyDerivedClassI::opLongFloatD_async(const Test::AMD_MyClass_opLongFloatDPtr& cb, - const Test::LongFloatD& p1, - const Test::LongFloatD& p2, - const Ice::Current&) -{ - Test::LongFloatD p3 = p1; - Test::LongFloatD r = p1; - std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end())); - cb->ice_response(r, p3); -} - -void -MyDerivedClassI::opStringStringD_async(const Test::AMD_MyClass_opStringStringDPtr& cb, - const Test::StringStringD& p1, - const Test::StringStringD& p2, - const Ice::Current&) -{ - Test::StringStringD p3 = p1; - Test::StringStringD r = p1; - std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end())); - cb->ice_response(r, p3); -} - -void -MyDerivedClassI::opStringMyEnumD_async(const Test::AMD_MyClass_opStringMyEnumDPtr& cb, - const Test::StringMyEnumD& p1, - const Test::StringMyEnumD& p2, - const Ice::Current&) -{ - Test::StringMyEnumD p3 = p1; - Test::StringMyEnumD r = p1; - std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end())); - cb->ice_response(r, p3); -} - -void -MyDerivedClassI::opMyEnumStringD_async(const Test::AMD_MyClass_opMyEnumStringDPtr& cb, - const Test::MyEnumStringD& p1, - const Test::MyEnumStringD& p2, - const Ice::Current&) -{ - Test::MyEnumStringD p3 = p1; - Test::MyEnumStringD r = p1; - std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end())); - cb->ice_response(r, p3); -} - -void -MyDerivedClassI::opMyStructMyEnumD_async(const Test::AMD_MyClass_opMyStructMyEnumDPtr& cb, - const Test::MyStructMyEnumD& p1, - const Test::MyStructMyEnumD& p2, - const Ice::Current&) -{ - Test::MyStructMyEnumD p3 = p1; - Test::MyStructMyEnumD r = p1; - std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end())); - cb->ice_response(r, p3); -} - -void -MyDerivedClassI::opByteBoolDS_async(const Test::AMD_MyClass_opByteBoolDSPtr& cb, - const Test::ByteBoolDS& p1, - const Test::ByteBoolDS& p2, - const Ice::Current&) -{ - Test::ByteBoolDS p3 = p2; - std::copy(p1.begin(), p1.end(), std::back_inserter(p3)); - Test::ByteBoolDS r; - r.resize(p1.size()); - std::reverse_copy(p1.begin(), p1.end(), r.begin()); - cb->ice_response(r, p3); -} - -void -MyDerivedClassI::opShortIntDS_async(const Test::AMD_MyClass_opShortIntDSPtr& cb, - const Test::ShortIntDS& p1, - const Test::ShortIntDS& p2, - const Ice::Current&) -{ - Test::ShortIntDS p3 = p2; - std::copy(p1.begin(), p1.end(), std::back_inserter(p3)); - Test::ShortIntDS r; - r.resize(p1.size()); - std::reverse_copy(p1.begin(), p1.end(), r.begin()); - cb->ice_response(r, p3); -} - -void -MyDerivedClassI::opLongFloatDS_async(const Test::AMD_MyClass_opLongFloatDSPtr& cb, - const Test::LongFloatDS& p1, - const Test::LongFloatDS& p2, - const Ice::Current&) -{ - Test::LongFloatDS p3 = p2; - std::copy(p1.begin(), p1.end(), std::back_inserter(p3)); - Test::LongFloatDS r; - r.resize(p1.size()); - std::reverse_copy(p1.begin(), p1.end(), r.begin()); - cb->ice_response(r, p3); -} - -void -MyDerivedClassI::opStringStringDS_async(const Test::AMD_MyClass_opStringStringDSPtr& cb, - const Test::StringStringDS& p1, - const Test::StringStringDS& p2, - const Ice::Current&) -{ - Test::StringStringDS p3 = p2; - std::copy(p1.begin(), p1.end(), std::back_inserter(p3)); - Test::StringStringDS r; - r.resize(p1.size()); - std::reverse_copy(p1.begin(), p1.end(), r.begin()); - cb->ice_response(r, p3); -} - -void -MyDerivedClassI::opStringMyEnumDS_async(const Test::AMD_MyClass_opStringMyEnumDSPtr& cb, - const Test::StringMyEnumDS& p1, - const Test::StringMyEnumDS& p2, - const Ice::Current&) -{ - Test::StringMyEnumDS p3 = p2; - std::copy(p1.begin(), p1.end(), std::back_inserter(p3)); - Test::StringMyEnumDS r; - r.resize(p1.size()); - std::reverse_copy(p1.begin(), p1.end(), r.begin()); - cb->ice_response(r, p3); -} - -void -MyDerivedClassI::opMyEnumStringDS_async(const Test::AMD_MyClass_opMyEnumStringDSPtr& cb, - const Test::MyEnumStringDS& p1, - const Test::MyEnumStringDS& p2, - const Ice::Current&) -{ - Test::MyEnumStringDS p3 = p2; - std::copy(p1.begin(), p1.end(), std::back_inserter(p3)); - Test::MyEnumStringDS r; - r.resize(p1.size()); - std::reverse_copy(p1.begin(), p1.end(), r.begin()); - cb->ice_response(r, p3); -} - -void -MyDerivedClassI::opMyStructMyEnumDS_async(const Test::AMD_MyClass_opMyStructMyEnumDSPtr& cb, - const Test::MyStructMyEnumDS& p1, - const Test::MyStructMyEnumDS& p2, - const Ice::Current&) -{ - Test::MyStructMyEnumDS p3 = p2; - std::copy(p1.begin(), p1.end(), std::back_inserter(p3)); - Test::MyStructMyEnumDS r; - r.resize(p1.size()); - std::reverse_copy(p1.begin(), p1.end(), r.begin()); - cb->ice_response(r, p3); -} - -void -MyDerivedClassI::opByteByteSD_async(const Test::AMD_MyClass_opByteByteSDPtr& cb, - const Test::ByteByteSD& p1, - const Test::ByteByteSD& p2, - const Ice::Current&) -{ - Test::ByteByteSD p3 = p2; - Test::ByteByteSD r; - std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end())); - cb->ice_response(r, p3); -} - -void -MyDerivedClassI::opBoolBoolSD_async(const Test::AMD_MyClass_opBoolBoolSDPtr& cb, - const Test::BoolBoolSD& p1, - const Test::BoolBoolSD& p2, - const Ice::Current&) -{ - Test::BoolBoolSD p3 = p2; - Test::BoolBoolSD r; - std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end())); - cb->ice_response(r, p3); -} - -void -MyDerivedClassI::opShortShortSD_async(const Test::AMD_MyClass_opShortShortSDPtr& cb, - const Test::ShortShortSD& p1, - const Test::ShortShortSD& p2, - const Ice::Current&) -{ - Test::ShortShortSD p3 = p2; - Test::ShortShortSD r; - std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end())); - cb->ice_response(r, p3); -} - -void -MyDerivedClassI::opIntIntSD_async(const Test::AMD_MyClass_opIntIntSDPtr& cb, - const Test::IntIntSD& p1, - const Test::IntIntSD& p2, - const Ice::Current&) -{ - Test::IntIntSD p3 = p2; - Test::IntIntSD r; - std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end())); - cb->ice_response(r, p3); -} - -void -MyDerivedClassI::opLongLongSD_async(const Test::AMD_MyClass_opLongLongSDPtr& cb, - const Test::LongLongSD& p1, - const Test::LongLongSD& p2, - const Ice::Current&) -{ - Test::LongLongSD p3 = p2; - Test::LongLongSD r; - std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end())); - cb->ice_response(r, p3); -} - -void -MyDerivedClassI::opStringFloatSD_async(const Test::AMD_MyClass_opStringFloatSDPtr& cb, - const Test::StringFloatSD& p1, - const Test::StringFloatSD& p2, - const Ice::Current&) -{ - Test::StringFloatSD p3 = p2; - Test::StringFloatSD r; - std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end())); - cb->ice_response(r, p3); -} - -void -MyDerivedClassI::opStringDoubleSD_async(const Test::AMD_MyClass_opStringDoubleSDPtr& cb, - const Test::StringDoubleSD& p1, - const Test::StringDoubleSD& p2, - const Ice::Current&) -{ - Test::StringDoubleSD p3 = p2; - Test::StringDoubleSD r; - std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end())); - cb->ice_response(r, p3); -} - -void -MyDerivedClassI::opStringStringSD_async(const Test::AMD_MyClass_opStringStringSDPtr& cb, - const Test::StringStringSD& p1, - const Test::StringStringSD& p2, - const Ice::Current&) -{ - Test::StringStringSD p3 = p2; - Test::StringStringSD r; - std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end())); - cb->ice_response(r, p3); -} - -void -MyDerivedClassI::opMyEnumMyEnumSD_async(const Test::AMD_MyClass_opMyEnumMyEnumSDPtr& cb, - const Test::MyEnumMyEnumSD& p1, - const Test::MyEnumMyEnumSD& p2, - const Ice::Current&) -{ - Test::MyEnumMyEnumSD p3 = p2; - Test::MyEnumMyEnumSD r; - std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end())); - cb->ice_response(r, p3); -} - -void -MyDerivedClassI::opIntS_async(const Test::AMD_MyClass_opIntSPtr& cb, const Test::IntS& s, const Ice::Current&) -{ - Test::IntS r; - std::transform(s.begin(), s.end(), std::back_inserter(r), std::negate()); - cb->ice_response(r); -} - -void -MyDerivedClassI::opByteSOneway_async(const Test::AMD_MyClass_opByteSOnewayPtr& cb, const Test::ByteS&, - const Ice::Current&) -{ - IceUtil::Mutex::Lock sync(_mutex); - ++_opByteSOnewayCallCount; - cb->ice_response(); -} - -void -MyDerivedClassI::opByteSOnewayCallCount_async(const Test::AMD_MyClass_opByteSOnewayCallCountPtr& cb, - const Ice::Current&) -{ - IceUtil::Mutex::Lock sync(_mutex); - cb->ice_response(_opByteSOnewayCallCount); - _opByteSOnewayCallCount = 0; -} - -void -MyDerivedClassI::opContext_async(const Test::AMD_MyClass_opContextPtr& cb, const Ice::Current& c) -{ - Test::StringStringD r = c.ctx; - cb->ice_response(r); -} - -void -MyDerivedClassI::opDoubleMarshaling_async(const Test::AMD_MyClass_opDoubleMarshalingPtr& cb, - Ice::Double p1, const Test::DoubleS& p2, const Ice::Current&) -{ - Ice::Double d = 1278312346.0 / 13.0; - test(p1 == d); - for(unsigned int i = 0; i < p2.size(); ++i) - { - test(p2[i] == d); - } - cb->ice_response(); -} - -void -MyDerivedClassI::opIdempotent_async(const Test::AMD_MyClass_opIdempotentPtr& cb, const Ice::Current& current) -{ - test(current.mode == ICE_ENUM(OperationMode, Idempotent)); - cb->ice_response(); -} - -void -MyDerivedClassI::opNonmutating_async(const Test::AMD_MyClass_opNonmutatingPtr& cb, const Ice::Current& current) -{ - test(current.mode == ICE_ENUM(OperationMode, Nonmutating)); - cb->ice_response(); -} - -void -MyDerivedClassI::opDerived_async(const Test::AMD_MyDerivedClass_opDerivedPtr& cb, const Ice::Current&) -{ - cb->ice_response(); -} - -void -MyDerivedClassI::opByte1_async(const Test::AMD_MyClass_opByte1Ptr& cb, Ice::Byte b, const Ice::Current&) -{ - cb->ice_response(b); -} - -void -MyDerivedClassI::opShort1_async(const Test::AMD_MyClass_opShort1Ptr& cb, Ice::Short s, const Ice::Current&) -{ - cb->ice_response(s); -} - -void -MyDerivedClassI::opInt1_async(const Test::AMD_MyClass_opInt1Ptr& cb, Ice::Int i, const Ice::Current&) -{ - cb->ice_response(i); -} - -void -MyDerivedClassI::opLong1_async(const Test::AMD_MyClass_opLong1Ptr& cb, Ice::Long l, const Ice::Current&) -{ - cb->ice_response(l); -} - -void -MyDerivedClassI::opFloat1_async(const Test::AMD_MyClass_opFloat1Ptr& cb, Ice::Float f, const Ice::Current&) -{ - cb->ice_response(f); -} - -void -MyDerivedClassI::opDouble1_async(const Test::AMD_MyClass_opDouble1Ptr& cb, Ice::Double d, const Ice::Current&) -{ - cb->ice_response(d); -} - -void -MyDerivedClassI::opString1_async(const Test::AMD_MyClass_opString1Ptr& cb, const std::string& s, - const Ice::Current&) -{ - cb->ice_response(s); -} - -void -MyDerivedClassI::opStringS1_async(const Test::AMD_MyClass_opStringS1Ptr& cb, const Test::StringS& seq, - const Ice::Current&) -{ - cb->ice_response(seq); -} - -void -MyDerivedClassI::opByteBoolD1_async(const Test::AMD_MyClass_opByteBoolD1Ptr& cb, const Test::ByteBoolD& dict, - const Ice::Current&) -{ - cb->ice_response(dict); -} - -void -MyDerivedClassI::opStringS2_async(const Test::AMD_MyClass_opStringS2Ptr& cb, const Test::StringS& seq, - const Ice::Current&) -{ - cb->ice_response(seq); -} - -void -MyDerivedClassI::opByteBoolD2_async(const Test::AMD_MyClass_opByteBoolD2Ptr& cb, const Test::ByteBoolD& dict, - const Ice::Current&) -{ - cb->ice_response(dict); -} - -void -MyDerivedClassI::opMyStruct1_async(const Test::AMD_MyDerivedClass_opMyStruct1Ptr& cb, const Test::MyStruct1& s, - const Ice::Current&) -{ - cb->ice_response(s); -} - -void -MyDerivedClassI::opMyClass1_async(const Test::AMD_MyDerivedClass_opMyClass1Ptr& cb, const Test::MyClass1Ptr& c, - const Ice::Current&) -{ - cb->ice_response(c); -} - -void -MyDerivedClassI::opStringLiterals_async(const Test::AMD_MyClass_opStringLiteralsPtr& cb, - const Ice::Current&) -{ - Test::StringS data; - data.push_back(Test::s0); - data.push_back(Test::s1); - data.push_back(Test::s2); - data.push_back(Test::s3); - data.push_back(Test::s4); - data.push_back(Test::s5); - data.push_back(Test::s6); - data.push_back(Test::s7); - data.push_back(Test::s8); - data.push_back(Test::s9); - data.push_back(Test::s10); - - data.push_back(Test::sw0); - data.push_back(Test::sw1); - data.push_back(Test::sw2); - data.push_back(Test::sw3); - data.push_back(Test::sw4); - data.push_back(Test::sw5); - data.push_back(Test::sw6); - data.push_back(Test::sw7); - data.push_back(Test::sw8); - data.push_back(Test::sw9); - data.push_back(Test::sw10); - - data.push_back(Test::ss0); - data.push_back(Test::ss1); - data.push_back(Test::ss2); - data.push_back(Test::ss3); - data.push_back(Test::ss4); - data.push_back(Test::ss5); - - data.push_back(Test::su0); - data.push_back(Test::su1); - data.push_back(Test::su2); - cb->ice_response(data); -} - -void -MyDerivedClassI::opWStringLiterals_async(const Test::AMD_MyClass_opWStringLiteralsPtr& cb, - const Ice::Current&) -{ - Test::WStringS data; - data.push_back(Test::ws0); - data.push_back(Test::ws1); - data.push_back(Test::ws2); - data.push_back(Test::ws3); - data.push_back(Test::ws4); - data.push_back(Test::ws5); - data.push_back(Test::ws6); - data.push_back(Test::ws7); - data.push_back(Test::ws8); - data.push_back(Test::ws9); - data.push_back(Test::ws10); - - data.push_back(Test::wsw0); - data.push_back(Test::wsw1); - data.push_back(Test::wsw2); - data.push_back(Test::wsw3); - data.push_back(Test::wsw4); - data.push_back(Test::wsw5); - data.push_back(Test::wsw6); - data.push_back(Test::wsw7); - data.push_back(Test::wsw8); - data.push_back(Test::wsw9); - data.push_back(Test::wsw10); - - data.push_back(Test::wss0); - data.push_back(Test::wss1); - data.push_back(Test::wss2); - data.push_back(Test::wss3); - data.push_back(Test::wss4); - data.push_back(Test::wss5); - - data.push_back(Test::wsu0); - data.push_back(Test::wsu1); - data.push_back(Test::wsu2); - cb->ice_response(data); -} - -void -MyDerivedClassI::opMStruct1_async(const Test::AMD_MyClass_opMStruct1Ptr& cb, - const Ice::Current&) -{ - Test::Structure s; - s.e = ICE_ENUM(MyEnum, enum1); // enum must be initialized - return cb->ice_response(s); -} - -void -MyDerivedClassI::opMStruct2_async(const Test::AMD_MyClass_opMStruct2Ptr& cb, - const Test::Structure& p1, - const Ice::Current&) -{ - cb->ice_response(p1,p1); -} - -void -MyDerivedClassI::opMSeq1_async(const Test::AMD_MyClass_opMSeq1Ptr& cb, - const Ice::Current&) -{ - cb->ice_response(Test::StringS()); -} - -void -MyDerivedClassI::opMSeq2_async(const Test::AMD_MyClass_opMSeq2Ptr& cb, - const Test::StringS& p1, - const Ice::Current&) -{ - cb->ice_response(p1,p1); -} - -void -MyDerivedClassI::opMDict1_async(const Test::AMD_MyClass_opMDict1Ptr& cb, - const Ice::Current&) -{ - cb->ice_response(Test::StringStringD()); -} - -void -MyDerivedClassI::opMDict2_async(const Test::AMD_MyClass_opMDict2Ptr& cb, - const Test::StringStringD& p1, - const Ice::Current&) -{ - cb->ice_response(p1,p1); -} - -#endif diff --git a/cpp/test/Ice/operations/TestAMDI.h b/cpp/test/Ice/operations/TestAMDI.h index 3249e308b14..389cb5967d3 100644 --- a/cpp/test/Ice/operations/TestAMDI.h +++ b/cpp/test/Ice/operations/TestAMDI.h @@ -22,7 +22,6 @@ class MyDerivedClassI : public Test::MyDerivedClass virtual std::vector ice_ids(const Ice::Current&) const; virtual std::string ice_id(const Ice::Current&) const; -#ifdef ICE_CPP11_MAPPING virtual void shutdownAsync(::std::function, ::std::function, const Ice::Current&); @@ -399,284 +398,6 @@ class MyDerivedClassI : public Test::MyDerivedClass ::std::function, const Ice::Current&); -#else - virtual void shutdown_async(const Test::AMD_MyClass_shutdownPtr&, - const Ice::Current&); - - virtual void supportsCompress_async(const Test::AMD_MyClass_supportsCompressPtr&, - const Ice::Current&); - - virtual void opVoid_async(const Test::AMD_MyClass_opVoidPtr&, - const Ice::Current&); - - virtual void opByte_async(const Test::AMD_MyClass_opBytePtr&, - Ice::Byte, Ice::Byte, - const Ice::Current&); - - virtual void opBool_async(const Test::AMD_MyClass_opBoolPtr&, - bool, bool, - const Ice::Current&); - - virtual void opShortIntLong_async(const Test::AMD_MyClass_opShortIntLongPtr&, - Ice::Short, Ice::Int, Ice::Long, - const Ice::Current&); - - virtual void opFloatDouble_async(const Test::AMD_MyClass_opFloatDoublePtr&, - Ice::Float, Ice::Double, - const Ice::Current&); - - virtual void opString_async(const Test::AMD_MyClass_opStringPtr&, - const std::string&, const std::string&, - const Ice::Current&); - - virtual void opMyEnum_async(const Test::AMD_MyClass_opMyEnumPtr&, - Test::MyEnum, - const Ice::Current&); - - virtual void opMyClass_async(const Test::AMD_MyClass_opMyClassPtr&, - const Test::MyClassPrxPtr&, - const Ice::Current&); - - virtual void opStruct_async(const Test::AMD_MyClass_opStructPtr&, - const Test::Structure&, const Test::Structure&, - const Ice::Current&); - - virtual void opByteS_async(const Test::AMD_MyClass_opByteSPtr&, - const Test::ByteS&, const Test::ByteS&, - const Ice::Current&); - - virtual void opBoolS_async(const Test::AMD_MyClass_opBoolSPtr&, - const Test::BoolS&, const Test::BoolS&, - const Ice::Current&); - - virtual void opShortIntLongS_async(const Test::AMD_MyClass_opShortIntLongSPtr&, - const Test::ShortS&, const Test::IntS&, const Test::LongS&, - const Ice::Current&); - - virtual void opFloatDoubleS_async(const Test::AMD_MyClass_opFloatDoubleSPtr&, - const Test::FloatS&, const Test::DoubleS&, - const Ice::Current&); - - virtual void opStringS_async(const Test::AMD_MyClass_opStringSPtr&, - const Test::StringS&, const Test::StringS&, - const Ice::Current&); - - virtual void opByteSS_async(const Test::AMD_MyClass_opByteSSPtr&, - const Test::ByteSS&, const Test::ByteSS&, - const Ice::Current&); - - virtual void opBoolSS_async(const Test::AMD_MyClass_opBoolSSPtr&, - const Test::BoolSS&, const Test::BoolSS&, - const Ice::Current&); - - virtual void opShortIntLongSS_async(const Test::AMD_MyClass_opShortIntLongSSPtr&, - const Test::ShortSS&, const Test::IntSS&, const Test::LongSS&, - const Ice::Current&); - - virtual void opFloatDoubleSS_async(const Test::AMD_MyClass_opFloatDoubleSSPtr&, - const Test::FloatSS&, const Test::DoubleSS&, - const Ice::Current&); - - virtual void opStringSS_async(const Test::AMD_MyClass_opStringSSPtr&, - const Test::StringSS&, const Test::StringSS&, - const Ice::Current&); - - virtual void opStringSSS_async(const Test::AMD_MyClass_opStringSSSPtr&, - const Test::StringSSS&, const Test::StringSSS&, - const Ice::Current&); - - virtual void opByteBoolD_async(const Test::AMD_MyClass_opByteBoolDPtr&, - const Test::ByteBoolD&, const Test::ByteBoolD&, - const Ice::Current&); - - virtual void opShortIntD_async(const Test::AMD_MyClass_opShortIntDPtr&, - const Test::ShortIntD&, const Test::ShortIntD&, - const Ice::Current&); - - virtual void opLongFloatD_async(const Test::AMD_MyClass_opLongFloatDPtr&, - const Test::LongFloatD&, const Test::LongFloatD&, - const Ice::Current&); - - virtual void opStringStringD_async(const Test::AMD_MyClass_opStringStringDPtr&, - const Test::StringStringD&, const Test::StringStringD&, - const Ice::Current&); - - virtual void opStringMyEnumD_async(const Test::AMD_MyClass_opStringMyEnumDPtr&, - const Test::StringMyEnumD&, const Test::StringMyEnumD&, - const Ice::Current&); - - virtual void opMyEnumStringD_async(const Test::AMD_MyClass_opMyEnumStringDPtr&, - const Test::MyEnumStringD&, const Test::MyEnumStringD&, - const Ice::Current&); - - virtual void opMyStructMyEnumD_async(const Test::AMD_MyClass_opMyStructMyEnumDPtr&, - const Test::MyStructMyEnumD&, const Test::MyStructMyEnumD&, - const Ice::Current&); - - virtual void opByteBoolDS_async(const Test::AMD_MyClass_opByteBoolDSPtr&, - const Test::ByteBoolDS&, const Test::ByteBoolDS&, - const Ice::Current&); - - virtual void opShortIntDS_async(const Test::AMD_MyClass_opShortIntDSPtr&, - const Test::ShortIntDS&, const Test::ShortIntDS&, - const Ice::Current&); - - virtual void opLongFloatDS_async(const Test::AMD_MyClass_opLongFloatDSPtr&, - const Test::LongFloatDS&, const Test::LongFloatDS&, - const Ice::Current&); - - virtual void opStringStringDS_async(const Test::AMD_MyClass_opStringStringDSPtr&, - const Test::StringStringDS&, const Test::StringStringDS&, - const Ice::Current&); - - virtual void opStringMyEnumDS_async(const Test::AMD_MyClass_opStringMyEnumDSPtr&, - const Test::StringMyEnumDS&, const Test::StringMyEnumDS&, - const Ice::Current&); - - virtual void opMyEnumStringDS_async(const Test::AMD_MyClass_opMyEnumStringDSPtr&, - const Test::MyEnumStringDS&, const Test::MyEnumStringDS&, - const Ice::Current&); - - virtual void opMyStructMyEnumDS_async(const Test::AMD_MyClass_opMyStructMyEnumDSPtr&, - const Test::MyStructMyEnumDS&, const Test::MyStructMyEnumDS&, - const Ice::Current&); - - virtual void opByteByteSD_async(const Test::AMD_MyClass_opByteByteSDPtr&, - const Test::ByteByteSD&, const Test::ByteByteSD&, - const Ice::Current&); - - virtual void opBoolBoolSD_async(const Test::AMD_MyClass_opBoolBoolSDPtr&, - const Test::BoolBoolSD&, const Test::BoolBoolSD&, - const Ice::Current&); - - virtual void opShortShortSD_async(const Test::AMD_MyClass_opShortShortSDPtr&, - const Test::ShortShortSD&, const Test::ShortShortSD&, - const Ice::Current&); - - virtual void opIntIntSD_async(const Test::AMD_MyClass_opIntIntSDPtr&, - const Test::IntIntSD&, const Test::IntIntSD&, - const Ice::Current&); - - virtual void opLongLongSD_async(const Test::AMD_MyClass_opLongLongSDPtr&, - const Test::LongLongSD&, const Test::LongLongSD&, - const Ice::Current&); - - virtual void opStringFloatSD_async(const Test::AMD_MyClass_opStringFloatSDPtr&, - const Test::StringFloatSD&, const Test::StringFloatSD&, - const Ice::Current&); - - virtual void opStringDoubleSD_async(const Test::AMD_MyClass_opStringDoubleSDPtr&, - const Test::StringDoubleSD&, const Test::StringDoubleSD&, - const Ice::Current&); - - virtual void opStringStringSD_async(const Test::AMD_MyClass_opStringStringSDPtr&, - const Test::StringStringSD&, const Test::StringStringSD&, - const Ice::Current&); - - virtual void opMyEnumMyEnumSD_async(const Test::AMD_MyClass_opMyEnumMyEnumSDPtr&, - const Test::MyEnumMyEnumSD&, const Test::MyEnumMyEnumSD&, - const Ice::Current&); - - virtual void opIntS_async(const Test::AMD_MyClass_opIntSPtr&, const Test::IntS&, const Ice::Current&); - - virtual void opByteSOneway_async(const Test::AMD_MyClass_opByteSOnewayPtr&, const Test::ByteS&, - const Ice::Current&); - virtual void opByteSOnewayCallCount_async(const Test::AMD_MyClass_opByteSOnewayCallCountPtr&, const Ice::Current&); - - virtual void opContext_async(const Test::AMD_MyClass_opContextPtr&, const Ice::Current&); - - virtual void opDoubleMarshaling_async(const Test::AMD_MyClass_opDoubleMarshalingPtr&, - Ice::Double, const Test::DoubleS&, const Ice::Current&); - - virtual void opIdempotent_async(const Test::AMD_MyClass_opIdempotentPtr&, - const Ice::Current&); - - virtual void opNonmutating_async(const Test::AMD_MyClass_opNonmutatingPtr&, - const Ice::Current&); - - virtual void opDerived_async(const Test::AMD_MyDerivedClass_opDerivedPtr&, - const Ice::Current&); - - virtual void opByte1_async(const Test::AMD_MyClass_opByte1Ptr&, - Ice::Byte, - const Ice::Current&); - - virtual void opShort1_async(const Test::AMD_MyClass_opShort1Ptr&, - Ice::Short, - const Ice::Current&); - - virtual void opInt1_async(const Test::AMD_MyClass_opInt1Ptr&, - Ice::Int, - const Ice::Current&); - - virtual void opLong1_async(const Test::AMD_MyClass_opLong1Ptr&, - Ice::Long, - const Ice::Current&); - - virtual void opFloat1_async(const Test::AMD_MyClass_opFloat1Ptr&, - Ice::Float, - const Ice::Current&); - - virtual void opDouble1_async(const Test::AMD_MyClass_opDouble1Ptr&, - Ice::Double, - const Ice::Current&); - - virtual void opString1_async(const Test::AMD_MyClass_opString1Ptr&, - const std::string&, - const Ice::Current&); - - virtual void opStringS1_async(const Test::AMD_MyClass_opStringS1Ptr&, - const Test::StringS&, - const Ice::Current&); - - virtual void opByteBoolD1_async(const Test::AMD_MyClass_opByteBoolD1Ptr&, - const Test::ByteBoolD&, - const Ice::Current&); - - virtual void opStringS2_async(const Test::AMD_MyClass_opStringS2Ptr&, - const Test::StringS&, - const Ice::Current&); - - virtual void opByteBoolD2_async(const Test::AMD_MyClass_opByteBoolD2Ptr&, - const Test::ByteBoolD&, - const Ice::Current&); - - virtual void opMyStruct1_async(const Test::AMD_MyDerivedClass_opMyStruct1Ptr&, - const Test::MyStruct1&, - const Ice::Current&); - - virtual void opMyClass1_async(const Test::AMD_MyDerivedClass_opMyClass1Ptr&, - const Test::MyClass1Ptr&, - const Ice::Current&); - - virtual void opStringLiterals_async(const Test::AMD_MyClass_opStringLiteralsPtr&, - const Ice::Current&); - - virtual void opWStringLiterals_async(const Test::AMD_MyClass_opWStringLiteralsPtr&, - const Ice::Current&); - - virtual void opMStruct1_async(const Test::AMD_MyClass_opMStruct1Ptr&, - const Ice::Current&); - - virtual void opMStruct2_async(const Test::AMD_MyClass_opMStruct2Ptr&, - const Test::Structure&, - const Ice::Current&); - - virtual void opMSeq1_async(const Test::AMD_MyClass_opMSeq1Ptr&, - const Ice::Current&); - - virtual void opMSeq2_async(const Test::AMD_MyClass_opMSeq2Ptr&, - const Test::StringS&, - const Ice::Current&); - - virtual void opMDict1_async(const Test::AMD_MyClass_opMDict1Ptr&, - const Ice::Current&); - - virtual void opMDict2_async(const Test::AMD_MyClass_opMDict2Ptr&, - const Test::StringStringD&, - const Ice::Current&); -#endif - private: IceUtil::ThreadPtr _opVoidThread; IceUtil::Mutex _opVoidMutex; diff --git a/cpp/test/Ice/operations/TestI.cpp b/cpp/test/Ice/operations/TestI.cpp index 21d42cf0811..9e057a02731 100644 --- a/cpp/test/Ice/operations/TestI.cpp +++ b/cpp/test/Ice/operations/TestI.cpp @@ -827,7 +827,6 @@ MyDerivedClassI::opWStringLiterals(const Ice::Current&) return data; } -#ifdef ICE_CPP11_MAPPING MyDerivedClassI::OpMStruct1MarshaledResult MyDerivedClassI::opMStruct1(const Ice::Current& current) { @@ -865,48 +864,3 @@ MyDerivedClassI::opMDict2(ICE_IN(Test::StringStringD) p1, const Ice::Current& cu { return OpMDict2MarshaledResult(p1, p1, current); } - -#else - -Test::Structure -MyDerivedClassI::opMStruct1(const Ice::Current&) -{ - Test::Structure s; - s.e = ICE_ENUM(MyEnum, enum1); // enum must be initialized - return s; -} - -Test::Structure -MyDerivedClassI::opMStruct2(ICE_IN(Test::Structure) p1, Test::Structure& p2, const Ice::Current&) -{ - p2 = p1; - return p1; -} - -Test::StringS -MyDerivedClassI::opMSeq1(const Ice::Current&) -{ - return Test::StringS(); -} - -Test::StringS -MyDerivedClassI::opMSeq2(ICE_IN(Test::StringS) p1, Test::StringS& p2, const Ice::Current&) -{ - p2 = p1; - return p1; -} - -Test::StringStringD -MyDerivedClassI::opMDict1(const Ice::Current&) -{ - return Test::StringStringD(); -} - -Test::StringStringD -MyDerivedClassI::opMDict2(ICE_IN(Test::StringStringD) p1, Test::StringStringD& p2, const Ice::Current&) -{ - p2 = p1; - return p1; -} - -#endif diff --git a/cpp/test/Ice/operations/TestI.h b/cpp/test/Ice/operations/TestI.h index ced966b59c0..38b1e9dfe9d 100644 --- a/cpp/test/Ice/operations/TestI.h +++ b/cpp/test/Ice/operations/TestI.h @@ -292,7 +292,6 @@ class MyDerivedClassI : public Test::MyDerivedClass virtual Test::WStringS opWStringLiterals(const Ice::Current&); -#ifdef ICE_CPP11_MAPPING virtual OpMStruct1MarshaledResult opMStruct1(const Ice::Current&); virtual OpMStruct2MarshaledResult opMStruct2(ICE_IN(Test::Structure), const Ice::Current&); @@ -304,19 +303,6 @@ class MyDerivedClassI : public Test::MyDerivedClass virtual OpMDict1MarshaledResult opMDict1(const Ice::Current&); virtual OpMDict2MarshaledResult opMDict2(ICE_IN(Test::StringStringD), const Ice::Current&); -#else - virtual Test::Structure opMStruct1(const Ice::Current&); - - virtual Test::Structure opMStruct2(ICE_IN(Test::Structure), Test::Structure&, const Ice::Current&); - - virtual Test::StringS opMSeq1(const Ice::Current&); - - virtual Test::StringS opMSeq2(ICE_IN(Test::StringS), Test::StringS&, const Ice::Current&); - - virtual Test::StringStringD opMDict1(const Ice::Current&); - - virtual Test::StringStringD opMDict2(ICE_IN(Test::StringStringD), Test::StringStringD&, const Ice::Current&); -#endif private: diff --git a/cpp/test/Ice/operations/Twoways.cpp b/cpp/test/Ice/operations/Twoways.cpp index 51549ec69e3..077eb2c3a81 100644 --- a/cpp/test/Ice/operations/Twoways.cpp +++ b/cpp/test/Ice/operations/Twoways.cpp @@ -381,11 +381,7 @@ twoways(const Ice::CommunicatorPtr& communicator, Test::TestHelper*, const Test: test(rso.p == 0); test(rso.e == ICE_ENUM(MyEnum, enum2)); test(rso.s.s == "def"); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(so.p, p)); -#else - test(so.p == p); -#endif test(so.e == ICE_ENUM(MyEnum, enum3)); test(so.s.s == "a new string"); so.p->opVoid(); diff --git a/cpp/test/Ice/operations/TwowaysAMI.cpp b/cpp/test/Ice/operations/TwowaysAMI.cpp index 74f70e2d6cf..23f9558fa6e 100644 --- a/cpp/test/Ice/operations/TwowaysAMI.cpp +++ b/cpp/test/Ice/operations/TwowaysAMI.cpp @@ -27,9 +27,6 @@ namespace { class CallbackBase -#ifndef ICE_CPP11_MAPPING -: public Ice::LocalObject -#endif { public: @@ -1032,7 +1029,6 @@ ICE_DEFINE_PTR(CallbackPtr, Callback); } -#ifdef ICE_CPP11_MAPPING function makeExceptionClosure(CallbackPtr& cb) { @@ -1048,32 +1044,23 @@ makeExceptionClosure(CallbackPtr& cb) } }; } -#endif void twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& p) { { CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->ice_pingAsync( [&]() { cb->ping(); }, makeExceptionClosure(cb)); -#else - Ice::Callback_Object_ice_pingPtr callback = Ice::newCallback_Object_ice_ping(cb, - &Callback::ping, - &Callback::exCB); - p->begin_ice_ping(callback); -#endif cb->check(); } { CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->ice_isAAsync( Test::MyClass::ice_staticId(), [&](bool v) @@ -1081,192 +1068,116 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& cb->isA(v); }, makeExceptionClosure(cb)); -#else - Ice::Callback_Object_ice_isAPtr callback = Ice::newCallback_Object_ice_isA(cb, - &Callback::isA, - &Callback::exCB); - p->begin_ice_isA(Test::MyClass::ice_staticId(), callback); -#endif cb->check(); } { CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->ice_idAsync( [&](string id) { cb->id(std::move(id)); }, makeExceptionClosure(cb)); -#else - Ice::Callback_Object_ice_idPtr callback = Ice::newCallback_Object_ice_id(cb, - &Callback::id, - &Callback::exCB); - p->begin_ice_id(callback); -#endif cb->check(); } { CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->ice_idsAsync( [&](vector ids) { cb->ids(std::move(ids)); }, makeExceptionClosure(cb)); - -#else - Ice::Callback_Object_ice_idsPtr callback = Ice::newCallback_Object_ice_ids(cb, - &Callback::ids, - &Callback::exCB); - p->begin_ice_ids(callback); -#endif cb->check(); } { CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opVoidAsync( [&]() { cb->opVoid(); }, makeExceptionClosure(cb)); - -#else - Test::Callback_MyClass_opVoidPtr callback = Test::newCallback_MyClass_opVoid(cb, - &Callback::opVoid, - &Callback::exCB); - p->begin_opVoid(callback); -#endif cb->check(); } { CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opByteAsync(Ice::Byte(0xff), Ice::Byte(0x0f), [&](Ice::Byte b1, Ice::Byte b2) { cb->opByte(b1, b2); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyClass_opBytePtr callback = Test::newCallback_MyClass_opByte(cb, - &Callback::opByte, - &Callback::exCB); - p->begin_opByte(Ice::Byte(0xff), Ice::Byte(0x0f), callback); -#endif cb->check(); } { CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opBoolAsync(true, false, [&](bool b1, bool b2) { cb->opBool(b1, b2); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyClass_opBoolPtr callback = Test::newCallback_MyClass_opBool(cb, - &Callback::opBool, - &Callback::exCB); - p->begin_opBool(true, false, callback); -#endif cb->check(); } { CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opShortIntLongAsync(10, 11, 12, [&](long long int l1, short s1P, int i1, long long int l2) { cb->opShortIntLong(l1, s1P, i1, l2); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyClass_opShortIntLongPtr callback = - Test::newCallback_MyClass_opShortIntLong(cb, &Callback::opShortIntLong, &Callback::exCB); - p->begin_opShortIntLong(10, 11, 12, callback); -#endif cb->check(); } { CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opFloatDoubleAsync(3.14f, 1.1E10, [&](double d1, float f1, double d2) { cb->opFloatDouble(d1, f1, d2); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyClass_opFloatDoublePtr callback = - Test::newCallback_MyClass_opFloatDouble(cb, &Callback::opFloatDouble, &Callback::exCB); - p->begin_opFloatDouble(Ice::Float(3.14), Ice::Double(1.1E10), callback); -#endif cb->check(); } { CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opStringAsync("hello", "world", [&](string s1P, string s2P) { cb->opString(std::move(s1P), std::move(s2P)); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyClass_opStringPtr callback = Test::newCallback_MyClass_opString(cb, - &Callback::opString, - &Callback::exCB); - p->begin_opString("hello", "world", callback); -#endif cb->check(); } { CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opMyEnumAsync(Test::MyEnum::enum2, [&](Test::MyEnum e1, Test::MyEnum e2) { cb->opMyEnum(e1, e2); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyClass_opMyEnumPtr callback = Test::newCallback_MyClass_opMyEnum(cb, - &Callback::opMyEnum, - &Callback::exCB); - p->begin_opMyEnum(Test::enum2, callback); -#endif cb->check(); } { CallbackPtr cb = ICE_MAKE_SHARED(Callback, communicator); -#ifdef ICE_CPP11_MAPPING p->opMyClassAsync(p, [&](shared_ptr c1, shared_ptr c2, shared_ptr c3) { cb->opMyClass(std::move(c1), std::move(c2), std::move(c3)); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyClass_opMyClassPtr callback = Test::newCallback_MyClass_opMyClass(cb, - &Callback::opMyClass, - &Callback::exCB); - p->begin_opMyClass(p, callback); -#endif cb->check(); } @@ -1281,19 +1192,12 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& si2.s.s = "def"; CallbackPtr cb = ICE_MAKE_SHARED(Callback, communicator); -#ifdef ICE_CPP11_MAPPING p->opStructAsync(si1, si2, [&](Test::Structure si3, Test::Structure si4) { cb->opStruct(std::move(si3), std::move(si4)); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyClass_opStructPtr callback = Test::newCallback_MyClass_opStruct(cb, - &Callback::opStruct, - &Callback::exCB); - p->begin_opStruct(si1, si2, callback); -#endif cb->check(); } @@ -1312,19 +1216,12 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& bsi2.push_back(Ice::Byte(0xf4)); CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opByteSAsync(bsi1, bsi2, [&](Test::ByteS bsi3, Test::ByteS bsi4) { cb->opByteS(std::move(bsi3), std::move(bsi4)); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyClass_opByteSPtr callback = Test::newCallback_MyClass_opByteS(cb, - &Callback::opByteS, - &Callback::exCB); - p->begin_opByteS(bsi1, bsi2, callback); -#endif cb->check(); } @@ -1339,19 +1236,12 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& bsi2.push_back(false); CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opBoolSAsync(bsi1, bsi2, [&](Test::BoolS bsi3, Test::BoolS bsi4) { cb->opBoolS(std::move(bsi3), std::move(bsi4)); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyClass_opBoolSPtr callback = Test::newCallback_MyClass_opBoolS(cb, - &Callback::opBoolS, - &Callback::exCB); - p->begin_opBoolS(bsi1, bsi2, callback); -#endif cb->check(); } @@ -1374,18 +1264,12 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& lsi.push_back(20); CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opShortIntLongSAsync(ssi, isi, lsi, [&](Test::LongS lsi1, Test::ShortS ssi1, Test::IntS isi1, Test::LongS lsi2) { cb->opShortIntLongS(std::move(lsi1), std::move(ssi1), std::move(isi1), std::move(lsi2)); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyClass_opShortIntLongSPtr callback = - Test::newCallback_MyClass_opShortIntLongS(cb, &Callback::opShortIntLongS, &Callback::exCB); - p->begin_opShortIntLongS(ssi, isi, lsi, callback); -#endif cb->check(); } @@ -1401,18 +1285,12 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& dsi.push_back(Ice::Double(1.3E10)); CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opFloatDoubleSAsync(fsi, dsi, [&](Test::DoubleS dsi1, Test::FloatS fsi1, Test::DoubleS dsi2) { cb->opFloatDoubleS(std::move(dsi1), std::move(fsi1), std::move(dsi2)); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyClass_opFloatDoubleSPtr callback = - Test::newCallback_MyClass_opFloatDoubleS(cb, &Callback::opFloatDoubleS, &Callback::exCB); - p->begin_opFloatDoubleS(fsi, dsi, callback); -#endif cb->check(); } @@ -1427,19 +1305,12 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& ssi2.push_back("xyz"); CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opStringSAsync(ssi1, ssi2, [&](Test::StringS ssi3, Test::StringS ssi4) { cb->opStringS(std::move(ssi3), std::move(ssi4)); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyClass_opStringSPtr callback = Test::newCallback_MyClass_opStringS(cb, - &Callback::opStringS, - &Callback::exCB); - p->begin_opStringS(ssi1, ssi2, callback); -#endif cb->check(); } @@ -1459,19 +1330,12 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& bsi2[1].push_back(Ice::Byte(0xf1)); CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opByteSSAsync(bsi1, bsi2, [&](Test::ByteSS bsi3, Test::ByteSS bsi4) { cb->opByteSS(std::move(bsi3), std::move(bsi4)); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyClass_opByteSSPtr callback = Test::newCallback_MyClass_opByteSS(cb, - &Callback::opByteSS, - &Callback::exCB); - p->begin_opByteSS(bsi1, bsi2, callback); -#endif cb->check(); } @@ -1491,19 +1355,12 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& bsi2[0].push_back(true); CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opBoolSSAsync(bsi1, bsi2, [&](Test::BoolSS bsi3, Test::BoolSS bsi4) { cb->opBoolSS(std::move(bsi3), std::move(bsi4)); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyClass_opBoolSSPtr callback = Test::newCallback_MyClass_opBoolSS(cb, - &Callback::opBoolSS, - &Callback::exCB); - p->begin_opBoolSS(bsi1, bsi2, callback); -#endif cb->check(); } @@ -1525,19 +1382,12 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& lsi[0].push_back(1729); CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opShortIntLongSSAsync(ssi, isi, lsi, [&](Test::LongSS lsi1, Test::ShortSS ssi1, Test::IntSS isi1, Test::LongSS lsi2) { cb->opShortIntLongSS(std::move(lsi1), std::move(ssi1), std::move(isi1), std::move(lsi2)); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyClass_opShortIntLongSSPtr callback = Test::newCallback_MyClass_opShortIntLongSS(cb, - &Callback::opShortIntLongSS, - &Callback::exCB); - p->begin_opShortIntLongSS(ssi, isi, lsi, callback); -#endif cb->check(); } @@ -1555,18 +1405,12 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& dsi[0].push_back(Ice::Double(1.3E10)); CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opFloatDoubleSSAsync(fsi, dsi, [&](Test::DoubleSS dsi1, Test::FloatSS fsi1, Test::DoubleSS dsi2) { cb->opFloatDoubleSS(std::move(dsi1), std::move(fsi1), std::move(dsi2)); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyClass_opFloatDoubleSSPtr callback = - Test::newCallback_MyClass_opFloatDoubleSS(cb, &Callback::opFloatDoubleSS, &Callback::exCB); - p->begin_opFloatDoubleSS(fsi, dsi, callback); -#endif cb->check(); } @@ -1583,18 +1427,12 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& ssi2[2].push_back("xyz"); CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opStringSSAsync(ssi1, ssi2, [&](Test::StringSS ssi3, Test::StringSS ssi4) { cb->opStringSS(std::move(ssi3), std::move(ssi4)); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyClass_opStringSSPtr callback = - Test::newCallback_MyClass_opStringSS(cb, &Callback::opStringSS, &Callback::exCB); - p->begin_opStringSS(ssi1, ssi2, callback); -#endif cb->check(); } @@ -1608,18 +1446,12 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& di2[101] = true; CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opByteBoolDAsync(di1, di2, [&](Test::ByteBoolD di3, Test::ByteBoolD di4) { cb->opByteBoolD(std::move(di3), std::move(di4)); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyClass_opByteBoolDPtr callback = - Test::newCallback_MyClass_opByteBoolD(cb, &Callback::opByteBoolD, &Callback::exCB); - p->begin_opByteBoolD(di1, di2, callback); -#endif cb->check(); } @@ -1633,18 +1465,12 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& di2[1101] = 0; CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opShortIntDAsync(di1, di2, [&](Test::ShortIntD di3, Test::ShortIntD di4) { cb->opShortIntD(std::move(di3), std::move(di4)); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyClass_opShortIntDPtr callback = - Test::newCallback_MyClass_opShortIntD(cb, &Callback::opShortIntD, &Callback::exCB); - p->begin_opShortIntD(di1, di2, callback); -#endif cb->check(); } @@ -1658,18 +1484,12 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& di2[999999130] = Ice::Float(0.5); CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opLongFloatDAsync(di1, di2, [&](Test::LongFloatD di3, Test::LongFloatD di4) { cb->opLongFloatD(std::move(di3), std::move(di4)); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyClass_opLongFloatDPtr callback = - Test::newCallback_MyClass_opLongFloatD(cb, &Callback::opLongFloatD, &Callback::exCB); - p->begin_opLongFloatD(di1, di2, callback); -#endif cb->check(); } @@ -1683,18 +1503,12 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& di2["BAR"] = "abc 0.5"; CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opStringStringDAsync(di1, di2, [&](Test::StringStringD di3, Test::StringStringD di4) { cb->opStringStringD(std::move(di3), std::move(di4)); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyClass_opStringStringDPtr callback = - Test::newCallback_MyClass_opStringStringD(cb, &Callback::opStringStringD, &Callback::exCB); - p->begin_opStringStringD(di1, di2, callback); -#endif cb->check(); } @@ -1708,18 +1522,12 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& di2["Hello!!"] = Test::ICE_ENUM(MyEnum, enum2); CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opStringMyEnumDAsync(di1, di2, [&](Test::StringMyEnumD di3, Test::StringMyEnumD di4) { cb->opStringMyEnumD(std::move(di3), std::move(di4)); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyClass_opStringMyEnumDPtr callback = - Test::newCallback_MyClass_opStringMyEnumD(cb, &Callback::opStringMyEnumD, &Callback::exCB); - p->begin_opStringMyEnumD(di1, di2, callback); -#endif cb->check(); } @@ -1738,18 +1546,12 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& di2[ms23] = Test::ICE_ENUM(MyEnum, enum2); CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opMyStructMyEnumDAsync(di1, di2, [&](Test::MyStructMyEnumD di3, Test::MyStructMyEnumD di4) { cb->opMyStructMyEnumD(std::move(di3), std::move(di4)); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyClass_opMyStructMyEnumDPtr callback = - Test::newCallback_MyClass_opMyStructMyEnumD(cb, &Callback::opMyStructMyEnumD, &Callback::exCB); - p->begin_opMyStructMyEnumD(di1, di2, callback); -#endif cb->check(); } @@ -1775,18 +1577,12 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& dsi2[0] = di3; CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opByteBoolDSAsync(dsi1, dsi2, [&](Test::ByteBoolDS dsi3, Test::ByteBoolDS dsi4) { cb->opByteBoolDS(std::move(dsi3), std::move(dsi4)); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyClass_opByteBoolDSPtr callback = - Test::newCallback_MyClass_opByteBoolDS(cb, &Callback::opByteBoolDS, &Callback::exCB); - p->begin_opByteBoolDS(dsi1, dsi2, callback); -#endif cb->check(); } @@ -1811,18 +1607,12 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& dsi2[0] = di3; CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opShortIntDSAsync(dsi1, dsi2, [&](Test::ShortIntDS dsi3, Test::ShortIntDS dsi4) { cb->opShortIntDS(std::move(dsi3), std::move(dsi4)); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyClass_opShortIntDSPtr callback = - Test::newCallback_MyClass_opShortIntDS(cb, &Callback::opShortIntDS, &Callback::exCB); - p->begin_opShortIntDS(dsi1, dsi2, callback); -#endif cb->check(); } @@ -1847,18 +1637,12 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& dsi2[0] = di3; CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opLongFloatDSAsync(dsi1, dsi2, [&](Test::LongFloatDS dsi3, Test::LongFloatDS dsi4) { cb->opLongFloatDS(std::move(dsi3), std::move(dsi4)); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyClass_opLongFloatDSPtr callback = - Test::newCallback_MyClass_opLongFloatDS(cb, &Callback::opLongFloatDS, &Callback::exCB); - p->begin_opLongFloatDS(dsi1, dsi2, callback); -#endif cb->check(); } @@ -1883,19 +1667,12 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& dsi2[0] = di3; CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opStringStringDSAsync(dsi1, dsi2, [&](Test::StringStringDS dsi3, Test::StringStringDS dsi4) { cb->opStringStringDS(std::move(dsi3), std::move(dsi4)); }, makeExceptionClosure(cb)); - -#else - Test::Callback_MyClass_opStringStringDSPtr callback = - Test::newCallback_MyClass_opStringStringDS(cb, &Callback::opStringStringDS, &Callback::exCB); - p->begin_opStringStringDS(dsi1, dsi2, callback); -#endif cb->check(); } @@ -1920,18 +1697,12 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& dsi2[0] = di3; CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opStringMyEnumDSAsync(dsi1, dsi2, [&](Test::StringMyEnumDS dsi3, Test::StringMyEnumDS dsi4) { cb->opStringMyEnumDS(std::move(dsi3), std::move(dsi4)); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyClass_opStringMyEnumDSPtr callback = - Test::newCallback_MyClass_opStringMyEnumDS(cb, &Callback::opStringMyEnumDS, &Callback::exCB); - p->begin_opStringMyEnumDS(dsi1, dsi2, callback); -#endif cb->check(); } @@ -1954,18 +1725,12 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& dsi2[0] = di3; CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opMyEnumStringDSAsync(dsi1, dsi2, [&](Test::MyEnumStringDS dsi3, Test::MyEnumStringDS dsi4) { cb->opMyEnumStringDS(std::move(dsi3), std::move(dsi4)); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyClass_opMyEnumStringDSPtr callback = - Test::newCallback_MyClass_opMyEnumStringDS(cb, &Callback::opMyEnumStringDS, &Callback::exCB); - p->begin_opMyEnumStringDS(dsi1, dsi2, callback); -#endif cb->check(); } @@ -1996,18 +1761,12 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& dsi2[0] = di3; CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opMyStructMyEnumDSAsync(dsi1, dsi2, [&](Test::MyStructMyEnumDS dsi3, Test::MyStructMyEnumDS dsi4) { cb->opMyStructMyEnumDS(std::move(dsi3), std::move(dsi4)); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyClass_opMyStructMyEnumDSPtr callback = - Test::newCallback_MyClass_opMyStructMyEnumDS(cb, &Callback::opMyStructMyEnumDS, &Callback::exCB); - p->begin_opMyStructMyEnumDS(dsi1, dsi2, callback); -#endif cb->check(); } @@ -2030,18 +1789,12 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& sdi2[Ice::Byte(0xf1)] = si3; CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opByteByteSDAsync(sdi1, sdi2, [&](Test::ByteByteSD sdi3, Test::ByteByteSD sdi4) { cb->opByteByteSD(std::move(sdi3), std::move(sdi4)); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyClass_opByteByteSDPtr callback = - Test::newCallback_MyClass_opByteByteSD(cb, &Callback::opByteByteSD, &Callback::exCB); - p->begin_opByteByteSD(sdi1, sdi2, callback); -#endif cb->check(); } @@ -2063,18 +1816,12 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& sdi2[false] = si1; CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opBoolBoolSDAsync(sdi1, sdi2, [&](Test::BoolBoolSD sdi3, Test::BoolBoolSD sdi4) { cb->opBoolBoolSD(std::move(sdi3), std::move(sdi4)); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyClass_opBoolBoolSDPtr callback = - Test::newCallback_MyClass_opBoolBoolSD(cb, &Callback::opBoolBoolSD, &Callback::exCB); - p->begin_opBoolBoolSD(sdi1, sdi2, callback); -#endif cb->check(); } @@ -2099,18 +1846,12 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& sdi2[4] = si3; CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opShortShortSDAsync(sdi1, sdi2, [&](Test::ShortShortSD sdi3, Test::ShortShortSD sdi4) { cb->opShortShortSD(std::move(sdi3), std::move(sdi4)); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyClass_opShortShortSDPtr callback = - Test::newCallback_MyClass_opShortShortSD(cb, &Callback::opShortShortSD, &Callback::exCB); - p->begin_opShortShortSD(sdi1, sdi2, callback); -#endif cb->check(); } @@ -2135,18 +1876,12 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& sdi2[400] = si3; CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opIntIntSDAsync(sdi1, sdi2, [&](Test::IntIntSD sdi3, Test::IntIntSD sdi4) { cb->opIntIntSD(std::move(sdi3), std::move(sdi4)); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyClass_opIntIntSDPtr callback = - Test::newCallback_MyClass_opIntIntSD(cb, &Callback::opIntIntSD, &Callback::exCB); - p->begin_opIntIntSD(sdi1, sdi2, callback); -#endif cb->check(); } @@ -2171,18 +1906,12 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& sdi2[999999992] = si3; CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opLongLongSDAsync(sdi1, sdi2, [&](Test::LongLongSD sdi3, Test::LongLongSD sdi4) { cb->opLongLongSD(std::move(sdi3), std::move(sdi4)); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyClass_opLongLongSDPtr callback = - Test::newCallback_MyClass_opLongLongSD(cb, &Callback::opLongLongSD, &Callback::exCB); - p->begin_opLongLongSD(sdi1, sdi2, callback); -#endif cb->check(); } @@ -2207,18 +1936,12 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& sdi2["aBc"] = si3; CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opStringFloatSDAsync(sdi1, sdi2, [&](Test::StringFloatSD sdi3, Test::StringFloatSD sdi4) { cb->opStringFloatSD(std::move(sdi3), std::move(sdi4)); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyClass_opStringFloatSDPtr callback = - Test::newCallback_MyClass_opStringFloatSD(cb, &Callback::opStringFloatSD, &Callback::exCB); - p->begin_opStringFloatSD(sdi1, sdi2, callback); -#endif cb->check(); } @@ -2243,18 +1966,12 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& sdi2[""] = si3; CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opStringDoubleSDAsync(sdi1, sdi2, [&](Test::StringDoubleSD sdi3, Test::StringDoubleSD sdi4) { cb->opStringDoubleSD(std::move(sdi3), std::move(sdi4)); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyClass_opStringDoubleSDPtr callback = - Test::newCallback_MyClass_opStringDoubleSD(cb, &Callback::opStringDoubleSD, &Callback::exCB); - p->begin_opStringDoubleSD(sdi1, sdi2, callback); -#endif cb->check(); } @@ -2281,18 +1998,12 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& sdi2["ghi"] = si3; CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opStringStringSDAsync(sdi1, sdi2, [&](Test::StringStringSD sdi3, Test::StringStringSD sdi4) { cb->opStringStringSD(std::move(sdi3), std::move(sdi4)); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyClass_opStringStringSDPtr callback = - Test::newCallback_MyClass_opStringStringSD(cb, &Callback::opStringStringSD, &Callback::exCB); - p->begin_opStringStringSD(sdi1, sdi2, callback); -#endif cb->check(); } @@ -2317,18 +2028,12 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& sdi2[Test::ICE_ENUM(MyEnum, enum1)] = si3; CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opMyEnumMyEnumSDAsync(sdi1, sdi2, [&](Test::MyEnumMyEnumSD sdi3, Test::MyEnumMyEnumSD sdi4) { cb->opMyEnumMyEnumSD(std::move(sdi3), std::move(sdi4)); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyClass_opMyEnumMyEnumSDPtr callback = - Test::newCallback_MyClass_opMyEnumMyEnumSD(cb, &Callback::opMyEnumMyEnumSD, &Callback::exCB); - p->begin_opMyEnumMyEnumSD(sdi1, sdi2, callback); -#endif cb->check(); } @@ -2343,18 +2048,12 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& s.push_back(i); } CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opIntSAsync(s, [&](Test::IntS s1P) { cb->opIntS(s1P); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyClass_opIntSPtr callback = - Test::newCallback_MyClass_opIntS(cb, &Callback::opIntS, &Callback::exCB); - p->begin_opIntS(s, callback); -#endif cb->check(); } } @@ -2367,7 +2066,6 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& ctx["three"] = "THREE"; { test(p->ice_getContext().empty()); -#ifdef ICE_CPP11_MAPPING promise prom; p->opContextAsync( [&](Ice::Context c) @@ -2380,15 +2078,9 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& test(false); }); prom.get_future().get(); -#else - Ice::AsyncResultPtr r = p->begin_opContext(); - Ice::Context c = p->end_opContext(r); - test(c != ctx); -#endif } { test(p->ice_getContext().empty()); -#ifdef ICE_CPP11_MAPPING promise prom; p->opContextAsync( [&](Ice::Context c) @@ -2401,16 +2093,10 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& test(false); }, nullptr, ctx); prom.get_future().get(); -#else - Ice::AsyncResultPtr r = p->begin_opContext(ctx); - Ice::Context c = p->end_opContext(r); - test(c == ctx); -#endif } { Test::MyClassPrxPtr p2 = ICE_CHECKED_CAST(Test::MyClassPrx, p->ice_context(ctx)); test(p2->ice_getContext() == ctx); -#ifdef ICE_CPP11_MAPPING promise prom; p2->opContextAsync( [&](Ice::Context c) @@ -2423,15 +2109,9 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& test(false); }); prom.get_future().get(); -#else - Ice::AsyncResultPtr r = p2->begin_opContext(); - Ice::Context c = p2->end_opContext(r); - test(c == ctx); -#endif } { Test::MyClassPrxPtr p2 = ICE_CHECKED_CAST(Test::MyClassPrx, p->ice_context(ctx)); -#ifdef ICE_CPP11_MAPPING promise prom; p2->opContextAsync( [&](Ice::Context c) @@ -2444,11 +2124,6 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& test(false); }, nullptr, ctx); prom.get_future().get(); -#else - Ice::AsyncResultPtr r = p2->begin_opContext(ctx); - Ice::Context c = p2->end_opContext(r); - test(c == ctx); -#endif } } @@ -2479,7 +2154,6 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& ic->getImplicitContext()->setContext(ctx); test(ic->getImplicitContext()->getContext() == ctx); { -#ifdef ICE_CPP11_MAPPING promise prom; q->opContextAsync( [&](Ice::Context c) @@ -2492,18 +2166,12 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& test(false); }); prom.get_future().get(); -#else - Ice::AsyncResultPtr r = q->begin_opContext(); - Ice::Context c = q->end_opContext(r); - test(c == ctx); -#endif } ic->getImplicitContext()->put("zero", "ZERO"); ctx = ic->getImplicitContext()->getContext(); { -#ifdef ICE_CPP11_MAPPING promise prom; q->opContextAsync( [&](Ice::Context c) @@ -2524,11 +2192,6 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& test(false); }); prom.get_future().get(); -#else - Ice::AsyncResultPtr r = q->begin_opContext(); - Ice::Context c = q->end_opContext(r); - test(c == ctx); -#endif } Ice::Context prxContext; @@ -2543,7 +2206,6 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& ic->getImplicitContext()->setContext(Ice::Context()); { -#ifdef ICE_CPP11_MAPPING promise prom; q->opContextAsync( [&](Ice::Context c) @@ -2556,16 +2218,10 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& test(false); }); prom.get_future().get(); -#else - Ice::AsyncResultPtr r = q->begin_opContext(); - Ice::Context c = q->end_opContext(r); - test(c == prxContext); -#endif } ic->getImplicitContext()->setContext(ctx); { -#ifdef ICE_CPP11_MAPPING promise prom; q->opContextAsync( [&](Ice::Context c) @@ -2578,11 +2234,6 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& test(false); }); prom.get_future().get(); -#else - Ice::AsyncResultPtr r = q->begin_opContext(); - Ice::Context c = q->end_opContext(r); - test(c == combined); -#endif } ic->getImplicitContext()->setContext(Ice::Context()); @@ -2595,52 +2246,34 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& Ice::Double d = 1278312346.0 / 13.0; Test::DoubleS ds(5, d); CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opDoubleMarshalingAsync(d, ds, [&]() { cb->opDoubleMarshaling(); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyClass_opDoubleMarshalingPtr callback = - Test::newCallback_MyClass_opDoubleMarshaling(cb, &Callback::opDoubleMarshaling, &Callback::exCB); - p->begin_opDoubleMarshaling(d, ds, callback); -#endif cb->check(); } { CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opIdempotentAsync( [&]() { cb->opIdempotent(); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyClass_opIdempotentPtr callback = - Test::newCallback_MyClass_opIdempotent(cb, &Callback::opIdempotent, &Callback::exCB); - p->begin_opIdempotent(callback); -#endif cb->check(); } { CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING p->opNonmutatingAsync( [&]() { cb->opNonmutating(); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyClass_opNonmutatingPtr callback = - Test::newCallback_MyClass_opNonmutating(cb, &Callback::opNonmutating, &Callback::exCB); - p->begin_opNonmutating(callback); -#endif cb->check(); } @@ -2648,23 +2281,15 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& Test::MyDerivedClassPrxPtr derived = ICE_CHECKED_CAST(Test::MyDerivedClassPrx, p); test(derived); CallbackPtr cb = ICE_MAKE_SHARED(Callback); -#ifdef ICE_CPP11_MAPPING derived->opDerivedAsync( [&]() { cb->opDerived(); }, makeExceptionClosure(cb)); -#else - Test::Callback_MyDerivedClass_opDerivedPtr callback = - Test::newCallback_MyDerivedClass_opDerived(cb, &Callback::opDerived, &Callback::exCB); - derived->begin_opDerived(callback); -#endif cb->check(); } -#ifdef ICE_CPP11_MAPPING - { CallbackPtr cb = ICE_MAKE_SHARED(Callback); auto f = p->ice_pingAsync(); @@ -4051,5 +3676,4 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& } cb->check(); } -#endif } diff --git a/cpp/test/Ice/optional/AllTests.cpp b/cpp/test/Ice/optional/AllTests.cpp index 3e4bf0b320a..c12f6766753 100644 --- a/cpp/test/Ice/optional/AllTests.cpp +++ b/cpp/test/Ice/optional/AllTests.cpp @@ -323,11 +323,7 @@ allTests(Test::TestHelper* helper, bool) InitialPrxPtr initial = ICE_CHECKED_CAST(InitialPrx, base); test(initial); -#ifdef ICE_CPP11_MAPPING test(targetEqualTo(initial, base)); -#else - test(initial == base); -#endif bool supportsCppStringView = initial->supportsCppStringView(); cout << "ok" << endl; @@ -521,11 +517,7 @@ allTests(Test::TestHelper* helper, bool) test(mo5->g == mo1->g); test(mo5->h == mo1->h); test(mo5->i == mo1->i); -#ifdef ICE_CPP11_MAPPING test(targetEqualTo(mo5->j.value(), mo1->j.value())); -#else - test(mo5->j == mo1->j); -#endif test(mo5->k == mo5->k); test(mo5->bs == mo1->bs); test(mo5->ss == mo1->ss); @@ -540,30 +532,22 @@ allTests(Test::TestHelper* helper, bool) test(mo5->vss == mo1->vss); test(!mo5->oos->empty() && (*mo5->oos)[0]->a == oo1->a); -#ifdef ICE_CPP11_MAPPING test(mo5->mips.value().size() == mo1->mips.value().size()); for(size_t i = 0; i< mo5->mips.value().size(); ++i) { test(targetEqualTo(mo5->mips.value()[i], mo1->mips.value()[i])); } -#else - test(mo5->mips == mo1->mips); -#endif test(mo5->ied == mo1->ied); test(mo5->ifsd == mo1->ifsd); test(mo5->ivsd == mo1->ivsd); test(!mo5->iood->empty() && (*mo5->iood)[5]->a == 15); -#ifdef ICE_CPP11_MAPPING test(mo5->imipd.value().size() == mo1->imipd.value().size()); for(auto& v : mo5->imipd.value()) { test(targetEqualTo(mo1->imipd.value()[v.first], v.second)); } -#else - test(mo5->imipd == mo1->imipd); -#endif test(mo5->bos == mo1->bos); @@ -597,11 +581,7 @@ allTests(Test::TestHelper* helper, bool) test(!mo7->g); test(mo7->h == mo1->h); test(!mo7->i); -#ifdef ICE_CPP11_MAPPING test(targetEqualTo(mo7->j.value(), mo1->j.value())); -#else - test(mo7->j == mo1->j); -#endif test(!mo7->k); test(mo7->bs == mo1->bs); test(!mo7->ss); @@ -667,15 +647,11 @@ allTests(Test::TestHelper* helper, bool) test(mo8->vss == mo1->vss); test(!mo8->oos); -#ifdef ICE_CPP11_MAPPING test(mo8->mips.value().size() == mo1->mips.value().size()); for(size_t i = 0; i< mo8->mips.value().size(); ++i) { test(targetEqualTo(mo8->mips.value()[i], mo1->mips.value()[i])); } -#else - test(mo8->mips == mo1->mips); -#endif test(mo8->ied == mo1->ied); test(!mo8->ifsd); @@ -954,11 +930,7 @@ allTests(Test::TestHelper* helper, bool) Ice::OutputStream out(communicator); out.startEncapsulation(); out.write(a); -#ifdef ICE_CPP11_MAPPING out.write(1, Ice::make_optional(make_shared())); -#else - out.write(1, IceUtil::makeOptional(Ice::ValuePtr(new DObjectWriter))); -#endif out.endEncapsulation(); out.finished(inEncaps); test(initial->ice_invoke("opClassAndUnknownOptional", Ice::ICE_ENUM(OperationMode, Normal), inEncaps, outEncaps)); @@ -1404,11 +1376,7 @@ allTests(Test::TestHelper* helper, bool) p1 = ICE_UNCHECKED_CAST(MyInterfacePrx, communicator->stringToProxy("test")); p2 = initial->opMyInterfaceProxy(p1, p3); -#ifdef ICE_CPP11_MAPPING test(targetEqualTo(p2.value(), p1.value()) && targetEqualTo(p3.value(), p1.value())); -#else - test(p2 == p1 && p3 == p1); -#endif Ice::OutputStream out(communicator); out.startEncapsulation(); @@ -1422,11 +1390,7 @@ allTests(Test::TestHelper* helper, bool) in.read(3, p3); in.endEncapsulation(); -#ifdef ICE_CPP11_MAPPING test(targetEqualTo(p2.value(), p1.value()) && targetEqualTo(p3.value(), p1.value())); -#else - test(p2 == p1 && p3 == p1); -#endif Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); in2.startEncapsulation(); @@ -1441,13 +1405,8 @@ allTests(Test::TestHelper* helper, bool) Ice::OutputStream out(communicator); out.startEncapsulation(); -#ifdef ICE_CPP11_MAPPING out.write(1, Ice::make_optional(f)); out.write(2, Ice::make_optional(f->ae)); -#else - out.write(1, IceUtil::makeOptional(f)); - out.write(2, IceUtil::makeOptional(f->ae)); -#endif out.endEncapsulation(); out.finished(inEncaps); @@ -1679,39 +1638,6 @@ allTests(Test::TestHelper* helper, bool) in2.endEncapsulation(); } -#ifndef ICE_CPP11_MAPPING - { - IceUtil::Optional > p1; - IceUtil::Optional p3; - IceUtil::Optional p2 = initial->opStringSeq(p1, p3); - test(!p2 && !p3); - - StringSeq ss(10); - fill(ss.begin(), ss.end(), "test1"); - p1 = make_pair(ss.begin(), ss.end()); - p2 = initial->opStringSeq(p1, p3); - test(p2 && p3); - test(p2 == ss && p3 == ss); - - Ice::OutputStream out(communicator); - out.startEncapsulation(); - out.write(2, p1); - out.endEncapsulation(); - out.finished(inEncaps); - initial->ice_invoke("opStringSeq", Ice::ICE_ENUM(OperationMode, Normal), inEncaps, outEncaps); - Ice::InputStream in(communicator, out.getEncoding(), outEncaps); - in.startEncapsulation(); - in.read(1, p2); - in.read(3, p3); - in.endEncapsulation(); - test(p2 == ss && p3 == ss); - - Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); - in2.startEncapsulation(); - in2.endEncapsulation(); - } -#endif - { IceUtil::Optional > p1; IceUtil::Optional p3; @@ -1757,38 +1683,6 @@ allTests(Test::TestHelper* helper, bool) in2.startEncapsulation(); in2.endEncapsulation(); } - -#ifndef ICE_CPP11_MAPPING - { - IceUtil::Optional > p1; - IceUtil::Optional p3; - IceUtil::Optional p2 = initial->opVarStructSeq(p1, p3); - test(!p2 && !p3); - - VarStructSeq ss(10); - p1 = make_pair(ss.begin(), ss.end()); - p2 = initial->opVarStructSeq(p1, p3); - test(p2 && p3); - test(p2 == ss && p3 == ss); - - Ice::OutputStream out(communicator); - out.startEncapsulation(); - out.write(2, p1); - out.endEncapsulation(); - out.finished(inEncaps); - initial->ice_invoke("opVarStructSeq", Ice::ICE_ENUM(OperationMode, Normal), inEncaps, outEncaps); - Ice::InputStream in(communicator, out.getEncoding(), outEncaps); - in.startEncapsulation(); - in.read(1, p2); - in.read(3, p3); - in.endEncapsulation(); - test(p2 == ss && p3 == ss); - - Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); - in2.startEncapsulation(); - in2.endEncapsulation(); - } -#endif cout << "ok" << endl; cout << "testing optional parameters and dictionaries... " << flush; diff --git a/cpp/test/Ice/optional/StringView.h b/cpp/test/Ice/optional/StringView.h index cf44dcc7108..6bcc838c7e6 100644 --- a/cpp/test/Ice/optional/StringView.h +++ b/cpp/test/Ice/optional/StringView.h @@ -156,14 +156,7 @@ struct StreamHelper template static inline void write(S* stream, const Util::string_view& v) { -#ifdef ICE_CPP11_MAPPING stream->write(v.data(), v.size()); -#else - // - // In C++98, for consistency with the read, we don't string-convert - // - stream->write(v.data(), v.size(), false); -#endif } template static inline void diff --git a/cpp/test/Ice/optional/TestAMDI.cpp b/cpp/test/Ice/optional/TestAMDI.cpp index 1402917a58b..deb9c7c63a3 100644 --- a/cpp/test/Ice/optional/TestAMDI.cpp +++ b/cpp/test/Ice/optional/TestAMDI.cpp @@ -14,8 +14,6 @@ InitialI::InitialI() { } -#ifdef ICE_CPP11_MAPPING - void InitialI::shutdownAsync(::std::function response, ::std::function, const Ice::Current& current) @@ -377,7 +375,6 @@ InitialI::opVoidAsync(::std::function response, response(); } -#ifdef ICE_CPP11_MAPPING void InitialI::opMStruct1Async(function response, function, @@ -445,75 +442,6 @@ InitialI::opMG2Async(Ice::optional p1, { response(OpMG2MarshaledResult(p1, p1, current)); } -#else -void -InitialI::opMStruct1Async(function&)> response, - function, - const Ice::Current&) -{ - response(Test::SmallStruct()); -} - -void -InitialI::opMStruct2Async(Ice::optional p1, - function&, const Ice::optional&)> response, - function, - const Ice::Current&) -{ - response(p1, p1); -} - -void -InitialI::opMSeq1Async(function&)> response, - function, - const Ice::Current&) -{ - response(Test::StringSeq()); -} - -void -InitialI::opMSeq2Async(Ice::optional p1, - function&, const Ice::optional&)> response, - function, - const Ice::Current&) -{ - response(p1, p1); -} - -void -InitialI::opMDict1Async(function&)> response, - function, - const Ice::Current&) -{ - response(StringIntDict()); -} - -void -InitialI::opMDict2Async(Ice::optional p1, - function&, const Ice::optional&)> response, - function, - const Ice::Current&) -{ - response(p1, p1); -} - -void -InitialI::opMG1Async(function>&)> response, - function, - const Ice::Current&) -{ - response(ICE_MAKE_SHARED(G)); -} - -void -InitialI::opMG2Async(Ice::optional p1, - function>&, const Ice::optional>&)> response, - function, - const Ice::Current&) -{ - response(p1, p1); -} -#endif void InitialI::supportsRequiredParamsAsync(::std::function response, @@ -549,478 +477,3 @@ InitialI::supportsNullOptionalAsync(::std::function response, { response(true); } - -#else // C++98 mapping - -void -InitialI::shutdown_async(const ::Test::AMD_Initial_shutdownPtr& cb, - const Ice::Current& current) -{ - current.adapter->getCommunicator()->shutdown(); - cb->ice_response(); -} - -void -InitialI::pingPong_async(const ::Test::AMD_Initial_pingPongPtr& cb, - const Ice::ValuePtr& obj, - const Ice::Current&) -{ - cb->ice_response(obj); -} - -void -InitialI::opOptionalException_async(const ::Test::AMD_Initial_opOptionalExceptionPtr& cb, - const IceUtil::Optional< ::Ice::Int>& a, - const IceUtil::Optional< ::std::string>& b, - const IceUtil::Optional& o, - const Ice::Current&) -{ - OptionalException ex; - ex.a = a; - ex.b = b; - ex.o = o; - cb->ice_exception(ex); -} - -void -InitialI::opDerivedException_async(const ::Test::AMD_Initial_opDerivedExceptionPtr& cb, - const IceUtil::Optional< ::Ice::Int>& a, - const IceUtil::Optional< ::std::string>& b, - const IceUtil::Optional& o, - const Ice::Current&) -{ - DerivedException ex; - ex.a = a; - ex.b = b; - ex.o = o; - ex.ss = b; - ex.o2 = o; - ex.d1 = "d1"; - ex.d2 = "d2"; - cb->ice_exception(ex); -} - -void -InitialI::opRequiredException_async(const ::Test::AMD_Initial_opRequiredExceptionPtr& cb, - const IceUtil::Optional< ::Ice::Int>& a, - const IceUtil::Optional< ::std::string>& b, - const IceUtil::Optional& o, - const Ice::Current&) -{ - RequiredException ex; - ex.a = a; - ex.b = b; - ex.o = o; - if(b) - { - ex.ss = b.value(); - } - if(o) - { - ex.o2 = o.value(); - } - cb->ice_exception(ex); -} - -void -InitialI::opByte_async(const ::Test::AMD_Initial_opBytePtr& cb, - const IceUtil::Optional< ::Ice::Byte>& p1, - const ::Ice::Current&) -{ - cb->ice_response(p1, p1); -} - -void -InitialI::opBool_async(const ::Test::AMD_Initial_opBoolPtr& cb, - const IceUtil::Optional& p1, - const ::Ice::Current&) -{ - cb->ice_response(p1, p1); -} - -void -InitialI::opShort_async(const ::Test::AMD_Initial_opShortPtr& cb, - const IceUtil::Optional< ::Ice::Short>& p1, - const ::Ice::Current&) -{ - cb->ice_response(p1, p1); -} - -void -InitialI::opInt_async(const ::Test::AMD_Initial_opIntPtr& cb, - const IceUtil::Optional< ::Ice::Int>& p1, - const ::Ice::Current&) -{ - cb->ice_response(p1, p1); -} - -void -InitialI::opLong_async(const ::Test::AMD_Initial_opLongPtr& cb, - const IceUtil::Optional< ::Ice::Long>& p1, - const ::Ice::Current&) -{ - cb->ice_response(p1, p1); -} - -void -InitialI::opFloat_async(const ::Test::AMD_Initial_opFloatPtr& cb, - const IceUtil::Optional< ::Ice::Float>& p1, - const ::Ice::Current&) -{ - cb->ice_response(p1, p1); -} - -void -InitialI::opDouble_async(const ::Test::AMD_Initial_opDoublePtr& cb, - const IceUtil::Optional< ::Ice::Double>& p1, - const ::Ice::Current&) -{ - cb->ice_response(p1, p1); -} - -void -InitialI::opString_async(const ::Test::AMD_Initial_opStringPtr& cb, - const IceUtil::Optional< ::std::string>& p1, - const ::Ice::Current&) -{ - cb->ice_response(p1, p1); -} - -void -InitialI::opCustomString_async(const ::Test::AMD_Initial_opCustomStringPtr& cb, - const IceUtil::Optional< Util::string_view>& p1, - const ::Ice::Current&) -{ - cb->ice_response(p1, p1); -} - -void -InitialI::opMyEnum_async(const ::Test::AMD_Initial_opMyEnumPtr& cb, - const IceUtil::Optional& p1, - const ::Ice::Current&) -{ - cb->ice_response(p1, p1); -} - -void -InitialI::opSmallStruct_async(const ::Test::AMD_Initial_opSmallStructPtr& cb, - const IceUtil::Optional& p1, - const ::Ice::Current&) -{ - cb->ice_response(p1, p1); -} - -void -InitialI::opFixedStruct_async(const ::Test::AMD_Initial_opFixedStructPtr& cb, - const IceUtil::Optional& p1, - const ::Ice::Current&) -{ - cb->ice_response(p1, p1); -} - -void -InitialI::opVarStruct_async(const ::Test::AMD_Initial_opVarStructPtr& cb, - const IceUtil::Optional& p1, - const ::Ice::Current&) -{ - cb->ice_response(p1, p1); -} - -void -InitialI::opOneOptional_async(const ::Test::AMD_Initial_opOneOptionalPtr& cb, - const IceUtil::Optional< Test::OneOptionalPtr>& p1, - const ::Ice::Current&) -{ - cb->ice_response(p1, p1); -} - -void -InitialI::opMyInterfaceProxy_async(const ::Test::AMD_Initial_opMyInterfaceProxyPtr& cb, - const IceUtil::Optional< Test::MyInterfacePrx>& p1, - const ::Ice::Current&) -{ - cb->ice_response(p1, p1); -} - -void -InitialI::opByteSeq_async(const ::Test::AMD_Initial_opByteSeqPtr& cb, - const IceUtil::Optional< ::std::pair >& p1, - const ::Ice::Current&) -{ - cb->ice_response(p1, p1); -} - -void -InitialI::opBoolSeq_async(const ::Test::AMD_Initial_opBoolSeqPtr& cb, - const IceUtil::Optional< ::std::pair >& p1, - const ::Ice::Current&) -{ - cb->ice_response(p1, p1); -} - -void -InitialI::opShortSeq_async(const ::Test::AMD_Initial_opShortSeqPtr& cb, - const IceUtil::Optional< ::std::pair >& p1, - const ::Ice::Current&) -{ - cb->ice_response(p1, p1); -} - -void -InitialI::opIntSeq_async(const ::Test::AMD_Initial_opIntSeqPtr& cb, - const IceUtil::Optional< ::std::pair >& p1, - const ::Ice::Current&) -{ - cb->ice_response(p1, p1); -} - -void -InitialI::opLongSeq_async(const ::Test::AMD_Initial_opLongSeqPtr& cb, - const IceUtil::Optional< ::std::pair >& p1, - const ::Ice::Current&) -{ - cb->ice_response(p1, p1); -} - -void -InitialI::opFloatSeq_async(const ::Test::AMD_Initial_opFloatSeqPtr& cb, - const IceUtil::Optional< ::std::pair >& p1, - const ::Ice::Current&) -{ - cb->ice_response(p1, p1); -} - -void -InitialI::opDoubleSeq_async(const ::Test::AMD_Initial_opDoubleSeqPtr& cb, - const IceUtil::Optional< ::std::pair >& p1, - const ::Ice::Current&) -{ - cb->ice_response(p1, p1); -} - -void -InitialI::opStringSeq_async(const ::Test::AMD_Initial_opStringSeqPtr& cb, - const IceUtil::Optional< ::std::pair< ::Test::StringSeq::const_iterator, - ::Test::StringSeq::const_iterator> >& p1, - const ::Ice::Current&) -{ - cb->ice_response(p1, p1); -} - -void -InitialI::opSmallStructSeq_async(const ::Test::AMD_Initial_opSmallStructSeqPtr& cb, - const IceUtil::Optional< ::std::pair >& p1, - const ::Ice::Current&) -{ - cb->ice_response(p1, p1); -} - -void -InitialI::opSmallStructList_async(const ::Test::AMD_Initial_opSmallStructListPtr& cb, - const IceUtil::Optional< ::std::pair >& p1, - const ::Ice::Current&) -{ - cb->ice_response(p1, p1); -} - -void -InitialI::opFixedStructSeq_async(const ::Test::AMD_Initial_opFixedStructSeqPtr& cb, - const IceUtil::Optional< ::std::pair >& p1, - const ::Ice::Current&) -{ - cb->ice_response(p1, p1); -} - -void -InitialI::opFixedStructList_async(const ::Test::AMD_Initial_opFixedStructListPtr& cb, - const IceUtil::Optional< ::std::pair >& p1, - const ::Ice::Current&) -{ - cb->ice_response(p1, p1); -} - -void -InitialI::opVarStructSeq_async(const ::Test::AMD_Initial_opVarStructSeqPtr& cb, - const IceUtil::Optional< ::std::pair< ::Test::VarStructSeq::const_iterator, - ::Test::VarStructSeq::const_iterator> >& p1, - const ::Ice::Current&) -{ - cb->ice_response(p1, p1); -} - -void -InitialI::opSerializable_async(const ::Test::AMD_Initial_opSerializablePtr& cb, - const IceUtil::Optional< ::Test::Serializable>& p1, - const ::Ice::Current&) -{ - cb->ice_response(p1, p1); -} - -void -InitialI::opIntIntDict_async(const ::Test::AMD_Initial_opIntIntDictPtr& cb, - const IceUtil::Optional< ::Test::IntIntDict>& p1, - const ::Ice::Current&) -{ - cb->ice_response(p1, p1); -} - -void -InitialI::opStringIntDict_async(const ::Test::AMD_Initial_opStringIntDictPtr& cb, - const IceUtil::Optional< ::Test::StringIntDict>& p1, - const ::Ice::Current&) -{ - cb->ice_response(p1, p1); -} - -void -InitialI::opIntOneOptionalDict_async(const ::Test::AMD_Initial_opIntOneOptionalDictPtr& cb, - const IceUtil::Optional< ::Test::IntOneOptionalDict>& p1, - const ::Ice::Current&) -{ - cb->ice_response(p1, p1); -} - -void -InitialI::opCustomIntStringDict_async(const ::Test::AMD_Initial_opCustomIntStringDictPtr& cb, - const IceUtil::Optional >& p1, - const ::Ice::Current&) -{ - cb->ice_response(p1, p1); -} - -void -InitialI::opClassAndUnknownOptional_async(const ::Test::AMD_Initial_opClassAndUnknownOptionalPtr& cb, - const Test::APtr&, - const Ice::Current&) -{ - cb->ice_response(); -} - -void -InitialI::sendOptionalClass_async(const ::Test::AMD_Initial_sendOptionalClassPtr& cb, - bool, - const IceUtil::Optional&, - const Ice::Current&) -{ - cb->ice_response(); -} - -void -InitialI::returnOptionalClass_async(const ::Test::AMD_Initial_returnOptionalClassPtr& cb, - bool, - const Ice::Current&) -{ - Optional o = new OneOptional(53); - cb->ice_response(o); -} - -void -InitialI::opG_async(const ::Test::AMD_Initial_opGPtr& cb, - const ::Test::GPtr& g, - const Ice::Current&) -{ - cb->ice_response(g); -} - -void -InitialI::opVoid_async(const ::Test::AMD_Initial_opVoidPtr& cb, - const Ice::Current&) -{ - cb->ice_response(); -} - -void -InitialI::opMStruct1_async(const Test::AMD_Initial_opMStruct1Ptr& cb, const Ice::Current&) -{ - cb->ice_response(Test::SmallStruct()); -} - -void -InitialI::opMStruct2_async(const Test::AMD_Initial_opMStruct2Ptr& cb, - const IceUtil::Optional< Test::SmallStruct>& p1, - const Ice::Current&) -{ - cb->ice_response(p1, p1); -} - -void -InitialI::opMSeq1_async(const Test::AMD_Initial_opMSeq1Ptr& cb, const Ice::Current&) -{ - cb->ice_response(Test::StringSeq()); -} - -void -InitialI::opMSeq2_async(const Test::AMD_Initial_opMSeq2Ptr& cb, - const IceUtil::Optional< Test::StringSeq>& p1, - const Ice::Current&) -{ - cb->ice_response(p1, p1); -} - -void -InitialI::opMDict1_async(const Test::AMD_Initial_opMDict1Ptr& cb, const Ice::Current&) -{ - cb->ice_response(Test::StringIntDict()); -} - -void -InitialI::opMDict2_async(const Test::AMD_Initial_opMDict2Ptr& cb, - const IceUtil::Optional< Test::StringIntDict>& p1, - const Ice::Current&) -{ - cb->ice_response(p1, p1); -} - -void -InitialI::opMG1_async(const Test::AMD_Initial_opMG1Ptr& cb, const Ice::Current&) -{ - cb->ice_response(new Test::G()); -} - -void -InitialI::opMG2_async(const Test::AMD_Initial_opMG2Ptr& cb, - const IceUtil::Optional& p1, - const Ice::Current&) -{ - cb->ice_response(p1, p1); -} - -void -InitialI::supportsRequiredParams_async(const ::Test::AMD_Initial_supportsRequiredParamsPtr& cb, - const Ice::Current&) -{ - cb->ice_response(false); -} - -void -InitialI::supportsJavaSerializable_async(const ::Test::AMD_Initial_supportsJavaSerializablePtr& cb, - const Ice::Current&) -{ - cb->ice_response(true); -} - -void -InitialI::supportsCsharpSerializable_async(const ::Test::AMD_Initial_supportsCsharpSerializablePtr& cb, - const Ice::Current&) -{ - cb->ice_response(true); -} - -void -InitialI::supportsCppStringView_async(const ::Test::AMD_Initial_supportsCppStringViewPtr& cb, - const Ice::Current&) -{ - cb->ice_response(true); -} - -void -InitialI::supportsNullOptional_async(const ::Test::AMD_Initial_supportsNullOptionalPtr& cb, const Ice::Current&) -{ - cb->ice_response(true); -} - -#endif diff --git a/cpp/test/Ice/optional/TestAMDI.h b/cpp/test/Ice/optional/TestAMDI.h index 7289015ccb0..4881e480d93 100644 --- a/cpp/test/Ice/optional/TestAMDI.h +++ b/cpp/test/Ice/optional/TestAMDI.h @@ -13,8 +13,6 @@ class InitialI : public Test::Initial InitialI(); -#ifdef ICE_CPP11_MAPPING - virtual void shutdownAsync(::std::function, ::std::function, const Ice::Current&) override; @@ -185,7 +183,6 @@ class InitialI : public Test::Initial virtual void opVoidAsync(::std::function, ::std::function, const Ice::Current&) override; -#ifdef ICE_CPP11_MAPPING virtual void opMStruct1Async(::std::function, ::std::function, const Ice::Current&) override; @@ -221,47 +218,6 @@ class InitialI : public Test::Initial ::std::function, ::std::function, const Ice::Current&) override; -#else - virtual void opMStruct1Async(::std::function&)>, - ::std::function, - const Ice::Current&) override; - - virtual void opMStruct2Async(Ice::optional, - ::std::function&, - const Ice::optional&)>, - ::std::function, - const Ice::Current&) override; - - virtual void opMSeq1Async(::std::function&)>, - ::std::function, - const Ice::Current&) override; - - virtual void opMSeq2Async(Ice::optional, - ::std::function&, - const Ice::optional&)>, - ::std::function, - const Ice::Current&) override; - - virtual void opMDict1Async(::std::function&)>, - ::std::function, - const Ice::Current&) override; - - virtual void opMDict2Async(Ice::optional, - ::std::function&, - const Ice::optional&)>, - ::std::function, - const Ice::Current&) override; - - virtual void opMG1Async(::std::function&)>, - ::std::function, - const Ice::Current&) override; - - virtual void opMG2Async(Ice::optional, - ::std::function&, - const Ice::optional&)>, - ::std::function, - const Ice::Current&) override; -#endif virtual void supportsRequiredParamsAsync(::std::function, ::std::function, const Ice::Current&) override; @@ -277,232 +233,6 @@ class InitialI : public Test::Initial virtual void supportsNullOptionalAsync(::std::function, ::std::function, const Ice::Current&) override; - -#else // C++98 mapping - - virtual void shutdown_async(const ::Test::AMD_Initial_shutdownPtr&, - const Ice::Current&); - - virtual void pingPong_async(const ::Test::AMD_Initial_pingPongPtr&, - const Ice::ValuePtr&, - const Ice::Current&); - - virtual void opOptionalException_async(const ::Test::AMD_Initial_opOptionalExceptionPtr&, - const IceUtil::Optional< ::Ice::Int>&, - const IceUtil::Optional< ::std::string>&, - const IceUtil::Optional&, - const Ice::Current&); - - virtual void opDerivedException_async(const ::Test::AMD_Initial_opDerivedExceptionPtr&, - const IceUtil::Optional< ::Ice::Int>&, - const IceUtil::Optional< ::std::string>&, - const IceUtil::Optional&, - const Ice::Current&); - - virtual void opRequiredException_async(const ::Test::AMD_Initial_opRequiredExceptionPtr&, - const IceUtil::Optional< ::Ice::Int>&, - const IceUtil::Optional< ::std::string>&, - const IceUtil::Optional&, - const Ice::Current&); - - virtual void opByte_async(const ::Test::AMD_Initial_opBytePtr&, - const IceUtil::Optional< ::Ice::Byte>&, - const ::Ice::Current&); - - virtual void opBool_async(const ::Test::AMD_Initial_opBoolPtr&, - const IceUtil::Optional< bool>&, - const ::Ice::Current&); - - virtual void opShort_async(const ::Test::AMD_Initial_opShortPtr&, - const IceUtil::Optional< ::Ice::Short>&, - const ::Ice::Current&); - - virtual void opInt_async(const ::Test::AMD_Initial_opIntPtr&, - const IceUtil::Optional< ::Ice::Int>&, - const ::Ice::Current&); - - virtual void opLong_async(const ::Test::AMD_Initial_opLongPtr&, - const IceUtil::Optional< ::Ice::Long>&, - const ::Ice::Current&); - - virtual void opFloat_async(const ::Test::AMD_Initial_opFloatPtr&, - const IceUtil::Optional< ::Ice::Float>&, - const ::Ice::Current&); - - virtual void opDouble_async(const ::Test::AMD_Initial_opDoublePtr&, - const IceUtil::Optional< ::Ice::Double>&, - const ::Ice::Current&); - - virtual void opString_async(const ::Test::AMD_Initial_opStringPtr&, - const IceUtil::Optional< ::std::string>&, - const ::Ice::Current&); - - virtual void opCustomString_async(const ::Test::AMD_Initial_opCustomStringPtr&, - const IceUtil::Optional< Util::string_view>&, - const ::Ice::Current&); - - virtual void opMyEnum_async(const ::Test::AMD_Initial_opMyEnumPtr&, - const IceUtil::Optional&, - const ::Ice::Current&); - - virtual void opSmallStruct_async(const ::Test::AMD_Initial_opSmallStructPtr&, - const IceUtil::Optional&, - const ::Ice::Current&); - - virtual void opFixedStruct_async(const ::Test::AMD_Initial_opFixedStructPtr&, - const IceUtil::Optional&, - const ::Ice::Current&); - - virtual void opVarStruct_async(const ::Test::AMD_Initial_opVarStructPtr&, - const IceUtil::Optional&, - const ::Ice::Current&); - - virtual void opOneOptional_async(const ::Test::AMD_Initial_opOneOptionalPtr&, - const IceUtil::Optional< Test::OneOptionalPtr>&, - const ::Ice::Current&); - - virtual void opMyInterfaceProxy_async(const ::Test::AMD_Initial_opMyInterfaceProxyPtr&, - const IceUtil::Optional< Test::MyInterfacePrx>&, - const ::Ice::Current&); - - virtual void opByteSeq_async(const ::Test::AMD_Initial_opByteSeqPtr&, - const IceUtil::Optional< ::std::pair >&, - const ::Ice::Current&); - - virtual void opBoolSeq_async(const ::Test::AMD_Initial_opBoolSeqPtr&, - const IceUtil::Optional< ::std::pair >&, - const ::Ice::Current&); - - virtual void opShortSeq_async(const ::Test::AMD_Initial_opShortSeqPtr&, - const IceUtil::Optional< ::std::pair >&, - const ::Ice::Current&); - - virtual void opIntSeq_async(const ::Test::AMD_Initial_opIntSeqPtr&, - const IceUtil::Optional< ::std::pair >&, - const ::Ice::Current&); - - virtual void opLongSeq_async(const ::Test::AMD_Initial_opLongSeqPtr&, - const IceUtil::Optional< ::std::pair >&, - const ::Ice::Current&); - - virtual void opFloatSeq_async(const ::Test::AMD_Initial_opFloatSeqPtr&, - const IceUtil::Optional< ::std::pair >&, - const ::Ice::Current&); - - virtual void opDoubleSeq_async(const ::Test::AMD_Initial_opDoubleSeqPtr&, - const IceUtil::Optional< ::std::pair >&, - const ::Ice::Current&); - - virtual void opStringSeq_async(const ::Test::AMD_Initial_opStringSeqPtr&, - const IceUtil::Optional< ::std::pair< ::Test::StringSeq::const_iterator, - ::Test::StringSeq::const_iterator> >&, - const ::Ice::Current&); - - virtual void opSmallStructSeq_async(const ::Test::AMD_Initial_opSmallStructSeqPtr&, - const IceUtil::Optional< ::std::pair >&, - const ::Ice::Current&); - - virtual void opSmallStructList_async(const ::Test::AMD_Initial_opSmallStructListPtr&, - const IceUtil::Optional< ::std::pair >&, - const ::Ice::Current&); - - virtual void opFixedStructSeq_async(const ::Test::AMD_Initial_opFixedStructSeqPtr&, - const IceUtil::Optional< ::std::pair >&, - const ::Ice::Current&); - - virtual void opFixedStructList_async(const ::Test::AMD_Initial_opFixedStructListPtr&, - const IceUtil::Optional< ::std::pair >&, - const ::Ice::Current&); - - virtual void opVarStructSeq_async(const ::Test::AMD_Initial_opVarStructSeqPtr&, - const IceUtil::Optional< ::std::pair< ::Test::VarStructSeq::const_iterator, - ::Test::VarStructSeq::const_iterator> >&, - const ::Ice::Current&); - - virtual void opSerializable_async(const ::Test::AMD_Initial_opSerializablePtr&, - const IceUtil::Optional< ::Test::Serializable>&, - const ::Ice::Current&); - - virtual void opIntIntDict_async(const ::Test::AMD_Initial_opIntIntDictPtr&, - const IceUtil::Optional< ::Test::IntIntDict>&, - const ::Ice::Current&); - - virtual void opStringIntDict_async(const ::Test::AMD_Initial_opStringIntDictPtr&, - const IceUtil::Optional< ::Test::StringIntDict>&, - const ::Ice::Current&); - - virtual void opIntOneOptionalDict_async(const ::Test::AMD_Initial_opIntOneOptionalDictPtr&, - const IceUtil::Optional< ::Test::IntOneOptionalDict>&, - const ::Ice::Current&); - - virtual void opCustomIntStringDict_async(const ::Test::AMD_Initial_opCustomIntStringDictPtr&, - const IceUtil::Optional >&, - const ::Ice::Current&); - - virtual void opClassAndUnknownOptional_async(const ::Test::AMD_Initial_opClassAndUnknownOptionalPtr&, - const Test::APtr&, - const Ice::Current&); - - virtual void sendOptionalClass_async(const ::Test::AMD_Initial_sendOptionalClassPtr&, - bool, - const IceUtil::Optional&, - const Ice::Current&); - - virtual void returnOptionalClass_async(const ::Test::AMD_Initial_returnOptionalClassPtr&, - bool, - const Ice::Current&); - - virtual void opG_async(const ::Test::AMD_Initial_opGPtr&, - const ::Test::GPtr&, - const Ice::Current&); - - virtual void opVoid_async(const ::Test::AMD_Initial_opVoidPtr&, - const Ice::Current&); - - virtual void opMStruct1_async(const Test::AMD_Initial_opMStruct1Ptr&, const Ice::Current&); - - virtual void opMStruct2_async(const Test::AMD_Initial_opMStruct2Ptr&, - const IceUtil::Optional< Test::SmallStruct>&, - const Ice::Current&); - - virtual void opMSeq1_async(const Test::AMD_Initial_opMSeq1Ptr&, const Ice::Current&); - - virtual void opMSeq2_async(const Test::AMD_Initial_opMSeq2Ptr&, - const IceUtil::Optional< Test::StringSeq>&, - const Ice::Current&); - - virtual void opMDict1_async(const Test::AMD_Initial_opMDict1Ptr&, const Ice::Current&); - - virtual void opMDict2_async(const Test::AMD_Initial_opMDict2Ptr&, const - IceUtil::Optional< Test::StringIntDict>&, - const Ice::Current&); - - virtual void opMG1_async(const Test::AMD_Initial_opMG1Ptr&, const Ice::Current&); - - virtual void opMG2_async(const Test::AMD_Initial_opMG2Ptr&, - const IceUtil::Optional< Test::GPtr>&, - const Ice::Current&); - - virtual void supportsRequiredParams_async(const ::Test::AMD_Initial_supportsRequiredParamsPtr&, - const Ice::Current&); - - virtual void supportsJavaSerializable_async(const ::Test::AMD_Initial_supportsJavaSerializablePtr&, - const Ice::Current&); - - virtual void supportsCsharpSerializable_async(const ::Test::AMD_Initial_supportsCsharpSerializablePtr&, - const Ice::Current&); - - virtual void supportsCppStringView_async(const ::Test::AMD_Initial_supportsCppStringViewPtr&, - const Ice::Current&); - - virtual void supportsNullOptional_async(const ::Test::AMD_Initial_supportsNullOptionalPtr&, const Ice::Current&); - -#endif - }; #endif diff --git a/cpp/test/Ice/optional/TestI.cpp b/cpp/test/Ice/optional/TestI.cpp index 1e3321d10eb..df0a1f6515f 100644 --- a/cpp/test/Ice/optional/TestI.cpp +++ b/cpp/test/Ice/optional/TestI.cpp @@ -20,7 +20,6 @@ InitialI::shutdown(const Current& current) current.adapter->getCommunicator()->shutdown(); } -#ifdef ICE_CPP11_MAPPING Test::Initial::PingPongMarshaledResult InitialI::pingPong(shared_ptr obj, const Current& current) { @@ -32,13 +31,6 @@ InitialI::pingPong(shared_ptr obj, const Current& current) } return result; } -#else -Ice::ValuePtr -InitialI::pingPong(const Ice::ValuePtr& obj, const Current&) -{ - return obj; -} -#endif void InitialI::opOptionalException(ICE_IN(Optional) a, @@ -273,7 +265,6 @@ InitialI::opDoubleSeq(ICE_IN(Optional >) p1, return p3; } -#ifdef ICE_CPP11_MAPPING Ice::optional InitialI::opStringSeq(Ice::optional p1, Ice::optional& p3, const Current&) @@ -284,18 +275,6 @@ InitialI::opStringSeq(Ice::optional p1, } return p3; } -#else -Optional -InitialI::opStringSeq(const Optional >& p1, - Optional& p3, const Current&) -{ - if(p1) - { - p3 = Ice::StringSeq(p1->first, p1->second); - } - return p3; -} -#endif Optional InitialI::opSmallStructSeq(ICE_IN(Optional >) p1, @@ -341,7 +320,6 @@ InitialI::opFixedStructList(ICE_IN(Optional InitialI::opVarStructSeq(Ice::optional p1, Ice::optional& p3, const Current&) @@ -352,18 +330,6 @@ InitialI::opVarStructSeq(Ice::optional p1, } return p3; } -#else -Optional -InitialI::opVarStructSeq(const Optional >& p1, - Optional& p3, const Current&) -{ - if(p1) - { - p3 = VarStructSeq(p1->first, p1->second); - } - return p3; -} -#endif Optional InitialI::opSerializable(ICE_IN(Optional) p1, Optional& p3, const Current&) @@ -436,7 +402,6 @@ InitialI::opVoid(const Ice::Current&) { } -#ifdef ICE_CPP11_MAPPING InitialI::OpMStruct1MarshaledResult InitialI::opMStruct1(const Ice::Current& current) { @@ -484,67 +449,6 @@ InitialI::opMG2(ICE_IN(IceUtil::Optional) p1, const Ice::Current& cu { return OpMG2MarshaledResult(p1, p1, current); } -#else -IceUtil::Optional -InitialI::opMStruct1(const Ice::Current&) -{ - return Test::SmallStruct(); -} - -IceUtil::Optional -InitialI::opMStruct2(ICE_IN(IceUtil::Optional) p1, - IceUtil::Optional& p2, - const Ice::Current&) -{ - p2 = p1; - return p1; -} - -IceUtil::Optional -InitialI::opMSeq1(const Ice::Current&) -{ - return Test::StringSeq(); -} - -IceUtil::Optional -InitialI::opMSeq2(ICE_IN(IceUtil::Optional) p1, - IceUtil::Optional& p2, - const Ice::Current&) -{ - p2 = p1; - return p1; -} - -IceUtil::Optional -InitialI::opMDict1(const Ice::Current&) -{ - return Test::StringIntDict(); -} - -IceUtil::Optional -InitialI::opMDict2(ICE_IN(IceUtil::Optional) p1, - IceUtil::Optional& p2, - const Ice::Current&) -{ - p2 = p1; - return p1; -} - -IceUtil::Optional -InitialI::opMG1(const Ice::Current&) -{ - return ICE_MAKE_SHARED(G); -} - -IceUtil::Optional -InitialI::opMG2(ICE_IN(IceUtil::Optional) p1, - IceUtil::Optional& p2, - const Ice::Current&) -{ - p2 = p1; - return p1; -} -#endif bool InitialI::supportsRequiredParams(const Ice::Current&) diff --git a/cpp/test/Ice/optional/TestI.h b/cpp/test/Ice/optional/TestI.h index 9f593182dab..1a28e530380 100644 --- a/cpp/test/Ice/optional/TestI.h +++ b/cpp/test/Ice/optional/TestI.h @@ -14,11 +14,7 @@ class InitialI : public Test::Initial InitialI(); virtual void shutdown(const Ice::Current&); -#ifdef ICE_CPP11_MAPPING virtual PingPongMarshaledResult pingPong(ICE_IN(Ice::ValuePtr), const Ice::Current&); -#else - virtual Ice::ValuePtr pingPong(const Ice::ValuePtr&, const Ice::Current&); -#endif virtual void opOptionalException(ICE_IN(IceUtil::Optional< ::Ice::Int>), ICE_IN(IceUtil::Optional< ::std::string>), @@ -129,17 +125,9 @@ class InitialI : public Test::Initial IceUtil::Optional< ::Test::DoubleSeq>&, const ::Ice::Current&); -#ifdef ICE_CPP11_MAPPING virtual Ice::optional<::Test::StringSeq> opStringSeq( Ice::optional<::Test::StringSeq>, Ice::optional<::Test::StringSeq>&, const ::Ice::Current&) ; -#else - virtual IceUtil::Optional< ::Test::StringSeq> opStringSeq( - const IceUtil::Optional< ::std::pair< ::Test::StringSeq::const_iterator, - ::Test::StringSeq::const_iterator> >&, - IceUtil::Optional< ::Test::StringSeq>&, - const ::Ice::Current&); -#endif virtual IceUtil::Optional< ::Test::SmallStructSeq> opSmallStructSeq( ICE_IN(IceUtil::Optional< ::std::pair >), @@ -157,17 +145,9 @@ class InitialI : public Test::Initial ICE_IN(IceUtil::Optional< ::std::pair >), IceUtil::Optional< ::Test::FixedStructList>&, const ::Ice::Current&); -#ifdef ICE_CPP11_MAPPING virtual Ice::optional<::Test::VarStructSeq> opVarStructSeq( Ice::optional<::Test::VarStructSeq>, Ice::optional<::Test::VarStructSeq>&, const ::Ice::Current&); -#else - virtual IceUtil::Optional< ::Test::VarStructSeq> opVarStructSeq( - const IceUtil::Optional< ::std::pair< ::Test::VarStructSeq::const_iterator, - ::Test::VarStructSeq::const_iterator> >&, - IceUtil::Optional< ::Test::VarStructSeq>&, - const ::Ice::Current&); -#endif virtual IceUtil::Optional< ::Test::Serializable> opSerializable( ICE_IN(IceUtil::Optional< ::Test::Serializable>), @@ -204,7 +184,6 @@ class InitialI : public Test::Initial virtual void opVoid(const Ice::Current&); -#ifdef ICE_CPP11_MAPPING virtual OpMStruct1MarshaledResult opMStruct1(const Ice::Current&); virtual OpMStruct2MarshaledResult opMStruct2(ICE_IN(IceUtil::Optional), const Ice::Current&); @@ -220,31 +199,6 @@ class InitialI : public Test::Initial virtual OpMG1MarshaledResult opMG1(const Ice::Current&); virtual OpMG2MarshaledResult opMG2(ICE_IN(IceUtil::Optional), const Ice::Current&); -#else - virtual IceUtil::Optional opMStruct1(const Ice::Current&); - - virtual IceUtil::Optional opMStruct2(ICE_IN(IceUtil::Optional), - IceUtil::Optional&, - const Ice::Current&); - - virtual IceUtil::Optional opMSeq1(const Ice::Current&); - - virtual IceUtil::Optional opMSeq2(ICE_IN(IceUtil::Optional), - IceUtil::Optional&, - const Ice::Current&); - - virtual IceUtil::Optional opMDict1(const Ice::Current&); - - virtual IceUtil::Optional opMDict2(ICE_IN(IceUtil::Optional), - IceUtil::Optional&, - const Ice::Current&); - - virtual IceUtil::Optional opMG1(const Ice::Current&); - - virtual IceUtil::Optional opMG2(ICE_IN(IceUtil::Optional), - IceUtil::Optional&, - const Ice::Current&); -#endif virtual bool supportsRequiredParams(const Ice::Current&); diff --git a/cpp/test/Ice/proxy/AllTests.cpp b/cpp/test/Ice/proxy/AllTests.cpp index f5b881369c4..78af1e97599 100644 --- a/cpp/test/Ice/proxy/AllTests.cpp +++ b/cpp/test/Ice/proxy/AllTests.cpp @@ -365,8 +365,6 @@ allTests(Test::TestHelper* helper) id2 = Ice::stringToIdentity(communicator->identityToString(id)); test(id == id2); - // More unicode characters -#if defined(ICE_CPP11_MAPPING) // To use unicode string literals with Visual Studio we need to build with /utf8 // compiler option require Visual Studio 2017 or later id.name = "banana \016-\U0001F34C\U000020AC\u00a2\u0024"; @@ -386,7 +384,6 @@ allTests(Test::TestHelper* helper) test(idStr == "greek \\360\\220\\205\\252/banana \\016-\\360\\237\\215\\214\\342\\202\\254\\302\\242$"); id2 = Ice::stringToIdentity(idStr); test(id == id2); -#endif cout << "ok" << endl; @@ -610,11 +607,7 @@ allTests(Test::TestHelper* helper) base->ice_timeout(0); test(false); } -#ifdef ICE_CPP11_MAPPING catch(const invalid_argument&) -#else - catch(const IceUtil::IllegalArgumentException&) -#endif { } @@ -622,11 +615,7 @@ allTests(Test::TestHelper* helper) { base->ice_timeout(-1); } -#ifdef ICE_CPP11_MAPPING catch(const invalid_argument&) -#else - catch(const IceUtil::IllegalArgumentException&) -#endif { test(false); } @@ -636,11 +625,7 @@ allTests(Test::TestHelper* helper) base->ice_timeout(-2); test(false); } -#ifdef ICE_CPP11_MAPPING catch(const invalid_argument&) -#else - catch(const IceUtil::IllegalArgumentException&) -#endif { } @@ -649,11 +634,7 @@ allTests(Test::TestHelper* helper) base->ice_invocationTimeout(0); test(false); } -#ifdef ICE_CPP11_MAPPING catch(const invalid_argument&) -#else - catch(const IceUtil::IllegalArgumentException&) -#endif { } @@ -662,11 +643,7 @@ allTests(Test::TestHelper* helper) base->ice_invocationTimeout(-1); base->ice_invocationTimeout(-2); } -#ifdef ICE_CPP11_MAPPING catch(const invalid_argument&) -#else - catch(const IceUtil::IllegalArgumentException&) -#endif { test(false); } @@ -676,11 +653,7 @@ allTests(Test::TestHelper* helper) base->ice_invocationTimeout(-3); test(false); } -#ifdef ICE_CPP11_MAPPING catch(const invalid_argument&) -#else - catch(const IceUtil::IllegalArgumentException&) -#endif { } @@ -688,11 +661,7 @@ allTests(Test::TestHelper* helper) { base->ice_locatorCacheTimeout(0); } -#ifdef ICE_CPP11_MAPPING catch(const invalid_argument&) -#else - catch(const IceUtil::IllegalArgumentException&) -#endif { test(false); } @@ -701,11 +670,7 @@ allTests(Test::TestHelper* helper) { base->ice_locatorCacheTimeout(-1); } -#ifdef ICE_CPP11_MAPPING catch(const invalid_argument&) -#else - catch(const IceUtil::IllegalArgumentException&) -#endif { test(false); } @@ -715,11 +680,7 @@ allTests(Test::TestHelper* helper) base->ice_locatorCacheTimeout(-2); test(false); } -#ifdef ICE_CPP11_MAPPING catch(const invalid_argument&) -#else - catch(const IceUtil::IllegalArgumentException&) -#endif { } @@ -727,7 +688,6 @@ allTests(Test::TestHelper* helper) cout << "testing proxy comparison... " << flush; -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(communicator->stringToProxy("foo"), communicator->stringToProxy("foo"))); test(Ice::targetNotEqualTo(communicator->stringToProxy("foo"), communicator->stringToProxy("foo2"))); test(Ice::targetLess(communicator->stringToProxy("foo"), communicator->stringToProxy("foo2"))); @@ -918,215 +878,6 @@ allTests(Test::TestHelper* helper) test(obj); test(Ice::targetEqualTo(cl2, obj)); test(Ice::targetEqualTo(cl2, derived)); -#else - test(communicator->stringToProxy("foo") == communicator->stringToProxy("foo")); - test(communicator->stringToProxy("foo") != communicator->stringToProxy("foo2")); - test(communicator->stringToProxy("foo") < communicator->stringToProxy("foo2")); - test(!(communicator->stringToProxy("foo2") < communicator->stringToProxy("foo"))); - - Ice::ObjectPrxPtr compObj = communicator->stringToProxy("foo"); - - test(compObj->ice_facet("facet") == compObj->ice_facet("facet")); - test(compObj->ice_facet("facet") != compObj->ice_facet("facet1")); - test(compObj->ice_facet("facet") < compObj->ice_facet("facet1")); - test(!(compObj->ice_facet("facet") < compObj->ice_facet("facet"))); - - test(compObj->ice_oneway() == compObj->ice_oneway()); - test(compObj->ice_oneway() != compObj->ice_twoway()); - test(compObj->ice_twoway() < compObj->ice_oneway()); - test(!(compObj->ice_oneway() < compObj->ice_twoway())); - - test(compObj->ice_secure(true) == compObj->ice_secure(true)); - test(compObj->ice_secure(false) != compObj->ice_secure(true)); - test(compObj->ice_secure(false) < compObj->ice_secure(true)); - test(!(compObj->ice_secure(true) < compObj->ice_secure(false))); - - test(compObj->ice_collocationOptimized(true) == compObj->ice_collocationOptimized(true)); - test(compObj->ice_collocationOptimized(false) != compObj->ice_collocationOptimized(true)); - test(compObj->ice_collocationOptimized(false) < compObj->ice_collocationOptimized(true)); - test(!(compObj->ice_collocationOptimized(true) < compObj->ice_collocationOptimized(false))); - - test(compObj->ice_connectionCached(true) == compObj->ice_connectionCached(true)); - test(compObj->ice_connectionCached(false) != compObj->ice_connectionCached(true)); - test(compObj->ice_connectionCached(false) < compObj->ice_connectionCached(true)); - test(!(compObj->ice_connectionCached(true) < compObj->ice_connectionCached(false))); - - test(compObj->ice_endpointSelection(Ice::ICE_ENUM(EndpointSelectionType, Random)) == compObj->ice_endpointSelection(Ice::ICE_ENUM(EndpointSelectionType, Random))); - test(compObj->ice_endpointSelection(Ice::ICE_ENUM(EndpointSelectionType, Random)) != compObj->ice_endpointSelection(Ice::ICE_ENUM(EndpointSelectionType, Ordered))); - test(compObj->ice_endpointSelection(Ice::ICE_ENUM(EndpointSelectionType, Random)) < compObj->ice_endpointSelection(Ice::ICE_ENUM(EndpointSelectionType, Ordered))); - test(!(compObj->ice_endpointSelection(Ice::ICE_ENUM(EndpointSelectionType, Ordered)) < compObj->ice_endpointSelection(Ice::ICE_ENUM(EndpointSelectionType, Random)))); - - test(compObj->ice_connectionId("id2") == compObj->ice_connectionId("id2")); - test(compObj->ice_connectionId("id1") != compObj->ice_connectionId("id2")); - test(compObj->ice_connectionId("id1") < compObj->ice_connectionId("id2")); - test(!(compObj->ice_connectionId("id2") < compObj->ice_connectionId("id1"))); - - test(compObj->ice_connectionId("id1")->ice_getConnectionId() == "id1"); - test(compObj->ice_connectionId("id2")->ice_getConnectionId() == "id2"); - - test(compObj->ice_compress(true) == compObj->ice_compress(true)); - test(compObj->ice_compress(false) != compObj->ice_compress(true)); - test(compObj->ice_compress(false) < compObj->ice_compress(true)); - test(!(compObj->ice_compress(true) < compObj->ice_compress(false))); - - test(!compObj->ice_getCompress()); - test(compObj->ice_compress(true)->ice_getCompress() == IceUtil::Optional(true)); - test(compObj->ice_compress(false)->ice_getCompress() == IceUtil::Optional(false)); - - test(compObj->ice_timeout(20) == compObj->ice_timeout(20)); - test(compObj->ice_timeout(10) != compObj->ice_timeout(20)); - test(compObj->ice_timeout(10) < compObj->ice_timeout(20)); - test(!(compObj->ice_timeout(20) < compObj->ice_timeout(10))); - - test(!compObj->ice_getTimeout()); - test(compObj->ice_timeout(10)->ice_getTimeout() == IceUtil::Optional(10)); - test(compObj->ice_timeout(20)->ice_getTimeout() == IceUtil::Optional(20)); - - Ice::LocatorPrxPtr loc1 = ICE_UNCHECKED_CAST(Ice::LocatorPrx, communicator->stringToProxy("loc1:" + endp)); - Ice::LocatorPrxPtr loc2 = ICE_UNCHECKED_CAST(Ice::LocatorPrx, communicator->stringToProxy("loc2:" + endp)); - test(compObj->ice_locator(0) == compObj->ice_locator(0)); - test(compObj->ice_locator(loc1) == compObj->ice_locator(loc1)); - test(compObj->ice_locator(loc1) != compObj->ice_locator(0)); - test(compObj->ice_locator(0) != compObj->ice_locator(loc2)); - test(compObj->ice_locator(loc1) != compObj->ice_locator(loc2)); - test(compObj->ice_locator(0) < compObj->ice_locator(loc1)); - test(!(compObj->ice_locator(loc1) < compObj->ice_locator(0))); - test(compObj->ice_locator(loc1) < compObj->ice_locator(loc2)); - test(!(compObj->ice_locator(loc2) < compObj->ice_locator(loc1))); - - Ice::RouterPrxPtr rtr1 = ICE_UNCHECKED_CAST(Ice::RouterPrx, communicator->stringToProxy("rtr1:" + endp)); - Ice::RouterPrxPtr rtr2 = ICE_UNCHECKED_CAST(Ice::RouterPrx, communicator->stringToProxy("rtr2:" + endp)); - test(compObj->ice_router(0) == compObj->ice_router(0)); - test(compObj->ice_router(rtr1) == compObj->ice_router(rtr1)); - test(compObj->ice_router(rtr1) != compObj->ice_router(0)); - test(compObj->ice_router(0) != compObj->ice_router(rtr2)); - test(compObj->ice_router(rtr1) != compObj->ice_router(rtr2)); - test(compObj->ice_router(0) < compObj->ice_router(rtr1)); - test(!(compObj->ice_router(rtr1) < compObj->ice_router(0))); - test(compObj->ice_router(rtr1) < compObj->ice_router(rtr2)); - test(!(compObj->ice_router(rtr2) < compObj->ice_router(rtr1))); - - Ice::Context ctx1; - ctx1["ctx1"] = "v1"; - Ice::Context ctx2; - ctx2["ctx2"] = "v2"; - test(compObj->ice_context(Ice::Context()) == compObj->ice_context(Ice::Context())); - test(compObj->ice_context(ctx1) == compObj->ice_context(ctx1)); - test(compObj->ice_context(ctx1) != compObj->ice_context(Ice::Context())); - test(compObj->ice_context(Ice::Context()) != compObj->ice_context(ctx2)); - test(compObj->ice_context(ctx1) != compObj->ice_context(ctx2)); - test(compObj->ice_context(ctx1) < compObj->ice_context(ctx2)); - test(!(compObj->ice_context(ctx2) < compObj->ice_context(ctx1))); - - test(compObj->ice_preferSecure(true) == compObj->ice_preferSecure(true)); - test(compObj->ice_preferSecure(true) != compObj->ice_preferSecure(false)); - test(compObj->ice_preferSecure(false) < compObj->ice_preferSecure(true)); - test(!(compObj->ice_preferSecure(true) < compObj->ice_preferSecure(false))); - - Ice::ObjectPrxPtr compObj1 = communicator->stringToProxy("foo:tcp -h 127.0.0.1 -p 10000"); - Ice::ObjectPrxPtr compObj2 = communicator->stringToProxy("foo:tcp -h 127.0.0.1 -p 10001"); - test(compObj1 != compObj2); - test(compObj1 < compObj2); - test(!(compObj2 < compObj1)); - - compObj1 = communicator->stringToProxy("foo@MyAdapter1"); - compObj2 = communicator->stringToProxy("foo@MyAdapter2"); - test(compObj1 != compObj2); - test(compObj1 < compObj2); - test(!(compObj2 < compObj1)); - - test(compObj1->ice_locatorCacheTimeout(20) == compObj1->ice_locatorCacheTimeout(20)); - test(compObj1->ice_locatorCacheTimeout(10) != compObj1->ice_locatorCacheTimeout(20)); - test(compObj1->ice_locatorCacheTimeout(10) < compObj1->ice_locatorCacheTimeout(20)); - test(!(compObj1->ice_locatorCacheTimeout(20) < compObj1->ice_locatorCacheTimeout(10))); - - test(compObj1->ice_invocationTimeout(20) == compObj1->ice_invocationTimeout(20)); - test(compObj1->ice_invocationTimeout(10) != compObj1->ice_invocationTimeout(20)); - test(compObj1->ice_invocationTimeout(10) < compObj1->ice_invocationTimeout(20)); - test(!(compObj1->ice_invocationTimeout(20) < compObj1->ice_invocationTimeout(10))); - - compObj1 = communicator->stringToProxy("foo:tcp -h 127.0.0.1 -p 1000"); - compObj2 = communicator->stringToProxy("foo@MyAdapter1"); - test(compObj1 != compObj2); - test(compObj1 < compObj2); - test(!(compObj2 < compObj1)); - - Ice::EndpointSeq endpts1 = communicator->stringToProxy("foo:tcp -h 127.0.0.1 -p 10000")->ice_getEndpoints(); - Ice::EndpointSeq endpts2 = communicator->stringToProxy("foo:tcp -h 127.0.0.1 -p 10001")->ice_getEndpoints(); - test(endpts1 != endpts2); - test(endpts1 < endpts2); - test(!(endpts2 < endpts1)); - test(endpts1 == communicator->stringToProxy("foo:tcp -h 127.0.0.1 -p 10000")->ice_getEndpoints()); - - test(compObj1->ice_encodingVersion(Ice::Encoding_1_0) == compObj1->ice_encodingVersion(Ice::Encoding_1_0)); - test(compObj1->ice_encodingVersion(Ice::Encoding_1_0) != compObj1->ice_encodingVersion(Ice::Encoding_1_1)); - test(compObj->ice_encodingVersion(Ice::Encoding_1_0) < compObj->ice_encodingVersion(Ice::Encoding_1_1)); - test(!(compObj->ice_encodingVersion(Ice::Encoding_1_1) < compObj->ice_encodingVersion(Ice::Encoding_1_0))); - - Ice::ConnectionPtr baseConnection = base->ice_getConnection(); - if(baseConnection && protocol != "bt") - { - Ice::ConnectionPtr baseConnection2 = base->ice_connectionId("base2")->ice_getConnection(); - compObj1 = compObj1->ice_fixed(baseConnection); - compObj2 = compObj2->ice_fixed(baseConnection2); - test(compObj1 != compObj2); - if(compObj1 < compObj2) - { - test(compObj2 >= compObj1); - } - else - { - test(compObj1 >= compObj2); - } - } - - cout << "ok" << endl; - - cout << "testing checked cast... " << flush; - Test::MyClassPrxPtr cl = ICE_CHECKED_CAST(Test::MyClassPrx, base); - test(cl); - - Test::MyDerivedClassPrxPtr derived = ICE_CHECKED_CAST(Test::MyDerivedClassPrx, cl); - test(derived); - test(cl == base); - test(derived == base); - test(cl == derived); - test(ICE_CHECKED_CAST(Test::MyDerivedClassPrx, cl, "facet") == ICE_NULLPTR); - - Ice::LocatorPrxPtr loc = ICE_CHECKED_CAST(Ice::LocatorPrx, base); - test(loc == 0); - - // - // Upcasting - // - Test::MyClassPrxPtr cl2 = ICE_CHECKED_CAST(Test::MyClassPrx, derived); - Ice::ObjectPrxPtr obj = ICE_CHECKED_CAST(Ice::ObjectPrx, derived); - test(cl2); - test(obj); - test(cl2 == obj); - test(cl2 == derived); - - // - // Now with alternate API - // - cl = Ice::checkedCast(base); - test(cl); - derived = Ice::checkedCast(cl); - test(derived); - test(cl == base); - test(derived == base); - test(cl == derived); - - loc = Ice::checkedCast(base); - test(loc == 0); - - cl2 = Ice::checkedCast(derived); - obj = Ice::checkedCast(derived); - test(cl2); - test(obj); - test(cl2 == obj); - test(cl2 == derived); -#endif cout << "ok" << endl; cout << "testing checked cast with context... " << flush; @@ -1135,26 +886,13 @@ allTests(Test::TestHelper* helper) ctx["one"] = "hello"; ctx["two"] = "world"; -#ifdef ICE_CPP11_MAPPING cl = Ice::checkedCast(base, ctx); -#else - cl = Test::MyClassPrx::checkedCast(base, ctx); -#endif Ice::Context c2 = cl->getContext(); test(ctx == c2); // // Now with alternate API // -#ifndef ICE_CPP11_MAPPING - cl = Ice::checkedCast(base); - ctx = cl->getContext(); - test(ctx.size() == 0); - - cl = Ice::checkedCast(base, ctx); - c2 = cl->getContext(); - test(ctx == c2); -#endif cout << "ok" << endl; if(protocol != "bt") @@ -1206,11 +944,7 @@ allTests(Test::TestHelper* helper) cl->ice_fixed(connection); test(false); } -#ifdef ICE_CPP11_MAPPING catch(const invalid_argument&) -#else - catch(const IceUtil::IllegalArgumentException&) -#endif { // Expected with null connection. } @@ -1244,11 +978,7 @@ allTests(Test::TestHelper* helper) string ref13 = "test -e 1.3:" + endp; Test::MyClassPrxPtr cl13 = ICE_UNCHECKED_CAST(Test::MyClassPrx, communicator->stringToProxy(ref13)); cl13->ice_ping(); -#ifdef ICE_CPP11_MAPPING cl13->ice_pingAsync().get(); -#else - cl13->end_ice_ping(cl13->begin_ice_ping()); -#endif try { @@ -1317,11 +1047,7 @@ allTests(Test::TestHelper* helper) ref13 = "test -p 1.3:" + endp; cl13 = ICE_UNCHECKED_CAST(Test::MyClassPrx, communicator->stringToProxy(ref13)); cl13->ice_ping(); -#ifdef ICE_CPP11_MAPPING cl13->ice_pingAsync().get(); -#else - cl13->end_ice_ping(cl13->begin_ice_ping()); -#endif cout << "ok" < obj, @@ -41,26 +40,6 @@ MyDerivedClassI::getContextAsync( { response(_ctx); } -#else -void -MyDerivedClassI::echo_async(const Test::AMD_MyDerivedClass_echoPtr& cb, const Ice::ObjectPrx& obj, const Ice::Current&) -{ - cb->ice_response(obj); -} - -void -MyDerivedClassI::shutdown_async(const Test::AMD_MyClass_shutdownPtr& cb, const Ice::Current& c) -{ - c.adapter->getCommunicator()->shutdown(); - cb->ice_response(); -} - -void -MyDerivedClassI::getContext_async(const Test::AMD_MyClass_getContextPtr& cb, const Ice::Current&) -{ - cb->ice_response(_ctx); -} -#endif bool MyDerivedClassI::ice_isA(string s, const Ice::Current& current) const diff --git a/cpp/test/Ice/proxy/TestAMDI.h b/cpp/test/Ice/proxy/TestAMDI.h index 9e4f5cdf166..a3290d97d0b 100644 --- a/cpp/test/Ice/proxy/TestAMDI.h +++ b/cpp/test/Ice/proxy/TestAMDI.h @@ -13,7 +13,6 @@ class MyDerivedClassI : public Test::MyDerivedClass MyDerivedClassI(); -#ifdef ICE_CPP11_MAPPING virtual void echoAsync( std::shared_ptr, ::std::function&)>, @@ -29,13 +28,6 @@ class MyDerivedClassI : public Test::MyDerivedClass ::std::function, ::std::function, const Ice::Current&); -#else - virtual void echo_async(const Test::AMD_MyDerivedClass_echoPtr&, const Ice::ObjectPrx&, const Ice::Current&); - virtual void shutdown_async(const Test::AMD_MyClass_shutdownPtr&, - const Ice::Current&); - virtual void getContext_async(const Test::AMD_MyClass_getContextPtr& cb, - const Ice::Current&); -#endif virtual bool ice_isA(std::string, const Ice::Current&) const; private: diff --git a/cpp/test/Ice/proxy/TestI.cpp b/cpp/test/Ice/proxy/TestI.cpp index 643923fcbaf..59c73ece024 100644 --- a/cpp/test/Ice/proxy/TestI.cpp +++ b/cpp/test/Ice/proxy/TestI.cpp @@ -11,19 +11,11 @@ MyDerivedClassI::MyDerivedClassI() { } -#ifdef ICE_CPP11_MAPPING shared_ptr MyDerivedClassI::echo(shared_ptr obj, const Ice::Current&) { return obj; } -#else -Ice::ObjectPrx -MyDerivedClassI::echo(const Ice::ObjectPrx& obj, const Ice::Current&) -{ - return obj; -} -#endif void MyDerivedClassI::shutdown(const Ice::Current& c) diff --git a/cpp/test/Ice/proxy/TestI.h b/cpp/test/Ice/proxy/TestI.h index 303f532a0db..26562453626 100644 --- a/cpp/test/Ice/proxy/TestI.h +++ b/cpp/test/Ice/proxy/TestI.h @@ -12,12 +12,7 @@ class MyDerivedClassI : public Test::MyDerivedClass public: MyDerivedClassI(); -#ifdef ICE_CPP11_MAPPING virtual std::shared_ptr echo(std::shared_ptr, const Ice::Current&); - -#else - virtual Ice::ObjectPrx echo(const Ice::ObjectPrx&, const Ice::Current&); -#endif virtual bool ice_isA(std::string, const Ice::Current&) const; virtual void shutdown(const Ice::Current&); virtual Ice::Context getContext(const Ice::Current&); diff --git a/cpp/test/Ice/retry/AllTests.cpp b/cpp/test/Ice/retry/AllTests.cpp index ff0444e034b..6260d3eb370 100644 --- a/cpp/test/Ice/retry/AllTests.cpp +++ b/cpp/test/Ice/retry/AllTests.cpp @@ -96,18 +96,11 @@ allTests(const Ice::CommunicatorPtr& communicator, const Ice::CommunicatorPtr& c cout << "testing checked cast... " << flush; RetryPrxPtr retry1 = ICE_CHECKED_CAST(RetryPrx, base1); test(retry1); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(retry1, base1)); -#else - test(retry1 == base1); -#endif + RetryPrxPtr retry2 = ICE_CHECKED_CAST(RetryPrx, base2); test(retry2); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(retry2, base2)); -#else - test(retry2 == base2); -#endif cout << "ok" << endl; cout << "calling regular operation with first proxy... " << flush; @@ -145,7 +138,6 @@ allTests(const Ice::CommunicatorPtr& communicator, const Ice::CommunicatorPtr& c CallbackFailPtr cb2 = new CallbackFail(); cout << "calling regular AMI operation with first proxy... " << flush; -#ifdef ICE_CPP11_MAPPING retry1->opAsync(false, [cb1]() { @@ -162,9 +154,6 @@ allTests(const Ice::CommunicatorPtr& communicator, const Ice::CommunicatorPtr& c cb1->exception(ex); } }); -#else - retry1->begin_op(false, newCallback_Retry_op(cb1, &CallbackSuccess::response, &CallbackSuccess::exception)); -#endif cb1->check(); testInvocationCount(1); testFailureCount(0); @@ -172,7 +161,6 @@ allTests(const Ice::CommunicatorPtr& communicator, const Ice::CommunicatorPtr& c cout << "ok" << endl; cout << "calling AMI operation to kill connection with second proxy... " << flush; -#ifdef ICE_CPP11_MAPPING retry2->opAsync(true, [cb2]() { @@ -189,9 +177,6 @@ allTests(const Ice::CommunicatorPtr& communicator, const Ice::CommunicatorPtr& c cb2->exception(ex); } }); -#else - retry2->begin_op(true, newCallback_Retry_op(cb2, &CallbackFail::response, &CallbackFail::exception)); -#endif cb2->check(); testInvocationCount(1); testFailureCount(1); @@ -199,7 +184,6 @@ allTests(const Ice::CommunicatorPtr& communicator, const Ice::CommunicatorPtr& c cout << "ok" << endl; cout << "calling regular AMI operation with first proxy again... " << flush; -#ifdef ICE_CPP11_MAPPING retry1->opAsync(false, [cb1]() { @@ -216,9 +200,6 @@ allTests(const Ice::CommunicatorPtr& communicator, const Ice::CommunicatorPtr& c cb1->exception(ex); } }); -#else - retry1->begin_op(false, newCallback_Retry_op(cb1, &CallbackSuccess::response, &CallbackSuccess::exception)); -#endif cb1->check(); testInvocationCount(1); testFailureCount(0); @@ -230,11 +211,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const Ice::CommunicatorPtr& c testInvocationCount(1); testFailureCount(0); testRetryCount(4); -#ifdef ICE_CPP11_MAPPING test(retry1->opIdempotentAsync(4).get() == 4); -#else - test(retry1->end_opIdempotent(retry1->begin_opIdempotent(4)) == 4); -#endif testInvocationCount(1); testFailureCount(0); testRetryCount(4); @@ -275,11 +252,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const Ice::CommunicatorPtr& c testRetryCount(0); try { -#ifdef ICE_CPP11_MAPPING retry1->opNotIdempotentAsync().get(); -#else - retry1->end_opNotIdempotent(retry1->begin_opNotIdempotent()); -#endif test(false); } catch(const Ice::LocalException&) @@ -307,11 +280,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const Ice::CommunicatorPtr& c testRetryCount(0); try { -#ifdef ICE_CPP11_MAPPING retry1->opSystemExceptionAsync().get(); -#else - retry1->end_opSystemException(retry1->begin_opSystemException()); -#endif test(false); } catch(const SystemFailure&) @@ -341,11 +310,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const Ice::CommunicatorPtr& c { // No more than 2 retries before timeout kicks-in RetryPrxPtr prx = retry2->ice_invocationTimeout(500); - #ifdef ICE_CPP11_MAPPING prx->opIdempotentAsync(4).get(); - #else - prx->end_opIdempotent(prx->begin_opIdempotent(4)); - #endif test(false); } catch(const Ice::InvocationTimeoutException&) diff --git a/cpp/test/Ice/retry/SystemFailure.h b/cpp/test/Ice/retry/SystemFailure.h index 2f379cd662e..d6f27a187b9 100644 --- a/cpp/test/Ice/retry/SystemFailure.h +++ b/cpp/test/Ice/retry/SystemFailure.h @@ -24,17 +24,10 @@ class SystemFailure : public Ice::SystemException return "SystemFailure"; } -#ifdef ICE_CPP11_MAPPING virtual IceUtil::Exception* ice_cloneImpl() const { return new SystemFailure(*this); } -#else - virtual SystemException* ice_clone() const - { - return new SystemFailure(*this); - } -#endif virtual void ice_throw() const { diff --git a/cpp/test/Ice/scope/AllTests.cpp b/cpp/test/Ice/scope/AllTests.cpp index d14ffaa1453..185cc4df28a 100644 --- a/cpp/test/Ice/scope/AllTests.cpp +++ b/cpp/test/Ice/scope/AllTests.cpp @@ -9,350 +9,6 @@ using namespace std; -#ifndef ICE_CPP11_MAPPING - -namespace Test -{ - -class Callback : public IceUtil::Shared -{ -public: - - Callback() : _called(false) - { - } - - void opS(const Test::S& s2, const Test::S& s3) - { - test(s2 == s3); - called(); - } - - void opSSeq(const Test::SSeq& s2, const Test::SSeq& s3) - { - test(s2 == s3); - called(); - } - - void opSMap(const Test::SMap& s2, const Test::SMap& s3) - { - test(s2 == s3); - called(); - } - - void opC(const Test::CPtr& c2, const Test::CPtr& c3) - { - test(c2 == c3); - called(); - } - - void opCSeq(const Test::CSeq& c2, const Test::CSeq& c3) - { - test(c2 == c3); - called(); - } - - void opCMap(const Test::CMap& c2, const Test::CMap& c3) - { - test(c2 == c3); - called(); - } - - void opE1(Test::E1 e) - { - test(e == Test::ICE_ENUM(E1, v1)); - called(); - } - - void opS1(const Test::S1& s) - { - test(s.s == "S1"); - called(); - } - - void opC1(const Test::C1Ptr& c) - { - test(c->s == "C1"); - called(); - } - - void error(const Ice::Exception&) - { - test(false); - } - - void called() - { - IceUtil::Monitor::Lock sync(_m); - assert(!_called); - _called = true; - _m.notify(); - } - - void check() - { - IceUtil::Monitor::Lock sync(_m); - while(!_called) - { - _m.wait(); - } - _called = false; - } - -private: - - IceUtil::Monitor _m; - bool _called; -}; - -namespace Inner -{ - -class Callback : public IceUtil::Shared -{ -public: - - Callback() : _called(false) - { - } - - void opS(const Test::Inner::Inner2::S& s2, const Test::Inner::Inner2::S& s3) - { - test(s2 == s3); - called(); - } - - void opSSeq(const Test::Inner::Inner2::SSeq& s2, const Test::Inner::Inner2::SSeq& s3) - { - test(s2 == s3); - called(); - } - - void opSMap(const Test::Inner::Inner2::SMap& s2, const Test::Inner::Inner2::SMap& s3) - { - test(s2 == s3); - called(); - } - - void opC(const Test::Inner::Inner2::CPtr& c2, const Test::Inner::Inner2::CPtr& c3) - { - test(c2 == c3); - called(); - } - - void opCSeq(const Test::Inner::Inner2::CSeq& c2, const Test::Inner::Inner2::CSeq& c3) - { - test(c2 == c3); - called(); - } - - void opCMap(const Test::Inner::Inner2::CMap& c2, const Test::Inner::Inner2::CMap& c3) - { - test(c2 == c3); - called(); - } - - void error(const Ice::Exception&) - { - test(false); - } - - void called() - { - IceUtil::Monitor::Lock sync(_m); - assert(!_called); - _called = true; - _m.notify(); - } - - void check() - { - IceUtil::Monitor::Lock sync(_m); - while(!_called) - { - _m.wait(); - } - _called = false; - } - -private: - - IceUtil::Monitor _m; - bool _called; -}; - -namespace Inner2 -{ - -class Callback : public IceUtil::Shared -{ -public: - - Callback() : _called(false) - { - } - - void opS(const Test::Inner::Inner2::S& s2, const Test::Inner::Inner2::S& s3) - { - test(s2 == s3); - called(); - } - - void opSSeq(const Test::Inner::Inner2::SSeq& s2, const Test::Inner::Inner2::SSeq& s3) - { - test(s2 == s3); - called(); - } - - void opSMap(const Test::Inner::Inner2::SMap& s2, const Test::Inner::Inner2::SMap& s3) - { - test(s2 == s3); - called(); - } - - void opC(const Test::Inner::Inner2::CPtr& s2, const Test::Inner::Inner2::CPtr& s3) - { - test(s2 == s3); - called(); - } - - void opCSeq(const Test::Inner::Inner2::CSeq& s2, const Test::Inner::Inner2::CSeq& s3) - { - test(s2 == s3); - called(); - } - - void opCMap(const Test::Inner::Inner2::CMap& s2, const Test::Inner::Inner2::CMap& s3) - { - test(s2 == s3); - called(); - } - - void error(const Ice::Exception&) - { - test(false); - } - - void called() - { - IceUtil::Monitor::Lock sync(_m); - assert(!_called); - _called = true; - _m.notify(); - } - - void check() - { - IceUtil::Monitor::Lock sync(_m); - while(!_called) - { - _m.wait(); - } - _called = false; - } - -private: - - IceUtil::Monitor _m; - bool _called; -}; - -} - -} - -} - -namespace Inner -{ - -namespace Test -{ - -namespace Inner2 -{ - -class Callback : public IceUtil::Shared -{ -public: - - Callback() : _called(false) - { - } - - void opS(const ::Test::S& s2, const ::Test::S& s3) - { - test(s2 == s3); - called(); - } - - void opSSeq(const ::Test::SSeq& s2, const ::Test::SSeq& s3) - { - test(s2 == s3); - called(); - } - - void opSMap(const ::Test::SMap& s2, const ::Test::SMap& s3) - { - test(s2 == s3); - called(); - } - - void opC(const ::Test::CPtr& s2, const ::Test::CPtr& s3) - { - test(s2 == s3); - called(); - } - - void opCSeq(const ::Test::CSeq& s2, const ::Test::CSeq& s3) - { - test(s2 == s3); - called(); - } - - void opCMap(const ::Test::CMap& s2, const ::Test::CMap& s3) - { - test(s2 == s3); - called(); - } - - void error(const Ice::Exception&) - { - test(false); - } - - void called() - { - IceUtil::Monitor::Lock sync(_m); - assert(!_called); - _called = true; - _m.notify(); - } - - void check() - { - IceUtil::Monitor::Lock sync(_m); - while(!_called) - { - _m.wait(); - } - _called = false; - } - -private: - - IceUtil::Monitor _m; - bool _called; -}; - -} - -} - -} - -#endif - void allTests(Test::TestHelper* helper) { @@ -416,7 +72,6 @@ allTests(Test::TestHelper* helper) test(c->s == "C1"); } -#ifdef ICE_CPP11_MAPPING // // C++ 11 Future-Based Async Function // @@ -740,133 +395,6 @@ allTests(Test::TestHelper* helper) } } } -#else - // - // C++ 98 AsyncResult API - // - { - Test::IPrxPtr i = ICE_CHECKED_CAST(Test::IPrx, communicator->stringToProxy("i1:" + helper->getTestEndpoint())); - - Test::S s1; - s1.v = 0; - - Test::S s2; - Test::S s3 = i->end_opS(s2, i->begin_opS(s1)); - - Test::SSeq sseq1; - sseq1.push_back(s1); - sseq1.push_back(s2); - sseq1.push_back(s3); - - Test::SSeq sseq2; - Test::SSeq sseq3 = i->end_opSSeq(sseq2, i->begin_opSSeq(sseq1)); - - Test::SMap smap1; - smap1["a"] = s1; - smap1["b"] = s2; - smap1["c"] = s3; - - Test::SMap smap2; - Test::SMap smap3 = i->end_opSMap(smap2, i->begin_opSMap(smap1)); - - Test::CPtr c1 = new Test::C(s1); - Test::CPtr c2; - Test::CPtr c3 = i->end_opC(c2, i->begin_opC(c1)); - - Test::CSeq cseq1; - cseq1.push_back(c1); - cseq1.push_back(c2); - cseq1.push_back(c3); - - Test::CSeq cseq2; - Test::CSeq cseq3 = i->end_opCSeq(cseq2, i->begin_opCSeq(cseq1)); - - Test::CMap cmap1; - cmap1["a"] = c1; - cmap1["b"] = c2; - cmap1["c"] = c3; - - Test::CMap cmap2; - Test::CMap cmap3 = i->end_opCMap(cmap2, i->begin_opCMap(cmap1)); - - Test::E1 e = i->end_opE1(i->begin_opE1(Test::ICE_ENUM(E1, v1))); - test(e == Test::ICE_ENUM(E1, v1)); - - Test::S1 s; - s.s = "S1"; - s = i->end_opS1(i->begin_opS1(s)); - test(s.s == "S1"); - - Test::C1Ptr c = i->end_opC1(i->begin_opC1(new Test::C1("C1"))); - test(c->s == "C1"); - } - // - // C++ 98 type safe callbacks - // - { - Test::IPrxPtr i = - ICE_CHECKED_CAST(Test::IPrx, communicator->stringToProxy("i1:" + helper->getTestEndpoint())); - IceUtil::Handle cb = new Test::Callback(); - - Test::S s1; - s1.v = 0; - Test::Callback_I_opSPtr opSCB = - Test::newCallback_I_opS(cb, &Test::Callback::opS, &Test::Callback::error); - i->begin_opS(s1, opSCB); - cb->check(); - - Test::SSeq sseq1; - sseq1.push_back(s1); - Test::Callback_I_opSSeqPtr opSSeqCB = - Test::newCallback_I_opSSeq(cb, &Test::Callback::opSSeq, &Test::Callback::error); - i->begin_opSSeq(sseq1, opSSeqCB); - cb->check(); - - Test::SMap smap1; - smap1["a"] = s1; - Test::Callback_I_opSMapPtr opSMapCB = - Test::newCallback_I_opSMap(cb, &Test::Callback::opSMap, &Test::Callback::error); - i->begin_opSMap(smap1, opSMapCB); - cb->check(); - - Test::CPtr c1 = new Test::C(s1); - Test::Callback_I_opCPtr opCCB = - Test::newCallback_I_opC(cb, &Test::Callback::opC, &Test::Callback::error); - i->begin_opC(c1, opCCB); - cb->check(); - - Test::CSeq cseq1; - cseq1.push_back(c1); - Test::Callback_I_opCSeqPtr opCSeqCB = - Test::newCallback_I_opCSeq(cb, &Test::Callback::opCSeq, &Test::Callback::error); - i->begin_opCSeq(cseq1, opCSeqCB); - cb->check(); - - Test::CMap cmap1; - cmap1["a"] = c1; - Test::Callback_I_opCMapPtr opCMapCB = - Test::newCallback_I_opCMap(cb, &Test::Callback::opCMap, &Test::Callback::error); - i->begin_opCMap(cmap1, opCMapCB); - cb->check(); - - Test::Callback_I_opE1Ptr opE1 = - Test::newCallback_I_opE1(cb, &Test::Callback::opE1, &Test::Callback::error); - i->begin_opE1(Test::ICE_ENUM(E1, v1), opE1); - cb->check(); - - Test::S1 s; - s.s = "S1"; - Test::Callback_I_opS1Ptr opS1 = - Test::newCallback_I_opS1(cb, &Test::Callback::opS1, &Test::Callback::error); - i->begin_opS1(s, opS1); - cb->check(); - - Test::Callback_I_opC1Ptr opC1 = - Test::newCallback_I_opC1(cb, &Test::Callback::opC1, &Test::Callback::error); - i->begin_opC1(new Test::C1("C1"), opC1); - cb->check(); - } -#endif { Test::Inner::Inner2::IPrxPtr i = @@ -914,7 +442,7 @@ allTests(Test::TestHelper* helper) test(cmap2["a"]->s == c1->s); test(cmap3["a"]->s == c1->s); } -#ifdef ICE_CPP11_MAPPING + // // C++ 11 Future-Based Async Function // @@ -1147,120 +675,6 @@ allTests(Test::TestHelper* helper) } } } -#else - // - // C++ 98 AsyncResult API - // - { - Test::Inner::Inner2::IPrxPtr i = - ICE_CHECKED_CAST(Test::Inner::Inner2::IPrx, - communicator->stringToProxy("i2:" + helper->getTestEndpoint())); - - Test::Inner::Inner2::S s1; - - s1.v = 0; - - Test::Inner::Inner2::S s2; - Test::Inner::Inner2::S s3 = i->end_opS(s2, i->begin_opS(s1)); - - Test::Inner::Inner2::SSeq sseq1; - sseq1.push_back(s1); - sseq1.push_back(s2); - sseq1.push_back(s3); - - Test::Inner::Inner2::SSeq sseq2; - Test::Inner::Inner2::SSeq sseq3 = i->end_opSSeq(sseq2, i->begin_opSSeq(sseq1)); - - Test::Inner::Inner2::SMap smap1; - smap1["a"] = s1; - smap1["b"] = s2; - smap1["c"] = s3; - - Test::Inner::Inner2::SMap smap2; - Test::Inner::Inner2::SMap smap3 = i->end_opSMap(smap2, i->begin_opSMap(smap1)); - - Test::Inner::Inner2::CPtr c1 = new Test::Inner::Inner2::C(s1); - Test::Inner::Inner2::CPtr c2; - Test::Inner::Inner2::CPtr c3 = i->end_opC(c2, i->begin_opC(c1)); - - Test::Inner::Inner2::CSeq cseq1; - cseq1.push_back(c1); - cseq1.push_back(c2); - cseq1.push_back(c3); - - Test::Inner::Inner2::CSeq cseq2; - Test::Inner::Inner2::CSeq cseq3 = i->end_opCSeq(cseq2, i->begin_opCSeq(cseq1)); - - Test::Inner::Inner2::CMap cmap1; - cmap1["a"] = c1; - cmap1["b"] = c2; - cmap1["c"] = c3; - - Test::Inner::Inner2::CMap cmap2; - Test::Inner::Inner2::CMap cmap3 = i->end_opCMap(cmap2, i->begin_opCMap(cmap1)); - } - // - // C++ 98 type safe callbacks - // - { - Test::Inner::Inner2::IPrxPtr i = - ICE_CHECKED_CAST(Test::Inner::Inner2::IPrx, - communicator->stringToProxy("i2:" + helper->getTestEndpoint())); - - IceUtil::Handle cb = new Test::Inner::Callback(); - - Test::Inner::Inner2::S s1; - s1.v = 0; - Test::Inner::Inner2::Callback_I_opSPtr opSCB = - Test::Inner::Inner2::newCallback_I_opS(cb, &Test::Inner::Callback::opS, &Test::Inner::Callback::error); - i->begin_opS(s1, opSCB); - cb->check(); - - Test::Inner::Inner2::SSeq sseq1; - sseq1.push_back(s1); - Test::Inner::Inner2::Callback_I_opSSeqPtr opSSeqCB = - Test::Inner::Inner2::newCallback_I_opSSeq(cb, - &Test::Inner::Callback::opSSeq, - &Test::Inner::Callback::error); - i->begin_opSSeq(sseq1, opSSeqCB); - cb->check(); - - Test::Inner::Inner2::SMap smap1; - smap1["a"] = s1; - Test::Inner::Inner2::Callback_I_opSMapPtr opSMapCB = - Test::Inner::Inner2::newCallback_I_opSMap(cb, - &Test::Inner::Callback::opSMap, - &Test::Inner::Callback::error); - i->begin_opSMap(smap1, opSMapCB); - cb->check(); - - Test::Inner::Inner2::CPtr c1 = new Test::Inner::Inner2::C(s1); - Test::Inner::Inner2::Callback_I_opCPtr opCCB = - Test::Inner::Inner2::newCallback_I_opC(cb, - &Test::Inner::Callback::opC, - &Test::Inner::Callback::error); - i->begin_opC(c1, opCCB); - cb->check(); - - Test::Inner::Inner2::CSeq cseq1; - cseq1.push_back(c1); - Test::Inner::Inner2::Callback_I_opCSeqPtr opCSeqCB = - Test::Inner::Inner2::newCallback_I_opCSeq(cb, - &Test::Inner::Callback::opCSeq, - &Test::Inner::Callback::error); - i->begin_opCSeq(cseq1, opCSeqCB); - cb->check(); - - Test::Inner::Inner2::CMap cmap1; - cmap1["a"] = c1; - Test::Inner::Inner2::Callback_I_opCMapPtr opCMapCB = - Test::Inner::Inner2::newCallback_I_opCMap(cb, - &Test::Inner::Callback::opCMap, - &Test::Inner::Callback::error); - i->begin_opCMap(cmap1, opCMapCB); - cb->check(); - } -#endif { Test::Inner::IPrxPtr i = @@ -1308,7 +722,6 @@ allTests(Test::TestHelper* helper) test(cmap3["a"]->s == c1->s); } -#ifdef ICE_CPP11_MAPPING // // C++ 11 Future-Based Async Function // @@ -1539,121 +952,6 @@ allTests(Test::TestHelper* helper) } } } -#else - // - // C++ 98 AsyncResult API - // - { - Test::Inner::IPrxPtr i = - ICE_CHECKED_CAST(Test::Inner::IPrx, - communicator->stringToProxy("i3:" + helper->getTestEndpoint())); - - Test::Inner::Inner2::S s1; - s1.v = 0; - - Test::Inner::Inner2::S s2; - Test::Inner::Inner2::S s3 = i->end_opS(s2, i->begin_opS(s1)); - - Test::Inner::Inner2::SSeq sseq1; - sseq1.push_back(s1); - sseq1.push_back(s2); - sseq1.push_back(s3); - - Test::Inner::Inner2::SSeq sseq2; - Test::Inner::Inner2::SSeq sseq3 = i->end_opSSeq(sseq2, i->begin_opSSeq(sseq1)); - - Test::Inner::Inner2::SMap smap1; - smap1["a"] = s1; - smap1["b"] = s2; - smap1["c"] = s3; - - Test::Inner::Inner2::SMap smap2; - Test::Inner::Inner2::SMap smap3 = i->end_opSMap(smap2, i->begin_opSMap(smap1)); - - Test::Inner::Inner2::CPtr c1 = new Test::Inner::Inner2::C(s1); - Test::Inner::Inner2::CPtr c2; - Test::Inner::Inner2::CPtr c3 = i->end_opC(c2, i->begin_opC(c1)); - - Test::Inner::Inner2::CSeq cseq1; - cseq1.push_back(c1); - cseq1.push_back(c2); - cseq1.push_back(c3); - - Test::Inner::Inner2::CSeq cseq2; - Test::Inner::Inner2::CSeq cseq3 = i->end_opCSeq(cseq2, i->begin_opCSeq(cseq1)); - - Test::Inner::Inner2::CMap cmap1; - cmap1["a"] = c1; - cmap1["b"] = c2; - cmap1["c"] = c3; - - Test::Inner::Inner2::CMap cmap2; - Test::Inner::Inner2::CMap cmap3 = i->end_opCMap(cmap2, i->begin_opCMap(cmap1)); - } - // - // C++ 98 type safe callbacks - // - { - Test::Inner::IPrxPtr i = - ICE_CHECKED_CAST(Test::Inner::IPrx, - communicator->stringToProxy("i3:" + helper->getTestEndpoint())); - - IceUtil::Handle cb = new Test::Inner::Callback(); - - Test::Inner::Inner2::S s1; - s1.v = 0; - Test::Inner::Callback_I_opSPtr opSCB = - Test::Inner::newCallback_I_opS(cb, - &Test::Inner::Callback::opS, - &Test::Inner::Callback::error); - i->begin_opS(s1, opSCB); - cb->check(); - - Test::Inner::Inner2::SSeq sseq1; - sseq1.push_back(s1); - Test::Inner::Callback_I_opSSeqPtr opSSeqCB = - Test::Inner::newCallback_I_opSSeq(cb, - &Test::Inner::Callback::opSSeq, - &Test::Inner::Callback::error); - i->begin_opSSeq(sseq1, opSSeqCB); - cb->check(); - - Test::Inner::Inner2::SMap smap1; - smap1["a"] = s1; - Test::Inner::Callback_I_opSMapPtr opSMapCB = - Test::Inner::newCallback_I_opSMap(cb, - &Test::Inner::Callback::opSMap, - &Test::Inner::Callback::error); - i->begin_opSMap(smap1, opSMapCB); - cb->check(); - - Test::Inner::Inner2::CPtr c1 = new Test::Inner::Inner2::C(s1); - Test::Inner::Callback_I_opCPtr opCCB = - Test::Inner::newCallback_I_opC(cb, - &Test::Inner::Callback::opC, - &Test::Inner::Callback::error); - i->begin_opC(c1, opCCB); - cb->check(); - - Test::Inner::Inner2::CSeq cseq1; - cseq1.push_back(c1); - Test::Inner::Callback_I_opCSeqPtr opCSeqCB = - Test::Inner::newCallback_I_opCSeq(cb, - &Test::Inner::Callback::opCSeq, - &Test::Inner::Callback::error); - i->begin_opCSeq(cseq1, opCSeqCB); - cb->check(); - - Test::Inner::Inner2::CMap cmap1; - cmap1["a"] = c1; - Test::Inner::Callback_I_opCMapPtr opCMapCB = - Test::Inner::newCallback_I_opCMap(cb, - &Test::Inner::Callback::opCMap, - &Test::Inner::Callback::error); - i->begin_opCMap(cmap1, opCMapCB); - cb->check(); - } -#endif { Inner::Test::Inner2::IPrxPtr i = @@ -1701,7 +999,6 @@ allTests(Test::TestHelper* helper) test(cmap3["a"]->s == c1->s); } -#ifdef ICE_CPP11_MAPPING // // C++ 11 Future-Based Async Function // @@ -1932,121 +1229,6 @@ allTests(Test::TestHelper* helper) } } } -#else - // - // C++ 98 AsyncResult API - // - { - Inner::Test::Inner2::IPrxPtr i = - ICE_CHECKED_CAST(Inner::Test::Inner2::IPrx, - communicator->stringToProxy("i4:" + helper->getTestEndpoint())); - - Test::S s1; - s1.v = 0; - - Test::S s2; - Test::S s3 = i->end_opS(s2, i->begin_opS(s1)); - - Test::SSeq sseq1; - sseq1.push_back(s1); - sseq1.push_back(s2); - sseq1.push_back(s3); - - Test::SSeq sseq2; - Test::SSeq sseq3 = i->end_opSSeq(sseq2, i->begin_opSSeq(sseq1)); - - Test::SMap smap1; - smap1["a"] = s1; - smap1["b"] = s2; - smap1["c"] = s3; - - Test::SMap smap2; - Test::SMap smap3 = i->end_opSMap(smap2, i->begin_opSMap(smap1)); - - Test::CPtr c1 = new Test::C(s1); - Test::CPtr c2; - Test::CPtr c3 = i->end_opC(c2, i->begin_opC(c1)); - - Test::CSeq cseq1; - cseq1.push_back(c1); - cseq1.push_back(c2); - cseq1.push_back(c3); - - Test::CSeq cseq2; - Test::CSeq cseq3 = i->end_opCSeq(cseq2, i->begin_opCSeq(cseq1)); - - Test::CMap cmap1; - cmap1["a"] = c1; - cmap1["b"] = c2; - cmap1["c"] = c3; - - Test::CMap cmap2; - Test::CMap cmap3 = i->end_opCMap(cmap2, i->begin_opCMap(cmap1)); - } - // - // C++ 98 type safe callbacks - // - { - Inner::Test::Inner2::IPrxPtr i = - ICE_CHECKED_CAST(Inner::Test::Inner2::IPrx, - communicator->stringToProxy("i4:" + helper->getTestEndpoint())); - - IceUtil::Handle cb = new Inner::Test::Inner2::Callback(); - - Test::S s1; - s1.v = 0; - Inner::Test::Inner2::Callback_I_opSPtr opSCB = - Inner::Test::Inner2::newCallback_I_opS(cb, - &Inner::Test::Inner2::Callback::opS, - &Inner::Test::Inner2::Callback::error); - i->begin_opS(s1, opSCB); - cb->check(); - - Test::SSeq sseq1; - sseq1.push_back(s1); - Inner::Test::Inner2::Callback_I_opSSeqPtr opSSeqCB = - Inner::Test::Inner2::newCallback_I_opSSeq(cb, - &Inner::Test::Inner2::Callback::opSSeq, - &Inner::Test::Inner2::Callback::error); - i->begin_opSSeq(sseq1, opSSeqCB); - cb->check(); - - Test::SMap smap1; - smap1["a"] = s1; - Inner::Test::Inner2::Callback_I_opSMapPtr opSMapCB = - Inner::Test::Inner2::newCallback_I_opSMap(cb, - &Inner::Test::Inner2::Callback::opSMap, - &Inner::Test::Inner2::Callback::error); - i->begin_opSMap(smap1, opSMapCB); - cb->check(); - - Test::CPtr c1 = new Test::C(s1); - Inner::Test::Inner2::Callback_I_opCPtr opCCB = - Inner::Test::Inner2::newCallback_I_opC(cb, - &Inner::Test::Inner2::Callback::opC, - &Inner::Test::Inner2::Callback::error); - i->begin_opC(c1, opCCB); - cb->check(); - - Test::CSeq cseq1; - cseq1.push_back(c1); - Inner::Test::Inner2::Callback_I_opCSeqPtr opCSeqCB = - Inner::Test::Inner2::newCallback_I_opCSeq(cb, - &Inner::Test::Inner2::Callback::opCSeq, - &Inner::Test::Inner2::Callback::error); - i->begin_opCSeq(cseq1, opCSeqCB); - cb->check(); - - Test::CMap cmap1; - cmap1["a"] = c1; - Inner::Test::Inner2::Callback_I_opCMapPtr opCMapCB = - Inner::Test::Inner2::newCallback_I_opCMap(cb, - &Inner::Test::Inner2::Callback::opCMap, - &Inner::Test::Inner2::Callback::error); - i->begin_opCMap(cmap1, opCMapCB); - cb->check(); - } -#endif Test::IPrxPtr i = ICE_CHECKED_CAST(Test::IPrx, communicator->stringToProxy("i1:" + helper->getTestEndpoint())); i->shutdown(); diff --git a/cpp/test/Ice/servantLocator/AllTests.cpp b/cpp/test/Ice/servantLocator/AllTests.cpp index 2e8859c99e1..5a2d27ec018 100644 --- a/cpp/test/Ice/servantLocator/AllTests.cpp +++ b/cpp/test/Ice/servantLocator/AllTests.cpp @@ -221,11 +221,7 @@ allTests(Test::TestHelper* helper) cout << "testing checked cast... " << flush; TestIntfPrxPtr obj = ICE_CHECKED_CAST(TestIntfPrx, base); test(obj); -#ifdef ICE_CPP11_MAPPING test(Ice::targetEqualTo(obj, base)); -#else - test(obj == base); -#endif cout << "ok" << endl; cout << "testing ice_ids... " << flush; diff --git a/cpp/test/Ice/servantLocator/TestAMDI.cpp b/cpp/test/Ice/servantLocator/TestAMDI.cpp index 861abd0dd57..5be71794bb8 100644 --- a/cpp/test/Ice/servantLocator/TestAMDI.cpp +++ b/cpp/test/Ice/servantLocator/TestAMDI.cpp @@ -9,7 +9,6 @@ using namespace std; using namespace Ice; -#ifdef ICE_CPP11_MAPPING void TestAMDI::requestFailedExceptionAsync(function response, function, const Current&) { @@ -160,117 +159,6 @@ TestAMDI::shutdownAsync(function response, current.adapter->deactivate(); response(); } -#else -void -TestAMDI::requestFailedException_async(const Test::AMD_TestIntf_requestFailedExceptionPtr& cb, const Current&) -{ - cb->ice_response(); -} - -void -TestAMDI::unknownUserException_async(const Test::AMD_TestIntf_unknownUserExceptionPtr& cb, const Current&) -{ - cb->ice_response(); -} - -void -TestAMDI::unknownLocalException_async(const Test::AMD_TestIntf_unknownLocalExceptionPtr& cb, const Current&) -{ - cb->ice_response(); -} - -void -TestAMDI::unknownException_async(const Test::AMD_TestIntf_unknownExceptionPtr& cb, const Current&) -{ - cb->ice_response(); -} - -void -TestAMDI::userException_async(const Test::AMD_TestIntf_userExceptionPtr& cb, const Current&) -{ - cb->ice_response(); -} - -void -TestAMDI::localException_async(const Test::AMD_TestIntf_localExceptionPtr& cb, const Current&) -{ - cb->ice_response(); -} - -void -TestAMDI::stdException_async(const Test::AMD_TestIntf_stdExceptionPtr& cb, const Current&) -{ - cb->ice_response(); -} - -void -TestAMDI::cppException_async(const Test::AMD_TestIntf_cppExceptionPtr& cb, const Current&) -{ - cb->ice_response(); -} - -void -TestAMDI::unknownExceptionWithServantException_async(const Test::AMD_TestIntf_unknownExceptionWithServantExceptionPtr& cb, const Current&) -{ - cb->ice_exception(Ice::ObjectNotExistException(__FILE__, __LINE__)); -} - -void -TestAMDI::impossibleException_async(const Test::AMD_TestIntf_impossibleExceptionPtr& cb, bool _cpp_throw, - const Current&) -{ - if(_cpp_throw) - { - cb->ice_exception(Test::TestImpossibleException()); - } - else - { - // - // Return a value so we can be sure that the stream position - // is reset correctly if finished() throws. - // - cb->ice_response("Hello"); - } -} - -void -TestAMDI::intfUserException_async(const Test::AMD_TestIntf_intfUserExceptionPtr& cb, bool _cpp_throw, const Current&) -{ - if(_cpp_throw) - { - cb->ice_exception(Test::TestIntfUserException()); - } - else - { - // - // Return a value so we can be sure that the stream position - // is reset correctly if finished() throws. - // - cb->ice_response("Hello"); - } -} - -void -TestAMDI::asyncResponse_async(const Test::AMD_TestIntf_asyncResponsePtr& cb, const Current&) -{ - cb->ice_response(); - throw Ice::ObjectNotExistException(__FILE__, __LINE__); -} - -void -TestAMDI::asyncException_async(const Test::AMD_TestIntf_asyncExceptionPtr& cb, const Current&) -{ - cb->ice_exception(Test::TestIntfUserException()); - throw Ice::ObjectNotExistException(__FILE__, __LINE__); -} - -void -TestAMDI::shutdown_async(const Test::AMD_TestIntf_shutdownPtr& cb, const Current& current) -{ - current.adapter->deactivate(); - cb->ice_response(); -} -#endif string Cookie::message() const diff --git a/cpp/test/Ice/servantLocator/TestAMDI.h b/cpp/test/Ice/servantLocator/TestAMDI.h index f22a0922a6b..e35c5c3a788 100644 --- a/cpp/test/Ice/servantLocator/TestAMDI.h +++ b/cpp/test/Ice/servantLocator/TestAMDI.h @@ -11,7 +11,6 @@ class TestAMDI : public Test::TestIntf { public: -#ifdef ICE_CPP11_MAPPING virtual void requestFailedExceptionAsync( std::function, std::function, @@ -83,42 +82,13 @@ class TestAMDI : public Test::TestIntf std::function, std::function, const Ice::Current&); -#else - virtual void requestFailedException_async(const Test::AMD_TestIntf_requestFailedExceptionPtr&, const Ice::Current&); - virtual void unknownUserException_async(const Test::AMD_TestIntf_unknownUserExceptionPtr&, const Ice::Current&); - virtual void unknownLocalException_async(const Test::AMD_TestIntf_unknownLocalExceptionPtr&, const Ice::Current&); - virtual void unknownException_async(const Test::AMD_TestIntf_unknownExceptionPtr&, const Ice::Current&); - virtual void userException_async(const Test::AMD_TestIntf_userExceptionPtr&, const Ice::Current&); - virtual void localException_async(const Test::AMD_TestIntf_localExceptionPtr&, const Ice::Current&); - virtual void stdException_async(const Test::AMD_TestIntf_stdExceptionPtr&, const Ice::Current&); - virtual void cppException_async(const Test::AMD_TestIntf_cppExceptionPtr&, const Ice::Current&); - - virtual void unknownExceptionWithServantException_async( - const Test::AMD_TestIntf_unknownExceptionWithServantExceptionPtr&, const Ice::Current&); - - virtual void impossibleException_async(const Test::AMD_TestIntf_impossibleExceptionPtr&, bool, const Ice::Current&); - virtual void intfUserException_async(const Test::AMD_TestIntf_intfUserExceptionPtr&, bool, const Ice::Current&); - - virtual void asyncResponse_async(const Test::AMD_TestIntf_asyncResponsePtr&, const Ice::Current&); - virtual void asyncException_async(const Test::AMD_TestIntf_asyncExceptionPtr&, const Ice::Current&); - - virtual void shutdown_async(const Test::AMD_TestIntf_shutdownPtr&, const Ice::Current&); -#endif }; -#ifdef ICE_CPP11_MAPPING class Cookie -#else -class Cookie : public Ice::LocalObject -#endif { public: std::string message() const; }; -#ifndef ICE_CPP11_MAPPING -typedef IceUtil::Handle CookiePtr; -#endif - #endif diff --git a/cpp/test/Ice/servantLocator/TestI.h b/cpp/test/Ice/servantLocator/TestI.h index cf853b38b66..d04c2e65682 100644 --- a/cpp/test/Ice/servantLocator/TestI.h +++ b/cpp/test/Ice/servantLocator/TestI.h @@ -31,19 +31,11 @@ class TestI : public Test::TestIntf virtual void shutdown(const Ice::Current&); }; -#ifdef ICE_CPP11_MAPPING class Cookie -#else -class Cookie : public Ice::LocalObject -#endif { public: std::string message() const; }; -#ifndef ICE_CPP11_MAPPING -typedef IceUtil::Handle CookiePtr; -#endif - #endif diff --git a/cpp/test/Ice/services/AllTests.cpp b/cpp/test/Ice/services/AllTests.cpp index 43dad9bca23..2c70a1052b6 100644 --- a/cpp/test/Ice/services/AllTests.cpp +++ b/cpp/test/Ice/services/AllTests.cpp @@ -19,19 +19,11 @@ class ClockI : public Clock { public: -#ifdef ICE_CPP11_MAPPING virtual void tick(string time, const Ice::Current&) { cout << time << endl; } -#else - virtual void - tick(const string& time, const Ice::Current&) - { - cout << time << endl; - } -#endif }; class SessionCallbackI : public Glacier2::SessionCallback @@ -117,22 +109,7 @@ allTests(Test::TestHelper* helper) Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapterWithEndpoints("subscriber" ,"tcp"); Ice::ObjectPrxPtr subscriber = adapter->addWithUUID(ICE_MAKE_SHARED(ClockI)); adapter->activate(); -#ifdef ICE_CPP11_MAPPING assert(!topic); -#else - try - { - topic->subscribeAndGetPublisher(qos, subscriber); - test(false); - } - catch(const IceStorm::AlreadySubscribed&) - { - test(false); - } - catch(const IceUtil::NullHandleException&) - { - } -#endif cout << "ok" << endl; } @@ -155,18 +132,7 @@ allTests(Test::TestHelper* helper) catch(const Ice::LocalException&) { } -#ifdef ICE_CPP11_MAPPING assert(!admin); -#else - try - { - admin = session->getAdmin(); - test(false); - } - catch(const IceUtil::NullHandleException&) - { - } -#endif cout << "ok" << endl; } } diff --git a/cpp/test/Ice/slicing/exceptions/AllTests.cpp b/cpp/test/Ice/slicing/exceptions/AllTests.cpp index aa68e511994..63ad2ad843b 100644 --- a/cpp/test/Ice/slicing/exceptions/AllTests.cpp +++ b/cpp/test/Ice/slicing/exceptions/AllTests.cpp @@ -9,317 +9,6 @@ using namespace std; using namespace Test; -#ifndef ICE_CPP11_MAPPING -class CallbackBase : public IceUtil::Monitor -{ -public: - - CallbackBase() : - _called(false) - { - } - - virtual ~CallbackBase() - { - } - - void check() - { - IceUtil::Monitor::Lock sync(*this); - while(!_called) - { - wait(); - } - _called = false; - } - -protected: - - void called() - { - IceUtil::Monitor::Lock sync(*this); - assert(!_called); - _called = true; - notify(); - } - -private: - - bool _called; -}; - -class Callback : public CallbackBase, public IceUtil::Shared -{ -public: - - void - response() - { - test(false); - } - - void - exception_baseAsBase(const Ice::Exception& exc) - { - try - { - exc.ice_throw(); - } - catch(const Base& b) - { - test(b.b == "Base.b"); - test(b.ice_id() =="::Test::Base"); - } - catch(...) - { - test(false); - } - called(); - } - - void - exception_unknownDerivedAsBase(const Ice::Exception& exc) - { - try - { - exc.ice_throw(); - } - catch(const Base& b) - { - test(b.b == "UnknownDerived.b"); - test(b.ice_id() == "::Test::Base"); - } - catch(...) - { - test(false); - } - called(); - } - - void - exception_knownDerivedAsBase(const Ice::Exception& exc) - { - try - { - exc.ice_throw(); - } - catch(const KnownDerived& k) - { - test(k.b == "KnownDerived.b"); - test(k.kd == "KnownDerived.kd"); - test(k.ice_id() == "::Test::KnownDerived"); - } - catch(...) - { - test(false); - } - called(); - } - - void - exception_knownDerivedAsKnownDerived(const Ice::Exception& exc) - { - try - { - exc.ice_throw(); - } - catch(const KnownDerived& k) - { - test(k.b == "KnownDerived.b"); - test(k.kd == "KnownDerived.kd"); - test(k.ice_id() == "::Test::KnownDerived"); - } - catch(...) - { - test(false); - } - called(); - } - - void - exception_unknownIntermediateAsBase(const Ice::Exception& exc) - { - try - { - exc.ice_throw(); - } - catch(const Base& b) - { - test(b.b == "UnknownIntermediate.b"); - test(b.ice_id() == "::Test::Base"); - } - catch(...) - { - test(false); - } - called(); - } - - void - exception_knownIntermediateAsBase(const Ice::Exception& exc) - { - try - { - exc.ice_throw(); - } - catch(const KnownIntermediate& ki) - { - test(ki.b == "KnownIntermediate.b"); - test(ki.ki == "KnownIntermediate.ki"); - test(ki.ice_id() == "::Test::KnownIntermediate"); - } - catch(...) - { - test(false); - } - called(); - } - - void - exception_knownMostDerivedAsBase(const Ice::Exception& exc) - { - try - { - exc.ice_throw(); - } - catch(const KnownMostDerived& kmd) - { - test(kmd.b == "KnownMostDerived.b"); - test(kmd.ki == "KnownMostDerived.ki"); - test(kmd.kmd == "KnownMostDerived.kmd"); - test(kmd.ice_id() == "::Test::KnownMostDerived"); - } - catch(...) - { - test(false); - } - called(); - } - - void - exception_knownIntermediateAsKnownIntermediate(const Ice::Exception& exc) - { - try - { - exc.ice_throw(); - } - catch(const KnownIntermediate& ki) - { - test(ki.b == "KnownIntermediate.b"); - test(ki.ki == "KnownIntermediate.ki"); - test(ki.ice_id() == "::Test::KnownIntermediate"); - } - catch(...) - { - test(false); - } - called(); - } - - void - exception_knownMostDerivedAsKnownMostDerived(const Ice::Exception& exc) - { - try - { - exc.ice_throw(); - } - catch(const KnownMostDerived& kmd) - { - test(kmd.b == "KnownMostDerived.b"); - test(kmd.ki == "KnownMostDerived.ki"); - test(kmd.kmd == "KnownMostDerived.kmd"); - test(kmd.ice_id() == "::Test::KnownMostDerived"); - } - catch(...) - { - test(false); - } - called(); - } - - void - exception_knownMostDerivedAsKnownIntermediate(const Ice::Exception& exc) - { - try - { - exc.ice_throw(); - } - catch(const KnownMostDerived& kmd) - { - test(kmd.b == "KnownMostDerived.b"); - test(kmd.ki == "KnownMostDerived.ki"); - test(kmd.kmd == "KnownMostDerived.kmd"); - test(kmd.ice_id() == "::Test::KnownMostDerived"); - } - catch(...) - { - test(false); - } - called(); - } - - void - exception_unknownMostDerived1AsBase(const Ice::Exception& exc) - { - try - { - exc.ice_throw(); - } - catch(const KnownIntermediate& ki) - { - test(ki.b == "UnknownMostDerived1.b"); - test(ki.ki == "UnknownMostDerived1.ki"); - test(ki.ice_id() == "::Test::KnownIntermediate"); - } - catch(...) - { - test(false); - } - called(); - } - - void - exception_unknownMostDerived1AsKnownIntermediate(const Ice::Exception& exc) - { - try - { - exc.ice_throw(); - } - catch(const KnownIntermediate& ki) - { - test(ki.b == "UnknownMostDerived1.b"); - test(ki.ki == "UnknownMostDerived1.ki"); - test(ki.ice_id() == "::Test::KnownIntermediate"); - } - catch(...) - { - test(false); - } - called(); - } - - void - exception_unknownMostDerived2AsBase(const Ice::Exception& exc) - { - try - { - exc.ice_throw(); - } - catch(const Base& b) - { - test(b.b == "UnknownMostDerived2.b"); - test(b.ice_id() == "::Test::Base"); - } - catch(...) - { - test(false); - } - called(); - } -}; -typedef IceUtil::Handle CallbackPtr; -#endif - class RelayI : public Relay { virtual void knownPreservedAsBase(const ::Ice::Current&) @@ -391,7 +80,6 @@ allTests(Test::TestHelper* helper) cout << "base (AMI)... " << flush; { -#ifdef ICE_CPP11_MAPPING auto result = test->baseAsBaseAsync(); try { @@ -407,13 +95,6 @@ allTests(Test::TestHelper* helper) { test(false); } - -#else - CallbackPtr cb = new Callback; - test->begin_baseAsBase( - newCallback_TestIntf_baseAsBase(cb, &Callback::response, &Callback::exception_baseAsBase)); - cb->check(); -#endif } cout << "ok" << endl; @@ -438,7 +119,6 @@ allTests(Test::TestHelper* helper) cout << "slicing of unknown derived (AMI)... " << flush; { -#ifdef ICE_CPP11_MAPPING auto result = test->unknownDerivedAsBaseAsync(); try { @@ -454,13 +134,6 @@ allTests(Test::TestHelper* helper) { test(false); } -#else - CallbackPtr cb = new Callback; - test->begin_unknownDerivedAsBase( - newCallback_TestIntf_unknownDerivedAsBase(cb, &Callback::response, - &Callback::exception_unknownDerivedAsBase)); - cb->check(); -#endif } cout << "ok" << endl; @@ -486,7 +159,6 @@ allTests(Test::TestHelper* helper) cout << "non-slicing of known derived as base (AMI)... " << flush; { -#ifdef ICE_CPP11_MAPPING auto result = test->knownDerivedAsBaseAsync(); try { @@ -503,12 +175,6 @@ allTests(Test::TestHelper* helper) { test(false); } -#else - CallbackPtr cb = new Callback; - test->begin_knownDerivedAsBase( - newCallback_TestIntf_knownDerivedAsBase(cb, &Callback::response, &Callback::exception_knownDerivedAsBase)); - cb->check(); -#endif } cout << "ok" << endl; @@ -534,7 +200,6 @@ allTests(Test::TestHelper* helper) cout << "non-slicing of known derived as derived (AMI)... " << flush; { -#ifdef ICE_CPP11_MAPPING auto result = test->knownDerivedAsKnownDerivedAsync(); try { @@ -550,13 +215,6 @@ allTests(Test::TestHelper* helper) { test(false); } -#else - CallbackPtr cb = new Callback; - test->begin_knownDerivedAsKnownDerived( - newCallback_TestIntf_knownDerivedAsKnownDerived(cb, &Callback::response, - &Callback::exception_knownDerivedAsKnownDerived)); - cb->check(); -#endif } cout << "ok" << endl; @@ -581,7 +239,6 @@ allTests(Test::TestHelper* helper) cout << "slicing of unknown intermediate as base (AMI)... " << flush; { -#ifdef ICE_CPP11_MAPPING auto result = test->unknownIntermediateAsBaseAsync(); try { @@ -597,13 +254,6 @@ allTests(Test::TestHelper* helper) { test(false); } -#else - CallbackPtr cb = new Callback; - test->begin_unknownIntermediateAsBase( - newCallback_TestIntf_unknownIntermediateAsBase(cb, &Callback::response, - &Callback::exception_unknownIntermediateAsBase)); - cb->check(); -#endif } cout << "ok" << endl; @@ -629,7 +279,6 @@ allTests(Test::TestHelper* helper) cout << "slicing of known intermediate as base (AMI)... " << flush; { -#ifdef ICE_CPP11_MAPPING auto result = test->knownIntermediateAsBaseAsync(); try { @@ -646,13 +295,6 @@ allTests(Test::TestHelper* helper) { test(false); } -#else - CallbackPtr cb = new Callback; - test->begin_knownIntermediateAsBase( - newCallback_TestIntf_knownIntermediateAsBase(cb, &Callback::response, - &Callback::exception_knownIntermediateAsBase)); - cb->check(); -#endif } cout << "ok" << endl; @@ -679,7 +321,6 @@ allTests(Test::TestHelper* helper) cout << "slicing of known most derived as base (AMI)... " << flush; { -#ifdef ICE_CPP11_MAPPING auto result = test->knownMostDerivedAsBaseAsync(); try { @@ -697,13 +338,6 @@ allTests(Test::TestHelper* helper) { test(false); } -#else - CallbackPtr cb = new Callback; - test->begin_knownMostDerivedAsBase( - newCallback_TestIntf_knownMostDerivedAsBase(cb, &Callback::response, - &Callback::exception_knownMostDerivedAsBase)); - cb->check(); -#endif } cout << "ok" << endl; @@ -729,7 +363,6 @@ allTests(Test::TestHelper* helper) cout << "non-slicing of known intermediate as intermediate (AMI)... " << flush; { -#ifdef ICE_CPP11_MAPPING auto result = test->knownIntermediateAsKnownIntermediateAsync(); try { @@ -746,13 +379,6 @@ allTests(Test::TestHelper* helper) { test(false); } -#else - CallbackPtr cb = new Callback; - test->begin_knownIntermediateAsKnownIntermediate( - newCallback_TestIntf_knownIntermediateAsKnownIntermediate(cb, &Callback::response, - &Callback::exception_knownIntermediateAsKnownIntermediate)); - cb->check(); -#endif } cout << "ok" << endl; @@ -779,7 +405,6 @@ allTests(Test::TestHelper* helper) cout << "non-slicing of known most derived as intermediate (AMI)... " << flush; { -#ifdef ICE_CPP11_MAPPING auto result = test->knownMostDerivedAsKnownIntermediateAsync(); try { @@ -797,13 +422,6 @@ allTests(Test::TestHelper* helper) { test(false); } -#else - CallbackPtr cb = new Callback; - test->begin_knownMostDerivedAsKnownIntermediate( - newCallback_TestIntf_knownMostDerivedAsKnownIntermediate(cb, &Callback::response, - &Callback::exception_knownMostDerivedAsKnownIntermediate)); - cb->check(); -#endif } cout << "ok" << endl; @@ -830,7 +448,6 @@ allTests(Test::TestHelper* helper) cout << "non-slicing of known most derived as most derived (AMI)... " << flush; { -#ifdef ICE_CPP11_MAPPING auto result = test->knownMostDerivedAsKnownMostDerivedAsync(); try { @@ -848,13 +465,6 @@ allTests(Test::TestHelper* helper) { test(false); } -#else - CallbackPtr cb = new Callback; - test->begin_knownMostDerivedAsKnownMostDerived( - newCallback_TestIntf_knownMostDerivedAsKnownMostDerived(cb, &Callback::response, - &Callback::exception_knownMostDerivedAsKnownMostDerived)); - cb->check(); -#endif } cout << "ok" << endl; @@ -880,7 +490,6 @@ allTests(Test::TestHelper* helper) cout << "slicing of unknown most derived, known intermediate as base (AMI)... " << flush; { -#ifdef ICE_CPP11_MAPPING auto result = test->unknownMostDerived1AsBaseAsync(); try { @@ -897,13 +506,6 @@ allTests(Test::TestHelper* helper) { test(false); } -#else - CallbackPtr cb = new Callback; - test->begin_unknownMostDerived1AsBase( - newCallback_TestIntf_unknownMostDerived1AsBase(cb, &Callback::response, - &Callback::exception_unknownMostDerived1AsBase)); - cb->check(); -#endif } cout << "ok" << endl; @@ -929,7 +531,6 @@ allTests(Test::TestHelper* helper) cout << "slicing of unknown most derived, known intermediate as intermediate (AMI)... " << flush; { -#ifdef ICE_CPP11_MAPPING auto result = test->unknownMostDerived1AsKnownIntermediateAsync(); try { @@ -946,13 +547,6 @@ allTests(Test::TestHelper* helper) { test(false); } -#else - CallbackPtr cb = new Callback; - test->begin_unknownMostDerived1AsKnownIntermediate( - newCallback_TestIntf_unknownMostDerived1AsKnownIntermediate(cb, &Callback::response, - &Callback::exception_unknownMostDerived1AsKnownIntermediate)); - cb->check(); -#endif } cout << "ok" << endl; @@ -977,7 +571,6 @@ allTests(Test::TestHelper* helper) cout << "slicing of unknown most derived, unknown intermediate as base (AMI)... " << flush; { -#ifdef ICE_CPP11_MAPPING auto result = test->unknownMostDerived2AsBaseAsync(); try { @@ -993,13 +586,6 @@ allTests(Test::TestHelper* helper) { test(false); } -#else - CallbackPtr cb = new Callback; - test->begin_unknownMostDerived2AsBase( - newCallback_TestIntf_unknownMostDerived2AsBase(cb, &Callback::response, - &Callback::exception_unknownMostDerived2AsBase)); - cb->check(); -#endif } cout << "ok" << endl; diff --git a/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp b/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp index 564cb9954e9..27d55712954 100644 --- a/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp +++ b/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp @@ -13,7 +13,6 @@ TestI::TestI() { } -#ifdef ICE_CPP11_MAPPING void TestI::baseAsBaseAsync(function, function error, const ::Ice::Current&) { @@ -397,259 +396,3 @@ TestI::shutdownAsync(function response, function, c current.adapter->getCommunicator()->shutdown(); response(); } -#else -void -TestI::baseAsBase_async(const AMD_TestIntf_baseAsBasePtr& cb, const ::Ice::Current&) -{ - Base b; - b.b = "Base.b"; - cb->ice_exception(b); -} - -void -TestI::unknownDerivedAsBase_async(const AMD_TestIntf_unknownDerivedAsBasePtr& cb, const ::Ice::Current&) -{ - UnknownDerived d; - d.b = "UnknownDerived.b"; - d.ud = "UnknownDerived.ud"; - cb->ice_exception(d); -} - -void -TestI::knownDerivedAsBase_async(const AMD_TestIntf_knownDerivedAsBasePtr& cb, const ::Ice::Current&) -{ - KnownDerived d; - d.b = "KnownDerived.b"; - d.kd = "KnownDerived.kd"; - cb->ice_exception(d); -} - -void -TestI::knownDerivedAsKnownDerived_async(const AMD_TestIntf_knownDerivedAsKnownDerivedPtr& cb, const ::Ice::Current&) -{ - KnownDerived d; - d.b = "KnownDerived.b"; - d.kd = "KnownDerived.kd"; - cb->ice_exception(d); -} - -void -TestI::unknownIntermediateAsBase_async(const AMD_TestIntf_unknownIntermediateAsBasePtr& cb, const ::Ice::Current&) -{ - UnknownIntermediate ui; - ui.b = "UnknownIntermediate.b"; - ui.ui = "UnknownIntermediate.ui"; - cb->ice_exception(ui); -} - -void -TestI::knownIntermediateAsBase_async(const AMD_TestIntf_knownIntermediateAsBasePtr& cb, const ::Ice::Current&) -{ - KnownIntermediate ki; - ki.b = "KnownIntermediate.b"; - ki.ki = "KnownIntermediate.ki"; - cb->ice_exception(ki); -} - -void -TestI::knownMostDerivedAsBase_async(const AMD_TestIntf_knownMostDerivedAsBasePtr& cb, const ::Ice::Current&) -{ - KnownMostDerived kmd; - kmd.b = "KnownMostDerived.b"; - kmd.ki = "KnownMostDerived.ki"; - kmd.kmd = "KnownMostDerived.kmd"; - cb->ice_exception(kmd); -} - -void -TestI::knownIntermediateAsKnownIntermediate_async(const AMD_TestIntf_knownIntermediateAsKnownIntermediatePtr& cb, - const ::Ice::Current&) -{ - KnownIntermediate ki; - ki.b = "KnownIntermediate.b"; - ki.ki = "KnownIntermediate.ki"; - cb->ice_exception(ki); -} - -void -TestI::knownMostDerivedAsKnownIntermediate_async(const AMD_TestIntf_knownMostDerivedAsKnownIntermediatePtr& cb, - const ::Ice::Current&) -{ - KnownMostDerived kmd; - kmd.b = "KnownMostDerived.b"; - kmd.ki = "KnownMostDerived.ki"; - kmd.kmd = "KnownMostDerived.kmd"; - cb->ice_exception(kmd); -} - -void -TestI:: -knownMostDerivedAsKnownMostDerived_async(const AMD_TestIntf_knownMostDerivedAsKnownMostDerivedPtr& cb, - const ::Ice::Current&) -{ - KnownMostDerived kmd; - kmd.b = "KnownMostDerived.b"; - kmd.ki = "KnownMostDerived.ki"; - kmd.kmd = "KnownMostDerived.kmd"; - cb->ice_exception(kmd); -} - -void -TestI::unknownMostDerived1AsBase_async(const AMD_TestIntf_unknownMostDerived1AsBasePtr& cb, const ::Ice::Current&) -{ - UnknownMostDerived1 umd1; - umd1.b = "UnknownMostDerived1.b"; - umd1.ki = "UnknownMostDerived1.ki"; - umd1.umd1 = "UnknownMostDerived1.umd1"; - cb->ice_exception(umd1); -} - -void -TestI::unknownMostDerived1AsKnownIntermediate_async(const AMD_TestIntf_unknownMostDerived1AsKnownIntermediatePtr& cb, - const ::Ice::Current&) -{ - UnknownMostDerived1 umd1; - umd1.b = "UnknownMostDerived1.b"; - umd1.ki = "UnknownMostDerived1.ki"; - umd1.umd1 = "UnknownMostDerived1.umd1"; - cb->ice_exception(umd1); -} - -void -TestI::unknownMostDerived2AsBase_async(const AMD_TestIntf_unknownMostDerived2AsBasePtr& cb, const ::Ice::Current&) -{ - UnknownMostDerived2 umd2; - umd2.b = "UnknownMostDerived2.b"; - umd2.ui = "UnknownMostDerived2.ui"; - umd2.umd2 = "UnknownMostDerived2.umd2"; - cb->ice_exception(umd2); -} - -void -TestI::unknownMostDerived2AsBaseCompact_async(const AMD_TestIntf_unknownMostDerived2AsBaseCompactPtr& cb, - const ::Ice::Current&) -{ - UnknownMostDerived2 umd2; - umd2.b = "UnknownMostDerived2.b"; - umd2.ui = "UnknownMostDerived2.ui"; - umd2.umd2 = "UnknownMostDerived2.umd2"; - cb->ice_exception(umd2); -} - -void -TestI::knownPreservedAsBase_async(const AMD_TestIntf_knownPreservedAsBasePtr& cb, const ::Ice::Current&) -{ - KnownPreservedDerived ex; - ex.b = "base"; - ex.kp = "preserved"; - ex.kpd = "derived"; - cb->ice_exception(ex); -} - -void -TestI::knownPreservedAsKnownPreserved_async(const AMD_TestIntf_knownPreservedAsKnownPreservedPtr& cb, - const ::Ice::Current&) -{ - KnownPreservedDerived ex; - ex.b = "base"; - ex.kp = "preserved"; - ex.kpd = "derived"; - cb->ice_exception(ex); -} - -void -TestI::relayKnownPreservedAsBase_async(const AMD_TestIntf_relayKnownPreservedAsBasePtr& cb, const RelayPrx& r, - const ::Ice::Current& c) -{ - try - { - RelayPrxPtr p = RelayPrx::uncheckedCast(c.con->createProxy(r->ice_getIdentity())); - p->knownPreservedAsBase(); - test(false); - } - catch(const Ice::Exception& ex) - { - cb->ice_exception(ex); - } -} - -void -TestI::relayKnownPreservedAsKnownPreserved_async(const AMD_TestIntf_relayKnownPreservedAsKnownPreservedPtr& cb, - const RelayPrx& r, const ::Ice::Current& c) -{ - try - { - RelayPrxPtr p = RelayPrx::uncheckedCast(c.con->createProxy(r->ice_getIdentity())); - p->knownPreservedAsKnownPreserved(); - test(false); - } - catch(const Ice::Exception& ex) - { - cb->ice_exception(ex); - } -} - -void -TestI::unknownPreservedAsBase_async(const AMD_TestIntf_unknownPreservedAsBasePtr& cb, const ::Ice::Current&) -{ - SPreserved2 ex; - ex.b = "base"; - ex.kp = "preserved"; - ex.kpd = "derived"; - ex.p1 = new SPreservedClass("bc", "spc"); - ex.p2 = ex.p1; - cb->ice_exception(ex); -} - -void -TestI::unknownPreservedAsKnownPreserved_async(const AMD_TestIntf_unknownPreservedAsKnownPreservedPtr& cb, - const ::Ice::Current&) -{ - SPreserved2 ex; - ex.b = "base"; - ex.kp = "preserved"; - ex.kpd = "derived"; - ex.p1 = new SPreservedClass("bc", "spc"); - ex.p2 = ex.p1; - cb->ice_exception(ex); -} - -void -TestI::relayUnknownPreservedAsBase_async(const AMD_TestIntf_relayUnknownPreservedAsBasePtr& cb, const RelayPrx& r, - const ::Ice::Current& c) -{ - try - { - RelayPrxPtr p = RelayPrx::uncheckedCast(c.con->createProxy(r->ice_getIdentity())); - p->unknownPreservedAsBase(); - test(false); - } - catch(const Ice::Exception& ex) - { - cb->ice_exception(ex); - } -} - -void -TestI::relayUnknownPreservedAsKnownPreserved_async(const AMD_TestIntf_relayUnknownPreservedAsKnownPreservedPtr& cb, - const RelayPrx& r, const ::Ice::Current& c) -{ - try - { - RelayPrxPtr p = RelayPrx::uncheckedCast(c.con->createProxy(r->ice_getIdentity())); - p->unknownPreservedAsKnownPreserved(); - test(false); - } - catch(const Ice::Exception& ex) - { - cb->ice_exception(ex); - } -} - -void -TestI::shutdown_async(const AMD_TestIntf_shutdownPtr& cb, const ::Ice::Current& current) -{ - current.adapter->getCommunicator()->shutdown(); - cb->ice_response(); -} -#endif diff --git a/cpp/test/Ice/slicing/exceptions/TestAMDI.h b/cpp/test/Ice/slicing/exceptions/TestAMDI.h index 97408707814..036969857f0 100644 --- a/cpp/test/Ice/slicing/exceptions/TestAMDI.h +++ b/cpp/test/Ice/slicing/exceptions/TestAMDI.h @@ -12,7 +12,6 @@ class TestI : public virtual Test::TestIntf public: TestI(); -#ifdef ICE_CPP11_MAPPING virtual void baseAsBaseAsync( std::function, std::function, @@ -131,82 +130,6 @@ class TestI : public virtual Test::TestIntf std::function, std::function, const ::Ice::Current&); -#else - virtual void baseAsBase_async(const ::Test::AMD_TestIntf_baseAsBasePtr&, const ::Ice::Current&); - - virtual void unknownDerivedAsBase_async(const ::Test::AMD_TestIntf_unknownDerivedAsBasePtr&, const ::Ice::Current&); - virtual void knownDerivedAsBase_async(const ::Test::AMD_TestIntf_knownDerivedAsBasePtr&, const ::Ice::Current&); - virtual void knownDerivedAsKnownDerived_async(const ::Test::AMD_TestIntf_knownDerivedAsKnownDerivedPtr&, - const ::Ice::Current&); - - virtual void unknownIntermediateAsBase_async(const ::Test::AMD_TestIntf_unknownIntermediateAsBasePtr&, - const ::Ice::Current&); - virtual void knownIntermediateAsBase_async(const ::Test::AMD_TestIntf_knownIntermediateAsBasePtr&, - const ::Ice::Current&); - virtual void knownMostDerivedAsBase_async(const ::Test::AMD_TestIntf_knownMostDerivedAsBasePtr&, - const ::Ice::Current&); - virtual void knownIntermediateAsKnownIntermediate_async( - const ::Test::AMD_TestIntf_knownIntermediateAsKnownIntermediatePtr&, - const ::Ice::Current&); - virtual void knownMostDerivedAsKnownIntermediate_async( - const ::Test::AMD_TestIntf_knownMostDerivedAsKnownIntermediatePtr&, - const ::Ice::Current&); - virtual void knownMostDerivedAsKnownMostDerived_async( - const ::Test::AMD_TestIntf_knownMostDerivedAsKnownMostDerivedPtr&, - const ::Ice::Current&); - - virtual void unknownMostDerived1AsBase_async( - const ::Test::AMD_TestIntf_unknownMostDerived1AsBasePtr&, - const ::Ice::Current&); - virtual void unknownMostDerived1AsKnownIntermediate_async( - const ::Test::AMD_TestIntf_unknownMostDerived1AsKnownIntermediatePtr&, - const ::Ice::Current&); - virtual void unknownMostDerived2AsBase_async( - const ::Test::AMD_TestIntf_unknownMostDerived2AsBasePtr&, - const ::Ice::Current&); - - virtual void unknownMostDerived2AsBaseCompact_async( - const ::Test::AMD_TestIntf_unknownMostDerived2AsBaseCompactPtr&, - const ::Ice::Current&); - - virtual void knownPreservedAsBase_async( - const ::Test::AMD_TestIntf_knownPreservedAsBasePtr&, - const ::Ice::Current&); - - virtual void knownPreservedAsKnownPreserved_async( - const ::Test::AMD_TestIntf_knownPreservedAsKnownPreservedPtr&, - const ::Ice::Current&); - - virtual void relayKnownPreservedAsBase_async( - const ::Test::AMD_TestIntf_relayKnownPreservedAsBasePtr&, - const ::Test::RelayPrx&, - const ::Ice::Current&); - - virtual void relayKnownPreservedAsKnownPreserved_async( - const ::Test::AMD_TestIntf_relayKnownPreservedAsKnownPreservedPtr&, - const ::Test::RelayPrx&, - const ::Ice::Current&); - - virtual void unknownPreservedAsBase_async( - const ::Test::AMD_TestIntf_unknownPreservedAsBasePtr&, - const ::Ice::Current&); - - virtual void unknownPreservedAsKnownPreserved_async( - const ::Test::AMD_TestIntf_unknownPreservedAsKnownPreservedPtr&, - const ::Ice::Current&); - - virtual void relayUnknownPreservedAsBase_async( - const ::Test::AMD_TestIntf_relayUnknownPreservedAsBasePtr&, - const ::Test::RelayPrx&, - const ::Ice::Current&); - - virtual void relayUnknownPreservedAsKnownPreserved_async( - const ::Test::AMD_TestIntf_relayUnknownPreservedAsKnownPreservedPtr&, - const ::Test::RelayPrx&, - const ::Ice::Current&); - - virtual void shutdown_async(const ::Test::AMD_TestIntf_shutdownPtr&, const ::Ice::Current&); -#endif }; #endif diff --git a/cpp/test/Ice/slicing/objects/AllTests.cpp b/cpp/test/Ice/slicing/objects/AllTests.cpp index 1879fb11698..7153b4d35c8 100644 --- a/cpp/test/Ice/slicing/objects/AllTests.cpp +++ b/cpp/test/Ice/slicing/objects/AllTests.cpp @@ -153,9 +153,6 @@ class CallbackBase : public IceUtil::Monitor }; class Callback : public CallbackBase -#ifndef ICE_CPP11_MAPPING - , public virtual IceUtil::Shared -#endif { public: @@ -711,7 +708,6 @@ allTests(Test::TestHelper* helper) cout << "base as Object (AMI)... " << flush; { -#ifdef ICE_CPP11_MAPPING auto f = test->SBaseAsObjectAsync(); try { @@ -726,12 +722,6 @@ allTests(Test::TestHelper* helper) { test(false); } -#else - CallbackPtr cb = new Callback(); - test->begin_SBaseAsObject( - newCallback_TestIntf_SBaseAsObject(cb, &Callback::response_SBaseAsObject, &Callback::exception)); - cb->check(); -#endif } cout << "ok" << endl; @@ -752,7 +742,6 @@ allTests(Test::TestHelper* helper) cout << "base as base (AMI)... " << flush; { -#ifdef ICE_CPP11_MAPPING try { auto sb = test->SBaseAsSBaseAsync().get(); @@ -762,12 +751,6 @@ allTests(Test::TestHelper* helper) { test(false); } -#else - CallbackPtr cb = new Callback; - test->begin_SBaseAsSBase( - newCallback_TestIntf_SBaseAsSBase(cb, &Callback::response_SBaseAsSBase, &Callback::exception)); - cb->check(); -#endif } cout << "ok" << endl; @@ -791,7 +774,6 @@ allTests(Test::TestHelper* helper) cout << "base with known derived as base (AMI)... " << flush; { -#ifdef ICE_CPP11_MAPPING auto f = test->SBSKnownDerivedAsSBaseAsync(); try { @@ -806,13 +788,6 @@ allTests(Test::TestHelper* helper) { test(false); } -#else - CallbackPtr cb = new Callback; - test->begin_SBSKnownDerivedAsSBase( - newCallback_TestIntf_SBSKnownDerivedAsSBase( - cb, &Callback::response_SBSKnownDerivedAsSBase, &Callback::exception)); - cb->check(); -#endif } cout << "ok" << endl; @@ -833,7 +808,6 @@ allTests(Test::TestHelper* helper) cout << "base with known derived as known derived (AMI)... " << flush; { -#ifdef ICE_CPP11_MAPPING auto f = test->SBSKnownDerivedAsSBSKnownDerivedAsync(); try { @@ -844,13 +818,6 @@ allTests(Test::TestHelper* helper) { test(false); } -#else - CallbackPtr cb = new Callback; - test->begin_SBSKnownDerivedAsSBSKnownDerived( - newCallback_TestIntf_SBSKnownDerivedAsSBSKnownDerived( - cb, &Callback::response_SBSKnownDerivedAsSBSKnownDerived, &Callback::exception)); - cb->check(); -#endif } cout << "ok" << endl; @@ -912,7 +879,6 @@ allTests(Test::TestHelper* helper) cout << "base with unknown derived as base (AMI)... " << flush; { -#ifdef ICE_CPP11_MAPPING auto f = test->SBSUnknownDerivedAsSBaseAsync(); try { @@ -923,20 +889,12 @@ allTests(Test::TestHelper* helper) { test(false); } -#else - CallbackPtr cb = new Callback; - test->begin_SBSUnknownDerivedAsSBase( - newCallback_TestIntf_SBSUnknownDerivedAsSBase( - cb, &Callback::response_SBSUnknownDerivedAsSBase, &Callback::exception)); - cb->check(); -#endif } if(test->ice_getEncodingVersion() == Ice::Encoding_1_0) { // // This test succeeds for the 1.0 encoding. // -#ifdef ICE_CPP11_MAPPING auto f = test->SBSUnknownDerivedAsSBaseCompactAsync(); try { @@ -947,13 +905,6 @@ allTests(Test::TestHelper* helper) { test(false); } -#else - CallbackPtr cb = new Callback; - test->begin_SBSUnknownDerivedAsSBaseCompact( - newCallback_TestIntf_SBSUnknownDerivedAsSBaseCompact( - cb, &Callback::response_SBSUnknownDerivedAsSBase, &Callback::exception)); - cb->check(); -#endif } else { @@ -961,7 +912,6 @@ allTests(Test::TestHelper* helper) // This test fails when using the compact format because the instance cannot // be sliced to a known type. // -#ifdef ICE_CPP11_MAPPING auto f = test->SBSUnknownDerivedAsSBaseCompactAsync(); try { @@ -975,14 +925,6 @@ allTests(Test::TestHelper* helper) { test(false); } -#else - CallbackPtr cb = new Callback; - test->begin_SBSUnknownDerivedAsSBaseCompact( - newCallback_TestIntf_SBSUnknownDerivedAsSBaseCompact( - cb, &Callback::response_SBSUnknownDerivedAsSBaseCompact, - &Callback::exception_SBSUnknownDerivedAsSBaseCompact)); - cb->check(); -#endif } cout << "ok" << endl; @@ -996,7 +938,6 @@ allTests(Test::TestHelper* helper) { try { -#ifdef ICE_CPP11_MAPPING if(test->ice_getEncodingVersion() == Ice::Encoding_1_0) { auto f = test->SUnknownAsObjectAsync(); @@ -1028,22 +969,6 @@ allTests(Test::TestHelper* helper) test(false); } } -#else - CallbackPtr cb = new Callback; - if(test->ice_getEncodingVersion() == Ice::Encoding_1_0) - { - test->begin_SUnknownAsObject( - newCallback_TestIntf_SUnknownAsObject( - cb, &Callback::response_SUnknownAsObject10, &Callback::exception_SUnknownAsObject10)); - } - else - { - test->begin_SUnknownAsObject( - newCallback_TestIntf_SUnknownAsObject( - cb, &Callback::response_SUnknownAsObject11, &Callback::exception_SUnknownAsObject11)); - } - cb->check(); -#endif } catch(...) { @@ -1073,7 +998,6 @@ allTests(Test::TestHelper* helper) cout << "one-element cycle (AMI)... " << flush; { -#ifdef ICE_CPP11_MAPPING auto f = test->oneElementCycleAsync(); try { @@ -1089,13 +1013,6 @@ allTests(Test::TestHelper* helper) { test(false); } -#else - CallbackPtr cb = new Callback; - test->begin_oneElementCycle( - newCallback_TestIntf_oneElementCycle( - cb, &Callback::response_oneElementCycle, &Callback::exception)); - cb->check(); -#endif } cout << "ok" << endl; @@ -1126,7 +1043,6 @@ allTests(Test::TestHelper* helper) cout << "two-element cycle (AMI)... " << flush; { -#ifdef ICE_CPP11_MAPPING auto f = test->twoElementCycleAsync(); try { @@ -1148,13 +1064,6 @@ allTests(Test::TestHelper* helper) { test(false); } -#else - CallbackPtr cb = new Callback; - test->begin_twoElementCycle( - newCallback_TestIntf_twoElementCycle( - cb, &Callback::response_twoElementCycle, &Callback::exception)); - cb->check(); -#endif } cout << "ok" << endl; @@ -1193,7 +1102,6 @@ allTests(Test::TestHelper* helper) cout << "known derived pointer slicing as base (AMI)... " << flush; { -#ifdef ICE_CPP11_MAPPING auto f = test->D1AsBAsync(); try { @@ -1222,11 +1130,6 @@ allTests(Test::TestHelper* helper) { test(false); } -#else - CallbackPtr cb = new Callback; - test->begin_D1AsB(newCallback_TestIntf_D1AsB(cb, &Callback::response_D1AsB, &Callback::exception)); - cb->check(); -#endif } cout << "ok" << endl; @@ -1259,7 +1162,6 @@ allTests(Test::TestHelper* helper) cout << "known derived pointer slicing as derived (AMI)... " << flush; { -#ifdef ICE_CPP11_MAPPING auto f = test->D1AsD1Async(); try { @@ -1282,11 +1184,6 @@ allTests(Test::TestHelper* helper) { test(false); } -#else - CallbackPtr cb = new Callback; - test->begin_D1AsD1(newCallback_TestIntf_D1AsD1(cb, &Callback::response_D1AsD1, &Callback::exception)); - cb->check(); -#endif } cout << "ok" << endl; @@ -1323,7 +1220,6 @@ allTests(Test::TestHelper* helper) cout << "unknown derived pointer slicing as base (AMI)... " << flush; { -#ifdef ICE_CPP11_MAPPING auto f = test->D2AsBAsync(); try { @@ -1350,11 +1246,6 @@ allTests(Test::TestHelper* helper) { test(false); } -#else - CallbackPtr cb = new Callback; - test->begin_D2AsB(newCallback_TestIntf_D2AsB(cb, &Callback::response_D2AsB, &Callback::exception)); - cb->check(); -#endif } cout << "ok" << endl; @@ -1392,7 +1283,6 @@ allTests(Test::TestHelper* helper) cout << "param ptr slicing with known first (AMI)... " << flush; { -#ifdef ICE_CPP11_MAPPING auto f = test->paramTest1Async(); try { @@ -1421,12 +1311,6 @@ allTests(Test::TestHelper* helper) { test(false); } -#else - CallbackPtr cb = new Callback; - test->begin_paramTest1( - newCallback_TestIntf_paramTest1(cb, &Callback::response_paramTest1, &Callback::exception)); - cb->check(); -#endif } cout << "ok" << endl; @@ -1484,7 +1368,6 @@ allTests(Test::TestHelper* helper) cout << "return value identity with known first (AMI)... " << flush; { -#ifdef ICE_CPP11_MAPPING auto f = test->returnTest1Async(); try { @@ -1498,12 +1381,6 @@ allTests(Test::TestHelper* helper) { test(false); } -#else - CallbackPtr cb = new Callback; - test->begin_returnTest1( - newCallback_TestIntf_returnTest1(cb, &Callback::response_returnTest1, &Callback::exception)); - cb->check(); -#endif } cout << "ok" << endl; @@ -1529,7 +1406,6 @@ allTests(Test::TestHelper* helper) cout << "return value identity with unknown first (AMI)... " << flush; { -#ifdef ICE_CPP11_MAPPING auto f = test->returnTest2Async(); try { @@ -1543,12 +1419,6 @@ allTests(Test::TestHelper* helper) { test(false); } -#else - CallbackPtr cb = new Callback; - test->begin_returnTest2( - newCallback_TestIntf_returnTest2(cb, &Callback::response_returnTest2, &Callback::exception)); - cb->check(); -#endif } cout << "ok" << endl; @@ -1616,16 +1486,8 @@ allTests(Test::TestHelper* helper) d1->pb = d3; d1->pd1 = d3; -#ifdef ICE_CPP11_MAPPING auto f = test->returnTest3Async(d1, d3); auto b1 = f.get(); -#else - CallbackPtr cb = new Callback; - test->begin_returnTest3(d1, d3, - newCallback_TestIntf_returnTest3(cb, &Callback::response_returnTest3, &Callback::exception)); - cb->check(); - BPtr b1 = cb->rb; -#endif test(b1); test(b1->sb == "D1.sb"); @@ -1725,16 +1587,8 @@ allTests(Test::TestHelper* helper) d1->pb = d3; d1->pd1 = d3; -#ifdef ICE_CPP11_MAPPING auto f = test->returnTest3Async(d3, d1); auto b1 = f.get(); -#else - CallbackPtr cb = new Callback; - test->begin_returnTest3(d3, d1, - newCallback_TestIntf_returnTest3(cb, &Callback::response_returnTest3, &Callback::exception)); - cb->check(); - BPtr b1 = cb->rb; -#endif test(b1); test(b1->sb == "D3.sb"); @@ -1804,7 +1658,6 @@ allTests(Test::TestHelper* helper) cout << "remainder unmarshaling (3 instances) (AMI)... " << flush; { -#ifdef ICE_CPP11_MAPPING auto f = test->paramTest3Async(); try { @@ -1836,12 +1689,6 @@ allTests(Test::TestHelper* helper) { test(false); } -#else - CallbackPtr cb = new Callback; - test->begin_paramTest3( - newCallback_TestIntf_paramTest3(cb, &Callback::response_paramTest3, &Callback::exception)); - cb->check(); -#endif } cout << "ok" << endl; @@ -1874,7 +1721,6 @@ allTests(Test::TestHelper* helper) cout << "remainder unmarshaling (4 instances) (AMI)... " << flush; { -#ifdef ICE_CPP11_MAPPING auto f = test->paramTest4Async(); try { @@ -1899,12 +1745,6 @@ allTests(Test::TestHelper* helper) { test(false); } -#else - CallbackPtr cb = new Callback; - test->begin_paramTest4( - newCallback_TestIntf_paramTest4(cb, &Callback::response_paramTest4, &Callback::exception)); - cb->check(); -#endif } cout << "ok" << endl; @@ -1962,15 +1802,7 @@ allTests(Test::TestHelper* helper) b2->sb = "B.sb(2)"; b2->pb = b1; -#ifdef ICE_CPP11_MAPPING auto r = test->returnTest3Async(d3, b2).get(); -#else - CallbackPtr cb = new Callback; - test->begin_returnTest3(d3, b2, - newCallback_TestIntf_returnTest3(cb, &Callback::response_returnTest3, &Callback::exception)); - cb->check(); - BPtr r = cb->rb; -#endif test(r); test(r->ice_id() == "::Test::B"); test(r->sb == "D3.sb"); @@ -2049,15 +1881,7 @@ allTests(Test::TestHelper* helper) d12->sd1 = "D1.sd1(2)"; d12->pd1 = d11; -#ifdef ICE_CPP11_MAPPING auto r = test->returnTest3Async(d3, d12).get(); -#else - CallbackPtr cb = new Callback; - test->begin_returnTest3(d3, d12, - newCallback_TestIntf_returnTest3(cb, &Callback::response_returnTest3, &Callback::exception)); - cb->check(); - BPtr r = cb->rb; -#endif test(r); test(r->ice_id() == "::Test::B"); test(r->sb == "D3.sb"); @@ -2218,16 +2042,7 @@ allTests(Test::TestHelper* helper) ss2->s.push_back(ss2d1); ss2->s.push_back(ss2d3); -#ifdef ICE_CPP11_MAPPING ss = test->sequenceTestAsync(ss1, ss2).get(); -#else - CallbackPtr cb = new Callback; - test->begin_sequenceTest(ss1, ss2, - newCallback_TestIntf_sequenceTest(cb, &Callback::response_sequenceTest, &Callback::exception)); - cb->check(); - ss = cb->rss3; -#endif - breakCycles(ss1); breakCycles(ss2); } @@ -2349,18 +2164,9 @@ allTests(Test::TestHelper* helper) bin[i] = d1; } -#ifdef ICE_CPP11_MAPPING auto result = test->dictionaryTestAsync(bin).get(); r = result.returnValue; bout = result.bout; -#else - CallbackPtr cb = new Callback; - test->begin_dictionaryTest(bin, - newCallback_TestIntf_dictionaryTest(cb, &Callback::response_dictionaryTest, &Callback::exception)); - cb->check(); - bout = cb->obdict; - r = cb->rbdict; -#endif test(bout.size() == 10); for(i = 0; i < 10; ++i) @@ -2427,7 +2233,6 @@ allTests(Test::TestHelper* helper) cout << "base exception thrown as base exception (AMI)... " << flush; { -#ifdef ICE_CPP11_MAPPING try { test->throwBaseAsBaseAsync().get(); @@ -2446,12 +2251,6 @@ allTests(Test::TestHelper* helper) { test(false); } -#else - CallbackPtr cb = new Callback; - test->begin_throwBaseAsBase( - newCallback_TestIntf_throwBaseAsBase(cb, &Callback::response, &Callback::exception_throwBaseAsBase)); - cb->check(); -#endif } cout << "ok" << endl; @@ -2487,7 +2286,6 @@ allTests(Test::TestHelper* helper) cout << "derived exception thrown as base exception (AMI)... " << flush; { -#ifdef ICE_CPP11_MAPPING try { test->throwDerivedAsBaseAsync().get(); @@ -2513,12 +2311,6 @@ allTests(Test::TestHelper* helper) { test(false); } -#else - CallbackPtr cb = new Callback; - test->begin_throwDerivedAsBase( - newCallback_TestIntf_throwDerivedAsBase(cb, &Callback::response, &Callback::exception_throwDerivedAsBase)); - cb->check(); -#endif } cout << "ok" << endl; @@ -2554,7 +2346,6 @@ allTests(Test::TestHelper* helper) cout << "derived exception thrown as derived exception (AMI)... " << flush; { -#ifdef ICE_CPP11_MAPPING try { test->throwDerivedAsDerivedAsync().get(); @@ -2580,13 +2371,6 @@ allTests(Test::TestHelper* helper) { test(false); } -#else - CallbackPtr cb = new Callback; - test->begin_throwDerivedAsDerived( - newCallback_TestIntf_throwDerivedAsDerived( - cb, &Callback::response, &Callback::exception_throwDerivedAsDerived)); - cb->check(); -#endif } cout << "ok" << endl; @@ -2615,7 +2399,6 @@ allTests(Test::TestHelper* helper) cout << "unknown derived exception thrown as base exception (AMI)... " << flush; { -#ifdef ICE_CPP11_MAPPING try { test->throwUnknownDerivedAsBaseAsync().get(); @@ -2634,13 +2417,6 @@ allTests(Test::TestHelper* helper) { test(false); } -#else - CallbackPtr cb = new Callback; - test->begin_throwUnknownDerivedAsBase( - newCallback_TestIntf_throwUnknownDerivedAsBase( - cb, &Callback::response, &Callback::exception_throwUnknownDerivedAsBase)); - cb->check(); -#endif } cout << "ok" << endl; @@ -2842,7 +2618,6 @@ allTests(Test::TestHelper* helper) pd->ps = "preserved"; pd->pb = pd; -#ifdef ICE_CPP11_MAPPING try { auto r = dynamic_pointer_cast(test->exchangePBaseAsync(pd).get()); @@ -2856,12 +2631,6 @@ allTests(Test::TestHelper* helper) { test(false); } -#else - CallbackPtr cb = new Callback; - test->begin_exchangePBase( - pd, newCallback_TestIntf_exchangePBase(cb, &Callback::response_preserved1, &Callback::exception)); - cb->check(); -#endif breakCycles(pd); } @@ -2872,7 +2641,6 @@ allTests(Test::TestHelper* helper) PCUnknownPtr pu = ICE_MAKE_SHARED(PCUnknown); pu->pi = 3; pu->pu = "preserved"; -#ifdef ICE_CPP11_MAPPING try { auto r = test->exchangePBaseAsync(pu).get(); @@ -2886,12 +2654,6 @@ allTests(Test::TestHelper* helper) { test(false); } -#else - CallbackPtr cb = new Callback; - test->begin_exchangePBase( - pu, newCallback_TestIntf_exchangePBase(cb, &Callback::response_preserved2, &Callback::exception)); - cb->check(); -#endif } { @@ -2902,7 +2664,6 @@ allTests(Test::TestHelper* helper) PCDerivedPtr pcd = ICE_MAKE_SHARED(PCDerived); pcd->pi = 3; pcd->pbs.push_back(pcd); -#ifdef ICE_CPP11_MAPPING if(test->ice_getEncodingVersion() == Ice::Encoding_1_0) { auto r = test->exchangePBaseAsync(pcd).get(); @@ -2922,21 +2683,6 @@ allTests(Test::TestHelper* helper) breakCycles(r); breakCycles(p2); } -#else - - CallbackPtr cb = new Callback; - if(test->ice_getEncodingVersion() == Ice::Encoding_1_0) - { - test->begin_exchangePBase( - pcd, newCallback_TestIntf_exchangePBase(cb, &Callback::response_preserved3, &Callback::exception)); - } - else - { - test->begin_exchangePBase( - pcd, newCallback_TestIntf_exchangePBase(cb, &Callback::response_preserved4, &Callback::exception)); - } - cb->check(); -#endif breakCycles(pcd); } @@ -2949,7 +2695,6 @@ allTests(Test::TestHelper* helper) pcd->pi = 3; pcd->pbs.push_back(pcd); -#ifdef ICE_CPP11_MAPPING if(test->ice_getEncodingVersion() == Ice::Encoding_1_0) { auto r = test->exchangePBaseAsync(pcd).get(); @@ -2969,22 +2714,6 @@ allTests(Test::TestHelper* helper) breakCycles(r); breakCycles(p2); } -#else - CallbackPtr cb = new Callback; - if(test->ice_getEncodingVersion() == Ice::Encoding_1_0) - { - test->begin_exchangePBase(pcd, newCallback_TestIntf_exchangePBase(cb, - &Callback::response_compactPreserved1, - &Callback::exception)); - } - else - { - test->begin_exchangePBase(pcd, newCallback_TestIntf_exchangePBase(cb, - &Callback::response_compactPreserved2, - &Callback::exception)); - } - cb->check(); -#endif breakCycles(pcd); } @@ -3009,7 +2738,6 @@ allTests(Test::TestHelper* helper) pcd->pcd2 = pcd->pi; pcd->pcd3 = pcd->pbs[10]; -#ifdef ICE_CPP11_MAPPING if(test->ice_getEncodingVersion() == Ice::Encoding_1_0) { auto r = test->exchangePBaseAsync(pcd).get(); @@ -3038,20 +2766,6 @@ allTests(Test::TestHelper* helper) breakCycles(r); breakCycles(pcd); } -#else - CallbackPtr cb = new Callback; - if(test->ice_getEncodingVersion() == Ice::Encoding_1_0) - { - test->begin_exchangePBase( - pcd, newCallback_TestIntf_exchangePBase(cb, &Callback::response_preserved3, &Callback::exception)); - } - else - { - test->begin_exchangePBase( - pcd, newCallback_TestIntf_exchangePBase(cb, &Callback::response_preserved5, &Callback::exception)); - } - cb->check(); -#endif } cout << "ok" << endl; diff --git a/cpp/test/Ice/slicing/objects/TestAMDI.cpp b/cpp/test/Ice/slicing/objects/TestAMDI.cpp index 2dde37cbbff..dad20d2d9eb 100644 --- a/cpp/test/Ice/slicing/objects/TestAMDI.cpp +++ b/cpp/test/Ice/slicing/objects/TestAMDI.cpp @@ -13,8 +13,6 @@ TestI::TestI() { } -#ifdef ICE_CPP11_MAPPING - void TestI::SBaseAsObjectAsync(function&)> response, function, @@ -122,8 +120,8 @@ TestI::oneElementCycleAsync(function&)> response, void TestI::twoElementCycleAsync(function&)> response, - function, - const ::Ice::Current&) + function, + const ::Ice::Current&) { auto b1 = make_shared(); b1->sb = "B1.sb"; @@ -654,527 +652,3 @@ TestI::shutdownAsync(function response, current.adapter->getCommunicator()->shutdown(); response(); } -#else - -void -TestI::SBaseAsObject_async(const AMD_TestIntf_SBaseAsObjectPtr& cb, const ::Ice::Current&) -{ - SBasePtr sb = new SBase; - sb->sb = "SBase.sb"; - cb->ice_response(sb); -} - -void -TestI::SBaseAsSBase_async(const AMD_TestIntf_SBaseAsSBasePtr& cb, const ::Ice::Current&) -{ - SBasePtr sb = new SBase; - sb->sb = "SBase.sb"; - cb->ice_response(sb); -} - -void -TestI::SBSKnownDerivedAsSBase_async(const AMD_TestIntf_SBSKnownDerivedAsSBasePtr& cb, const ::Ice::Current&) -{ - SBSKnownDerivedPtr sbskd = new SBSKnownDerived; - sbskd->sb = "SBSKnownDerived.sb"; - sbskd->sbskd = "SBSKnownDerived.sbskd"; - cb->ice_response(sbskd); -} - -void -TestI::SBSKnownDerivedAsSBSKnownDerived_async(const AMD_TestIntf_SBSKnownDerivedAsSBSKnownDerivedPtr& cb, - const ::Ice::Current&) -{ - SBSKnownDerivedPtr sbskd = new SBSKnownDerived; - sbskd->sb = "SBSKnownDerived.sb"; - sbskd->sbskd = "SBSKnownDerived.sbskd"; - cb->ice_response(sbskd); -} - -void -TestI::SBSUnknownDerivedAsSBase_async(const AMD_TestIntf_SBSUnknownDerivedAsSBasePtr& cb, const ::Ice::Current&) -{ - SBSUnknownDerivedPtr sbsud = new SBSUnknownDerived; - sbsud->sb = "SBSUnknownDerived.sb"; - sbsud->sbsud = "SBSUnknownDerived.sbsud"; - cb->ice_response(sbsud); -} - -void -TestI::SBSUnknownDerivedAsSBaseCompact_async(const AMD_TestIntf_SBSUnknownDerivedAsSBaseCompactPtr& cb, - const ::Ice::Current&) -{ - SBSUnknownDerivedPtr sbsud = new SBSUnknownDerived; - sbsud->sb = "SBSUnknownDerived.sb"; - sbsud->sbsud = "SBSUnknownDerived.sbsud"; - cb->ice_response(sbsud); -} - -void -TestI::SUnknownAsObject_async(const AMD_TestIntf_SUnknownAsObjectPtr& cb, const ::Ice::Current&) -{ - SUnknownPtr su = new SUnknown; - su->su = "SUnknown.su"; - su->cycle = su; - cb->ice_response(su); -} - -void -TestI::checkSUnknown_async(const AMD_TestIntf_checkSUnknownPtr& cb, - const Ice::ValuePtr& obj, - const ::Ice::Current& current) -{ - SUnknownPtr su = SUnknownPtr::dynamicCast(obj); - if(current.encoding == Ice::Encoding_1_0) - { - test(!su); - } - else - { - test(su); - test(su->su == "SUnknown.su"); - } - cb->ice_response(); -} - -void -TestI::oneElementCycle_async(const AMD_TestIntf_oneElementCyclePtr& cb, const ::Ice::Current&) -{ - BPtr b = new B; - b->sb = "B1.sb"; - b->pb = b; - cb->ice_response(b); -} - -void -TestI::twoElementCycle_async(const AMD_TestIntf_twoElementCyclePtr& cb, const ::Ice::Current&) -{ - BPtr b1 = new B; - b1->sb = "B1.sb"; - BPtr b2 = new B; - b2->sb = "B2.sb"; - b2->pb = b1; - b1->pb = b2; - cb->ice_response(b1); -} - -void -TestI::D1AsB_async(const AMD_TestIntf_D1AsBPtr& cb, const ::Ice::Current&) -{ - D1Ptr d1 = new D1; - d1->sb = "D1.sb"; - d1->sd1 = "D1.sd1"; - D2Ptr d2 = new D2; - d2->pb = d1; - d2->sb = "D2.sb"; - d2->sd2 = "D2.sd2"; - d2->pd2 = d1; - d1->pb = d2; - d1->pd1 = d2; - cb->ice_response(d1); -} - -void -TestI::D1AsD1_async(const AMD_TestIntf_D1AsD1Ptr& cb, const ::Ice::Current&) -{ - D1Ptr d1 = new D1; - d1->sb = "D1.sb"; - d1->sd1 = "D1.sd1"; - D2Ptr d2 = new D2; - d2->pb = d1; - d2->sb = "D2.sb"; - d2->sd2 = "D2.sd2"; - d2->pd2 = d1; - d1->pb = d2; - d1->pd1 = d2; - cb->ice_response(d1); -} - -void -TestI::D2AsB_async(const AMD_TestIntf_D2AsBPtr& cb, const ::Ice::Current&) -{ - D2Ptr d2 = new D2; - d2->sb = "D2.sb"; - d2->sd2 = "D2.sd2"; - D1Ptr d1 = new D1; - d1->pb = d2; - d1->sb = "D1.sb"; - d1->sd1 = "D1.sd1"; - d1->pd1 = d2; - d2->pb = d1; - d2->pd2 = d1; - cb->ice_response(d2); -} - -void -TestI::paramTest1_async(const AMD_TestIntf_paramTest1Ptr& cb, const ::Ice::Current&) -{ - D1Ptr d1 = new D1; - d1->sb = "D1.sb"; - d1->sd1 = "D1.sd1"; - D2Ptr d2 = new D2; - d2->pb = d1; - d2->sb = "D2.sb"; - d2->sd2 = "D2.sd2"; - d2->pd2 = d1; - d1->pb = d2; - d1->pd1 = d2; - cb->ice_response(d1, d2); -} - -void -TestI::paramTest2_async(const AMD_TestIntf_paramTest2Ptr& cb, const ::Ice::Current&) -{ - D1Ptr d1 = new D1; - d1->sb = "D1.sb"; - d1->sd1 = "D1.sd1"; - D2Ptr d2 = new D2; - d2->pb = d1; - d2->sb = "D2.sb"; - d2->sd2 = "D2.sd2"; - d2->pd2 = d1; - d1->pb = d2; - d1->pd1 = d2; - cb->ice_response(d2, d1); -} - -void -TestI::paramTest3_async(const AMD_TestIntf_paramTest3Ptr& cb, const ::Ice::Current&) -{ - D2Ptr d2 = new D2; - d2->sb = "D2.sb (p1 1)"; - d2->pb = 0; - d2->sd2 = "D2.sd2 (p1 1)"; - - D1Ptr d1 = new D1; - d1->sb = "D1.sb (p1 2)"; - d1->pb = 0; - d1->sd1 = "D1.sd2 (p1 2)"; - d1->pd1 = 0; - d2->pd2 = d1; - - D2Ptr d4 = new D2; - d4->sb = "D2.sb (p2 1)"; - d4->pb = 0; - d4->sd2 = "D2.sd2 (p2 1)"; - - D1Ptr d3 = new D1; - d3->sb = "D1.sb (p2 2)"; - d3->pb = 0; - d3->sd1 = "D1.sd2 (p2 2)"; - d3->pd1 = 0; - d4->pd2 = d3; - - cb->ice_response(d3, d2, d4); -} - -void -TestI::paramTest4_async(const AMD_TestIntf_paramTest4Ptr& cb, const ::Ice::Current&) -{ - D4Ptr d4 = new D4; - d4->sb = "D4.sb (1)"; - d4->pb = 0; - d4->p1 = new B; - d4->p1->sb = "B.sb (1)"; - d4->p2 = new B; - d4->p2->sb = "B.sb (2)"; - cb->ice_response(d4->p2, d4); -} - -void -TestI::returnTest1_async(const AMD_TestIntf_returnTest1Ptr& cb, const ::Ice::Current&) -{ - D1Ptr d1 = new D1; - d1->sb = "D1.sb"; - d1->sd1 = "D1.sd1"; - D2Ptr d2 = new D2; - d2->pb = d1; - d2->sb = "D2.sb"; - d2->sd2 = "D2.sd2"; - d2->pd2 = d1; - d1->pb = d2; - d1->pd1 = d2; - cb->ice_response(d2, d2, d1); -} - -void -TestI::returnTest2_async(const AMD_TestIntf_returnTest2Ptr& cb, const ::Ice::Current&) -{ - D1Ptr d1 = new D1; - d1->sb = "D1.sb"; - d1->sd1 = "D1.sd1"; - D2Ptr d2 = new D2; - d2->pb = d1; - d2->sb = "D2.sb"; - d2->sd2 = "D2.sd2"; - d2->pd2 = d1; - d1->pb = d2; - d1->pd1 = d2; - cb->ice_response(d1, d1, d2); -} - -void -TestI::returnTest3_async(const AMD_TestIntf_returnTest3Ptr& cb, const BPtr& p1, const BPtr&, const ::Ice::Current&) -{ - cb->ice_response(p1); -} - -void -TestI::sequenceTest_async(const AMD_TestIntf_sequenceTestPtr& cb, - const SS1Ptr& p1, const SS2Ptr& p2, const ::Ice::Current&) -{ - SS3 ss; - ss.c1 = p1; - ss.c2 = p2; - cb->ice_response(ss); -} - -void -TestI::dictionaryTest_async(const AMD_TestIntf_dictionaryTestPtr& cb, const BDict& bin, const ::Ice::Current&) -{ - BDict bout; - int i; - for(i = 0; i < 10; ++i) - { - BPtr b = bin.find(i)->second; - D2Ptr d2 = new D2; - d2->sb = b->sb; - d2->pb = b->pb; - d2->sd2 = "D2"; - d2->pd2 = d2; - bout[i * 10] = d2; - } - BDict r; - for(i = 0; i < 10; ++i) - { - std::ostringstream s; - s << "D1." << i * 20; - D1Ptr d1 = new D1; - d1->sb = s.str(); - d1->pb = (i == 0 ? BPtr(0) : r.find((i - 1) * 20)->second); - d1->sd1 = s.str(); - d1->pd1 = d1; - r[i * 20] = d1; - } - cb->ice_response(r, bout); -} - -void -TestI::exchangePBase_async(const AMD_TestIntf_exchangePBasePtr& cb, const PBasePtr& pb, const ::Ice::Current&) -{ - cb->ice_response(pb); -} - -void -TestI::PBSUnknownAsPreserved_async(const Test::AMD_TestIntf_PBSUnknownAsPreservedPtr& cb, const Ice::Current& current) -{ - PSUnknownPtr r = new PSUnknown; - r->pi = 5; - r->ps = "preserved"; - r->psu = "unknown"; - r->graph = 0; - if(current.encoding != Ice::Encoding_1_0) - { - // - // 1.0 encoding doesn't support unmarshaling unknown classes even if referenced - // from unread slice. - // - r->cl = new MyClass(15); - } - cb->ice_response(r); -} - -void -TestI::checkPBSUnknown_async(const Test::AMD_TestIntf_checkPBSUnknownPtr& cb, const Test::PreservedPtr& p, - const Ice::Current& current) -{ - PSUnknownPtr pu = PSUnknownPtr::dynamicCast(p); - if(current.encoding == Ice::Encoding_1_0) - { - test(!pu); - test(p->pi == 5); - test(p->ps == "preserved"); - } - else - { - test(pu); - test(pu->pi == 5); - test(pu->ps == "preserved"); - test(pu->psu == "unknown"); - test(!pu->graph); - test(pu->cl && pu->cl->i == 15); - } - cb->ice_response(); -} - -void -TestI::PBSUnknownAsPreservedWithGraph_async(const Test::AMD_TestIntf_PBSUnknownAsPreservedWithGraphPtr& cb, - const Ice::Current&) -{ - PSUnknownPtr r = new PSUnknown; - r->pi = 5; - r->ps = "preserved"; - r->psu = "unknown"; - r->graph = new PNode; - r->graph->next = new PNode; - r->graph->next->next = new PNode; - r->graph->next->next->next = r->graph; - cb->ice_response(r); - r->graph->next->next->next = 0; // Break the cycle. -} - -void -TestI::checkPBSUnknownWithGraph_async(const Test::AMD_TestIntf_checkPBSUnknownWithGraphPtr& cb, - const Test::PreservedPtr& p, const Ice::Current& current) -{ - PSUnknownPtr pu = PSUnknownPtr::dynamicCast(p); - if(current.encoding == Ice::Encoding_1_0) - { - test(!pu); - test(p->pi == 5); - test(p->ps == "preserved"); - } - else - { - test(pu); - test(pu->pi == 5); - test(pu->ps == "preserved"); - test(pu->psu == "unknown"); - test(pu->graph != pu->graph->next); - test(pu->graph->next != pu->graph->next->next); - test(pu->graph->next->next->next == pu->graph); - pu->graph->next->next->next = 0; // Break the cycle. - } - cb->ice_response(); -} - -void -TestI::PBSUnknown2AsPreservedWithGraph_async(const Test::AMD_TestIntf_PBSUnknown2AsPreservedWithGraphPtr& cb, - const Ice::Current&) -{ - PSUnknown2Ptr r = new PSUnknown2; - r->pi = 5; - r->ps = "preserved"; - r->pb = r; - cb->ice_response(r); - r->pb = 0; // Break the cycle. -} - -void -TestI::checkPBSUnknown2WithGraph_async(const Test::AMD_TestIntf_checkPBSUnknown2WithGraphPtr& cb, - const Test::PreservedPtr& p, const Ice::Current& current) -{ - PSUnknown2Ptr pu = PSUnknown2Ptr::dynamicCast(p); - if(current.encoding == Ice::Encoding_1_0) - { - test(!pu); - test(p->pi == 5); - test(p->ps == "preserved"); - } - else - { - test(pu); - test(pu->pi == 5); - test(pu->ps == "preserved"); - test(pu->pb == pu); - pu->pb = 0; // Break the cycle. - } - cb->ice_response(); -} - -void -TestI::exchangePNode_async(const AMD_TestIntf_exchangePNodePtr& cb, const PNodePtr& pn, const ::Ice::Current&) -{ - cb->ice_response(pn); -} - -void -TestI::throwBaseAsBase_async(const AMD_TestIntf_throwBaseAsBasePtr& cb, const ::Ice::Current&) -{ - BaseException be; - be.sbe = "sbe"; - be.pb = new B; - be.pb->sb = "sb"; - be.pb->pb = be.pb; - cb->ice_exception(be); -} - -void -TestI::throwDerivedAsBase_async(const AMD_TestIntf_throwDerivedAsBasePtr& cb, const ::Ice::Current&) -{ - DerivedException de; - de.sbe = "sbe"; - de.pb = new B; - de.pb->sb = "sb1"; - de.pb->pb = de.pb; - de.sde = "sde1"; - de.pd1 = new D1; - de.pd1->sb = "sb2"; - de.pd1->pb = de.pd1; - de.pd1->sd1 = "sd2"; - de.pd1->pd1 = de.pd1; - cb->ice_exception(de); -} - -void -TestI::throwDerivedAsDerived_async(const AMD_TestIntf_throwDerivedAsDerivedPtr& cb, const ::Ice::Current&) -{ - DerivedException de; - de.sbe = "sbe"; - de.pb = new B; - de.pb->sb = "sb1"; - de.pb->pb = de.pb; - de.sde = "sde1"; - de.pd1 = new D1; - de.pd1->sb = "sb2"; - de.pd1->pb = de.pd1; - de.pd1->sd1 = "sd2"; - de.pd1->pd1 = de.pd1; - cb->ice_exception(de); -} - -void -TestI::throwUnknownDerivedAsBase_async(const AMD_TestIntf_throwUnknownDerivedAsBasePtr& cb, const ::Ice::Current&) -{ - D2Ptr d2 = new D2; - d2->sb = "sb d2"; - d2->pb = d2; - d2->sd2 = "sd2 d2"; - d2->pd2 = d2; - - UnknownDerivedException ude; - ude.sbe = "sbe"; - ude.pb = d2; - ude.sude = "sude"; - ude.pd2 = d2; - cb->ice_exception(ude); -} - -void -TestI::throwPreservedException_async(const AMD_TestIntf_throwPreservedExceptionPtr& cb, const ::Ice::Current&) -{ - PSUnknownException ue; - ue.p = new PSUnknown2; - ue.p->pi = 5; - ue.p->ps = "preserved"; - ue.p->pb = ue.p; - cb->ice_exception(ue); - ue.p->pb = 0; // Break the cycle. -} - -void -TestI::useForward_async(const AMD_TestIntf_useForwardPtr& cb, const ::Ice::Current&) -{ - ForwardPtr f = new Forward; - f->h = new Hidden; - f->h->f = f; - cb->ice_response(f); -} - -void -TestI::shutdown_async(const AMD_TestIntf_shutdownPtr& cb, const ::Ice::Current& current) -{ - current.adapter->getCommunicator()->shutdown(); - cb->ice_response(); -} -#endif diff --git a/cpp/test/Ice/slicing/objects/TestAMDI.h b/cpp/test/Ice/slicing/objects/TestAMDI.h index f1bfa74b190..c4d0cb6d573 100644 --- a/cpp/test/Ice/slicing/objects/TestAMDI.h +++ b/cpp/test/Ice/slicing/objects/TestAMDI.h @@ -12,7 +12,6 @@ class TestI : public virtual ::Test::TestIntf public: TestI(); -#ifdef ICE_CPP11_MAPPING virtual void SBaseAsObjectAsync(std::function&)>, std::function, const ::Ice::Current&); @@ -180,81 +179,6 @@ class TestI : public virtual ::Test::TestIntf virtual void shutdownAsync(std::function, std::function, const ::Ice::Current&); -#else - virtual void SBaseAsObject_async(const ::Test::AMD_TestIntf_SBaseAsObjectPtr&, const ::Ice::Current&); - virtual void SBaseAsSBase_async(const ::Test::AMD_TestIntf_SBaseAsSBasePtr&, const ::Ice::Current&); - virtual void SBSKnownDerivedAsSBase_async(const ::Test::AMD_TestIntf_SBSKnownDerivedAsSBasePtr&, - const ::Ice::Current&); - virtual void SBSKnownDerivedAsSBSKnownDerived_async(const ::Test::AMD_TestIntf_SBSKnownDerivedAsSBSKnownDerivedPtr&, - const ::Ice::Current&); - - virtual void SBSUnknownDerivedAsSBase_async(const ::Test::AMD_TestIntf_SBSUnknownDerivedAsSBasePtr&, - const ::Ice::Current&); - - virtual void SBSUnknownDerivedAsSBaseCompact_async(const ::Test::AMD_TestIntf_SBSUnknownDerivedAsSBaseCompactPtr&, - const ::Ice::Current&); - - virtual void SUnknownAsObject_async(const ::Test::AMD_TestIntf_SUnknownAsObjectPtr&, const ::Ice::Current&); - virtual void checkSUnknown_async(const ::Test::AMD_TestIntf_checkSUnknownPtr&, const Ice::ValuePtr&, - const ::Ice::Current&); - - virtual void oneElementCycle_async(const ::Test::AMD_TestIntf_oneElementCyclePtr&, const ::Ice::Current&); - virtual void twoElementCycle_async(const ::Test::AMD_TestIntf_twoElementCyclePtr&, const ::Ice::Current&); - - virtual void D1AsB_async(const ::Test::AMD_TestIntf_D1AsBPtr&, const ::Ice::Current&); - virtual void D1AsD1_async(const ::Test::AMD_TestIntf_D1AsD1Ptr&, const ::Ice::Current&); - virtual void D2AsB_async(const ::Test::AMD_TestIntf_D2AsBPtr&, const ::Ice::Current&); - - virtual void paramTest1_async(const ::Test::AMD_TestIntf_paramTest1Ptr&, const ::Ice::Current&); - virtual void paramTest2_async(const ::Test::AMD_TestIntf_paramTest2Ptr&, const ::Ice::Current&); - virtual void paramTest3_async(const ::Test::AMD_TestIntf_paramTest3Ptr&, const ::Ice::Current&); - virtual void paramTest4_async(const ::Test::AMD_TestIntf_paramTest4Ptr&, const ::Ice::Current&); - - virtual void returnTest1_async(const ::Test::AMD_TestIntf_returnTest1Ptr&, const ::Ice::Current&); - virtual void returnTest2_async(const ::Test::AMD_TestIntf_returnTest2Ptr&, const ::Ice::Current&); - virtual void returnTest3_async(const ::Test::AMD_TestIntf_returnTest3Ptr&, const ::Test::BPtr&, const ::Test::BPtr&, - const ::Ice::Current&); - - virtual void sequenceTest_async(const ::Test::AMD_TestIntf_sequenceTestPtr&, - const ::Test::SS1Ptr&, const ::Test::SS2Ptr&, const ::Ice::Current&); - - virtual void dictionaryTest_async(const ::Test::AMD_TestIntf_dictionaryTestPtr&, - const ::Test::BDict&, const ::Ice::Current&); - - virtual void exchangePBase_async(const ::Test::AMD_TestIntf_exchangePBasePtr&, const ::Test::PBasePtr&, - const ::Ice::Current&); - - virtual void PBSUnknownAsPreserved_async(const ::Test::AMD_TestIntf_PBSUnknownAsPreservedPtr&, - const ::Ice::Current&); - virtual void checkPBSUnknown_async(const ::Test::AMD_TestIntf_checkPBSUnknownPtr&, const ::Test::PreservedPtr&, - const ::Ice::Current&); - - virtual void PBSUnknownAsPreservedWithGraph_async(const ::Test::AMD_TestIntf_PBSUnknownAsPreservedWithGraphPtr&, - const ::Ice::Current&); - virtual void checkPBSUnknownWithGraph_async(const ::Test::AMD_TestIntf_checkPBSUnknownWithGraphPtr&, - const ::Test::PreservedPtr&, const ::Ice::Current&); - - virtual void PBSUnknown2AsPreservedWithGraph_async(const ::Test::AMD_TestIntf_PBSUnknown2AsPreservedWithGraphPtr&, - const ::Ice::Current&); - virtual void checkPBSUnknown2WithGraph_async(const ::Test::AMD_TestIntf_checkPBSUnknown2WithGraphPtr&, - const ::Test::PreservedPtr&, const ::Ice::Current&); - - virtual void exchangePNode_async(const ::Test::AMD_TestIntf_exchangePNodePtr&, const ::Test::PNodePtr&, - const ::Ice::Current&); - - virtual void throwBaseAsBase_async(const ::Test::AMD_TestIntf_throwBaseAsBasePtr&, const ::Ice::Current&); - virtual void throwDerivedAsBase_async(const ::Test::AMD_TestIntf_throwDerivedAsBasePtr&, const ::Ice::Current&); - virtual void throwDerivedAsDerived_async(const ::Test::AMD_TestIntf_throwDerivedAsDerivedPtr&, - const ::Ice::Current&); - virtual void throwUnknownDerivedAsBase_async(const ::Test::AMD_TestIntf_throwUnknownDerivedAsBasePtr&, - const ::Ice::Current&); - virtual void throwPreservedException_async(const ::Test::AMD_TestIntf_throwPreservedExceptionPtr&, - const ::Ice::Current&); - - virtual void useForward_async(const ::Test::AMD_TestIntf_useForwardPtr&, const ::Ice::Current&); - - virtual void shutdown_async(const ::Test::AMD_TestIntf_shutdownPtr&, const ::Ice::Current&); -#endif }; #endif diff --git a/cpp/test/Ice/slicing/objects/TestI.cpp b/cpp/test/Ice/slicing/objects/TestI.cpp index df1c6636581..4c55e71e593 100644 --- a/cpp/test/Ice/slicing/objects/TestI.cpp +++ b/cpp/test/Ice/slicing/objects/TestI.cpp @@ -482,16 +482,10 @@ TestI::checkPBSUnknown(ICE_IN(Test::PreservedPtr) p, const Ice::Current& current } } -#ifdef ICE_CPP11_MAPPING void TestI::PBSUnknownAsPreservedWithGraphAsync(function&)> response, function, const Ice::Current&) -#else -void -TestI::PBSUnknownAsPreservedWithGraph_async(const Test::AMD_TestIntf_PBSUnknownAsPreservedWithGraphPtr& cb, - const Ice::Current&) -#endif { PSUnknownPtr r = ICE_MAKE_SHARED(PSUnknown); r->pi = 5; @@ -501,11 +495,7 @@ TestI::PBSUnknownAsPreservedWithGraph_async(const Test::AMD_TestIntf_PBSUnknownA r->graph->next = ICE_MAKE_SHARED(PNode); r->graph->next->next = ICE_MAKE_SHARED(PNode); r->graph->next->next->next = r->graph; -#ifdef ICE_CPP11_MAPPING response(r); -#else - cb->ice_response(r); -#endif r->graph->next->next->next = 0; // Break the cycle. } @@ -532,26 +522,16 @@ TestI::checkPBSUnknownWithGraph(ICE_IN(Test::PreservedPtr) p, const Ice::Current } } -#ifdef ICE_CPP11_MAPPING void TestI::PBSUnknown2AsPreservedWithGraphAsync(function&)> response, function, const Ice::Current&) -#else -void -TestI::PBSUnknown2AsPreservedWithGraph_async(const Test::AMD_TestIntf_PBSUnknown2AsPreservedWithGraphPtr& cb, - const Ice::Current&) -#endif { PSUnknown2Ptr r = ICE_MAKE_SHARED(PSUnknown2); r->pi = 5; r->ps = "preserved"; r->pb = r; -#ifdef ICE_CPP11_MAPPING response(r); -#else - cb->ice_response(r); -#endif r->pb = 0; // Break the cycle. } @@ -649,22 +629,16 @@ TestI::throwUnknownDerivedAsBase(const ::Ice::Current&) throw ude; } -#ifdef ICE_CPP11_MAPPING void TestI::throwPreservedExceptionAsync(function, function exception, const ::Ice::Current&) -#else -void -TestI::throwPreservedException_async(const AMD_TestIntf_throwPreservedExceptionPtr& cb, const ::Ice::Current&) -#endif { PSUnknownException ue; ue.p = ICE_MAKE_SHARED(PSUnknown2); ue.p->pi = 5; ue.p->ps = "preserved"; ue.p->pb = ue.p; -#ifdef ICE_CPP11_MAPPING try { throw ue; @@ -673,9 +647,6 @@ TestI::throwPreservedException_async(const AMD_TestIntf_throwPreservedExceptionP { exception(current_exception()); } -#else - cb->ice_exception(ue); -#endif ue.p->pb = 0; // Break the cycle. } diff --git a/cpp/test/Ice/slicing/objects/TestI.h b/cpp/test/Ice/slicing/objects/TestI.h index 267a5b0e996..9fe8d9ab6cc 100644 --- a/cpp/test/Ice/slicing/objects/TestI.h +++ b/cpp/test/Ice/slicing/objects/TestI.h @@ -51,24 +51,14 @@ class TestI : public virtual Test::TestIntf virtual ::Test::PreservedPtr PBSUnknownAsPreserved(const ::Ice::Current&); virtual void checkPBSUnknown(ICE_IN(::Test::PreservedPtr), const ::Ice::Current&); -#ifdef ICE_CPP11_MAPPING virtual void PBSUnknownAsPreservedWithGraphAsync(std::function&)>, std::function, const ::Ice::Current&); -#else - virtual void PBSUnknownAsPreservedWithGraph_async(const ::Test::AMD_TestIntf_PBSUnknownAsPreservedWithGraphPtr&, - const ::Ice::Current&); -#endif virtual void checkPBSUnknownWithGraph(ICE_IN(::Test::PreservedPtr), const ::Ice::Current&); -#ifdef ICE_CPP11_MAPPING virtual void PBSUnknown2AsPreservedWithGraphAsync(std::function&)>, std::function, const ::Ice::Current&); -#else - virtual void PBSUnknown2AsPreservedWithGraph_async(const ::Test::AMD_TestIntf_PBSUnknown2AsPreservedWithGraphPtr&, - const ::Ice::Current&); -#endif virtual void checkPBSUnknown2WithGraph(ICE_IN(::Test::PreservedPtr), const ::Ice::Current&); virtual ::Test::PNodePtr exchangePNode(ICE_IN(::Test::PNodePtr), const ::Ice::Current&); @@ -77,14 +67,9 @@ class TestI : public virtual Test::TestIntf virtual void throwDerivedAsBase(const ::Ice::Current&); virtual void throwDerivedAsDerived(const ::Ice::Current&); virtual void throwUnknownDerivedAsBase(const ::Ice::Current&); -#ifdef ICE_CPP11_MAPPING virtual void throwPreservedExceptionAsync(std::function, std::function, const ::Ice::Current&); -#else - virtual void throwPreservedException_async(const ::Test::AMD_TestIntf_throwPreservedExceptionPtr&, - const ::Ice::Current&); -#endif virtual void useForward(::Test::ForwardPtr&, const ::Ice::Current&); diff --git a/cpp/test/Ice/stream/Client.cpp b/cpp/test/Ice/stream/Client.cpp index e8b16dc00c6..3945a7d8b49 100644 --- a/cpp/test/Ice/stream/Client.cpp +++ b/cpp/test/Ice/stream/Client.cpp @@ -290,29 +290,12 @@ allTests(Test::TestHelper* helper) Ice::InputStream in(communicator, data); SmallStruct s2; in.read(s2); - -#ifdef ICE_CPP11_MAPPING test(targetEqualTo(s2.p, s.p)); s2.p = s.p; // otherwise the s2 == s below will fail -#endif test(s2 == s); } -#ifndef ICE_CPP11_MAPPING - { - Ice::OutputStream out(communicator); - ClassStructPtr s = new ClassStruct(); - s->i = 10; - out.write(s); - out.finished(data); - Ice::InputStream in(communicator, data); - ClassStructPtr s2 = new ClassStruct(); - in.read(s2); - test(s2->i == s->i); - } -#endif - { Ice::OutputStream out(communicator); OptionalClassPtr o = ICE_MAKE_SHARED(OptionalClass); @@ -655,10 +638,8 @@ allTests(Test::TestHelper* helper) for(SmallStructS::size_type j = 0; j < arr2.size(); ++j) { -#ifdef ICE_CPP11_MAPPING test(targetEqualTo(arr[j].p, arr2[j].p)); arr2[j].p = arr[j].p; -#endif test(arr[j] == arr2[j]); } @@ -674,10 +655,6 @@ allTests(Test::TestHelper* helper) Ice::InputStream in2(communicator, data); SmallStructSS arr2S; in2.read(arr2S); -#ifndef ICE_CPP11_MAPPING - // With C++11, we need targetEqualTo to compare proxies - test(arr2S == arrS); -#endif } { @@ -1044,23 +1021,6 @@ allTests(Test::TestHelper* helper) test(s2 == s); } -#ifndef ICE_CPP11_MAPPING - // - // No support for struct-as-class in C++11. - // - { - Ice::OutputStream out(communicator); - NestedClassStructPtr s = new NestedClassStruct(); - s->i = 10; - out.write(s); - out.finished(data); - Ice::InputStream in(communicator, data); - NestedClassStructPtr s2 = new NestedClassStruct(); - in.read(s2); - test(s2->i == s->i); - } -#endif - { Ice::OutputStream out(communicator); NestedException ex; @@ -1111,23 +1071,6 @@ allTests(Test::TestHelper* helper) test(s2 == s); } -#ifndef ICE_CPP11_MAPPING - // - // No support for struct-as-class in C++11. - // - { - Ice::OutputStream out(communicator); - NestedClassStruct2Ptr s = new NestedClassStruct2(); - s->i = 10; - out.write(s); - out.finished(data); - Ice::InputStream in(communicator, data); - NestedClassStruct2Ptr s2 = new NestedClassStruct2(); - in.read(s2); - test(s2->i == s->i); - } -#endif - { Ice::OutputStream out(communicator); NestedException2 ex; diff --git a/cpp/test/Ice/timeout/AllTests.cpp b/cpp/test/Ice/timeout/AllTests.cpp index 42fb207a96a..5ba155e1d6d 100644 --- a/cpp/test/Ice/timeout/AllTests.cpp +++ b/cpp/test/Ice/timeout/AllTests.cpp @@ -226,7 +226,6 @@ allTestsWithController(Test::TestHelper* helper, const ControllerPrxPtr& control // TimeoutPrxPtr to = ICE_UNCHECKED_CAST(TimeoutPrx, obj->ice_invocationTimeout(100)); -#ifdef ICE_CPP11_MAPPING auto f = to->sleepAsync(1000); try { @@ -240,11 +239,6 @@ allTestsWithController(Test::TestHelper* helper, const ControllerPrxPtr& control { test(false); } -#else - CallbackPtr cb = new Callback(); - to->begin_sleep(1000, newCallback_Timeout_sleep(cb, &Callback::responseEx, &Callback::exceptionEx)); - cb->check(); -#endif obj->ice_ping(); } { @@ -252,7 +246,6 @@ allTestsWithController(Test::TestHelper* helper, const ControllerPrxPtr& control // Expect success. // TimeoutPrxPtr to = ICE_UNCHECKED_CAST(TimeoutPrx, obj->ice_invocationTimeout(1000)); -#ifdef ICE_CPP11_MAPPING auto f = to->sleepAsync(100); try { @@ -262,11 +255,6 @@ allTestsWithController(Test::TestHelper* helper, const ControllerPrxPtr& control { test(false); } -#else - CallbackPtr cb = new Callback(); - to->begin_sleep(100, newCallback_Timeout_sleep(cb, &Callback::response, &Callback::exception)); - cb->check(); -#endif } { // @@ -295,11 +283,7 @@ allTestsWithController(Test::TestHelper* helper, const ControllerPrxPtr& control try { con = connect(to); -#ifdef ICE_CPP11_MAPPING to->sleepAsync(750).get(); -#else - to->end_sleep(to->begin_sleep(750)); -#endif test(false); } catch(const Ice::TimeoutException&) @@ -490,11 +474,7 @@ allTestsWithController(Test::TestHelper* helper, const ControllerPrxPtr& control try { -#ifdef ICE_CPP11_MAPPING timeout->sleepAsync(500).get(); -#else - timeout->end_sleep(timeout->begin_sleep(500)); -#endif test(false); } catch(const Ice::InvocationTimeoutException&) @@ -504,11 +484,7 @@ allTestsWithController(Test::TestHelper* helper, const ControllerPrxPtr& control try { timeout->ice_invocationTimeout(-2)->ice_ping(); - #ifdef ICE_CPP11_MAPPING timeout->ice_invocationTimeout(-2)->ice_pingAsync().get(); - #else - timeout->ice_invocationTimeout(-2)->begin_ice_ping()->waitForCompleted(); - #endif } catch(const Ice::Exception&) { @@ -521,18 +497,10 @@ allTestsWithController(Test::TestHelper* helper, const ControllerPrxPtr& control batchTimeout->ice_ping(); // Keep the server thread pool busy. -#ifdef ICE_CPP11_MAPPING timeout->ice_invocationTimeout(-1)->sleepAsync(500); -#else - timeout->ice_invocationTimeout(-1)->begin_sleep(500); -#endif try { -#ifdef ICE_CPP11_MAPPING batchTimeout->ice_flushBatchRequestsAsync().get(); -#else - batchTimeout->end_ice_flushBatchRequests(batchTimeout->begin_ice_flushBatchRequests()); -#endif test(false); } catch(const Ice::InvocationTimeoutException&) diff --git a/cpp/test/Ice/udp/TestI.cpp b/cpp/test/Ice/udp/TestI.cpp index b89fe3866b1..6e3b67272f0 100644 --- a/cpp/test/Ice/udp/TestI.cpp +++ b/cpp/test/Ice/udp/TestI.cpp @@ -58,11 +58,7 @@ TestIntfI::pingBiDir(ICE_IN(Ice::Identity) id, const Ice::Current& current) // // Send the reply through the incoming connection. // -#ifdef ICE_CPP11_MAPPING Ice::uncheckedCast(current.con->createProxy(id))->replyAsync(); -#else - Test::PingReplyPrx::uncheckedCast(current.con->createProxy(id))->begin_reply(); -#endif } catch(const Ice::Exception& ex) { diff --git a/cpp/test/IceBox/configuration/Service.cpp b/cpp/test/IceBox/configuration/Service.cpp index 2a4be64571e..e31263973cb 100644 --- a/cpp/test/IceBox/configuration/Service.cpp +++ b/cpp/test/IceBox/configuration/Service.cpp @@ -30,11 +30,7 @@ extern "C" // Factory function // ICE_DECLSPEC_EXPORT ::IceBox::Service* -#ifdef ICE_CPP11_MAPPING create(const shared_ptr&) -#else -create(CommunicatorPtr) -#endif { return new ServiceI; } diff --git a/cpp/test/IceUtil/timer/Client.cpp b/cpp/test/IceUtil/timer/Client.cpp index 27ec7a197af..30b7c8e1bce 100644 --- a/cpp/test/IceUtil/timer/Client.cpp +++ b/cpp/test/IceUtil/timer/Client.cpp @@ -216,11 +216,7 @@ Client::run(int, char*[]) test(IceUtil::Time::now(IceUtil::Time::Monotonic) > start); -#ifdef ICE_CPP11_MAPPING sort(tasks.begin(), tasks.end(), TargetLess>()); -#else - sort(tasks.begin(), tasks.end()); -#endif for(p = tasks.begin(); p + 1 != tasks.end(); ++p) { if((*p)->getRunTime() > (*(p + 1))->getRunTime()) diff --git a/cpp/test/Slice/escape/Client.cpp b/cpp/test/Slice/escape/Client.cpp index 93bd0e26946..5972e6af09f 100644 --- a/cpp/test/Slice/escape/Client.cpp +++ b/cpp/test/Slice/escape/Client.cpp @@ -13,7 +13,6 @@ class breakI : public _cpp_and::_cpp_break { public: -#ifdef ICE_CPP11_MAPPING virtual void caseAsync(::Ice::Int, function response, function, @@ -21,12 +20,6 @@ class breakI : public _cpp_and::_cpp_break { response(0); } -#else - virtual void case_async(const ::_cpp_and::AMD_break_casePtr& cb, ::Ice::Int, const ::Ice::Current&) - { - cb->ice_response(0); - } -#endif }; class charI: public _cpp_and::_cpp_char @@ -46,11 +39,8 @@ class charI: public _cpp_and::_cpp_char class switchI: public _cpp_and::_cpp_switch { public: -#ifdef ICE_CPP11_MAPPING + virtual void foo(shared_ptr<_cpp_and::charPrx>, Ice::Int&, const ::Ice::Current&) -#else - virtual void foo(const _cpp_and::charPrx&, Ice::Int&, const ::Ice::Current&) -#endif { } }; @@ -58,21 +48,18 @@ class switchI: public _cpp_and::_cpp_switch class doI : public _cpp_and::_cpp_do { public: -#ifdef ICE_CPP11_MAPPING + virtual void caseAsync(int, ::std::function, ::std::function, const ::Ice::Current&) { } -#else - virtual void case_async(const ::_cpp_and::AMD_break_casePtr&, ::Ice::Int, const ::Ice::Current&) - { - } -#endif + virtual void _cpp_explicit(const ::Ice::Current&) { } + virtual void foo(const _cpp_and::charPrx&, Ice::Int&, const ::Ice::Current&) { } @@ -87,24 +74,12 @@ class friendI : public _cpp_and::_cpp_friend virtual _cpp_and::_cpp_auto _cpp_goto(_cpp_and::_cpp_continue, const _cpp_and::_cpp_auto&, -#ifdef ICE_CPP11_MAPPING const _cpp_and::_cpp_delete&, -#else - const _cpp_and::deletePtr&, -#endif const _cpp_and::switchPtr&, -#ifdef ICE_CPP11_MAPPING const ::std::shared_ptr<::Ice::Value>&, -#else - const _cpp_and::doPtr&, -#endif const _cpp_and::breakPrxPtr&, const _cpp_and::charPrxPtr&, -#ifdef ICE_CPP11_MAPPING const ::std::shared_ptr<::Ice::ObjectPrx>&, -#else - const _cpp_and::switchPrxPtr&, -#endif const _cpp_and::doPrxPtr&, ::Ice::Int, ::Ice::Int, ::Ice::Int, ::Ice::Int, @@ -121,26 +96,16 @@ class friendI : public _cpp_and::_cpp_friend // void testtypes(const Ice::CommunicatorPtr& communicator) { -#ifdef ICE_CPP11_MAPPING _cpp_and::_cpp_continue a = _cpp_and::_cpp_continue::_cpp_asm; test(a == _cpp_and::_cpp_continue::_cpp_asm); -#else - _cpp_and::_cpp_continue a = _cpp_and::_cpp_asm; - test(a); -#endif _cpp_and::_cpp_auto b, b2; b._cpp_default = 0; b2._cpp_default = b._cpp_default; b._cpp_default = b2._cpp_default; -#ifdef ICE_CPP11_MAPPING _cpp_and::_cpp_delete c; c._cpp_else = ""; -#else - _cpp_and::deletePtr c = new _cpp_and::_cpp_delete(); - c->_cpp_else = ""; -#endif _cpp_and::breakPrxPtr d = ICE_UNCHECKED_CAST(_cpp_and::breakPrx, communicator->stringToProxy("hello:tcp -h 127.0.0.1 -p 12010")); diff --git a/cpp/test/Slice/structure/Client.cpp b/cpp/test/Slice/structure/Client.cpp index 79065eff642..7ffa8ae194f 100644 --- a/cpp/test/Slice/structure/Client.cpp +++ b/cpp/test/Slice/structure/Client.cpp @@ -33,227 +33,9 @@ allTests(const Ice::CommunicatorPtr& communicator) def_s2.il.push_back(2); def_s2.il.push_back(3); def_s2.sd["abc"] = "def"; -#ifdef ICE_CPP11_MAPPING def_s2.s = {"name"}; -#else - def_s2.s = new S1("name"); -#endif def_s2.cls = ICE_MAKE_SHARED(C, 5); def_s2.prx = communicator->stringToProxy("test"); - -#ifndef ICE_CPP11_MAPPING - // - // cpp:comparable required by tests bellow is only - // supported with C++98 mapping. - // - - // - // Change one primitive member at a time. - // - { - S2 v; - - v = def_s2; - test(v == def_s2); - - v = def_s2; - v.bo = false; - test(v != def_s2); - - v = def_s2; - v.by--; - test(v != def_s2); - - v = def_s2; - v.sh--; - test(v != def_s2); - - v = def_s2; - v.i--; - test(v != def_s2); - - v = def_s2; - v.l--; - test(v != def_s2); - - v = def_s2; - v.f--; - test(v != def_s2); - - v = def_s2; - v.d--; - test(v != def_s2); - - v = def_s2; - v.str = ""; - test(v != def_s2); - } - - // - // String member - // - { - S2 v1, v2; - - v1 = def_s2; - v1.str = "string"; - test(v1 == def_s2); - - v1 = def_s2; - v2 = def_s2; - v1.str.clear(); - test(v1 != v2); - - v1 = def_s2; - v2 = def_s2; - v2.str.clear(); - test(v1 != v2); - - v1 = def_s2; - v2 = def_s2; - v1.str.clear(); - v2.str.clear(); - test(v1 == v2); - } - - // - // Sequence member - // - { - S2 v1, v2; - - v1 = def_s2; - v1.ss = def_s2.ss; - test(v1 == def_s2); - - v1 = def_s2; - v2 = def_s2; - v1.ss.clear(); - test(v1 != v2); - - v1 = def_s2; - v2 = def_s2; - v2.ss.clear(); - test(v1 != v2); - } - - // - // Custom sequence member - // - { - S2 v1, v2; - - v1 = def_s2; - v1.il = def_s2.il; - test(v1 == def_s2); - - v1 = def_s2; - v2 = def_s2; - v1.il.clear(); - test(v1 != v2); - - v1 = def_s2; - v2 = def_s2; - v2.il.clear(); - test(v1 != v2); - } - - // - // Dictionary member - // - { - S2 v1, v2; - - v1 = def_s2; - v1.sd = def_s2.sd; - test(v1 == def_s2); - - v1 = def_s2; - v2 = def_s2; - v1.sd.clear(); - test(v1 != v2); - - v1 = def_s2; - v2 = def_s2; - v2.sd.clear(); - test(v1 != v2); - } - - // - // Struct member - // - { - S2 v1, v2; - - v1 = def_s2; - v1.s = new S1(def_s2.s->name); - test(v1 == def_s2); - - v1 = def_s2; - v1.s = new S1("name"); - test(v1 == def_s2); - - v1 = def_s2; - v1.s = new S1("noname"); - test(v1 != def_s2); - - v1 = def_s2; - v2 = def_s2; - v1.s = 0; - test(v1 != v2); - - v1 = def_s2; - v2 = def_s2; - v2.s = 0; - test(v1 != v2); - } - - // - // Class member - // - { - S2 v1, v2; - - v1 = def_s2; - v1.cls = new C(def_s2.cls->i); - test(v1 != def_s2); - - v1 = def_s2; - v2 = def_s2; - v1.cls = 0; - test(v1 != v2); - - v1 = def_s2; - v2 = def_s2; - v2.cls = 0; - test(v1 != v2); - } - - // - // Proxy member - // - { - S2 v1, v2; - - v1 = def_s2; - v1.prx = communicator->stringToProxy("test"); - test(v1 == def_s2); - - v1 = def_s2; - v1.prx = communicator->stringToProxy("test2"); - test(v1 != def_s2); - - v1 = def_s2; - v2 = def_s2; - v1.prx = 0; - test(v1 != v2); - - v1 = def_s2; - v2 = def_s2; - v2.prx = 0; - test(v1 != v2); - } -#endif cout << "ok" << endl; } diff --git a/cpp/test/include/TestHelper.h b/cpp/test/include/TestHelper.h index e30305fda46..21c421eb6cc 100644 --- a/cpp/test/include/TestHelper.h +++ b/cpp/test/include/TestHelper.h @@ -38,9 +38,6 @@ namespace Test { class TEST_API ControllerHelper -#ifndef ICE_CPP11_MAPPING - : public virtual IceUtil::Shared -#endif { public: diff --git a/cpp/test/ios/controller/Bundle/ControllerI.mm b/cpp/test/ios/controller/Bundle/ControllerI.mm index 08c9246de4e..f78670db011 100644 --- a/cpp/test/ios/controller/Bundle/ControllerI.mm +++ b/cpp/test/ios/controller/Bundle/ControllerI.mm @@ -80,13 +80,8 @@ -(void) println:(NSString*)msg; ProcessControllerI(id, NSString*, NSString*); -#ifdef ICE_CPP11_MAPPING virtual shared_ptr start(string, string, StringSeq, const Ice::Current&); virtual string getHost(string, bool, const Ice::Current&); -#else - virtual ProcessPrx start(const string&, const string&, const StringSeq&, const Ice::Current&); - virtual string getHost(const string&, bool, const Ice::Current&); -#endif private: @@ -330,13 +325,8 @@ -(void) println:(NSString*)msg; { } -#ifdef ICE_CPP11_MAPPING shared_ptr ProcessControllerI::start(string testSuite, string exe, StringSeq args, const Ice::Current& c) -#else -ProcessPrx -ProcessControllerI::start(const string& testSuite, const string& exe, const StringSeq& args, const Ice::Current& c) -#endif { StringSeq newArgs = args; std::string prefix = std::string("test/") + testSuite; @@ -354,11 +344,7 @@ -(void) println:(NSString*)msg; } string -#ifdef ICE_CPP11_MAPPING ProcessControllerI::getHost(string protocol, bool ipv6, const Ice::Current& c) -#else -ProcessControllerI::getHost(const string& protocol, bool ipv6, const Ice::Current& c) -#endif { return ipv6 ? _ipv6 : _ipv4; } diff --git a/cpp/test/ios/controller/C++ Test Controller.xcodeproj/project.pbxproj b/cpp/test/ios/controller/C++ Test Controller.xcodeproj/project.pbxproj index 8e242ab3b9a..622dff4a948 100644 --- a/cpp/test/ios/controller/C++ Test Controller.xcodeproj/project.pbxproj +++ b/cpp/test/ios/controller/C++ Test Controller.xcodeproj/project.pbxproj @@ -555,7 +555,6 @@ GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", - ICE_CPP11_MAPPING, ICE_STATIC_LIBS, ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; @@ -594,7 +593,6 @@ ENABLE_BITCODE = NO; GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_PREPROCESSOR_DEFINITIONS = ( - ICE_CPP11_MAPPING, ICE_STATIC_LIBS, ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; @@ -632,7 +630,6 @@ DEVELOPMENT_TEAM = U4TBVKNQ7F; GCC_PREPROCESSOR_DEFINITIONS = ( ICE_STATIC_LIBS, - ICE_CPP11_MAPPING, ); HEADER_SEARCH_PATHS = ""; INFOPLIST_FILE = Classes/Info.plist; @@ -666,7 +663,6 @@ DEVELOPMENT_TEAM = U4TBVKNQ7F; GCC_PREPROCESSOR_DEFINITIONS = ( ICE_STATIC_LIBS, - ICE_CPP11_MAPPING, ); HEADER_SEARCH_PATHS = ""; INFOPLIST_FILE = Classes/Info.plist; diff --git a/cpp/test/ios/controller/Classes/ControllerView.m b/cpp/test/ios/controller/Classes/ControllerView.m index fad924889c5..1269f634d8f 100644 --- a/cpp/test/ios/controller/Classes/ControllerView.m +++ b/cpp/test/ios/controller/Classes/ControllerView.m @@ -18,11 +18,7 @@ - (void)viewDidLoad // Load the controller bundle. // NSString* bundlePath = [[NSBundle mainBundle] privateFrameworksPath]; -#ifdef ICE_CPP11_MAPPING const char* bundle = "Cpp11ControllerBundle.bundle"; -#else - const char* bundle = "Cpp98ControllerBundle.bundle"; -#endif bundlePath = [bundlePath stringByAppendingPathComponent:[NSString stringWithUTF8String:bundle]]; NSURL* bundleURL = [NSURL fileURLWithPath:bundlePath]; diff --git a/matlab/config/Make.rules b/matlab/config/Make.rules index eef53982eb0..8e899b96368 100644 --- a/matlab/config/Make.rules +++ b/matlab/config/Make.rules @@ -25,10 +25,10 @@ matlab_cflags = -fexceptions \ -DMATLAB_MEX_FILE \ -I$(MATLAB_HOME)/extern/include -matlab_cppflags := $(matlab_cflags) -DICE_CPP11_MAPPING +matlab_cppflags := $(matlab_cflags) ifneq ($(shell $(CC) -E config/cplusplus_check.cpp 1> /dev/null 2>&1; echo $$?),0) -matlab_cppflags := $(matlab_cppflags) -std=c++11 +matlab_cppflags := $(matlab_cppflags) -std=c++17 endif matlab_ldflags := -L$(MATLAB_HOME)/bin/glnxa64 -lmx -lmex -lmat -lm -lstdc++ diff --git a/php/config/Make.rules b/php/config/Make.rules index 97129aeedbd..6f70fcd2ab3 100644 --- a/php/config/Make.rules +++ b/php/config/Make.rules @@ -50,7 +50,7 @@ ifneq ($(shell type $(PHP_CONFIG) > /dev/null 2>&1 && echo 0),0) $(error $(PHP_CONFIG) not found review your PHP installation and ensure $(PHP_CONFIG) is in your PATH) endif -php_cppflags = -std=c++17 $(shell $(PHP_CONFIG) --includes) -DICE_CPP11_MAPPING +php_cppflags = -std=c++17 $(shell $(PHP_CONFIG) --includes) ifeq ($(os),Darwin) php_cppflags := $(php_cppflags) -Wno-unused-parameter -Wno-missing-field-initializers diff --git a/python/modules/IcePy/Makefile.mk b/python/modules/IcePy/Makefile.mk index 15ffb845e33..d4880be4ce6 100644 --- a/python/modules/IcePy/Makefile.mk +++ b/python/modules/IcePy/Makefile.mk @@ -8,14 +8,8 @@ IcePy_target := python-module IcePy_targetname := IcePy IcePy_targetdir := $(lang_srcdir)/python IcePy_installdir := $(install_pythondir) -IcePy_cppflags := -I$(project) $(ice_cpp_cppflags) -I$(top_srcdir)/cpp/src -I$(top_srcdir)/cpp/src/slice2py $(python_cppflags) \ - -DICE_CPP11_MAPPING -IcePy_dependencies := IceDiscovery++11 IceLocatorDiscovery++11 IceSSL++11 Ice++11 -# TODO temporary ++11 dependencies are not linked -IcePy_system_libs := $(python_ldflags) \ - -L$(top_srcdir)/cpp/lib/x86_64-linux-gnu \ - -L$(top_srcdir)/cpp/lib \ - -lIce++11 -lIceSSL++11 -lIceDiscovery++11 -lIceLocatorDiscovery++11 +IcePy_cppflags := -I$(project) $(ice_cpp_cppflags) -I$(top_srcdir)/cpp/src -I$(top_srcdir)/cpp/src/slice2py $(python_cppflags) +IcePy_dependencies := IceDiscovery IceLocatorDiscovery IceSSL Ice IcePy_libs := mcpp IcePy_extra_sources := $(wildcard $(top_srcdir)/cpp/src/Slice/*.cpp) \ $(top_srcdir)/cpp/src/slice2py/PythonUtil.cpp \ diff --git a/python/modules/IcePy/msbuild/icepy.vcxproj b/python/modules/IcePy/msbuild/icepy.vcxproj index a84ad13831b..125100af350 100644 --- a/python/modules/IcePy/msbuild/icepy.vcxproj +++ b/python/modules/IcePy/msbuild/icepy.vcxproj @@ -153,7 +153,6 @@ stdcpp17 - ICE_CPP11_MAPPING;%(PreprocessorDefinitions) @@ -162,7 +161,6 @@ stdcpp17 - ICE_CPP11_MAPPING;%(PreprocessorDefinitions) @@ -171,7 +169,6 @@ stdcpp17 - ICE_CPP11_MAPPING;%(PreprocessorDefinitions) @@ -180,7 +177,6 @@ stdcpp17 - ICE_CPP11_MAPPING;%(PreprocessorDefinitions) diff --git a/ruby/src/IceRuby/Makefile.mk b/ruby/src/IceRuby/Makefile.mk index 1d478dd1c4e..83375862054 100644 --- a/ruby/src/IceRuby/Makefile.mk +++ b/ruby/src/IceRuby/Makefile.mk @@ -9,13 +9,9 @@ IceRuby_targetname := IceRuby IceRuby_targetdir := $(lang_srcdir)/ruby IceRuby_installdir := $(install_rubylibdir) IceRuby_cppflags := -I$(project) $(ice_cpp_cppflags) -I$(top_srcdir)/cpp/src -I$(top_srcdir)/cpp/src/slice2rb \ - $(ruby_cppflags) -DICE_CPP11_MAPPING + $(ruby_cppflags) IceRuby_system_libs := $(ruby_ldflags) -IceRubydependencies := IceDiscovery++11 IceLocatorDiscovery++11 IceSSL++11 Ice++11 -# TODO temporary ++11 dependencies are not linked -IceRuby_system_libs += -L$(top_srcdir)/cpp/lib/x86_64-linux-gnu \ - -L$(top_srcdir)/cpp/lib \ - -lIce++11 -lIceSSL++11 -lIceDiscovery++11 -lIceLocatorDiscovery++11 +IceRubydependencies := IceDiscovery IceLocatorDiscovery IceSSL Ice IceRuby_libs := mcpp IceRuby_extra_sources := $(wildcard $(top_srcdir)/cpp/src/Slice/*.cpp) \ $(top_srcdir)/cpp/src/slice2rb/RubyUtil.cpp \ diff --git a/scripts/Component.py b/scripts/Component.py index 438fb8a4cd4..9efcd7ea213 100644 --- a/scripts/Component.py +++ b/scripts/Component.py @@ -165,14 +165,6 @@ def canRun(self, testId, mapping, current): if testId == "IceStorm/repgrid": return False - # No C++98 tests for Glacier2, IceGrid, IceStorm, IceBridge - if ( - isinstance(mapping, Util.CppMapping) - and not current.config.cpp11 - and parent in ["Glacier2", "IceBridge", "IceGrid", "IceStorm"] - ): - return False - return True def isMainThreadOnly(self, testId): diff --git a/scripts/Util.py b/scripts/Util.py index d34c4c60c2d..a9796c0be2b 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -3646,13 +3646,9 @@ def __init__(self, options=[]): if self.buildConfig == platform.getDefaultBuildConfig(): if isinstance(platform, Windows): - self.buildConfig = "Cpp11-Release" + self.buildConfig = "Release" else: - self.buildConfig = "cpp11-shared" - - # Derive from the build config the cpp11 option. This is used by canRun to allow filtering - # tests on the cpp11 value in the testcase options specification - self.cpp11 = self.buildConfig.lower().find("cpp11") >= 0 + self.buildConfig = "shared" parseOptions( self, @@ -3769,14 +3765,11 @@ def getIOSControllerIdentity(self, current): if current.config.buildPlatform == "iphonesimulator" else "iPhoneOS" ) - mapping = "Cpp11" if current.config.cpp11 else "Cpp98" - return "{0}/com.zeroc.{1}-Test-Controller".format(category, mapping) + return "{0}/com.zeroc.Cpp11-Test-Controller".format(category, mapping) def getIOSAppFullPath(self, current): appName = ( "C++11 Test Controller.app" - if current.config.cpp11 - else "C++98 Test Controller.app" ) path = os.path.join(self.component.getTestDir(self), "ios", "controller") path = os.path.join( diff --git a/swift/Rakefile b/swift/Rakefile index 491284b45c7..045d4ed943c 100644 --- a/swift/Rakefile +++ b/swift/Rakefile @@ -185,7 +185,6 @@ def create_platform_targets(project, platform, bindist) "$(SRCROOT)/../cpp/src/" ] config.build_settings["GCC_PREPROCESSOR_DEFINITIONS"] = [ - "ICE_CPP11_MAPPING", "ICE_BUILDING_SRC", "ICE_STATIC_LIBS", "ICE_SWIFT" @@ -249,7 +248,6 @@ def create_platform_targets(project, platform, bindist) "-liconv" ] config.build_settings["GCC_PREPROCESSOR_DEFINITIONS"] = [ - "ICE_CPP11_MAPPING", "ICE_STATIC_LIBS", "ICE_SWIFT" ] From 11993c002ffeb7882486ef01c1b85df83c519dcf Mon Sep 17 00:00:00 2001 From: Jose Date: Thu, 1 Feb 2024 14:30:44 +0100 Subject: [PATCH 03/17] Script fixes --- scripts/Glacier2Util.py | 2 +- scripts/IceBoxUtil.py | 2 -- scripts/IceBridgeUtil.py | 2 +- scripts/IceGridUtil.py | 6 +++--- scripts/IcePatch2Util.py | 6 +++--- scripts/tests/IceBox/admin.py | 2 +- 6 files changed, 9 insertions(+), 11 deletions(-) diff --git a/scripts/Glacier2Util.py b/scripts/Glacier2Util.py index 403c2f5f5a2..ff187c6e9b3 100644 --- a/scripts/Glacier2Util.py +++ b/scripts/Glacier2Util.py @@ -21,7 +21,7 @@ class Glacier2Router(ProcessFromBinDir, ProcessIsReleaseOnly, Server): def __init__(self, portnum=50, passwords={"userid": "abc123"}, *args, **kargs): Server.__init__( self, - "glacier2router++11", + "glacier2router", mapping=Mapping.getByName("cpp"), desc="Glacier2 router", readyCount=2, diff --git a/scripts/IceBoxUtil.py b/scripts/IceBoxUtil.py index 1822da32ae4..eed36e792dd 100644 --- a/scripts/IceBoxUtil.py +++ b/scripts/IceBoxUtil.py @@ -39,8 +39,6 @@ def getExe(self, current): name += "32" # Multilib platform if isinstance(platform, AIX) and current.config.buildPlatform == "ppc": name += "_32" - if current.config.cpp11: - name += "++11" return name def getEffectiveArgs(self, current, args): diff --git a/scripts/IceBridgeUtil.py b/scripts/IceBridgeUtil.py index 1df1f0f77ac..f1d4b72d526 100644 --- a/scripts/IceBridgeUtil.py +++ b/scripts/IceBridgeUtil.py @@ -10,7 +10,7 @@ class IceBridge(ProcessFromBinDir, ProcessIsReleaseOnly, Server): def __init__(self, *args, **kargs): Server.__init__( self, - "icebridge++11", + "icebridge", mapping=Mapping.getByName("cpp"), desc="IceBridge", *args, diff --git a/scripts/IceGridUtil.py b/scripts/IceGridUtil.py index e232502c9b8..962864fad89 100644 --- a/scripts/IceGridUtil.py +++ b/scripts/IceGridUtil.py @@ -70,7 +70,7 @@ def __init__( IceGridClient.__init__( self, replica=replica, - exe="icegridadmin++11", + exe="icegridadmin", mapping=Mapping.getByName("cpp"), *args, **kargs, @@ -92,7 +92,7 @@ class IceGridNode(ProcessFromBinDir, Server): def __init__(self, name="localnode", *args, **kargs): Server.__init__( self, - "icegridnode++11", + "icegridnode", mapping=Mapping.getByName("cpp"), desc="IceGrid node " + name, ready="node", @@ -160,7 +160,7 @@ class IceGridRegistry(ProcessFromBinDir, Server): def __init__(self, name, portnum=20, ready="AdminSessionManager", *args, **kargs): Server.__init__( self, - "icegridregistry++11", + "icegridregistry", mapping=Mapping.getByName("cpp"), desc="IceGrid registry " + name, ready=ready, diff --git a/scripts/IcePatch2Util.py b/scripts/IcePatch2Util.py index bcb1d8964fc..09335c80a42 100644 --- a/scripts/IcePatch2Util.py +++ b/scripts/IcePatch2Util.py @@ -10,7 +10,7 @@ class IcePatch2Calc(ProcessFromBinDir, ProcessIsReleaseOnly, Process): def __init__(self, *args, **kargs): Process.__init__( self, - exe="icepatch2calc++11", + exe="icepatch2calc", mapping=Mapping.getByName("cpp"), *args, **kargs, @@ -24,7 +24,7 @@ class IcePatch2Client(ProcessFromBinDir, ProcessIsReleaseOnly, Process): def __init__(self, *args, **kargs): Process.__init__( self, - exe="icepatch2client++11", + exe="icepatch2client", mapping=Mapping.getByName("cpp"), *args, **kargs, @@ -38,7 +38,7 @@ class IcePatch2Server(ProcessFromBinDir, ProcessIsReleaseOnly, Process): def __init__(self, *args, **kargs): Process.__init__( self, - exe="icepatch2server++11", + exe="icepatch2server", mapping=Mapping.getByName("cpp"), *args, **kargs, diff --git a/scripts/tests/IceBox/admin.py b/scripts/tests/IceBox/admin.py index 041e3450722..39310bfc2af 100644 --- a/scripts/tests/IceBox/admin.py +++ b/scripts/tests/IceBox/admin.py @@ -29,6 +29,6 @@ def runClientSide(self, current): ], libDirs=["testservice"], runOnMainThread=True, - options={"ipv6": [False], "mx": [False], "cpp11": [False]}, + options={"ipv6": [False], "mx": [False]}, multihost=False, ) From b60aca8846091378a07f3152d89e022da63008ab Mon Sep 17 00:00:00 2001 From: Jose Date: Thu, 1 Feb 2024 14:37:51 +0100 Subject: [PATCH 04/17] IceStormUtil fixes --- scripts/IceStormUtil.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/IceStormUtil.py b/scripts/IceStormUtil.py index b841f48ecf0..f75dc5818db 100644 --- a/scripts/IceStormUtil.py +++ b/scripts/IceStormUtil.py @@ -31,7 +31,7 @@ def __init__( ): Server.__init__( self, - exe="icebox++11", + exe="icebox", ready="IceStorm", mapping=Mapping.getByName("cpp"), *args, @@ -223,7 +223,7 @@ class IceStormAdmin(ProcessFromBinDir, ProcessIsReleaseOnly, IceStormProcess, Cl def __init__(self, instanceName=None, instance=None, *args, **kargs): Client.__init__( self, - exe="icestormadmin++11", + exe="icestormadmin", mapping=Mapping.getByName("cpp"), *args, **kargs, From b48ad51345e06302a84213d388c55b3e88000e9c Mon Sep 17 00:00:00 2001 From: Jose Date: Thu, 1 Feb 2024 19:24:44 +0100 Subject: [PATCH 05/17] Windows build fixes --- cpp/msbuild/ice.cpp.props | 57 +- cpp/msbuild/ice.cpp11.props | 10 - cpp/msbuild/ice.cpp98.props | 9 - cpp/msbuild/ice.proj | 69 +- cpp/msbuild/{ice.v143.sln => ice.sln} | 275 +-- cpp/msbuild/ice.test.sln | 1813 +++-------------- .../Glacier2/msbuild/glacier2router.vcxproj | 4 +- ...acier2cryptpermissionsverifier++11.vcxproj | 111 - ...yptpermissionsverifier++11.vcxproj.filters | 27 - .../glacier2cryptpermissionsverifier.vcxproj | 4 +- .../msbuild/glacier2++11/glacier2++11.vcxproj | 369 ---- .../glacier2++11/glacier2++11.vcxproj.filters | 230 --- .../msbuild/glacier2++11/packages.config | 4 - .../msbuild/glacier2/glacier2.vcxproj | 64 +- cpp/src/Ice/ConnectionFactory.h | 2 +- cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj | 948 --------- .../msbuild/ice++11/ice++11.vcxproj.filters | 868 -------- cpp/src/Ice/msbuild/ice++11/packages.config | 5 - cpp/src/Ice/msbuild/ice/ice.vcxproj | 145 +- cpp/src/Ice/msbuild/ice/ice.vcxproj.filters | 249 +-- .../msbuild/icebox++11/icebox++11.vcxproj | 83 - .../icebox++11/icebox++11.vcxproj.filters | 35 - cpp/src/IceBox/msbuild/icebox/icebox.vcxproj | 12 +- .../msbuild/iceboxadmin/iceboxadmin.vcxproj | 2 +- .../iceboxlib++11/iceboxlib++11.vcxproj | 180 -- .../iceboxlib++11.vcxproj.filters | 107 - .../msbuild/iceboxlib++11/packages.config | 4 - .../msbuild/iceboxlib/iceboxlib.vcxproj | 16 +- .../iceboxlib/iceboxlib.vcxproj.filters | 50 +- cpp/src/IceBridge/msbuild/icebridge.vcxproj | 4 +- cpp/src/IceDB/msbuild/icedb.vcxproj | 4 +- .../icediscovery++11/icediscovery++11.vcxproj | 171 -- .../icediscovery++11.vcxproj.filters | 116 -- .../msbuild/icediscovery++11/packages.config | 4 - .../msbuild/icediscovery/icediscovery.vcxproj | 24 +- .../msbuild/icegridadmin/icegridadmin.vcxproj | 4 +- .../msbuild/icegridnode/icegridnode.vcxproj | 4 +- .../icegridregistry/icegridregistry.vcxproj | 4 +- .../msbuild/icegrid++11/icegrid++11.vcxproj | 468 ----- .../icegrid++11/icegrid++11.vcxproj.filters | 275 --- .../msbuild/icegrid++11/packages.config | 4 - .../msbuild/icegrid/icegrid.vcxproj | 74 +- .../icelocatordiscovery++11.vcxproj | 167 -- .../icelocatordiscovery++11/packages.config | 4 - .../icelocatordiscovery.vcxproj | 24 +- .../icelocatordiscovery.vcxproj.filters | 104 - .../icelocatordiscoveryvcxproj.filters} | 0 .../icepatch2calc.vcxproj} | 2 +- .../icepatch2calc.vcxproj.filters} | 0 .../icepatch2client.vcxproj} | 2 +- .../icepatch2client.vcxproj.filters} | 0 .../icepatch2server.vcxproj} | 2 +- .../icepatch2server.vcxproj.filters} | 0 .../icepatch2++11/icepatch2++11.vcxproj | 226 -- .../icepatch2++11.vcxproj.filters | 143 -- .../msbuild/icepatch2++11/packages.config | 5 - .../msbuild/icepatch2/icepatch2.vcxproj | 23 +- .../msbuild/icessl++11/icessl++11.vcxproj | 160 -- .../icessl++11/icessl++11.vcxproj.filters | 174 -- .../IceSSL/msbuild/icessl++11/packages.config | 4 - cpp/src/IceSSL/msbuild/icessl/icessl.vcxproj | 14 +- .../msbuild/icessl/icessl.vcxproj.filters | 51 +- .../icesslopenssl++11.vcxproj | 120 -- .../icesslopenssl++11.vcxproj.filters | 96 - .../msbuild/icesslopenssl++11/packages.config | 4 - .../icesslopenssl/icesslopenssl.vcxproj | 11 +- .../icestormadmin/icestormadmin.vcxproj | 4 +- .../msbuild/icestormdb/icestormdb.vcxproj | 4 +- .../icestormservice/icestormservice.vcxproj | 4 +- .../msbuild/icestorm++11/icestorm++11.vcxproj | 213 -- .../icestorm++11/icestorm++11.vcxproj.filters | 125 -- .../msbuild/icestorm++11/packages.config | 4 - .../msbuild/icestorm/icestorm.vcxproj | 22 +- .../IceUtil/msbuild/iceutil/iceutil.vcxproj | 2 +- cpp/src/IceXML/msbuild/icexml.vcxproj | 4 +- cpp/src/Slice/msbuild/slice.vcxproj | 2 +- cpp/src/ice2slice/msbuild/ice2slice.vcxproj | 2 +- cpp/src/icegriddb/msbuild/icegriddb.vcxproj | 4 +- .../iceserviceinstall/ServiceInstaller.cpp | 2 +- .../msbuild/iceserviceinstall.vcxproj | 2 +- cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj | 2 +- cpp/src/slice2cs/msbuild/slice2cs.vcxproj | 2 +- cpp/src/slice2java/msbuild/slice2java.vcxproj | 2 +- cpp/src/slice2js/msbuild/slice2js.vcxproj | 2 +- .../slice2matlab/msbuild/slice2matlab.vcxproj | 2 +- cpp/src/slice2php/msbuild/slice2php.vcxproj | 2 +- cpp/src/slice2py/msbuild/slice2py.vcxproj | 2 +- cpp/src/slice2rb/msbuild/slice2rb.vcxproj | 2 +- .../slice2swift/msbuild/slice2swift.vcxproj | 2 +- .../Common/msbuild/testcommon.vcxproj.filters | 24 - .../application/msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../application/msbuild/server/server.vcxproj | 80 - .../msbuild/server/server.vcxproj.filters | 48 - .../attack/msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../attack/msbuild/server/server.vcxproj | 80 - .../msbuild/server/server.vcxproj.filters | 48 - .../msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../msbuild/server/server.vcxproj | 80 - .../msbuild/server/server.vcxproj.filters | 48 - .../override/msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../override/msbuild/server/server.vcxproj | 80 - .../msbuild/server/server.vcxproj.filters | 48 - .../router/msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../router/msbuild/server/server.vcxproj | 80 - .../msbuild/server/server.vcxproj.filters | 48 - .../msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../msbuild/server/server.vcxproj | 80 - .../msbuild/server/server.vcxproj.filters | 48 - .../msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../msbuild/server/server.vcxproj | 80 - .../msbuild/server/server.vcxproj.filters | 48 - .../msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../msbuild/server/server.vcxproj | 80 - .../msbuild/server/server.vcxproj.filters | 48 - .../Ice/acm/msbuild/client/client.vcxproj | 80 - .../acm/msbuild/client/client.vcxproj.filters | 48 - .../Ice/acm/msbuild/server/server.vcxproj | 80 - .../acm/msbuild/server/server.vcxproj.filters | 48 - .../msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../msbuild/collocated/collocated.vcxproj | 80 - .../collocated/collocated.vcxproj.filters | 48 - .../msbuild/server/server.vcxproj | 80 - .../msbuild/server/server.vcxproj.filters | 48 - .../Ice/admin/msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../Ice/admin/msbuild/server/server.vcxproj | 80 - .../msbuild/server/server.vcxproj.filters | 48 - .../Ice/ami/msbuild/client/client.vcxproj | 80 - .../ami/msbuild/client/client.vcxproj.filters | 48 - .../ami/msbuild/collocated/collocated.vcxproj | 80 - .../collocated/collocated.vcxproj.filters | 48 - .../Ice/ami/msbuild/server/server.vcxproj | 80 - .../ami/msbuild/server/server.vcxproj.filters | 48 - .../msbuild/client/client.vcxproj.filters | 24 - .../msbuild/server/server.vcxproj.filters | 24 - .../testtransport/testtransport.vcxproj | 80 - .../testtransport.vcxproj.filters | 48 - .../Ice/binding/msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../Ice/binding/msbuild/server/server.vcxproj | 80 - .../msbuild/server/server.vcxproj.filters | 48 - .../Ice/custom/msbuild/client/client.vcxproj | 160 -- .../msbuild/client/client.vcxproj.filters | 72 - .../msbuild/collocated/collocated.vcxproj | 160 -- .../collocated/collocated.vcxproj.filters | 72 - .../Ice/custom/msbuild/server/server.vcxproj | 160 -- .../msbuild/server/server.vcxproj.filters | 72 - .../msbuild/serveramd/serveramd.vcxproj | 160 -- .../serveramd/serveramd.vcxproj.filters | 72 - .../Ice/defaultServant/msbuild/client.vcxproj | 80 - .../msbuild/client.vcxproj.filters | 48 - .../Ice/defaultValue/msbuild/client.vcxproj | 80 - .../msbuild/client.vcxproj.filters | 48 - .../dispatcher/msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../msbuild/collocated/collocated.vcxproj | 80 - .../collocated/collocated.vcxproj.filters | 48 - .../dispatcher/msbuild/server/server.vcxproj | 80 - .../msbuild/server/server.vcxproj.filters | 48 - cpp/test/Ice/echo/msbuild/server.vcxproj | 80 - .../Ice/echo/msbuild/server.vcxproj.filters | 48 - .../Ice/enums/msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../Ice/enums/msbuild/server/server.vcxproj | 80 - .../msbuild/server/server.vcxproj.filters | 48 - .../exceptions/msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../msbuild/collocated/collocated.vcxproj | 80 - .../collocated/collocated.vcxproj.filters | 48 - .../exceptions/msbuild/server/server.vcxproj | 80 - .../msbuild/server/server.vcxproj.filters | 48 - .../msbuild/serveramd/serveramd.vcxproj | 80 - .../serveramd/serveramd.vcxproj.filters | 48 - .../Ice/facets/msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../msbuild/collocated/collocated.vcxproj | 80 - .../collocated/collocated.vcxproj.filters | 48 - .../Ice/facets/msbuild/server/server.vcxproj | 80 - .../msbuild/server/server.vcxproj.filters | 48 - .../msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../msbuild/server/server.vcxproj | 80 - .../msbuild/server/server.vcxproj.filters | 48 - cpp/test/Ice/hash/msbuild/client.vcxproj | 80 - .../Ice/hash/msbuild/client.vcxproj.filters | 48 - .../Ice/hold/msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../Ice/hold/msbuild/server/server.vcxproj | 80 - .../msbuild/server/server.vcxproj.filters | 48 - .../Ice/impl/msbuild/server/server.vcxproj | 120 -- .../msbuild/server/server.vcxproj.filters | 72 - .../impl/msbuild/serveramd/serveramd.vcxproj | 120 -- .../serveramd/serveramd.vcxproj.filters | 72 - .../Ice/info/msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../Ice/info/msbuild/server/server.vcxproj | 80 - .../msbuild/server/server.vcxproj.filters | 48 - .../inheritance/msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../msbuild/collocated/collocated.vcxproj | 80 - .../collocated/collocated.vcxproj.filters | 48 - .../msbuild/server/server.vcxproj.filters | 38 +- .../interceptortest/interceptortest.vcxproj | 80 - .../interceptortest.vcxproj.filters | 48 - .../Ice/invoke/msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../Ice/invoke/msbuild/server/server.vcxproj | 80 - .../msbuild/server/server.vcxproj.filters | 48 - .../library/msbuild/alltests/alltests.vcxproj | 84 - .../msbuild/gencode/gencode.vcxproj.filters | 24 - .../location/msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../location/msbuild/server/server.vcxproj | 80 - .../msbuild/server/server.vcxproj.filters | 48 - .../Ice/metrics/msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../msbuild/collocated/collocated.vcxproj | 80 - .../collocated/collocated.vcxproj.filters | 48 - .../Ice/metrics/msbuild/server/server.vcxproj | 80 - .../msbuild/server/server.vcxproj.filters | 48 - .../msbuild/serveramd/serveramd.vcxproj | 80 - .../serveramd/serveramd.vcxproj.filters | 48 - .../msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../msbuild/server/server.vcxproj | 80 - .../msbuild/server/server.vcxproj.filters | 48 - .../Ice/objects/msbuild/client/client.vcxproj | 320 --- .../msbuild/client/client.vcxproj.filters | 120 -- .../msbuild/collocated/collocated.vcxproj | 320 --- .../collocated/collocated.vcxproj.filters | 120 -- .../Ice/objects/msbuild/server/server.vcxproj | 320 --- .../msbuild/server/server.vcxproj.filters | 120 -- .../operations/msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../msbuild/collocated/collocated.vcxproj | 80 - .../collocated/collocated.vcxproj.filters | 48 - .../operations/msbuild/server/server.vcxproj | 80 - .../msbuild/server/server.vcxproj.filters | 48 - .../msbuild/serveramd/serveramd.vcxproj | 80 - .../serveramd/serveramd.vcxproj.filters | 48 - .../optional/msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../optional/msbuild/server/server.vcxproj | 80 - .../msbuild/server/server.vcxproj.filters | 48 - .../msbuild/serveramd/serveramd.vcxproj | 80 - .../serveramd/serveramd.vcxproj.filters | 48 - .../Ice/proxy/msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../msbuild/collocated/collocated.vcxproj | 80 - .../collocated/collocated.vcxproj.filters | 48 - .../Ice/proxy/msbuild/server/server.vcxproj | 80 - .../msbuild/server/server.vcxproj.filters | 48 - .../proxy/msbuild/serveramd/serveramd.vcxproj | 80 - .../serveramd/serveramd.vcxproj.filters | 48 - .../Ice/retry/msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../msbuild/collocated/collocated.vcxproj | 80 - .../collocated/collocated.vcxproj.filters | 48 - .../Ice/retry/msbuild/server/server.vcxproj | 80 - .../msbuild/server/server.vcxproj.filters | 48 - .../Ice/scope/msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../Ice/scope/msbuild/server/server.vcxproj | 80 - .../msbuild/server/server.vcxproj.filters | 48 - .../msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../msbuild/collocated/collocated.vcxproj | 80 - .../collocated/collocated.vcxproj.filters | 48 - .../msbuild/server/server.vcxproj | 80 - .../msbuild/server/server.vcxproj.filters | 48 - .../msbuild/serveramd/serveramd.vcxproj | 80 - .../serveramd/serveramd.vcxproj.filters | 48 - cpp/test/Ice/services/msbuild/client.vcxproj | 80 - .../services/msbuild/client.vcxproj.filters | 48 - .../exceptions/msbuild/client/client.vcxproj | 160 -- .../msbuild/client/client.vcxproj.filters | 72 - .../exceptions/msbuild/server/server.vcxproj | 160 -- .../msbuild/server/server.vcxproj.filters | 72 - .../msbuild/serveramd/serveramd.vcxproj | 160 -- .../serveramd/serveramd.vcxproj.filters | 72 - .../objects/msbuild/client/client.vcxproj | 160 -- .../msbuild/client/client.vcxproj.filters | 72 - .../objects/msbuild/server/server.vcxproj | 160 -- .../msbuild/server/server.vcxproj.filters | 72 - .../msbuild/serveramd/serveramd.vcxproj | 160 -- .../serveramd/serveramd.vcxproj.filters | 72 - cpp/test/Ice/stream/msbuild/client.vcxproj | 80 - .../Ice/stream/msbuild/client.vcxproj.filters | 48 - .../msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../msbuild/server/server.vcxproj | 80 - .../msbuild/server/server.vcxproj.filters | 48 - .../msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../msbuild/server/server.vcxproj | 80 - .../msbuild/server/server.vcxproj.filters | 48 - .../msbuild/servercustom/servercustom.vcxproj | 80 - .../servercustom/servercustom.vcxproj.filters | 48 - .../Ice/timeout/msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../Ice/timeout/msbuild/server/server.vcxproj | 80 - .../msbuild/server/server.vcxproj.filters | 48 - .../Ice/udp/msbuild/client/client.vcxproj | 80 - .../udp/msbuild/client/client.vcxproj.filters | 48 - .../Ice/udp/msbuild/server/server.vcxproj | 80 - .../udp/msbuild/server/server.vcxproj.filters | 48 - .../admin/msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../msbuild/testservice/testservice.vcxproj | 80 - .../testservice/testservice.vcxproj.filters | 48 - .../msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../msbuild/testservice/testservice.vcxproj | 80 - .../testservice/testservice.vcxproj.filters | 48 - .../simple/msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../simple/msbuild/server/server.vcxproj | 80 - .../msbuild/server/server.vcxproj.filters | 48 - .../simple/msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../simple/msbuild/server/server.vcxproj | 80 - .../msbuild/server/server.vcxproj.filters | 48 - .../activation/msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../activation/msbuild/server/server.vcxproj | 80 - .../msbuild/server/server.vcxproj.filters | 48 - .../allocation/msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../allocation/msbuild/server/server.vcxproj | 80 - .../msbuild/server/server.vcxproj.filters | 48 - .../deployer/msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../deployer/msbuild/server/server.vcxproj | 80 - .../msbuild/server/server.vcxproj.filters | 48 - .../msbuild/testservice/testservice.vcxproj | 80 - .../testservice/testservice.vcxproj.filters | 48 - .../msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../msbuild/server/server.vcxproj | 80 - .../msbuild/server/server.vcxproj.filters | 48 - .../msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../msbuild/server/server.vcxproj | 80 - .../msbuild/server/server.vcxproj.filters | 48 - .../msbuild/testservice/testservice.vcxproj | 80 - .../testservice/testservice.vcxproj.filters | 48 - .../msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../msbuild/server/server.vcxproj | 80 - .../msbuild/server/server.vcxproj.filters | 48 - .../msbuild/testservice/testservice.vcxproj | 80 - .../testservice/testservice.vcxproj.filters | 48 - .../replication/msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../replication/msbuild/server/server.vcxproj | 80 - .../msbuild/server/server.vcxproj.filters | 48 - .../session/msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../session/msbuild/server/server.vcxproj | 82 +- .../msbuild/server/server.vcxproj.filters | 48 - .../session/msbuild/verifier/verifier.vcxproj | 80 - .../msbuild/verifier/verifier.vcxproj.filters | 48 - .../simple/msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../simple/msbuild/server/server.vcxproj | 80 - .../msbuild/server/server.vcxproj.filters | 48 - .../update/msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../update/msbuild/server/server.vcxproj | 80 - .../msbuild/server/server.vcxproj.filters | 48 - .../msbuild/client/client.vcxproj | 80 - .../msbuild/client/client.vcxproj.filters | 48 - .../msbuild/server/server.vcxproj | 80 - .../msbuild/server/server.vcxproj.filters | 48 - .../msbuild/publisher/publisher.vcxproj | 80 - .../publisher/publisher.vcxproj.filters | 48 - .../msbuild/subscriber/subscriber.vcxproj | 80 - .../subscriber/subscriber.vcxproj.filters | 48 - .../msbuild/publisher/publisher.vcxproj | 80 - .../publisher/publisher.vcxproj.filters | 48 - .../msbuild/subscriber/subscriber.vcxproj | 80 - .../subscriber/subscriber.vcxproj.filters | 48 - .../rep1/msbuild/publisher/publisher.vcxproj | 80 - .../publisher/publisher.vcxproj.filters | 48 - .../IceStorm/rep1/msbuild/sub/sub.vcxproj | 80 - .../rep1/msbuild/sub/sub.vcxproj.filters | 48 - .../msbuild/subscriber/subscriber.vcxproj | 80 - .../subscriber/subscriber.vcxproj.filters | 48 - .../IceStorm/repgrid/msbuild/client.vcxproj | 80 - .../repgrid/msbuild/client.vcxproj.filters | 48 - .../repstress/msbuild/control/control.vcxproj | 160 -- .../msbuild/control/control.vcxproj.filters | 72 - .../msbuild/publisher/publisher.vcxproj | 160 -- .../publisher/publisher.vcxproj.filters | 72 - .../msbuild/subscriber/subscriber.vcxproj | 160 -- .../subscriber/subscriber.vcxproj.filters | 72 - .../msbuild/publisher/publisher.vcxproj | 80 - .../publisher/publisher.vcxproj.filters | 48 - .../msbuild/subscriber/subscriber.vcxproj | 80 - .../subscriber/subscriber.vcxproj.filters | 48 - .../msbuild/publisher/publisher.vcxproj | 80 - .../publisher/publisher.vcxproj.filters | 48 - .../msbuild/subscriber/subscriber.vcxproj | 80 - .../subscriber/subscriber.vcxproj.filters | 48 - cpp/test/Slice/escape/msbuild/client.vcxproj | 160 -- .../escape/msbuild/client.vcxproj.filters | 72 - cpp/test/Slice/macros/msbuild/client.vcxproj | 80 - .../macros/msbuild/client.vcxproj.filters | 48 - cpp/test/Slice/parser/msbuild/client.vcxproj | 160 -- .../parser/msbuild/client.vcxproj.filters | 72 - .../structure/msbuild/client.vcxproj.filters | 50 +- cpp/test/Slice/utf8BOM/msbuild/client.vcxproj | 96 - .../utf8BOM/msbuild/client.vcxproj.filters | 48 - matlab/src/msbuild/ice/ice.vcxproj | 2 +- matlab/src/msbuild/icethunk/icethunk.vcxproj | 2 +- 424 files changed, 698 insertions(+), 31736 deletions(-) delete mode 100644 cpp/msbuild/ice.cpp11.props delete mode 100644 cpp/msbuild/ice.cpp98.props rename cpp/msbuild/{ice.v143.sln => ice.sln} (65%) delete mode 100644 cpp/src/Glacier2CryptPermissionsVerifier/msbuild/glacier2cryptpermissionsverifier++11/glacier2cryptpermissionsverifier++11.vcxproj delete mode 100644 cpp/src/Glacier2CryptPermissionsVerifier/msbuild/glacier2cryptpermissionsverifier++11/glacier2cryptpermissionsverifier++11.vcxproj.filters delete mode 100644 cpp/src/Glacier2Lib/msbuild/glacier2++11/glacier2++11.vcxproj delete mode 100644 cpp/src/Glacier2Lib/msbuild/glacier2++11/glacier2++11.vcxproj.filters delete mode 100644 cpp/src/Glacier2Lib/msbuild/glacier2++11/packages.config delete mode 100644 cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj delete mode 100644 cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj.filters delete mode 100644 cpp/src/Ice/msbuild/ice++11/packages.config delete mode 100644 cpp/src/IceBox/msbuild/icebox++11/icebox++11.vcxproj delete mode 100644 cpp/src/IceBox/msbuild/icebox++11/icebox++11.vcxproj.filters delete mode 100644 cpp/src/IceBox/msbuild/iceboxlib++11/iceboxlib++11.vcxproj delete mode 100644 cpp/src/IceBox/msbuild/iceboxlib++11/iceboxlib++11.vcxproj.filters delete mode 100644 cpp/src/IceBox/msbuild/iceboxlib++11/packages.config delete mode 100644 cpp/src/IceDiscovery/msbuild/icediscovery++11/icediscovery++11.vcxproj delete mode 100644 cpp/src/IceDiscovery/msbuild/icediscovery++11/icediscovery++11.vcxproj.filters delete mode 100644 cpp/src/IceDiscovery/msbuild/icediscovery++11/packages.config delete mode 100644 cpp/src/IceGridLib/msbuild/icegrid++11/icegrid++11.vcxproj delete mode 100644 cpp/src/IceGridLib/msbuild/icegrid++11/icegrid++11.vcxproj.filters delete mode 100644 cpp/src/IceGridLib/msbuild/icegrid++11/packages.config delete mode 100644 cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery++11/icelocatordiscovery++11.vcxproj delete mode 100644 cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery++11/packages.config delete mode 100644 cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery/icelocatordiscovery.vcxproj.filters rename cpp/src/IceLocatorDiscovery/msbuild/{icelocatordiscovery++11/icelocatordiscovery++11.vcxproj.filters => icelocatordiscovery/icelocatordiscoveryvcxproj.filters} (100%) rename cpp/src/IcePatch2/msbuild/{icepatch2calc++11/icepatch2calc++11.vcxproj => icepatch2calc/icepatch2calc.vcxproj} (99%) rename cpp/src/IcePatch2/msbuild/{icepatch2calc++11/icepatch2calc++11.vcxproj.filters => icepatch2calc/icepatch2calc.vcxproj.filters} (100%) rename cpp/src/IcePatch2/msbuild/{icepatch2client++11/icepatch2client++11.vcxproj => icepatch2client/icepatch2client.vcxproj} (99%) rename cpp/src/IcePatch2/msbuild/{icepatch2client++11/icepatch2client++11.vcxproj.filters => icepatch2client/icepatch2client.vcxproj.filters} (100%) rename cpp/src/IcePatch2/msbuild/{icepatch2server++11/icepatch2server++11.vcxproj => icepatch2server/icepatch2server.vcxproj} (99%) rename cpp/src/IcePatch2/msbuild/{icepatch2server++11/icepatch2server++11.vcxproj.filters => icepatch2server/icepatch2server.vcxproj.filters} (100%) delete mode 100644 cpp/src/IcePatch2Lib/msbuild/icepatch2++11/icepatch2++11.vcxproj delete mode 100644 cpp/src/IcePatch2Lib/msbuild/icepatch2++11/icepatch2++11.vcxproj.filters delete mode 100644 cpp/src/IcePatch2Lib/msbuild/icepatch2++11/packages.config delete mode 100644 cpp/src/IceSSL/msbuild/icessl++11/icessl++11.vcxproj delete mode 100644 cpp/src/IceSSL/msbuild/icessl++11/icessl++11.vcxproj.filters delete mode 100644 cpp/src/IceSSL/msbuild/icessl++11/packages.config delete mode 100644 cpp/src/IceSSL/msbuild/icesslopenssl++11/icesslopenssl++11.vcxproj delete mode 100644 cpp/src/IceSSL/msbuild/icesslopenssl++11/icesslopenssl++11.vcxproj.filters delete mode 100644 cpp/src/IceSSL/msbuild/icesslopenssl++11/packages.config delete mode 100644 cpp/src/IceStormLib/msbuild/icestorm++11/icestorm++11.vcxproj delete mode 100644 cpp/src/IceStormLib/msbuild/icestorm++11/icestorm++11.vcxproj.filters delete mode 100644 cpp/src/IceStormLib/msbuild/icestorm++11/packages.config diff --git a/cpp/msbuild/ice.cpp.props b/cpp/msbuild/ice.cpp.props index 8f1fef51afd..2f83327deb4 100644 --- a/cpp/msbuild/ice.cpp.props +++ b/cpp/msbuild/ice.cpp.props @@ -1,5 +1,10 @@ + + + cpp + yes + - + Disabled _DEBUG;%(PreprocessorDefinitions) @@ -126,7 +131,7 @@ - + MaxSpeed NDEBUG;%(PreprocessorDefinitions) @@ -159,7 +164,7 @@ - $(IceHome)\cpp\lib\$(Platform)\$(IceConfiguration)\$(TargetName).lib + $(IceHome)\cpp\lib\$(Platform)\$(Configuration)\$(TargetName).lib @@ -181,37 +186,21 @@ - - - - - $(ProjectName.Replace("++11", "$(IceSoVersion)++11d")) - - - - $(ProjectName.Replace("++11", "$(IceSoVersion)++11")) - - - - - - - $(ProjectName)$(IceSoVersion)d - + + $(ProjectName)$(IceSoVersion)d + - - $(ProjectName)$(IceSoVersion) - + + $(ProjectName)$(IceSoVersion) + - - $(ProjectName)d - + + $(ProjectName)d + - - $(ProjectName) - - - + + $(ProjectName) + - + Configuration=Debug;Platform=Win32;VisualStudioVersion=$(VisualStudioVersion) - + Configuration=Debug;Platform=x64;VisualStudioVersion=$(VisualStudioVersion) - + Configuration=Release;Platform=Win32;VisualStudioVersion=$(VisualStudioVersion) - + Configuration=Release;Platform=x64;VisualStudioVersion=$(VisualStudioVersion) - + Configuration=Debug;Platform=Win32;VisualStudioVersion=$(VisualStudioVersion) @@ -91,23 +85,7 @@ - - - - Configuration=Cpp11-Debug;Platform=Win32 - - - Configuration=Cpp11-Debug;Platform=x64 - - - Configuration=Cpp11-Release;Platform=Win32 - - - Configuration=Cpp11-Release;Platform=x64 - - - - + Configuration=Debug;Platform=Win32 @@ -122,30 +100,14 @@ Configuration=Release;Platform=x64 - - - - - Configuration=Cpp11-Debug;Platform=Win32 - - - Configuration=Cpp11-Debug;Platform=x64 - - - Configuration=Cpp11-Release;Platform=Win32 - - - Configuration=Cpp11-Release;Platform=x64 - - $(Platform)|$(Configuration) - + - + Configuration=$(Configuration);Platform=$(Platform);VisualStudioVersion=$(VisualStudioVersion) @@ -154,25 +116,12 @@ - - - - Configuration=Cpp11-$(Configuration);Platform=$(Platform) - - - Configuration=$(Configuration);Platform=$(Platform) - - - - Configuration=Cpp11-$(Configuration);Platform=$(Platform) - - diff --git a/cpp/msbuild/ice.v143.sln b/cpp/msbuild/ice.sln similarity index 65% rename from cpp/msbuild/ice.v143.sln rename to cpp/msbuild/ice.sln index 49d054baa16..8ea861cfc59 100644 --- a/cpp/msbuild/ice.v143.sln +++ b/cpp/msbuild/ice.sln @@ -45,115 +45,71 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slice2py", "..\src\slice2py {57CD6AC2-0C9D-4648-9E9D-5DF60C90F18A} = {57CD6AC2-0C9D-4648-9E9D-5DF60C90F18A} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ice++11", "..\src\Ice\msbuild\ice++11\ice++11.vcxproj", "{3AB9772C-6113-4F1C-90FB-5368E7486C11}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ice", "..\src\Ice\msbuild\ice\ice.vcxproj", "{3AB9772C-6113-4F1C-90FB-5368E7486C11}" ProjectSection(ProjectDependencies) = postProject {763F88BB-37FD-4BCC-9D13-A7103596EA06} = {763F88BB-37FD-4BCC-9D13-A7103596EA06} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icexml++11", "..\src\IceXML\msbuild\icexml.vcxproj", "{90EC26E8-AFFA-4E44-B068-AB5849A96FDD}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icexml", "..\src\IceXML\msbuild\icexml.vcxproj", "{90EC26E8-AFFA-4E44-B068-AB5849A96FDD}" ProjectSection(ProjectDependencies) = postProject {3AB9772C-6113-4F1C-90FB-5368E7486C11} = {3AB9772C-6113-4F1C-90FB-5368E7486C11} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ice", "..\src\Ice\msbuild\ice\ice.vcxproj", "{6485EC94-6B47-428D-B42D-AAA11F08DB59}" - ProjectSection(ProjectDependencies) = postProject - {4D1A5110-3176-44BA-8BBB-57BF56519B9F} = {4D1A5110-3176-44BA-8BBB-57BF56519B9F} - {763F88BB-37FD-4BCC-9D13-A7103596EA06} = {763F88BB-37FD-4BCC-9D13-A7103596EA06} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glacier2++11", "..\src\Glacier2Lib\msbuild\glacier2++11\glacier2++11.vcxproj", "{2940A3C2-A9BA-44AA-AF65-00479C783407}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glacier2", "..\src\Glacier2Lib\msbuild\glacier2\glacier2.vcxproj", "{2940A3C2-A9BA-44AA-AF65-00479C783407}" ProjectSection(ProjectDependencies) = postProject {3AB9772C-6113-4F1C-90FB-5368E7486C11} = {3AB9772C-6113-4F1C-90FB-5368E7486C11} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icedb++11", "..\src\IceDB\msbuild\icedb.vcxproj", "{E8ACC848-F7DA-4B29-B52F-81D66E7D397E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icedb", "..\src\IceDB\msbuild\icedb.vcxproj", "{E8ACC848-F7DA-4B29-B52F-81D66E7D397E}" ProjectSection(ProjectDependencies) = postProject {3AB9772C-6113-4F1C-90FB-5368E7486C11} = {3AB9772C-6113-4F1C-90FB-5368E7486C11} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icestorm", "..\src\IceStormLib\msbuild\icestorm\icestorm.vcxproj", "{E6864F0D-B2ED-406A-B98C-F3668A680005}" - ProjectSection(ProjectDependencies) = postProject - {6485EC94-6B47-428D-B42D-AAA11F08DB59} = {6485EC94-6B47-428D-B42D-AAA11F08DB59} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icestorm++11", "..\src\IceStormLib\msbuild\icestorm++11\icestorm++11.vcxproj", "{A28E5839-97F3-4874-BB77-E425787CF2ED}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icestorm", "..\src\IceStormLib\msbuild\icestorm\icestorm.vcxproj", "{A28E5839-97F3-4874-BB77-E425787CF2ED}" ProjectSection(ProjectDependencies) = postProject {3AB9772C-6113-4F1C-90FB-5368E7486C11} = {3AB9772C-6113-4F1C-90FB-5368E7486C11} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icepatch2", "..\src\IcePatch2Lib\msbuild\icepatch2\icepatch2.vcxproj", "{994ADD25-20A0-4715-A3EC-9F86AFD481D0}" - ProjectSection(ProjectDependencies) = postProject - {6485EC94-6B47-428D-B42D-AAA11F08DB59} = {6485EC94-6B47-428D-B42D-AAA11F08DB59} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icegrid", "..\src\IceGridLib\msbuild\icegrid\icegrid.vcxproj", "{18BF13D3-85D3-43A5-8C96-E52EB0672F72}" - ProjectSection(ProjectDependencies) = postProject - {6485EC94-6B47-428D-B42D-AAA11F08DB59} = {6485EC94-6B47-428D-B42D-AAA11F08DB59} - {C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {C7223CC8-0AAA-470B-ACB3-12B9DE75525C} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icegrid++11", "..\src\IceGridLib\msbuild\icegrid++11\icegrid++11.vcxproj", "{142A9562-8DEC-4B1B-9B15-2CAD8304447B}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icegrid", "..\src\IceGridLib\msbuild\icegrid\icegrid.vcxproj", "{142A9562-8DEC-4B1B-9B15-2CAD8304447B}" ProjectSection(ProjectDependencies) = postProject {2940A3C2-A9BA-44AA-AF65-00479C783407} = {2940A3C2-A9BA-44AA-AF65-00479C783407} {3AB9772C-6113-4F1C-90FB-5368E7486C11} = {3AB9772C-6113-4F1C-90FB-5368E7486C11} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icediscovery++11", "..\src\IceDiscovery\msbuild\icediscovery++11\icediscovery++11.vcxproj", "{270BB666-62FB-49ED-BFA2-8F279DC9ABDD}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icediscovery", "..\src\IceDiscovery\msbuild\icediscovery\icediscovery.vcxproj", "{270BB666-62FB-49ED-BFA2-8F279DC9ABDD}" ProjectSection(ProjectDependencies) = postProject {3AB9772C-6113-4F1C-90FB-5368E7486C11} = {3AB9772C-6113-4F1C-90FB-5368E7486C11} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icelocatordiscovery", "..\src\IceLocatorDiscovery\msbuild\icelocatordiscovery\icelocatordiscovery.vcxproj", "{5A8CEAB6-9F57-495C-B554-F93F842A0A28}" - ProjectSection(ProjectDependencies) = postProject - {6485EC94-6B47-428D-B42D-AAA11F08DB59} = {6485EC94-6B47-428D-B42D-AAA11F08DB59} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icelocatordiscovery++11", "..\src\IceLocatorDiscovery\msbuild\icelocatordiscovery++11\icelocatordiscovery++11.vcxproj", "{C694B856-3393-41B4-B3DC-3A5AD9A92A3D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icelocatordiscovery", "..\src\IceLocatorDiscovery\msbuild\icelocatordiscovery\icelocatordiscovery.vcxproj", "{C694B856-3393-41B4-B3DC-3A5AD9A92A3D}" ProjectSection(ProjectDependencies) = postProject {3AB9772C-6113-4F1C-90FB-5368E7486C11} = {3AB9772C-6113-4F1C-90FB-5368E7486C11} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iceboxlib", "..\src\IceBox\msbuild\iceboxlib\iceboxlib.vcxproj", "{588F90CA-62AC-4101-83FC-19AB9DB6B509}" - ProjectSection(ProjectDependencies) = postProject - {6485EC94-6B47-428D-B42D-AAA11F08DB59} = {6485EC94-6B47-428D-B42D-AAA11F08DB59} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iceboxlib++11", "..\src\IceBox\msbuild\iceboxlib++11\iceboxlib++11.vcxproj", "{4F8DD63C-3359-42F2-A6A8-80F7D55593AC}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iceboxlib", "..\src\IceBox\msbuild\iceboxlib\iceboxlib.vcxproj", "{4F8DD63C-3359-42F2-A6A8-80F7D55593AC}" ProjectSection(ProjectDependencies) = postProject {3AB9772C-6113-4F1C-90FB-5368E7486C11} = {3AB9772C-6113-4F1C-90FB-5368E7486C11} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icebox", "..\src\IceBox\msbuild\icebox\icebox.vcxproj", "{81C8FC6A-CAC3-4B6D-AE4D-5DEAD29726C5}" - ProjectSection(ProjectDependencies) = postProject - {588F90CA-62AC-4101-83FC-19AB9DB6B509} = {588F90CA-62AC-4101-83FC-19AB9DB6B509} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icebox++11", "..\src\IceBox\msbuild\icebox++11\icebox++11.vcxproj", "{96161748-CE5E-4548-BC1D-AFD2F137A1DC}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icebox", "..\src\IceBox\msbuild\icebox\icebox.vcxproj", "{96161748-CE5E-4548-BC1D-AFD2F137A1DC}" ProjectSection(ProjectDependencies) = postProject {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} = {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iceboxadmin", "..\src\IceBox\msbuild\iceboxadmin\iceboxadmin.vcxproj", "{1B745EA3-C97A-41BB-8E6F-64AAE992BE55}" - ProjectSection(ProjectDependencies) = postProject - {588F90CA-62AC-4101-83FC-19AB9DB6B509} = {588F90CA-62AC-4101-83FC-19AB9DB6B509} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iceserviceinstall", "..\src\iceserviceinstall\msbuild\iceserviceinstall.vcxproj", "{0E22B627-F1A6-4771-89DE-9E45FD51F124}" - ProjectSection(ProjectDependencies) = postProject - {6485EC94-6B47-428D-B42D-AAA11F08DB59} = {6485EC94-6B47-428D-B42D-AAA11F08DB59} - EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icestormdb++11", "..\src\IceStorm\msbuild\icestormdb\icestormdb.vcxproj", "{F0B74B00-F252-4D38-A352-ED379CB196E9}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icestormdb", "..\src\IceStorm\msbuild\icestormdb\icestormdb.vcxproj", "{F0B74B00-F252-4D38-A352-ED379CB196E9}" ProjectSection(ProjectDependencies) = postProject {142A9562-8DEC-4B1B-9B15-2CAD8304447B} = {142A9562-8DEC-4B1B-9B15-2CAD8304447B} {2940A3C2-A9BA-44AA-AF65-00479C783407} = {2940A3C2-A9BA-44AA-AF65-00479C783407} {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} = {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} - {994ADD25-20A0-4715-A3EC-9F86AFD481D0} = {994ADD25-20A0-4715-A3EC-9F86AFD481D0} {A28E5839-97F3-4874-BB77-E425787CF2ED} = {A28E5839-97F3-4874-BB77-E425787CF2ED} {E8ACC848-F7DA-4B29-B52F-81D66E7D397E} = {E8ACC848-F7DA-4B29-B52F-81D66E7D397E} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icestormservice++11", "..\src\IceStorm\msbuild\icestormservice\icestormservice.vcxproj", "{9E13C4B5-5DA9-43C1-9304-AEAC035E854D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icestormservice", "..\src\IceStorm\msbuild\icestormservice\icestormservice.vcxproj", "{9E13C4B5-5DA9-43C1-9304-AEAC035E854D}" ProjectSection(ProjectDependencies) = postProject {142A9562-8DEC-4B1B-9B15-2CAD8304447B} = {142A9562-8DEC-4B1B-9B15-2CAD8304447B} {2940A3C2-A9BA-44AA-AF65-00479C783407} = {2940A3C2-A9BA-44AA-AF65-00479C783407} @@ -162,7 +118,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icestormservice++11", "..\s {E8ACC848-F7DA-4B29-B52F-81D66E7D397E} = {E8ACC848-F7DA-4B29-B52F-81D66E7D397E} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icestormadmin++11", "..\src\IceStorm\msbuild\icestormadmin\icestormadmin.vcxproj", "{8F1A1F99-DBE0-408D-99F7-D59142BD008C}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icestormadmin", "..\src\IceStorm\msbuild\icestormadmin\icestormadmin.vcxproj", "{8F1A1F99-DBE0-408D-99F7-D59142BD008C}" ProjectSection(ProjectDependencies) = postProject {142A9562-8DEC-4B1B-9B15-2CAD8304447B} = {142A9562-8DEC-4B1B-9B15-2CAD8304447B} {2940A3C2-A9BA-44AA-AF65-00479C783407} = {2940A3C2-A9BA-44AA-AF65-00479C783407} @@ -171,7 +127,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icestormadmin++11", "..\src {E8ACC848-F7DA-4B29-B52F-81D66E7D397E} = {E8ACC848-F7DA-4B29-B52F-81D66E7D397E} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icegridadmin++11", "..\src\IceGrid\msbuild\icegridadmin\icegridadmin.vcxproj", "{1F4CA1BE-B405-400F-912E-F0CC7E369D59}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icegridadmin", "..\src\IceGrid\msbuild\icegridadmin\icegridadmin.vcxproj", "{1F4CA1BE-B405-400F-912E-F0CC7E369D59}" ProjectSection(ProjectDependencies) = postProject {142A9562-8DEC-4B1B-9B15-2CAD8304447B} = {142A9562-8DEC-4B1B-9B15-2CAD8304447B} {18F381D8-BA61-4E6A-B877-9F6BC28C07E5} = {18F381D8-BA61-4E6A-B877-9F6BC28C07E5} @@ -180,7 +136,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icegridadmin++11", "..\src\ {C694B856-3393-41B4-B3DC-3A5AD9A92A3D} = {C694B856-3393-41B4-B3DC-3A5AD9A92A3D} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icegridnode++11", "..\src\IceGrid\msbuild\icegridnode\icegridnode.vcxproj", "{48EF9416-336F-4FA5-A376-FDFB7726ADBA}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icegridnode", "..\src\IceGrid\msbuild\icegridnode\icegridnode.vcxproj", "{48EF9416-336F-4FA5-A376-FDFB7726ADBA}" ProjectSection(ProjectDependencies) = postProject {142A9562-8DEC-4B1B-9B15-2CAD8304447B} = {142A9562-8DEC-4B1B-9B15-2CAD8304447B} {18F381D8-BA61-4E6A-B877-9F6BC28C07E5} = {18F381D8-BA61-4E6A-B877-9F6BC28C07E5} @@ -193,12 +149,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icegridnode++11", "..\src\I {E8ACC848-F7DA-4B29-B52F-81D66E7D397E} = {E8ACC848-F7DA-4B29-B52F-81D66E7D397E} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icessl", "..\src\IceSSL\msbuild\icessl\icessl.vcxproj", "{72FA68A9-49B6-4AB6-94AE-34BB03770A51}" - ProjectSection(ProjectDependencies) = postProject - {6485EC94-6B47-428D-B42D-AAA11F08DB59} = {6485EC94-6B47-428D-B42D-AAA11F08DB59} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icegridregistry++11", "..\src\IceGrid\msbuild\icegridregistry\icegridregistry.vcxproj", "{64490115-464B-4DC3-B7C6-D0AF1B68B6F9}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icegridregistry", "..\src\IceGrid\msbuild\icegridregistry\icegridregistry.vcxproj", "{64490115-464B-4DC3-B7C6-D0AF1B68B6F9}" ProjectSection(ProjectDependencies) = postProject {142A9562-8DEC-4B1B-9B15-2CAD8304447B} = {142A9562-8DEC-4B1B-9B15-2CAD8304447B} {18F381D8-BA61-4E6A-B877-9F6BC28C07E5} = {18F381D8-BA61-4E6A-B877-9F6BC28C07E5} @@ -210,85 +161,60 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icegridregistry++11", "..\s {A28E5839-97F3-4874-BB77-E425787CF2ED} = {A28E5839-97F3-4874-BB77-E425787CF2ED} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icessl++11", "..\src\IceSSL\msbuild\icessl++11\icessl++11.vcxproj", "{5923B17D-2873-4245-87A7-FB8F4BE12501}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icessl", "..\src\IceSSL\msbuild\icessl\icessl.vcxproj", "{5923B17D-2873-4245-87A7-FB8F4BE12501}" ProjectSection(ProjectDependencies) = postProject {3AB9772C-6113-4F1C-90FB-5368E7486C11} = {3AB9772C-6113-4F1C-90FB-5368E7486C11} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icediscovery", "..\src\IceDiscovery\msbuild\icediscovery\icediscovery.vcxproj", "{3850C9C9-BA92-4EE6-9E77-E5BAE2A9BC81}" - ProjectSection(ProjectDependencies) = postProject - {6485EC94-6B47-428D-B42D-AAA11F08DB59} = {6485EC94-6B47-428D-B42D-AAA11F08DB59} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glacier2", "..\src\Glacier2Lib\msbuild\glacier2\glacier2.vcxproj", "{C7223CC8-0AAA-470B-ACB3-12B9DE75525C}" - ProjectSection(ProjectDependencies) = postProject - {6485EC94-6B47-428D-B42D-AAA11F08DB59} = {6485EC94-6B47-428D-B42D-AAA11F08DB59} - {763F88BB-37FD-4BCC-9D13-A7103596EA06} = {763F88BB-37FD-4BCC-9D13-A7103596EA06} - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "C++98", "C++98", "{2DC2B270-B7AE-48CF-8FB0-41A55A9747E9}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "C++11", "C++11", "{F48CC091-6F26-4EC8-A2FB-485975E7C908}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glacier2router++11", "..\src\Glacier2\msbuild\glacier2router.vcxproj", "{541CF1D6-95FD-4499-AB02-75CCCEE660B0}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glacier2router", "..\src\Glacier2\msbuild\glacier2router.vcxproj", "{541CF1D6-95FD-4499-AB02-75CCCEE660B0}" ProjectSection(ProjectDependencies) = postProject {2940A3C2-A9BA-44AA-AF65-00479C783407} = {2940A3C2-A9BA-44AA-AF65-00479C783407} {3AB9772C-6113-4F1C-90FB-5368E7486C11} = {3AB9772C-6113-4F1C-90FB-5368E7486C11} {5923B17D-2873-4245-87A7-FB8F4BE12501} = {5923B17D-2873-4245-87A7-FB8F4BE12501} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icegriddb++11", "..\src\icegriddb\msbuild\icegriddb.vcxproj", "{369524F4-D374-44F4-BCFD-408934595701}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icegriddb", "..\src\icegriddb\msbuild\icegriddb.vcxproj", "{369524F4-D374-44F4-BCFD-408934595701}" ProjectSection(ProjectDependencies) = postProject {142A9562-8DEC-4B1B-9B15-2CAD8304447B} = {142A9562-8DEC-4B1B-9B15-2CAD8304447B} {3AB9772C-6113-4F1C-90FB-5368E7486C11} = {3AB9772C-6113-4F1C-90FB-5368E7486C11} {E8ACC848-F7DA-4B29-B52F-81D66E7D397E} = {E8ACC848-F7DA-4B29-B52F-81D66E7D397E} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icebridge++11", "..\src\IceBridge\msbuild\icebridge.vcxproj", "{1D6E8807-7C28-421F-B49E-BCB482FCB21D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icebridge", "..\src\IceBridge\msbuild\icebridge.vcxproj", "{1D6E8807-7C28-421F-B49E-BCB482FCB21D}" ProjectSection(ProjectDependencies) = postProject {3AB9772C-6113-4F1C-90FB-5368E7486C11} = {3AB9772C-6113-4F1C-90FB-5368E7486C11} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slice2rb", "..\src\slice2rb\msbuild\slice2rb.vcxproj", "{A79E9EB0-878C-4EDB-9804-2D262D6008DB}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icesslopenssl++11", "..\src\IceSSL\msbuild\icesslopenssl++11\icesslopenssl++11.vcxproj", "{D0DC2305-37FE-4D03-BE05-AC8912678DC8}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icesslopenssl", "..\src\IceSSL\msbuild\icesslopenssl\icesslopenssl.vcxproj", "{D0DC2305-37FE-4D03-BE05-AC8912678DC8}" ProjectSection(ProjectDependencies) = postProject {5923B17D-2873-4245-87A7-FB8F4BE12501} = {5923B17D-2873-4245-87A7-FB8F4BE12501} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icesslopenssl", "..\src\IceSSL\msbuild\icesslopenssl\icesslopenssl.vcxproj", "{0D08F6B8-39C0-413B-84CE-D73230BCC740}" - ProjectSection(ProjectDependencies) = postProject - {72FA68A9-49B6-4AB6-94AE-34BB03770A51} = {72FA68A9-49B6-4AB6-94AE-34BB03770A51} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ice2slice", "..\src\ice2slice\msbuild\ice2slice.vcxproj", "{773EA63E-40AE-45B8-82B4-82B54CF309F8}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glacier2cryptpermissionsverifier", "..\src\Glacier2CryptPermissionsVerifier\msbuild\glacier2cryptpermissionsverifier\glacier2cryptpermissionsverifier.vcxproj", "{519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3}" - ProjectSection(ProjectDependencies) = postProject - {C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {C7223CC8-0AAA-470B-ACB3-12B9DE75525C} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icepatch2++11", "..\src\IcePatch2Lib\msbuild\icepatch2++11\icepatch2++11.vcxproj", "{18F381D8-BA61-4E6A-B877-9F6BC28C07E5}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icepatch2", "..\src\IcePatch2Lib\msbuild\icepatch2\icepatch2.vcxproj", "{18F381D8-BA61-4E6A-B877-9F6BC28C07E5}" ProjectSection(ProjectDependencies) = postProject {3AB9772C-6113-4F1C-90FB-5368E7486C11} = {3AB9772C-6113-4F1C-90FB-5368E7486C11} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glacier2cryptpermissionsverifier++11", "..\src\Glacier2CryptPermissionsVerifier\msbuild\glacier2cryptpermissionsverifier++11\glacier2cryptpermissionsverifier++11.vcxproj", "{BF2077E4-D837-486B-9356-24FA5F659808}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glacier2cryptpermissionsverifier", "..\src\Glacier2CryptPermissionsVerifier\msbuild\glacier2cryptpermissionsverifier\glacier2cryptpermissionsverifier.vcxproj", "{BF2077E4-D837-486B-9356-24FA5F659808}" ProjectSection(ProjectDependencies) = postProject {2940A3C2-A9BA-44AA-AF65-00479C783407} = {2940A3C2-A9BA-44AA-AF65-00479C783407} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icepatch2server++11", "..\src\IcePatch2\msbuild\icepatch2server++11\icepatch2server++11.vcxproj", "{7E1D6372-D417-4143-A7AF-BE3E77550238}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icepatch2server", "..\src\IcePatch2\msbuild\icepatch2server\icepatch2server.vcxproj", "{7E1D6372-D417-4143-A7AF-BE3E77550238}" ProjectSection(ProjectDependencies) = postProject {18F381D8-BA61-4E6A-B877-9F6BC28C07E5} = {18F381D8-BA61-4E6A-B877-9F6BC28C07E5} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icepatch2calc++11", "..\src\IcePatch2\msbuild\icepatch2calc++11\icepatch2calc++11.vcxproj", "{8BCB4793-C004-459D-9605-272470D53A40}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icepatch2calc", "..\src\IcePatch2\msbuild\icepatch2calc\icepatch2calc.vcxproj", "{8BCB4793-C004-459D-9605-272470D53A40}" ProjectSection(ProjectDependencies) = postProject {18F381D8-BA61-4E6A-B877-9F6BC28C07E5} = {18F381D8-BA61-4E6A-B877-9F6BC28C07E5} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icepatch2client++11", "..\src\IcePatch2\msbuild\icepatch2client++11\icepatch2client++11.vcxproj", "{43D54B43-526E-40CE-9945-81420C54A415}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icepatch2client", "..\src\IcePatch2\msbuild\icepatch2client\icepatch2client.vcxproj", "{43D54B43-526E-40CE-9945-81420C54A415}" ProjectSection(ProjectDependencies) = postProject {18F381D8-BA61-4E6A-B877-9F6BC28C07E5} = {18F381D8-BA61-4E6A-B877-9F6BC28C07E5} EndProjectSection @@ -389,14 +315,6 @@ Global {90EC26E8-AFFA-4E44-B068-AB5849A96FDD}.Release|Win32.Build.0 = Release|Win32 {90EC26E8-AFFA-4E44-B068-AB5849A96FDD}.Release|x64.ActiveCfg = Release|x64 {90EC26E8-AFFA-4E44-B068-AB5849A96FDD}.Release|x64.Build.0 = Release|x64 - {6485EC94-6B47-428D-B42D-AAA11F08DB59}.Debug|Win32.ActiveCfg = Debug|Win32 - {6485EC94-6B47-428D-B42D-AAA11F08DB59}.Debug|Win32.Build.0 = Debug|Win32 - {6485EC94-6B47-428D-B42D-AAA11F08DB59}.Debug|x64.ActiveCfg = Debug|x64 - {6485EC94-6B47-428D-B42D-AAA11F08DB59}.Debug|x64.Build.0 = Debug|x64 - {6485EC94-6B47-428D-B42D-AAA11F08DB59}.Release|Win32.ActiveCfg = Release|Win32 - {6485EC94-6B47-428D-B42D-AAA11F08DB59}.Release|Win32.Build.0 = Release|Win32 - {6485EC94-6B47-428D-B42D-AAA11F08DB59}.Release|x64.ActiveCfg = Release|x64 - {6485EC94-6B47-428D-B42D-AAA11F08DB59}.Release|x64.Build.0 = Release|x64 {2940A3C2-A9BA-44AA-AF65-00479C783407}.Debug|Win32.ActiveCfg = Debug|Win32 {2940A3C2-A9BA-44AA-AF65-00479C783407}.Debug|Win32.Build.0 = Debug|Win32 {2940A3C2-A9BA-44AA-AF65-00479C783407}.Debug|x64.ActiveCfg = Debug|x64 @@ -413,14 +331,6 @@ Global {E8ACC848-F7DA-4B29-B52F-81D66E7D397E}.Release|Win32.Build.0 = Release|Win32 {E8ACC848-F7DA-4B29-B52F-81D66E7D397E}.Release|x64.ActiveCfg = Release|x64 {E8ACC848-F7DA-4B29-B52F-81D66E7D397E}.Release|x64.Build.0 = Release|x64 - {E6864F0D-B2ED-406A-B98C-F3668A680005}.Debug|Win32.ActiveCfg = Debug|Win32 - {E6864F0D-B2ED-406A-B98C-F3668A680005}.Debug|Win32.Build.0 = Debug|Win32 - {E6864F0D-B2ED-406A-B98C-F3668A680005}.Debug|x64.ActiveCfg = Debug|x64 - {E6864F0D-B2ED-406A-B98C-F3668A680005}.Debug|x64.Build.0 = Debug|x64 - {E6864F0D-B2ED-406A-B98C-F3668A680005}.Release|Win32.ActiveCfg = Release|Win32 - {E6864F0D-B2ED-406A-B98C-F3668A680005}.Release|Win32.Build.0 = Release|Win32 - {E6864F0D-B2ED-406A-B98C-F3668A680005}.Release|x64.ActiveCfg = Release|x64 - {E6864F0D-B2ED-406A-B98C-F3668A680005}.Release|x64.Build.0 = Release|x64 {A28E5839-97F3-4874-BB77-E425787CF2ED}.Debug|Win32.ActiveCfg = Debug|Win32 {A28E5839-97F3-4874-BB77-E425787CF2ED}.Debug|Win32.Build.0 = Debug|Win32 {A28E5839-97F3-4874-BB77-E425787CF2ED}.Debug|x64.ActiveCfg = Debug|x64 @@ -429,22 +339,6 @@ Global {A28E5839-97F3-4874-BB77-E425787CF2ED}.Release|Win32.Build.0 = Release|Win32 {A28E5839-97F3-4874-BB77-E425787CF2ED}.Release|x64.ActiveCfg = Release|x64 {A28E5839-97F3-4874-BB77-E425787CF2ED}.Release|x64.Build.0 = Release|x64 - {994ADD25-20A0-4715-A3EC-9F86AFD481D0}.Debug|Win32.ActiveCfg = Debug|Win32 - {994ADD25-20A0-4715-A3EC-9F86AFD481D0}.Debug|Win32.Build.0 = Debug|Win32 - {994ADD25-20A0-4715-A3EC-9F86AFD481D0}.Debug|x64.ActiveCfg = Debug|x64 - {994ADD25-20A0-4715-A3EC-9F86AFD481D0}.Debug|x64.Build.0 = Debug|x64 - {994ADD25-20A0-4715-A3EC-9F86AFD481D0}.Release|Win32.ActiveCfg = Release|Win32 - {994ADD25-20A0-4715-A3EC-9F86AFD481D0}.Release|Win32.Build.0 = Release|Win32 - {994ADD25-20A0-4715-A3EC-9F86AFD481D0}.Release|x64.ActiveCfg = Release|x64 - {994ADD25-20A0-4715-A3EC-9F86AFD481D0}.Release|x64.Build.0 = Release|x64 - {18BF13D3-85D3-43A5-8C96-E52EB0672F72}.Debug|Win32.ActiveCfg = Debug|Win32 - {18BF13D3-85D3-43A5-8C96-E52EB0672F72}.Debug|Win32.Build.0 = Debug|Win32 - {18BF13D3-85D3-43A5-8C96-E52EB0672F72}.Debug|x64.ActiveCfg = Debug|x64 - {18BF13D3-85D3-43A5-8C96-E52EB0672F72}.Debug|x64.Build.0 = Debug|x64 - {18BF13D3-85D3-43A5-8C96-E52EB0672F72}.Release|Win32.ActiveCfg = Release|Win32 - {18BF13D3-85D3-43A5-8C96-E52EB0672F72}.Release|Win32.Build.0 = Release|Win32 - {18BF13D3-85D3-43A5-8C96-E52EB0672F72}.Release|x64.ActiveCfg = Release|x64 - {18BF13D3-85D3-43A5-8C96-E52EB0672F72}.Release|x64.Build.0 = Release|x64 {142A9562-8DEC-4B1B-9B15-2CAD8304447B}.Debug|Win32.ActiveCfg = Debug|Win32 {142A9562-8DEC-4B1B-9B15-2CAD8304447B}.Debug|Win32.Build.0 = Debug|Win32 {142A9562-8DEC-4B1B-9B15-2CAD8304447B}.Debug|x64.ActiveCfg = Debug|x64 @@ -461,14 +355,6 @@ Global {270BB666-62FB-49ED-BFA2-8F279DC9ABDD}.Release|Win32.Build.0 = Release|Win32 {270BB666-62FB-49ED-BFA2-8F279DC9ABDD}.Release|x64.ActiveCfg = Release|x64 {270BB666-62FB-49ED-BFA2-8F279DC9ABDD}.Release|x64.Build.0 = Release|x64 - {5A8CEAB6-9F57-495C-B554-F93F842A0A28}.Debug|Win32.ActiveCfg = Debug|Win32 - {5A8CEAB6-9F57-495C-B554-F93F842A0A28}.Debug|Win32.Build.0 = Debug|Win32 - {5A8CEAB6-9F57-495C-B554-F93F842A0A28}.Debug|x64.ActiveCfg = Debug|x64 - {5A8CEAB6-9F57-495C-B554-F93F842A0A28}.Debug|x64.Build.0 = Debug|x64 - {5A8CEAB6-9F57-495C-B554-F93F842A0A28}.Release|Win32.ActiveCfg = Release|Win32 - {5A8CEAB6-9F57-495C-B554-F93F842A0A28}.Release|Win32.Build.0 = Release|Win32 - {5A8CEAB6-9F57-495C-B554-F93F842A0A28}.Release|x64.ActiveCfg = Release|x64 - {5A8CEAB6-9F57-495C-B554-F93F842A0A28}.Release|x64.Build.0 = Release|x64 {C694B856-3393-41B4-B3DC-3A5AD9A92A3D}.Debug|Win32.ActiveCfg = Debug|Win32 {C694B856-3393-41B4-B3DC-3A5AD9A92A3D}.Debug|Win32.Build.0 = Debug|Win32 {C694B856-3393-41B4-B3DC-3A5AD9A92A3D}.Debug|x64.ActiveCfg = Debug|x64 @@ -477,14 +363,6 @@ Global {C694B856-3393-41B4-B3DC-3A5AD9A92A3D}.Release|Win32.Build.0 = Release|Win32 {C694B856-3393-41B4-B3DC-3A5AD9A92A3D}.Release|x64.ActiveCfg = Release|x64 {C694B856-3393-41B4-B3DC-3A5AD9A92A3D}.Release|x64.Build.0 = Release|x64 - {588F90CA-62AC-4101-83FC-19AB9DB6B509}.Debug|Win32.ActiveCfg = Debug|Win32 - {588F90CA-62AC-4101-83FC-19AB9DB6B509}.Debug|Win32.Build.0 = Debug|Win32 - {588F90CA-62AC-4101-83FC-19AB9DB6B509}.Debug|x64.ActiveCfg = Debug|x64 - {588F90CA-62AC-4101-83FC-19AB9DB6B509}.Debug|x64.Build.0 = Debug|x64 - {588F90CA-62AC-4101-83FC-19AB9DB6B509}.Release|Win32.ActiveCfg = Release|Win32 - {588F90CA-62AC-4101-83FC-19AB9DB6B509}.Release|Win32.Build.0 = Release|Win32 - {588F90CA-62AC-4101-83FC-19AB9DB6B509}.Release|x64.ActiveCfg = Release|x64 - {588F90CA-62AC-4101-83FC-19AB9DB6B509}.Release|x64.Build.0 = Release|x64 {4F8DD63C-3359-42F2-A6A8-80F7D55593AC}.Debug|Win32.ActiveCfg = Debug|Win32 {4F8DD63C-3359-42F2-A6A8-80F7D55593AC}.Debug|Win32.Build.0 = Debug|Win32 {4F8DD63C-3359-42F2-A6A8-80F7D55593AC}.Debug|x64.ActiveCfg = Debug|x64 @@ -493,14 +371,6 @@ Global {4F8DD63C-3359-42F2-A6A8-80F7D55593AC}.Release|Win32.Build.0 = Release|Win32 {4F8DD63C-3359-42F2-A6A8-80F7D55593AC}.Release|x64.ActiveCfg = Release|x64 {4F8DD63C-3359-42F2-A6A8-80F7D55593AC}.Release|x64.Build.0 = Release|x64 - {81C8FC6A-CAC3-4B6D-AE4D-5DEAD29726C5}.Debug|Win32.ActiveCfg = Debug|Win32 - {81C8FC6A-CAC3-4B6D-AE4D-5DEAD29726C5}.Debug|Win32.Build.0 = Debug|Win32 - {81C8FC6A-CAC3-4B6D-AE4D-5DEAD29726C5}.Debug|x64.ActiveCfg = Debug|x64 - {81C8FC6A-CAC3-4B6D-AE4D-5DEAD29726C5}.Debug|x64.Build.0 = Debug|x64 - {81C8FC6A-CAC3-4B6D-AE4D-5DEAD29726C5}.Release|Win32.ActiveCfg = Release|Win32 - {81C8FC6A-CAC3-4B6D-AE4D-5DEAD29726C5}.Release|Win32.Build.0 = Release|Win32 - {81C8FC6A-CAC3-4B6D-AE4D-5DEAD29726C5}.Release|x64.ActiveCfg = Release|x64 - {81C8FC6A-CAC3-4B6D-AE4D-5DEAD29726C5}.Release|x64.Build.0 = Release|x64 {96161748-CE5E-4548-BC1D-AFD2F137A1DC}.Debug|Win32.ActiveCfg = Debug|Win32 {96161748-CE5E-4548-BC1D-AFD2F137A1DC}.Debug|Win32.Build.0 = Debug|Win32 {96161748-CE5E-4548-BC1D-AFD2F137A1DC}.Debug|x64.ActiveCfg = Debug|x64 @@ -565,14 +435,6 @@ Global {48EF9416-336F-4FA5-A376-FDFB7726ADBA}.Release|Win32.Build.0 = Release|Win32 {48EF9416-336F-4FA5-A376-FDFB7726ADBA}.Release|x64.ActiveCfg = Release|x64 {48EF9416-336F-4FA5-A376-FDFB7726ADBA}.Release|x64.Build.0 = Release|x64 - {72FA68A9-49B6-4AB6-94AE-34BB03770A51}.Debug|Win32.ActiveCfg = Debug|Win32 - {72FA68A9-49B6-4AB6-94AE-34BB03770A51}.Debug|Win32.Build.0 = Debug|Win32 - {72FA68A9-49B6-4AB6-94AE-34BB03770A51}.Debug|x64.ActiveCfg = Debug|x64 - {72FA68A9-49B6-4AB6-94AE-34BB03770A51}.Debug|x64.Build.0 = Debug|x64 - {72FA68A9-49B6-4AB6-94AE-34BB03770A51}.Release|Win32.ActiveCfg = Release|Win32 - {72FA68A9-49B6-4AB6-94AE-34BB03770A51}.Release|Win32.Build.0 = Release|Win32 - {72FA68A9-49B6-4AB6-94AE-34BB03770A51}.Release|x64.ActiveCfg = Release|x64 - {72FA68A9-49B6-4AB6-94AE-34BB03770A51}.Release|x64.Build.0 = Release|x64 {64490115-464B-4DC3-B7C6-D0AF1B68B6F9}.Debug|Win32.ActiveCfg = Debug|Win32 {64490115-464B-4DC3-B7C6-D0AF1B68B6F9}.Debug|Win32.Build.0 = Debug|Win32 {64490115-464B-4DC3-B7C6-D0AF1B68B6F9}.Debug|x64.ActiveCfg = Debug|x64 @@ -589,22 +451,6 @@ Global {5923B17D-2873-4245-87A7-FB8F4BE12501}.Release|Win32.Build.0 = Release|Win32 {5923B17D-2873-4245-87A7-FB8F4BE12501}.Release|x64.ActiveCfg = Release|x64 {5923B17D-2873-4245-87A7-FB8F4BE12501}.Release|x64.Build.0 = Release|x64 - {3850C9C9-BA92-4EE6-9E77-E5BAE2A9BC81}.Debug|Win32.ActiveCfg = Debug|Win32 - {3850C9C9-BA92-4EE6-9E77-E5BAE2A9BC81}.Debug|Win32.Build.0 = Debug|Win32 - {3850C9C9-BA92-4EE6-9E77-E5BAE2A9BC81}.Debug|x64.ActiveCfg = Debug|x64 - {3850C9C9-BA92-4EE6-9E77-E5BAE2A9BC81}.Debug|x64.Build.0 = Debug|x64 - {3850C9C9-BA92-4EE6-9E77-E5BAE2A9BC81}.Release|Win32.ActiveCfg = Release|Win32 - {3850C9C9-BA92-4EE6-9E77-E5BAE2A9BC81}.Release|Win32.Build.0 = Release|Win32 - {3850C9C9-BA92-4EE6-9E77-E5BAE2A9BC81}.Release|x64.ActiveCfg = Release|x64 - {3850C9C9-BA92-4EE6-9E77-E5BAE2A9BC81}.Release|x64.Build.0 = Release|x64 - {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Debug|Win32.ActiveCfg = Debug|Win32 - {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Debug|Win32.Build.0 = Debug|Win32 - {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Debug|x64.ActiveCfg = Debug|x64 - {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Debug|x64.Build.0 = Debug|x64 - {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Release|Win32.ActiveCfg = Release|Win32 - {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Release|Win32.Build.0 = Release|Win32 - {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Release|x64.ActiveCfg = Release|x64 - {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Release|x64.Build.0 = Release|x64 {541CF1D6-95FD-4499-AB02-75CCCEE660B0}.Debug|Win32.ActiveCfg = Debug|Win32 {541CF1D6-95FD-4499-AB02-75CCCEE660B0}.Debug|Win32.Build.0 = Debug|Win32 {541CF1D6-95FD-4499-AB02-75CCCEE660B0}.Debug|x64.ActiveCfg = Debug|x64 @@ -645,14 +491,6 @@ Global {D0DC2305-37FE-4D03-BE05-AC8912678DC8}.Release|Win32.Build.0 = Release|Win32 {D0DC2305-37FE-4D03-BE05-AC8912678DC8}.Release|x64.ActiveCfg = Release|x64 {D0DC2305-37FE-4D03-BE05-AC8912678DC8}.Release|x64.Build.0 = Release|x64 - {0D08F6B8-39C0-413B-84CE-D73230BCC740}.Debug|Win32.ActiveCfg = Debug|Win32 - {0D08F6B8-39C0-413B-84CE-D73230BCC740}.Debug|Win32.Build.0 = Debug|Win32 - {0D08F6B8-39C0-413B-84CE-D73230BCC740}.Debug|x64.ActiveCfg = Debug|x64 - {0D08F6B8-39C0-413B-84CE-D73230BCC740}.Debug|x64.Build.0 = Debug|x64 - {0D08F6B8-39C0-413B-84CE-D73230BCC740}.Release|Win32.ActiveCfg = Release|Win32 - {0D08F6B8-39C0-413B-84CE-D73230BCC740}.Release|Win32.Build.0 = Release|Win32 - {0D08F6B8-39C0-413B-84CE-D73230BCC740}.Release|x64.ActiveCfg = Release|x64 - {0D08F6B8-39C0-413B-84CE-D73230BCC740}.Release|x64.Build.0 = Release|x64 {773EA63E-40AE-45B8-82B4-82B54CF309F8}.Debug|Win32.ActiveCfg = Debug|Win32 {773EA63E-40AE-45B8-82B4-82B54CF309F8}.Debug|Win32.Build.0 = Debug|Win32 {773EA63E-40AE-45B8-82B4-82B54CF309F8}.Debug|x64.ActiveCfg = Debug|x64 @@ -661,14 +499,6 @@ Global {773EA63E-40AE-45B8-82B4-82B54CF309F8}.Release|Win32.Build.0 = Release|Win32 {773EA63E-40AE-45B8-82B4-82B54CF309F8}.Release|x64.ActiveCfg = Release|x64 {773EA63E-40AE-45B8-82B4-82B54CF309F8}.Release|x64.Build.0 = Release|x64 - {519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3}.Debug|Win32.ActiveCfg = Debug|Win32 - {519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3}.Debug|Win32.Build.0 = Debug|Win32 - {519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3}.Debug|x64.ActiveCfg = Debug|x64 - {519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3}.Debug|x64.Build.0 = Debug|x64 - {519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3}.Release|Win32.ActiveCfg = Release|Win32 - {519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3}.Release|Win32.Build.0 = Release|Win32 - {519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3}.Release|x64.ActiveCfg = Release|x64 - {519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3}.Release|x64.Build.0 = Release|x64 {18F381D8-BA61-4E6A-B877-9F6BC28C07E5}.Debug|Win32.ActiveCfg = Debug|Win32 {18F381D8-BA61-4E6A-B877-9F6BC28C07E5}.Debug|Win32.Build.0 = Debug|Win32 {18F381D8-BA61-4E6A-B877-9F6BC28C07E5}.Debug|x64.ActiveCfg = Debug|x64 @@ -713,59 +543,6 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {4D1A5110-3176-44BA-8BBB-57BF56519B9F} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {57CD6AC2-0C9D-4648-9E9D-5DF60C90F18A} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {763F88BB-37FD-4BCC-9D13-A7103596EA06} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {7BF9F3E4-46CA-491B-A349-624C45212A19} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {A503D0D4-22BB-4BDB-B996-862D14DA3349} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {8DF85304-2A53-4C36-804F-5C6FA2F75ACF} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {FBDCD48E-57DB-4CC1-A9D6-7D9F1C97D0E1} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {55A6E595-EFE4-47B9-957C-E4CFF2E75FD6} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {ACAF39D3-B4BD-426B-98DE-D95944B0D3F6} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {3AB9772C-6113-4F1C-90FB-5368E7486C11} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} - {90EC26E8-AFFA-4E44-B068-AB5849A96FDD} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} - {6485EC94-6B47-428D-B42D-AAA11F08DB59} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {2940A3C2-A9BA-44AA-AF65-00479C783407} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} - {E8ACC848-F7DA-4B29-B52F-81D66E7D397E} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} - {E6864F0D-B2ED-406A-B98C-F3668A680005} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {A28E5839-97F3-4874-BB77-E425787CF2ED} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} - {994ADD25-20A0-4715-A3EC-9F86AFD481D0} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {18BF13D3-85D3-43A5-8C96-E52EB0672F72} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {142A9562-8DEC-4B1B-9B15-2CAD8304447B} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} - {270BB666-62FB-49ED-BFA2-8F279DC9ABDD} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} - {5A8CEAB6-9F57-495C-B554-F93F842A0A28} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {C694B856-3393-41B4-B3DC-3A5AD9A92A3D} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} - {588F90CA-62AC-4101-83FC-19AB9DB6B509} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} - {81C8FC6A-CAC3-4B6D-AE4D-5DEAD29726C5} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {96161748-CE5E-4548-BC1D-AFD2F137A1DC} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} - {1B745EA3-C97A-41BB-8E6F-64AAE992BE55} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {0E22B627-F1A6-4771-89DE-9E45FD51F124} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {F0B74B00-F252-4D38-A352-ED379CB196E9} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} - {9E13C4B5-5DA9-43C1-9304-AEAC035E854D} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} - {8F1A1F99-DBE0-408D-99F7-D59142BD008C} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} - {1F4CA1BE-B405-400F-912E-F0CC7E369D59} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} - {48EF9416-336F-4FA5-A376-FDFB7726ADBA} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} - {72FA68A9-49B6-4AB6-94AE-34BB03770A51} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {64490115-464B-4DC3-B7C6-D0AF1B68B6F9} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} - {5923B17D-2873-4245-87A7-FB8F4BE12501} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} - {3850C9C9-BA92-4EE6-9E77-E5BAE2A9BC81} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {541CF1D6-95FD-4499-AB02-75CCCEE660B0} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} - {369524F4-D374-44F4-BCFD-408934595701} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} - {1D6E8807-7C28-421F-B49E-BCB482FCB21D} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} - {A79E9EB0-878C-4EDB-9804-2D262D6008DB} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {D0DC2305-37FE-4D03-BE05-AC8912678DC8} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} - {0D08F6B8-39C0-413B-84CE-D73230BCC740} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {773EA63E-40AE-45B8-82B4-82B54CF309F8} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {18F381D8-BA61-4E6A-B877-9F6BC28C07E5} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} - {BF2077E4-D837-486B-9356-24FA5F659808} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} - {7E1D6372-D417-4143-A7AF-BE3E77550238} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} - {8BCB4793-C004-459D-9605-272470D53A40} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} - {43D54B43-526E-40CE-9945-81420C54A415} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} - EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {AAB39BE9-A7ED-4C54-80FE-D63A173ABB06} EndGlobalSection diff --git a/cpp/msbuild/ice.test.sln b/cpp/msbuild/ice.test.sln index 01372fea0bb..dfc0d3520f8 100644 --- a/cpp/msbuild/ice.test.sln +++ b/cpp/msbuild/ice.test.sln @@ -1192,24 +1192,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "..\test\IceUtil\t EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Cpp11-Debug|Win32 = Cpp11-Debug|Win32 - Cpp11-Debug|x64 = Cpp11-Debug|x64 - Cpp11-Release|Win32 = Cpp11-Release|Win32 - Cpp11-Release|x64 = Cpp11-Release|x64 Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {CD25A05C-228D-473F-A86F-6C2DD22085B4}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {CD25A05C-228D-473F-A86F-6C2DD22085B4}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {CD25A05C-228D-473F-A86F-6C2DD22085B4}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {CD25A05C-228D-473F-A86F-6C2DD22085B4}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {CD25A05C-228D-473F-A86F-6C2DD22085B4}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {CD25A05C-228D-473F-A86F-6C2DD22085B4}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {CD25A05C-228D-473F-A86F-6C2DD22085B4}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {CD25A05C-228D-473F-A86F-6C2DD22085B4}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {CD25A05C-228D-473F-A86F-6C2DD22085B4}.Debug|Win32.ActiveCfg = Debug|Win32 {CD25A05C-228D-473F-A86F-6C2DD22085B4}.Debug|Win32.Build.0 = Debug|Win32 {CD25A05C-228D-473F-A86F-6C2DD22085B4}.Debug|x64.ActiveCfg = Debug|x64 @@ -1218,14 +1206,6 @@ Global {CD25A05C-228D-473F-A86F-6C2DD22085B4}.Release|Win32.Build.0 = Release|Win32 {CD25A05C-228D-473F-A86F-6C2DD22085B4}.Release|x64.ActiveCfg = Release|x64 {CD25A05C-228D-473F-A86F-6C2DD22085B4}.Release|x64.Build.0 = Release|x64 - {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Debug|Win32.ActiveCfg = Debug|Win32 {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Debug|Win32.Build.0 = Debug|Win32 {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Debug|x64.ActiveCfg = Debug|x64 @@ -1234,14 +1214,6 @@ Global {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Release|Win32.Build.0 = Release|Win32 {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Release|x64.ActiveCfg = Release|x64 {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Release|x64.Build.0 = Release|x64 - {FC4AC0A5-84D5-461F-BE52-EA686F52773E}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {FC4AC0A5-84D5-461F-BE52-EA686F52773E}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {FC4AC0A5-84D5-461F-BE52-EA686F52773E}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {FC4AC0A5-84D5-461F-BE52-EA686F52773E}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {FC4AC0A5-84D5-461F-BE52-EA686F52773E}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {FC4AC0A5-84D5-461F-BE52-EA686F52773E}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {FC4AC0A5-84D5-461F-BE52-EA686F52773E}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {FC4AC0A5-84D5-461F-BE52-EA686F52773E}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {FC4AC0A5-84D5-461F-BE52-EA686F52773E}.Debug|Win32.ActiveCfg = Debug|Win32 {FC4AC0A5-84D5-461F-BE52-EA686F52773E}.Debug|Win32.Build.0 = Debug|Win32 {FC4AC0A5-84D5-461F-BE52-EA686F52773E}.Debug|x64.ActiveCfg = Debug|x64 @@ -1250,14 +1222,6 @@ Global {FC4AC0A5-84D5-461F-BE52-EA686F52773E}.Release|Win32.Build.0 = Release|Win32 {FC4AC0A5-84D5-461F-BE52-EA686F52773E}.Release|x64.ActiveCfg = Release|x64 {FC4AC0A5-84D5-461F-BE52-EA686F52773E}.Release|x64.Build.0 = Release|x64 - {715411FA-34B3-4ABF-8476-3C84F5EFFFE5}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {715411FA-34B3-4ABF-8476-3C84F5EFFFE5}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {715411FA-34B3-4ABF-8476-3C84F5EFFFE5}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {715411FA-34B3-4ABF-8476-3C84F5EFFFE5}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {715411FA-34B3-4ABF-8476-3C84F5EFFFE5}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {715411FA-34B3-4ABF-8476-3C84F5EFFFE5}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {715411FA-34B3-4ABF-8476-3C84F5EFFFE5}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {715411FA-34B3-4ABF-8476-3C84F5EFFFE5}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {715411FA-34B3-4ABF-8476-3C84F5EFFFE5}.Debug|Win32.ActiveCfg = Debug|Win32 {715411FA-34B3-4ABF-8476-3C84F5EFFFE5}.Debug|Win32.Build.0 = Debug|Win32 {715411FA-34B3-4ABF-8476-3C84F5EFFFE5}.Debug|x64.ActiveCfg = Debug|x64 @@ -1266,14 +1230,6 @@ Global {715411FA-34B3-4ABF-8476-3C84F5EFFFE5}.Release|Win32.Build.0 = Release|Win32 {715411FA-34B3-4ABF-8476-3C84F5EFFFE5}.Release|x64.ActiveCfg = Release|x64 {715411FA-34B3-4ABF-8476-3C84F5EFFFE5}.Release|x64.Build.0 = Release|x64 - {5D38E70A-98C1-4B1D-BC0D-01BC114078C5}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {5D38E70A-98C1-4B1D-BC0D-01BC114078C5}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {5D38E70A-98C1-4B1D-BC0D-01BC114078C5}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {5D38E70A-98C1-4B1D-BC0D-01BC114078C5}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {5D38E70A-98C1-4B1D-BC0D-01BC114078C5}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {5D38E70A-98C1-4B1D-BC0D-01BC114078C5}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {5D38E70A-98C1-4B1D-BC0D-01BC114078C5}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {5D38E70A-98C1-4B1D-BC0D-01BC114078C5}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {5D38E70A-98C1-4B1D-BC0D-01BC114078C5}.Debug|Win32.ActiveCfg = Debug|Win32 {5D38E70A-98C1-4B1D-BC0D-01BC114078C5}.Debug|Win32.Build.0 = Debug|Win32 {5D38E70A-98C1-4B1D-BC0D-01BC114078C5}.Debug|x64.ActiveCfg = Debug|x64 @@ -1282,14 +1238,6 @@ Global {5D38E70A-98C1-4B1D-BC0D-01BC114078C5}.Release|Win32.Build.0 = Release|Win32 {5D38E70A-98C1-4B1D-BC0D-01BC114078C5}.Release|x64.ActiveCfg = Release|x64 {5D38E70A-98C1-4B1D-BC0D-01BC114078C5}.Release|x64.Build.0 = Release|x64 - {9929ACAD-44DE-4699-BA2C-6EE8B665C6EB}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {9929ACAD-44DE-4699-BA2C-6EE8B665C6EB}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {9929ACAD-44DE-4699-BA2C-6EE8B665C6EB}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {9929ACAD-44DE-4699-BA2C-6EE8B665C6EB}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {9929ACAD-44DE-4699-BA2C-6EE8B665C6EB}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {9929ACAD-44DE-4699-BA2C-6EE8B665C6EB}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {9929ACAD-44DE-4699-BA2C-6EE8B665C6EB}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {9929ACAD-44DE-4699-BA2C-6EE8B665C6EB}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {9929ACAD-44DE-4699-BA2C-6EE8B665C6EB}.Debug|Win32.ActiveCfg = Debug|Win32 {9929ACAD-44DE-4699-BA2C-6EE8B665C6EB}.Debug|Win32.Build.0 = Debug|Win32 {9929ACAD-44DE-4699-BA2C-6EE8B665C6EB}.Debug|x64.ActiveCfg = Debug|x64 @@ -1298,14 +1246,6 @@ Global {9929ACAD-44DE-4699-BA2C-6EE8B665C6EB}.Release|Win32.Build.0 = Release|Win32 {9929ACAD-44DE-4699-BA2C-6EE8B665C6EB}.Release|x64.ActiveCfg = Release|x64 {9929ACAD-44DE-4699-BA2C-6EE8B665C6EB}.Release|x64.Build.0 = Release|x64 - {25132357-8775-4C8F-AF35-CEC5F6BB08E7}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {25132357-8775-4C8F-AF35-CEC5F6BB08E7}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {25132357-8775-4C8F-AF35-CEC5F6BB08E7}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {25132357-8775-4C8F-AF35-CEC5F6BB08E7}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {25132357-8775-4C8F-AF35-CEC5F6BB08E7}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {25132357-8775-4C8F-AF35-CEC5F6BB08E7}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {25132357-8775-4C8F-AF35-CEC5F6BB08E7}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {25132357-8775-4C8F-AF35-CEC5F6BB08E7}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {25132357-8775-4C8F-AF35-CEC5F6BB08E7}.Debug|Win32.ActiveCfg = Debug|Win32 {25132357-8775-4C8F-AF35-CEC5F6BB08E7}.Debug|Win32.Build.0 = Debug|Win32 {25132357-8775-4C8F-AF35-CEC5F6BB08E7}.Debug|x64.ActiveCfg = Debug|x64 @@ -1314,14 +1254,6 @@ Global {25132357-8775-4C8F-AF35-CEC5F6BB08E7}.Release|Win32.Build.0 = Release|Win32 {25132357-8775-4C8F-AF35-CEC5F6BB08E7}.Release|x64.ActiveCfg = Release|x64 {25132357-8775-4C8F-AF35-CEC5F6BB08E7}.Release|x64.Build.0 = Release|x64 - {0A601498-AA62-4639-9319-BC1EA94EBE13}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {0A601498-AA62-4639-9319-BC1EA94EBE13}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {0A601498-AA62-4639-9319-BC1EA94EBE13}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {0A601498-AA62-4639-9319-BC1EA94EBE13}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {0A601498-AA62-4639-9319-BC1EA94EBE13}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {0A601498-AA62-4639-9319-BC1EA94EBE13}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {0A601498-AA62-4639-9319-BC1EA94EBE13}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {0A601498-AA62-4639-9319-BC1EA94EBE13}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {0A601498-AA62-4639-9319-BC1EA94EBE13}.Debug|Win32.ActiveCfg = Debug|Win32 {0A601498-AA62-4639-9319-BC1EA94EBE13}.Debug|Win32.Build.0 = Debug|Win32 {0A601498-AA62-4639-9319-BC1EA94EBE13}.Debug|x64.ActiveCfg = Debug|x64 @@ -1330,14 +1262,6 @@ Global {0A601498-AA62-4639-9319-BC1EA94EBE13}.Release|Win32.Build.0 = Release|Win32 {0A601498-AA62-4639-9319-BC1EA94EBE13}.Release|x64.ActiveCfg = Release|x64 {0A601498-AA62-4639-9319-BC1EA94EBE13}.Release|x64.Build.0 = Release|x64 - {24272AC4-1B9D-40C0-B432-485EEB642A38}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {24272AC4-1B9D-40C0-B432-485EEB642A38}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {24272AC4-1B9D-40C0-B432-485EEB642A38}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {24272AC4-1B9D-40C0-B432-485EEB642A38}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {24272AC4-1B9D-40C0-B432-485EEB642A38}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {24272AC4-1B9D-40C0-B432-485EEB642A38}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {24272AC4-1B9D-40C0-B432-485EEB642A38}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {24272AC4-1B9D-40C0-B432-485EEB642A38}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {24272AC4-1B9D-40C0-B432-485EEB642A38}.Debug|Win32.ActiveCfg = Debug|Win32 {24272AC4-1B9D-40C0-B432-485EEB642A38}.Debug|Win32.Build.0 = Debug|Win32 {24272AC4-1B9D-40C0-B432-485EEB642A38}.Debug|x64.ActiveCfg = Debug|x64 @@ -1346,14 +1270,6 @@ Global {24272AC4-1B9D-40C0-B432-485EEB642A38}.Release|Win32.Build.0 = Release|Win32 {24272AC4-1B9D-40C0-B432-485EEB642A38}.Release|x64.ActiveCfg = Release|x64 {24272AC4-1B9D-40C0-B432-485EEB642A38}.Release|x64.Build.0 = Release|x64 - {697273CB-CEAF-481E-A77B-56FDAE5B3D3A}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {697273CB-CEAF-481E-A77B-56FDAE5B3D3A}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {697273CB-CEAF-481E-A77B-56FDAE5B3D3A}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {697273CB-CEAF-481E-A77B-56FDAE5B3D3A}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {697273CB-CEAF-481E-A77B-56FDAE5B3D3A}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {697273CB-CEAF-481E-A77B-56FDAE5B3D3A}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {697273CB-CEAF-481E-A77B-56FDAE5B3D3A}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {697273CB-CEAF-481E-A77B-56FDAE5B3D3A}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {697273CB-CEAF-481E-A77B-56FDAE5B3D3A}.Debug|Win32.ActiveCfg = Debug|Win32 {697273CB-CEAF-481E-A77B-56FDAE5B3D3A}.Debug|Win32.Build.0 = Debug|Win32 {697273CB-CEAF-481E-A77B-56FDAE5B3D3A}.Debug|x64.ActiveCfg = Debug|x64 @@ -1362,14 +1278,6 @@ Global {697273CB-CEAF-481E-A77B-56FDAE5B3D3A}.Release|Win32.Build.0 = Release|Win32 {697273CB-CEAF-481E-A77B-56FDAE5B3D3A}.Release|x64.ActiveCfg = Release|x64 {697273CB-CEAF-481E-A77B-56FDAE5B3D3A}.Release|x64.Build.0 = Release|x64 - {26E3EDCA-70EE-43EA-8FB1-0B7BD61DD3F2}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {26E3EDCA-70EE-43EA-8FB1-0B7BD61DD3F2}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {26E3EDCA-70EE-43EA-8FB1-0B7BD61DD3F2}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {26E3EDCA-70EE-43EA-8FB1-0B7BD61DD3F2}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {26E3EDCA-70EE-43EA-8FB1-0B7BD61DD3F2}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {26E3EDCA-70EE-43EA-8FB1-0B7BD61DD3F2}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {26E3EDCA-70EE-43EA-8FB1-0B7BD61DD3F2}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {26E3EDCA-70EE-43EA-8FB1-0B7BD61DD3F2}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {26E3EDCA-70EE-43EA-8FB1-0B7BD61DD3F2}.Debug|Win32.ActiveCfg = Debug|Win32 {26E3EDCA-70EE-43EA-8FB1-0B7BD61DD3F2}.Debug|Win32.Build.0 = Debug|Win32 {26E3EDCA-70EE-43EA-8FB1-0B7BD61DD3F2}.Debug|x64.ActiveCfg = Debug|x64 @@ -1378,14 +1286,6 @@ Global {26E3EDCA-70EE-43EA-8FB1-0B7BD61DD3F2}.Release|Win32.Build.0 = Release|Win32 {26E3EDCA-70EE-43EA-8FB1-0B7BD61DD3F2}.Release|x64.ActiveCfg = Release|x64 {26E3EDCA-70EE-43EA-8FB1-0B7BD61DD3F2}.Release|x64.Build.0 = Release|x64 - {5BEA940C-1C98-486B-A530-C238D3A74E87}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {5BEA940C-1C98-486B-A530-C238D3A74E87}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {5BEA940C-1C98-486B-A530-C238D3A74E87}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {5BEA940C-1C98-486B-A530-C238D3A74E87}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {5BEA940C-1C98-486B-A530-C238D3A74E87}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {5BEA940C-1C98-486B-A530-C238D3A74E87}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {5BEA940C-1C98-486B-A530-C238D3A74E87}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {5BEA940C-1C98-486B-A530-C238D3A74E87}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {5BEA940C-1C98-486B-A530-C238D3A74E87}.Debug|Win32.ActiveCfg = Debug|Win32 {5BEA940C-1C98-486B-A530-C238D3A74E87}.Debug|Win32.Build.0 = Debug|Win32 {5BEA940C-1C98-486B-A530-C238D3A74E87}.Debug|x64.ActiveCfg = Debug|x64 @@ -1394,14 +1294,6 @@ Global {5BEA940C-1C98-486B-A530-C238D3A74E87}.Release|Win32.Build.0 = Release|Win32 {5BEA940C-1C98-486B-A530-C238D3A74E87}.Release|x64.ActiveCfg = Release|x64 {5BEA940C-1C98-486B-A530-C238D3A74E87}.Release|x64.Build.0 = Release|x64 - {3215FCAD-59F2-47F4-8DB5-AEA11B39991D}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {3215FCAD-59F2-47F4-8DB5-AEA11B39991D}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {3215FCAD-59F2-47F4-8DB5-AEA11B39991D}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {3215FCAD-59F2-47F4-8DB5-AEA11B39991D}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {3215FCAD-59F2-47F4-8DB5-AEA11B39991D}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {3215FCAD-59F2-47F4-8DB5-AEA11B39991D}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {3215FCAD-59F2-47F4-8DB5-AEA11B39991D}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {3215FCAD-59F2-47F4-8DB5-AEA11B39991D}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {3215FCAD-59F2-47F4-8DB5-AEA11B39991D}.Debug|Win32.ActiveCfg = Debug|Win32 {3215FCAD-59F2-47F4-8DB5-AEA11B39991D}.Debug|Win32.Build.0 = Debug|Win32 {3215FCAD-59F2-47F4-8DB5-AEA11B39991D}.Debug|x64.ActiveCfg = Debug|x64 @@ -1410,14 +1302,6 @@ Global {3215FCAD-59F2-47F4-8DB5-AEA11B39991D}.Release|Win32.Build.0 = Release|Win32 {3215FCAD-59F2-47F4-8DB5-AEA11B39991D}.Release|x64.ActiveCfg = Release|x64 {3215FCAD-59F2-47F4-8DB5-AEA11B39991D}.Release|x64.Build.0 = Release|x64 - {80FE3863-C289-4BDE-833C-256D5E54093A}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {80FE3863-C289-4BDE-833C-256D5E54093A}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {80FE3863-C289-4BDE-833C-256D5E54093A}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {80FE3863-C289-4BDE-833C-256D5E54093A}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {80FE3863-C289-4BDE-833C-256D5E54093A}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {80FE3863-C289-4BDE-833C-256D5E54093A}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {80FE3863-C289-4BDE-833C-256D5E54093A}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {80FE3863-C289-4BDE-833C-256D5E54093A}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {80FE3863-C289-4BDE-833C-256D5E54093A}.Debug|Win32.ActiveCfg = Debug|Win32 {80FE3863-C289-4BDE-833C-256D5E54093A}.Debug|Win32.Build.0 = Debug|Win32 {80FE3863-C289-4BDE-833C-256D5E54093A}.Debug|x64.ActiveCfg = Debug|x64 @@ -1426,14 +1310,6 @@ Global {80FE3863-C289-4BDE-833C-256D5E54093A}.Release|Win32.Build.0 = Release|Win32 {80FE3863-C289-4BDE-833C-256D5E54093A}.Release|x64.ActiveCfg = Release|x64 {80FE3863-C289-4BDE-833C-256D5E54093A}.Release|x64.Build.0 = Release|x64 - {5105B294-6DAB-4604-8BD7-10C126EED1FE}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {5105B294-6DAB-4604-8BD7-10C126EED1FE}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {5105B294-6DAB-4604-8BD7-10C126EED1FE}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {5105B294-6DAB-4604-8BD7-10C126EED1FE}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {5105B294-6DAB-4604-8BD7-10C126EED1FE}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {5105B294-6DAB-4604-8BD7-10C126EED1FE}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {5105B294-6DAB-4604-8BD7-10C126EED1FE}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {5105B294-6DAB-4604-8BD7-10C126EED1FE}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {5105B294-6DAB-4604-8BD7-10C126EED1FE}.Debug|Win32.ActiveCfg = Debug|Win32 {5105B294-6DAB-4604-8BD7-10C126EED1FE}.Debug|Win32.Build.0 = Debug|Win32 {5105B294-6DAB-4604-8BD7-10C126EED1FE}.Debug|x64.ActiveCfg = Debug|x64 @@ -1442,14 +1318,6 @@ Global {5105B294-6DAB-4604-8BD7-10C126EED1FE}.Release|Win32.Build.0 = Release|Win32 {5105B294-6DAB-4604-8BD7-10C126EED1FE}.Release|x64.ActiveCfg = Release|x64 {5105B294-6DAB-4604-8BD7-10C126EED1FE}.Release|x64.Build.0 = Release|x64 - {BA3042D4-7E5B-461D-A31E-345753A8A726}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {BA3042D4-7E5B-461D-A31E-345753A8A726}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {BA3042D4-7E5B-461D-A31E-345753A8A726}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {BA3042D4-7E5B-461D-A31E-345753A8A726}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {BA3042D4-7E5B-461D-A31E-345753A8A726}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {BA3042D4-7E5B-461D-A31E-345753A8A726}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {BA3042D4-7E5B-461D-A31E-345753A8A726}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {BA3042D4-7E5B-461D-A31E-345753A8A726}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {BA3042D4-7E5B-461D-A31E-345753A8A726}.Debug|Win32.ActiveCfg = Debug|Win32 {BA3042D4-7E5B-461D-A31E-345753A8A726}.Debug|Win32.Build.0 = Debug|Win32 {BA3042D4-7E5B-461D-A31E-345753A8A726}.Debug|x64.ActiveCfg = Debug|x64 @@ -1458,14 +1326,6 @@ Global {BA3042D4-7E5B-461D-A31E-345753A8A726}.Release|Win32.Build.0 = Release|Win32 {BA3042D4-7E5B-461D-A31E-345753A8A726}.Release|x64.ActiveCfg = Release|x64 {BA3042D4-7E5B-461D-A31E-345753A8A726}.Release|x64.Build.0 = Release|x64 - {FBAC9C87-6A77-4663-9653-F0DFEFB00935}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {FBAC9C87-6A77-4663-9653-F0DFEFB00935}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {FBAC9C87-6A77-4663-9653-F0DFEFB00935}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {FBAC9C87-6A77-4663-9653-F0DFEFB00935}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {FBAC9C87-6A77-4663-9653-F0DFEFB00935}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {FBAC9C87-6A77-4663-9653-F0DFEFB00935}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {FBAC9C87-6A77-4663-9653-F0DFEFB00935}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {FBAC9C87-6A77-4663-9653-F0DFEFB00935}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {FBAC9C87-6A77-4663-9653-F0DFEFB00935}.Debug|Win32.ActiveCfg = Debug|Win32 {FBAC9C87-6A77-4663-9653-F0DFEFB00935}.Debug|Win32.Build.0 = Debug|Win32 {FBAC9C87-6A77-4663-9653-F0DFEFB00935}.Debug|x64.ActiveCfg = Debug|x64 @@ -1474,14 +1334,6 @@ Global {FBAC9C87-6A77-4663-9653-F0DFEFB00935}.Release|Win32.Build.0 = Release|Win32 {FBAC9C87-6A77-4663-9653-F0DFEFB00935}.Release|x64.ActiveCfg = Release|x64 {FBAC9C87-6A77-4663-9653-F0DFEFB00935}.Release|x64.Build.0 = Release|x64 - {3E471DF3-EB57-4FC3-AF20-2CF548DBF5C1}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {3E471DF3-EB57-4FC3-AF20-2CF548DBF5C1}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {3E471DF3-EB57-4FC3-AF20-2CF548DBF5C1}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {3E471DF3-EB57-4FC3-AF20-2CF548DBF5C1}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {3E471DF3-EB57-4FC3-AF20-2CF548DBF5C1}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {3E471DF3-EB57-4FC3-AF20-2CF548DBF5C1}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {3E471DF3-EB57-4FC3-AF20-2CF548DBF5C1}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {3E471DF3-EB57-4FC3-AF20-2CF548DBF5C1}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {3E471DF3-EB57-4FC3-AF20-2CF548DBF5C1}.Debug|Win32.ActiveCfg = Debug|Win32 {3E471DF3-EB57-4FC3-AF20-2CF548DBF5C1}.Debug|Win32.Build.0 = Debug|Win32 {3E471DF3-EB57-4FC3-AF20-2CF548DBF5C1}.Debug|x64.ActiveCfg = Debug|x64 @@ -1490,14 +1342,6 @@ Global {3E471DF3-EB57-4FC3-AF20-2CF548DBF5C1}.Release|Win32.Build.0 = Release|Win32 {3E471DF3-EB57-4FC3-AF20-2CF548DBF5C1}.Release|x64.ActiveCfg = Release|x64 {3E471DF3-EB57-4FC3-AF20-2CF548DBF5C1}.Release|x64.Build.0 = Release|x64 - {5F22AF4C-5DFE-43E9-98E6-64187F174761}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {5F22AF4C-5DFE-43E9-98E6-64187F174761}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {5F22AF4C-5DFE-43E9-98E6-64187F174761}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {5F22AF4C-5DFE-43E9-98E6-64187F174761}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {5F22AF4C-5DFE-43E9-98E6-64187F174761}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {5F22AF4C-5DFE-43E9-98E6-64187F174761}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {5F22AF4C-5DFE-43E9-98E6-64187F174761}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {5F22AF4C-5DFE-43E9-98E6-64187F174761}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {5F22AF4C-5DFE-43E9-98E6-64187F174761}.Debug|Win32.ActiveCfg = Debug|Win32 {5F22AF4C-5DFE-43E9-98E6-64187F174761}.Debug|Win32.Build.0 = Debug|Win32 {5F22AF4C-5DFE-43E9-98E6-64187F174761}.Debug|x64.ActiveCfg = Debug|x64 @@ -1506,14 +1350,6 @@ Global {5F22AF4C-5DFE-43E9-98E6-64187F174761}.Release|Win32.Build.0 = Release|Win32 {5F22AF4C-5DFE-43E9-98E6-64187F174761}.Release|x64.ActiveCfg = Release|x64 {5F22AF4C-5DFE-43E9-98E6-64187F174761}.Release|x64.Build.0 = Release|x64 - {3BDD2378-5B4E-4021-846E-3225A04E85B1}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {3BDD2378-5B4E-4021-846E-3225A04E85B1}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {3BDD2378-5B4E-4021-846E-3225A04E85B1}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {3BDD2378-5B4E-4021-846E-3225A04E85B1}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {3BDD2378-5B4E-4021-846E-3225A04E85B1}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {3BDD2378-5B4E-4021-846E-3225A04E85B1}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {3BDD2378-5B4E-4021-846E-3225A04E85B1}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {3BDD2378-5B4E-4021-846E-3225A04E85B1}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {3BDD2378-5B4E-4021-846E-3225A04E85B1}.Debug|Win32.ActiveCfg = Debug|Win32 {3BDD2378-5B4E-4021-846E-3225A04E85B1}.Debug|Win32.Build.0 = Debug|Win32 {3BDD2378-5B4E-4021-846E-3225A04E85B1}.Debug|x64.ActiveCfg = Debug|x64 @@ -1522,14 +1358,6 @@ Global {3BDD2378-5B4E-4021-846E-3225A04E85B1}.Release|Win32.Build.0 = Release|Win32 {3BDD2378-5B4E-4021-846E-3225A04E85B1}.Release|x64.ActiveCfg = Release|x64 {3BDD2378-5B4E-4021-846E-3225A04E85B1}.Release|x64.Build.0 = Release|x64 - {0E5471E9-E208-4B77-B9D6-C4AD36CBB653}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {0E5471E9-E208-4B77-B9D6-C4AD36CBB653}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {0E5471E9-E208-4B77-B9D6-C4AD36CBB653}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {0E5471E9-E208-4B77-B9D6-C4AD36CBB653}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {0E5471E9-E208-4B77-B9D6-C4AD36CBB653}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {0E5471E9-E208-4B77-B9D6-C4AD36CBB653}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {0E5471E9-E208-4B77-B9D6-C4AD36CBB653}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {0E5471E9-E208-4B77-B9D6-C4AD36CBB653}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {0E5471E9-E208-4B77-B9D6-C4AD36CBB653}.Debug|Win32.ActiveCfg = Debug|Win32 {0E5471E9-E208-4B77-B9D6-C4AD36CBB653}.Debug|Win32.Build.0 = Debug|Win32 {0E5471E9-E208-4B77-B9D6-C4AD36CBB653}.Debug|x64.ActiveCfg = Debug|x64 @@ -1538,14 +1366,6 @@ Global {0E5471E9-E208-4B77-B9D6-C4AD36CBB653}.Release|Win32.Build.0 = Release|Win32 {0E5471E9-E208-4B77-B9D6-C4AD36CBB653}.Release|x64.ActiveCfg = Release|x64 {0E5471E9-E208-4B77-B9D6-C4AD36CBB653}.Release|x64.Build.0 = Release|x64 - {6BF6F8F7-AF5F-4A4C-90C2-77473F6AFC2F}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {6BF6F8F7-AF5F-4A4C-90C2-77473F6AFC2F}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {6BF6F8F7-AF5F-4A4C-90C2-77473F6AFC2F}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {6BF6F8F7-AF5F-4A4C-90C2-77473F6AFC2F}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {6BF6F8F7-AF5F-4A4C-90C2-77473F6AFC2F}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {6BF6F8F7-AF5F-4A4C-90C2-77473F6AFC2F}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {6BF6F8F7-AF5F-4A4C-90C2-77473F6AFC2F}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {6BF6F8F7-AF5F-4A4C-90C2-77473F6AFC2F}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {6BF6F8F7-AF5F-4A4C-90C2-77473F6AFC2F}.Debug|Win32.ActiveCfg = Debug|Win32 {6BF6F8F7-AF5F-4A4C-90C2-77473F6AFC2F}.Debug|Win32.Build.0 = Debug|Win32 {6BF6F8F7-AF5F-4A4C-90C2-77473F6AFC2F}.Debug|x64.ActiveCfg = Debug|x64 @@ -1554,14 +1374,6 @@ Global {6BF6F8F7-AF5F-4A4C-90C2-77473F6AFC2F}.Release|Win32.Build.0 = Release|Win32 {6BF6F8F7-AF5F-4A4C-90C2-77473F6AFC2F}.Release|x64.ActiveCfg = Release|x64 {6BF6F8F7-AF5F-4A4C-90C2-77473F6AFC2F}.Release|x64.Build.0 = Release|x64 - {3A38F35B-3A61-4490-955D-D1CAE61CB7FD}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {3A38F35B-3A61-4490-955D-D1CAE61CB7FD}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {3A38F35B-3A61-4490-955D-D1CAE61CB7FD}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {3A38F35B-3A61-4490-955D-D1CAE61CB7FD}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {3A38F35B-3A61-4490-955D-D1CAE61CB7FD}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {3A38F35B-3A61-4490-955D-D1CAE61CB7FD}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {3A38F35B-3A61-4490-955D-D1CAE61CB7FD}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {3A38F35B-3A61-4490-955D-D1CAE61CB7FD}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {3A38F35B-3A61-4490-955D-D1CAE61CB7FD}.Debug|Win32.ActiveCfg = Debug|Win32 {3A38F35B-3A61-4490-955D-D1CAE61CB7FD}.Debug|Win32.Build.0 = Debug|Win32 {3A38F35B-3A61-4490-955D-D1CAE61CB7FD}.Debug|x64.ActiveCfg = Debug|x64 @@ -1570,14 +1382,6 @@ Global {3A38F35B-3A61-4490-955D-D1CAE61CB7FD}.Release|Win32.Build.0 = Release|Win32 {3A38F35B-3A61-4490-955D-D1CAE61CB7FD}.Release|x64.ActiveCfg = Release|x64 {3A38F35B-3A61-4490-955D-D1CAE61CB7FD}.Release|x64.Build.0 = Release|x64 - {24550251-512C-4DC0-9B62-7DB6664DDCA8}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {24550251-512C-4DC0-9B62-7DB6664DDCA8}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {24550251-512C-4DC0-9B62-7DB6664DDCA8}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {24550251-512C-4DC0-9B62-7DB6664DDCA8}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {24550251-512C-4DC0-9B62-7DB6664DDCA8}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {24550251-512C-4DC0-9B62-7DB6664DDCA8}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {24550251-512C-4DC0-9B62-7DB6664DDCA8}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {24550251-512C-4DC0-9B62-7DB6664DDCA8}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {24550251-512C-4DC0-9B62-7DB6664DDCA8}.Debug|Win32.ActiveCfg = Debug|Win32 {24550251-512C-4DC0-9B62-7DB6664DDCA8}.Debug|Win32.Build.0 = Debug|Win32 {24550251-512C-4DC0-9B62-7DB6664DDCA8}.Debug|x64.ActiveCfg = Debug|x64 @@ -1586,14 +1390,6 @@ Global {24550251-512C-4DC0-9B62-7DB6664DDCA8}.Release|Win32.Build.0 = Release|Win32 {24550251-512C-4DC0-9B62-7DB6664DDCA8}.Release|x64.ActiveCfg = Release|x64 {24550251-512C-4DC0-9B62-7DB6664DDCA8}.Release|x64.Build.0 = Release|x64 - {8D0B611C-F9C2-4B53-8497-7BD8036BD831}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {8D0B611C-F9C2-4B53-8497-7BD8036BD831}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {8D0B611C-F9C2-4B53-8497-7BD8036BD831}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {8D0B611C-F9C2-4B53-8497-7BD8036BD831}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {8D0B611C-F9C2-4B53-8497-7BD8036BD831}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {8D0B611C-F9C2-4B53-8497-7BD8036BD831}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {8D0B611C-F9C2-4B53-8497-7BD8036BD831}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {8D0B611C-F9C2-4B53-8497-7BD8036BD831}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {8D0B611C-F9C2-4B53-8497-7BD8036BD831}.Debug|Win32.ActiveCfg = Debug|Win32 {8D0B611C-F9C2-4B53-8497-7BD8036BD831}.Debug|Win32.Build.0 = Debug|Win32 {8D0B611C-F9C2-4B53-8497-7BD8036BD831}.Debug|x64.ActiveCfg = Debug|x64 @@ -1602,14 +1398,6 @@ Global {8D0B611C-F9C2-4B53-8497-7BD8036BD831}.Release|Win32.Build.0 = Release|Win32 {8D0B611C-F9C2-4B53-8497-7BD8036BD831}.Release|x64.ActiveCfg = Release|x64 {8D0B611C-F9C2-4B53-8497-7BD8036BD831}.Release|x64.Build.0 = Release|x64 - {386DD353-1314-407B-A394-476F4983461D}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {386DD353-1314-407B-A394-476F4983461D}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {386DD353-1314-407B-A394-476F4983461D}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {386DD353-1314-407B-A394-476F4983461D}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {386DD353-1314-407B-A394-476F4983461D}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {386DD353-1314-407B-A394-476F4983461D}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {386DD353-1314-407B-A394-476F4983461D}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {386DD353-1314-407B-A394-476F4983461D}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {386DD353-1314-407B-A394-476F4983461D}.Debug|Win32.ActiveCfg = Debug|Win32 {386DD353-1314-407B-A394-476F4983461D}.Debug|Win32.Build.0 = Debug|Win32 {386DD353-1314-407B-A394-476F4983461D}.Debug|x64.ActiveCfg = Debug|x64 @@ -1618,14 +1406,6 @@ Global {386DD353-1314-407B-A394-476F4983461D}.Release|Win32.Build.0 = Release|Win32 {386DD353-1314-407B-A394-476F4983461D}.Release|x64.ActiveCfg = Release|x64 {386DD353-1314-407B-A394-476F4983461D}.Release|x64.Build.0 = Release|x64 - {46DDEC66-2287-47E2-BFE4-BDE53B5D40C5}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {46DDEC66-2287-47E2-BFE4-BDE53B5D40C5}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {46DDEC66-2287-47E2-BFE4-BDE53B5D40C5}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {46DDEC66-2287-47E2-BFE4-BDE53B5D40C5}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {46DDEC66-2287-47E2-BFE4-BDE53B5D40C5}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {46DDEC66-2287-47E2-BFE4-BDE53B5D40C5}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {46DDEC66-2287-47E2-BFE4-BDE53B5D40C5}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {46DDEC66-2287-47E2-BFE4-BDE53B5D40C5}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {46DDEC66-2287-47E2-BFE4-BDE53B5D40C5}.Debug|Win32.ActiveCfg = Debug|Win32 {46DDEC66-2287-47E2-BFE4-BDE53B5D40C5}.Debug|Win32.Build.0 = Debug|Win32 {46DDEC66-2287-47E2-BFE4-BDE53B5D40C5}.Debug|x64.ActiveCfg = Debug|x64 @@ -1634,14 +1414,6 @@ Global {46DDEC66-2287-47E2-BFE4-BDE53B5D40C5}.Release|Win32.Build.0 = Release|Win32 {46DDEC66-2287-47E2-BFE4-BDE53B5D40C5}.Release|x64.ActiveCfg = Release|x64 {46DDEC66-2287-47E2-BFE4-BDE53B5D40C5}.Release|x64.Build.0 = Release|x64 - {420B2FB5-833E-449A-BF43-5A5538DAEEC4}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {420B2FB5-833E-449A-BF43-5A5538DAEEC4}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {420B2FB5-833E-449A-BF43-5A5538DAEEC4}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {420B2FB5-833E-449A-BF43-5A5538DAEEC4}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {420B2FB5-833E-449A-BF43-5A5538DAEEC4}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {420B2FB5-833E-449A-BF43-5A5538DAEEC4}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {420B2FB5-833E-449A-BF43-5A5538DAEEC4}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {420B2FB5-833E-449A-BF43-5A5538DAEEC4}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {420B2FB5-833E-449A-BF43-5A5538DAEEC4}.Debug|Win32.ActiveCfg = Debug|Win32 {420B2FB5-833E-449A-BF43-5A5538DAEEC4}.Debug|Win32.Build.0 = Debug|Win32 {420B2FB5-833E-449A-BF43-5A5538DAEEC4}.Debug|x64.ActiveCfg = Debug|x64 @@ -1650,14 +1422,6 @@ Global {420B2FB5-833E-449A-BF43-5A5538DAEEC4}.Release|Win32.Build.0 = Release|Win32 {420B2FB5-833E-449A-BF43-5A5538DAEEC4}.Release|x64.ActiveCfg = Release|x64 {420B2FB5-833E-449A-BF43-5A5538DAEEC4}.Release|x64.Build.0 = Release|x64 - {606D6061-3084-498A-988A-7F5B9FE8732D}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {606D6061-3084-498A-988A-7F5B9FE8732D}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {606D6061-3084-498A-988A-7F5B9FE8732D}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {606D6061-3084-498A-988A-7F5B9FE8732D}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {606D6061-3084-498A-988A-7F5B9FE8732D}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {606D6061-3084-498A-988A-7F5B9FE8732D}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {606D6061-3084-498A-988A-7F5B9FE8732D}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {606D6061-3084-498A-988A-7F5B9FE8732D}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {606D6061-3084-498A-988A-7F5B9FE8732D}.Debug|Win32.ActiveCfg = Debug|Win32 {606D6061-3084-498A-988A-7F5B9FE8732D}.Debug|Win32.Build.0 = Debug|Win32 {606D6061-3084-498A-988A-7F5B9FE8732D}.Debug|x64.ActiveCfg = Debug|x64 @@ -1666,14 +1430,6 @@ Global {606D6061-3084-498A-988A-7F5B9FE8732D}.Release|Win32.Build.0 = Release|Win32 {606D6061-3084-498A-988A-7F5B9FE8732D}.Release|x64.ActiveCfg = Release|x64 {606D6061-3084-498A-988A-7F5B9FE8732D}.Release|x64.Build.0 = Release|x64 - {CC0C7076-D15B-42AB-AFD6-CE40472F6E84}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {CC0C7076-D15B-42AB-AFD6-CE40472F6E84}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {CC0C7076-D15B-42AB-AFD6-CE40472F6E84}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {CC0C7076-D15B-42AB-AFD6-CE40472F6E84}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {CC0C7076-D15B-42AB-AFD6-CE40472F6E84}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {CC0C7076-D15B-42AB-AFD6-CE40472F6E84}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {CC0C7076-D15B-42AB-AFD6-CE40472F6E84}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {CC0C7076-D15B-42AB-AFD6-CE40472F6E84}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {CC0C7076-D15B-42AB-AFD6-CE40472F6E84}.Debug|Win32.ActiveCfg = Debug|Win32 {CC0C7076-D15B-42AB-AFD6-CE40472F6E84}.Debug|Win32.Build.0 = Debug|Win32 {CC0C7076-D15B-42AB-AFD6-CE40472F6E84}.Debug|x64.ActiveCfg = Debug|x64 @@ -1682,14 +1438,6 @@ Global {CC0C7076-D15B-42AB-AFD6-CE40472F6E84}.Release|Win32.Build.0 = Release|Win32 {CC0C7076-D15B-42AB-AFD6-CE40472F6E84}.Release|x64.ActiveCfg = Release|x64 {CC0C7076-D15B-42AB-AFD6-CE40472F6E84}.Release|x64.Build.0 = Release|x64 - {685612A9-F2AA-4ACA-8327-5D40E4731906}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {685612A9-F2AA-4ACA-8327-5D40E4731906}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {685612A9-F2AA-4ACA-8327-5D40E4731906}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {685612A9-F2AA-4ACA-8327-5D40E4731906}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {685612A9-F2AA-4ACA-8327-5D40E4731906}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {685612A9-F2AA-4ACA-8327-5D40E4731906}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {685612A9-F2AA-4ACA-8327-5D40E4731906}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {685612A9-F2AA-4ACA-8327-5D40E4731906}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {685612A9-F2AA-4ACA-8327-5D40E4731906}.Debug|Win32.ActiveCfg = Debug|Win32 {685612A9-F2AA-4ACA-8327-5D40E4731906}.Debug|Win32.Build.0 = Debug|Win32 {685612A9-F2AA-4ACA-8327-5D40E4731906}.Debug|x64.ActiveCfg = Debug|x64 @@ -1698,14 +1446,6 @@ Global {685612A9-F2AA-4ACA-8327-5D40E4731906}.Release|Win32.Build.0 = Release|Win32 {685612A9-F2AA-4ACA-8327-5D40E4731906}.Release|x64.ActiveCfg = Release|x64 {685612A9-F2AA-4ACA-8327-5D40E4731906}.Release|x64.Build.0 = Release|x64 - {649ECCDB-5CA3-4371-B521-95CE8EF534BA}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {649ECCDB-5CA3-4371-B521-95CE8EF534BA}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {649ECCDB-5CA3-4371-B521-95CE8EF534BA}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {649ECCDB-5CA3-4371-B521-95CE8EF534BA}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {649ECCDB-5CA3-4371-B521-95CE8EF534BA}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {649ECCDB-5CA3-4371-B521-95CE8EF534BA}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {649ECCDB-5CA3-4371-B521-95CE8EF534BA}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {649ECCDB-5CA3-4371-B521-95CE8EF534BA}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {649ECCDB-5CA3-4371-B521-95CE8EF534BA}.Debug|Win32.ActiveCfg = Debug|Win32 {649ECCDB-5CA3-4371-B521-95CE8EF534BA}.Debug|Win32.Build.0 = Debug|Win32 {649ECCDB-5CA3-4371-B521-95CE8EF534BA}.Debug|x64.ActiveCfg = Debug|x64 @@ -1714,14 +1454,6 @@ Global {649ECCDB-5CA3-4371-B521-95CE8EF534BA}.Release|Win32.Build.0 = Release|Win32 {649ECCDB-5CA3-4371-B521-95CE8EF534BA}.Release|x64.ActiveCfg = Release|x64 {649ECCDB-5CA3-4371-B521-95CE8EF534BA}.Release|x64.Build.0 = Release|x64 - {10A9A668-8508-4971-AD56-15B50AB12829}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {10A9A668-8508-4971-AD56-15B50AB12829}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {10A9A668-8508-4971-AD56-15B50AB12829}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {10A9A668-8508-4971-AD56-15B50AB12829}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {10A9A668-8508-4971-AD56-15B50AB12829}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {10A9A668-8508-4971-AD56-15B50AB12829}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {10A9A668-8508-4971-AD56-15B50AB12829}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {10A9A668-8508-4971-AD56-15B50AB12829}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {10A9A668-8508-4971-AD56-15B50AB12829}.Debug|Win32.ActiveCfg = Debug|Win32 {10A9A668-8508-4971-AD56-15B50AB12829}.Debug|Win32.Build.0 = Debug|Win32 {10A9A668-8508-4971-AD56-15B50AB12829}.Debug|x64.ActiveCfg = Debug|x64 @@ -1730,14 +1462,6 @@ Global {10A9A668-8508-4971-AD56-15B50AB12829}.Release|Win32.Build.0 = Release|Win32 {10A9A668-8508-4971-AD56-15B50AB12829}.Release|x64.ActiveCfg = Release|x64 {10A9A668-8508-4971-AD56-15B50AB12829}.Release|x64.Build.0 = Release|x64 - {3001AE1F-E8D1-4C33-8ED1-B7D676D3BC73}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {3001AE1F-E8D1-4C33-8ED1-B7D676D3BC73}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {3001AE1F-E8D1-4C33-8ED1-B7D676D3BC73}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {3001AE1F-E8D1-4C33-8ED1-B7D676D3BC73}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {3001AE1F-E8D1-4C33-8ED1-B7D676D3BC73}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {3001AE1F-E8D1-4C33-8ED1-B7D676D3BC73}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {3001AE1F-E8D1-4C33-8ED1-B7D676D3BC73}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {3001AE1F-E8D1-4C33-8ED1-B7D676D3BC73}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {3001AE1F-E8D1-4C33-8ED1-B7D676D3BC73}.Debug|Win32.ActiveCfg = Debug|Win32 {3001AE1F-E8D1-4C33-8ED1-B7D676D3BC73}.Debug|Win32.Build.0 = Debug|Win32 {3001AE1F-E8D1-4C33-8ED1-B7D676D3BC73}.Debug|x64.ActiveCfg = Debug|x64 @@ -1746,14 +1470,6 @@ Global {3001AE1F-E8D1-4C33-8ED1-B7D676D3BC73}.Release|Win32.Build.0 = Release|Win32 {3001AE1F-E8D1-4C33-8ED1-B7D676D3BC73}.Release|x64.ActiveCfg = Release|x64 {3001AE1F-E8D1-4C33-8ED1-B7D676D3BC73}.Release|x64.Build.0 = Release|x64 - {9145C992-2C7A-4D01-B957-F38373DF5829}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {9145C992-2C7A-4D01-B957-F38373DF5829}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {9145C992-2C7A-4D01-B957-F38373DF5829}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {9145C992-2C7A-4D01-B957-F38373DF5829}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {9145C992-2C7A-4D01-B957-F38373DF5829}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {9145C992-2C7A-4D01-B957-F38373DF5829}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {9145C992-2C7A-4D01-B957-F38373DF5829}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {9145C992-2C7A-4D01-B957-F38373DF5829}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {9145C992-2C7A-4D01-B957-F38373DF5829}.Debug|Win32.ActiveCfg = Debug|Win32 {9145C992-2C7A-4D01-B957-F38373DF5829}.Debug|Win32.Build.0 = Debug|Win32 {9145C992-2C7A-4D01-B957-F38373DF5829}.Debug|x64.ActiveCfg = Debug|x64 @@ -1762,14 +1478,6 @@ Global {9145C992-2C7A-4D01-B957-F38373DF5829}.Release|Win32.Build.0 = Release|Win32 {9145C992-2C7A-4D01-B957-F38373DF5829}.Release|x64.ActiveCfg = Release|x64 {9145C992-2C7A-4D01-B957-F38373DF5829}.Release|x64.Build.0 = Release|x64 - {4ADE8581-F2FC-4350-BFAE-62FEFF254A11}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {4ADE8581-F2FC-4350-BFAE-62FEFF254A11}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {4ADE8581-F2FC-4350-BFAE-62FEFF254A11}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {4ADE8581-F2FC-4350-BFAE-62FEFF254A11}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {4ADE8581-F2FC-4350-BFAE-62FEFF254A11}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {4ADE8581-F2FC-4350-BFAE-62FEFF254A11}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {4ADE8581-F2FC-4350-BFAE-62FEFF254A11}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {4ADE8581-F2FC-4350-BFAE-62FEFF254A11}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {4ADE8581-F2FC-4350-BFAE-62FEFF254A11}.Debug|Win32.ActiveCfg = Debug|Win32 {4ADE8581-F2FC-4350-BFAE-62FEFF254A11}.Debug|Win32.Build.0 = Debug|Win32 {4ADE8581-F2FC-4350-BFAE-62FEFF254A11}.Debug|x64.ActiveCfg = Debug|x64 @@ -1778,14 +1486,6 @@ Global {4ADE8581-F2FC-4350-BFAE-62FEFF254A11}.Release|Win32.Build.0 = Release|Win32 {4ADE8581-F2FC-4350-BFAE-62FEFF254A11}.Release|x64.ActiveCfg = Release|x64 {4ADE8581-F2FC-4350-BFAE-62FEFF254A11}.Release|x64.Build.0 = Release|x64 - {C95B71C9-654C-4C6C-B956-F1A70F5CB5A3}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {C95B71C9-654C-4C6C-B956-F1A70F5CB5A3}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {C95B71C9-654C-4C6C-B956-F1A70F5CB5A3}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {C95B71C9-654C-4C6C-B956-F1A70F5CB5A3}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {C95B71C9-654C-4C6C-B956-F1A70F5CB5A3}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {C95B71C9-654C-4C6C-B956-F1A70F5CB5A3}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {C95B71C9-654C-4C6C-B956-F1A70F5CB5A3}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {C95B71C9-654C-4C6C-B956-F1A70F5CB5A3}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {C95B71C9-654C-4C6C-B956-F1A70F5CB5A3}.Debug|Win32.ActiveCfg = Debug|Win32 {C95B71C9-654C-4C6C-B956-F1A70F5CB5A3}.Debug|Win32.Build.0 = Debug|Win32 {C95B71C9-654C-4C6C-B956-F1A70F5CB5A3}.Debug|x64.ActiveCfg = Debug|x64 @@ -1794,14 +1494,6 @@ Global {C95B71C9-654C-4C6C-B956-F1A70F5CB5A3}.Release|Win32.Build.0 = Release|Win32 {C95B71C9-654C-4C6C-B956-F1A70F5CB5A3}.Release|x64.ActiveCfg = Release|x64 {C95B71C9-654C-4C6C-B956-F1A70F5CB5A3}.Release|x64.Build.0 = Release|x64 - {311D5177-A40C-4527-BA81-A0D8C20AA121}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {311D5177-A40C-4527-BA81-A0D8C20AA121}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {311D5177-A40C-4527-BA81-A0D8C20AA121}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {311D5177-A40C-4527-BA81-A0D8C20AA121}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {311D5177-A40C-4527-BA81-A0D8C20AA121}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {311D5177-A40C-4527-BA81-A0D8C20AA121}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {311D5177-A40C-4527-BA81-A0D8C20AA121}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {311D5177-A40C-4527-BA81-A0D8C20AA121}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {311D5177-A40C-4527-BA81-A0D8C20AA121}.Debug|Win32.ActiveCfg = Debug|Win32 {311D5177-A40C-4527-BA81-A0D8C20AA121}.Debug|Win32.Build.0 = Debug|Win32 {311D5177-A40C-4527-BA81-A0D8C20AA121}.Debug|x64.ActiveCfg = Debug|x64 @@ -1810,14 +1502,6 @@ Global {311D5177-A40C-4527-BA81-A0D8C20AA121}.Release|Win32.Build.0 = Release|Win32 {311D5177-A40C-4527-BA81-A0D8C20AA121}.Release|x64.ActiveCfg = Release|x64 {311D5177-A40C-4527-BA81-A0D8C20AA121}.Release|x64.Build.0 = Release|x64 - {74931348-C85B-4B59-BC91-154D1CF9A933}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {74931348-C85B-4B59-BC91-154D1CF9A933}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {74931348-C85B-4B59-BC91-154D1CF9A933}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {74931348-C85B-4B59-BC91-154D1CF9A933}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {74931348-C85B-4B59-BC91-154D1CF9A933}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {74931348-C85B-4B59-BC91-154D1CF9A933}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {74931348-C85B-4B59-BC91-154D1CF9A933}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {74931348-C85B-4B59-BC91-154D1CF9A933}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {74931348-C85B-4B59-BC91-154D1CF9A933}.Debug|Win32.ActiveCfg = Debug|Win32 {74931348-C85B-4B59-BC91-154D1CF9A933}.Debug|Win32.Build.0 = Debug|Win32 {74931348-C85B-4B59-BC91-154D1CF9A933}.Debug|x64.ActiveCfg = Debug|x64 @@ -1826,14 +1510,6 @@ Global {74931348-C85B-4B59-BC91-154D1CF9A933}.Release|Win32.Build.0 = Release|Win32 {74931348-C85B-4B59-BC91-154D1CF9A933}.Release|x64.ActiveCfg = Release|x64 {74931348-C85B-4B59-BC91-154D1CF9A933}.Release|x64.Build.0 = Release|x64 - {1E199A0A-392A-45E3-9B33-D27ADD734F0D}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {1E199A0A-392A-45E3-9B33-D27ADD734F0D}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {1E199A0A-392A-45E3-9B33-D27ADD734F0D}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {1E199A0A-392A-45E3-9B33-D27ADD734F0D}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {1E199A0A-392A-45E3-9B33-D27ADD734F0D}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {1E199A0A-392A-45E3-9B33-D27ADD734F0D}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {1E199A0A-392A-45E3-9B33-D27ADD734F0D}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {1E199A0A-392A-45E3-9B33-D27ADD734F0D}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {1E199A0A-392A-45E3-9B33-D27ADD734F0D}.Debug|Win32.ActiveCfg = Debug|Win32 {1E199A0A-392A-45E3-9B33-D27ADD734F0D}.Debug|Win32.Build.0 = Debug|Win32 {1E199A0A-392A-45E3-9B33-D27ADD734F0D}.Debug|x64.ActiveCfg = Debug|x64 @@ -1842,14 +1518,6 @@ Global {1E199A0A-392A-45E3-9B33-D27ADD734F0D}.Release|Win32.Build.0 = Release|Win32 {1E199A0A-392A-45E3-9B33-D27ADD734F0D}.Release|x64.ActiveCfg = Release|x64 {1E199A0A-392A-45E3-9B33-D27ADD734F0D}.Release|x64.Build.0 = Release|x64 - {FD9FB0E5-22D8-41B2-B6B9-272BA12516CC}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {FD9FB0E5-22D8-41B2-B6B9-272BA12516CC}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {FD9FB0E5-22D8-41B2-B6B9-272BA12516CC}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {FD9FB0E5-22D8-41B2-B6B9-272BA12516CC}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {FD9FB0E5-22D8-41B2-B6B9-272BA12516CC}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {FD9FB0E5-22D8-41B2-B6B9-272BA12516CC}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {FD9FB0E5-22D8-41B2-B6B9-272BA12516CC}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {FD9FB0E5-22D8-41B2-B6B9-272BA12516CC}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {FD9FB0E5-22D8-41B2-B6B9-272BA12516CC}.Debug|Win32.ActiveCfg = Debug|Win32 {FD9FB0E5-22D8-41B2-B6B9-272BA12516CC}.Debug|Win32.Build.0 = Debug|Win32 {FD9FB0E5-22D8-41B2-B6B9-272BA12516CC}.Debug|x64.ActiveCfg = Debug|x64 @@ -1858,14 +1526,6 @@ Global {FD9FB0E5-22D8-41B2-B6B9-272BA12516CC}.Release|Win32.Build.0 = Release|Win32 {FD9FB0E5-22D8-41B2-B6B9-272BA12516CC}.Release|x64.ActiveCfg = Release|x64 {FD9FB0E5-22D8-41B2-B6B9-272BA12516CC}.Release|x64.Build.0 = Release|x64 - {40D8363E-E617-4270-9A1F-7B69A3112F6B}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {40D8363E-E617-4270-9A1F-7B69A3112F6B}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {40D8363E-E617-4270-9A1F-7B69A3112F6B}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {40D8363E-E617-4270-9A1F-7B69A3112F6B}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {40D8363E-E617-4270-9A1F-7B69A3112F6B}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {40D8363E-E617-4270-9A1F-7B69A3112F6B}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {40D8363E-E617-4270-9A1F-7B69A3112F6B}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {40D8363E-E617-4270-9A1F-7B69A3112F6B}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {40D8363E-E617-4270-9A1F-7B69A3112F6B}.Debug|Win32.ActiveCfg = Debug|Win32 {40D8363E-E617-4270-9A1F-7B69A3112F6B}.Debug|Win32.Build.0 = Debug|Win32 {40D8363E-E617-4270-9A1F-7B69A3112F6B}.Debug|x64.ActiveCfg = Debug|x64 @@ -1874,14 +1534,6 @@ Global {40D8363E-E617-4270-9A1F-7B69A3112F6B}.Release|Win32.Build.0 = Release|Win32 {40D8363E-E617-4270-9A1F-7B69A3112F6B}.Release|x64.ActiveCfg = Release|x64 {40D8363E-E617-4270-9A1F-7B69A3112F6B}.Release|x64.Build.0 = Release|x64 - {2923D875-5496-4D0D-B19F-B55AF6EC25E8}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {2923D875-5496-4D0D-B19F-B55AF6EC25E8}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {2923D875-5496-4D0D-B19F-B55AF6EC25E8}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {2923D875-5496-4D0D-B19F-B55AF6EC25E8}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {2923D875-5496-4D0D-B19F-B55AF6EC25E8}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {2923D875-5496-4D0D-B19F-B55AF6EC25E8}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {2923D875-5496-4D0D-B19F-B55AF6EC25E8}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {2923D875-5496-4D0D-B19F-B55AF6EC25E8}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {2923D875-5496-4D0D-B19F-B55AF6EC25E8}.Debug|Win32.ActiveCfg = Debug|Win32 {2923D875-5496-4D0D-B19F-B55AF6EC25E8}.Debug|Win32.Build.0 = Debug|Win32 {2923D875-5496-4D0D-B19F-B55AF6EC25E8}.Debug|x64.ActiveCfg = Debug|x64 @@ -1890,14 +1542,6 @@ Global {2923D875-5496-4D0D-B19F-B55AF6EC25E8}.Release|Win32.Build.0 = Release|Win32 {2923D875-5496-4D0D-B19F-B55AF6EC25E8}.Release|x64.ActiveCfg = Release|x64 {2923D875-5496-4D0D-B19F-B55AF6EC25E8}.Release|x64.Build.0 = Release|x64 - {387716BD-A892-4D88-86CB-E64FF359271D}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {387716BD-A892-4D88-86CB-E64FF359271D}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {387716BD-A892-4D88-86CB-E64FF359271D}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {387716BD-A892-4D88-86CB-E64FF359271D}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {387716BD-A892-4D88-86CB-E64FF359271D}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {387716BD-A892-4D88-86CB-E64FF359271D}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {387716BD-A892-4D88-86CB-E64FF359271D}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {387716BD-A892-4D88-86CB-E64FF359271D}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {387716BD-A892-4D88-86CB-E64FF359271D}.Debug|Win32.ActiveCfg = Debug|Win32 {387716BD-A892-4D88-86CB-E64FF359271D}.Debug|Win32.Build.0 = Debug|Win32 {387716BD-A892-4D88-86CB-E64FF359271D}.Debug|x64.ActiveCfg = Debug|x64 @@ -1906,14 +1550,6 @@ Global {387716BD-A892-4D88-86CB-E64FF359271D}.Release|Win32.Build.0 = Release|Win32 {387716BD-A892-4D88-86CB-E64FF359271D}.Release|x64.ActiveCfg = Release|x64 {387716BD-A892-4D88-86CB-E64FF359271D}.Release|x64.Build.0 = Release|x64 - {CC584047-6A76-4E0B-AABE-1CDB4A735079}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {CC584047-6A76-4E0B-AABE-1CDB4A735079}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {CC584047-6A76-4E0B-AABE-1CDB4A735079}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {CC584047-6A76-4E0B-AABE-1CDB4A735079}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {CC584047-6A76-4E0B-AABE-1CDB4A735079}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {CC584047-6A76-4E0B-AABE-1CDB4A735079}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {CC584047-6A76-4E0B-AABE-1CDB4A735079}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {CC584047-6A76-4E0B-AABE-1CDB4A735079}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {CC584047-6A76-4E0B-AABE-1CDB4A735079}.Debug|Win32.ActiveCfg = Debug|Win32 {CC584047-6A76-4E0B-AABE-1CDB4A735079}.Debug|Win32.Build.0 = Debug|Win32 {CC584047-6A76-4E0B-AABE-1CDB4A735079}.Debug|x64.ActiveCfg = Debug|x64 @@ -1922,14 +1558,6 @@ Global {CC584047-6A76-4E0B-AABE-1CDB4A735079}.Release|Win32.Build.0 = Release|Win32 {CC584047-6A76-4E0B-AABE-1CDB4A735079}.Release|x64.ActiveCfg = Release|x64 {CC584047-6A76-4E0B-AABE-1CDB4A735079}.Release|x64.Build.0 = Release|x64 - {BC79E960-2F72-4CC7-8C2F-A1C0E2EDD271}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {BC79E960-2F72-4CC7-8C2F-A1C0E2EDD271}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {BC79E960-2F72-4CC7-8C2F-A1C0E2EDD271}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {BC79E960-2F72-4CC7-8C2F-A1C0E2EDD271}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {BC79E960-2F72-4CC7-8C2F-A1C0E2EDD271}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {BC79E960-2F72-4CC7-8C2F-A1C0E2EDD271}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {BC79E960-2F72-4CC7-8C2F-A1C0E2EDD271}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {BC79E960-2F72-4CC7-8C2F-A1C0E2EDD271}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {BC79E960-2F72-4CC7-8C2F-A1C0E2EDD271}.Debug|Win32.ActiveCfg = Debug|Win32 {BC79E960-2F72-4CC7-8C2F-A1C0E2EDD271}.Debug|Win32.Build.0 = Debug|Win32 {BC79E960-2F72-4CC7-8C2F-A1C0E2EDD271}.Debug|x64.ActiveCfg = Debug|x64 @@ -1938,14 +1566,6 @@ Global {BC79E960-2F72-4CC7-8C2F-A1C0E2EDD271}.Release|Win32.Build.0 = Release|Win32 {BC79E960-2F72-4CC7-8C2F-A1C0E2EDD271}.Release|x64.ActiveCfg = Release|x64 {BC79E960-2F72-4CC7-8C2F-A1C0E2EDD271}.Release|x64.Build.0 = Release|x64 - {75A5B8DA-6110-4588-8B86-D9002E6FD028}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {75A5B8DA-6110-4588-8B86-D9002E6FD028}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {75A5B8DA-6110-4588-8B86-D9002E6FD028}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {75A5B8DA-6110-4588-8B86-D9002E6FD028}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {75A5B8DA-6110-4588-8B86-D9002E6FD028}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {75A5B8DA-6110-4588-8B86-D9002E6FD028}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {75A5B8DA-6110-4588-8B86-D9002E6FD028}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {75A5B8DA-6110-4588-8B86-D9002E6FD028}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {75A5B8DA-6110-4588-8B86-D9002E6FD028}.Debug|Win32.ActiveCfg = Debug|Win32 {75A5B8DA-6110-4588-8B86-D9002E6FD028}.Debug|Win32.Build.0 = Debug|Win32 {75A5B8DA-6110-4588-8B86-D9002E6FD028}.Debug|x64.ActiveCfg = Debug|x64 @@ -1954,14 +1574,6 @@ Global {75A5B8DA-6110-4588-8B86-D9002E6FD028}.Release|Win32.Build.0 = Release|Win32 {75A5B8DA-6110-4588-8B86-D9002E6FD028}.Release|x64.ActiveCfg = Release|x64 {75A5B8DA-6110-4588-8B86-D9002E6FD028}.Release|x64.Build.0 = Release|x64 - {ED9139A9-82F5-435F-BA2D-FD55D46ADCCB}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {ED9139A9-82F5-435F-BA2D-FD55D46ADCCB}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {ED9139A9-82F5-435F-BA2D-FD55D46ADCCB}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {ED9139A9-82F5-435F-BA2D-FD55D46ADCCB}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {ED9139A9-82F5-435F-BA2D-FD55D46ADCCB}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {ED9139A9-82F5-435F-BA2D-FD55D46ADCCB}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {ED9139A9-82F5-435F-BA2D-FD55D46ADCCB}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {ED9139A9-82F5-435F-BA2D-FD55D46ADCCB}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {ED9139A9-82F5-435F-BA2D-FD55D46ADCCB}.Debug|Win32.ActiveCfg = Debug|Win32 {ED9139A9-82F5-435F-BA2D-FD55D46ADCCB}.Debug|Win32.Build.0 = Debug|Win32 {ED9139A9-82F5-435F-BA2D-FD55D46ADCCB}.Debug|x64.ActiveCfg = Debug|x64 @@ -1970,14 +1582,6 @@ Global {ED9139A9-82F5-435F-BA2D-FD55D46ADCCB}.Release|Win32.Build.0 = Release|Win32 {ED9139A9-82F5-435F-BA2D-FD55D46ADCCB}.Release|x64.ActiveCfg = Release|x64 {ED9139A9-82F5-435F-BA2D-FD55D46ADCCB}.Release|x64.Build.0 = Release|x64 - {9681E7B8-4D88-4AFF-8F96-784DDF5F5B76}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {9681E7B8-4D88-4AFF-8F96-784DDF5F5B76}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {9681E7B8-4D88-4AFF-8F96-784DDF5F5B76}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {9681E7B8-4D88-4AFF-8F96-784DDF5F5B76}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {9681E7B8-4D88-4AFF-8F96-784DDF5F5B76}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {9681E7B8-4D88-4AFF-8F96-784DDF5F5B76}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {9681E7B8-4D88-4AFF-8F96-784DDF5F5B76}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {9681E7B8-4D88-4AFF-8F96-784DDF5F5B76}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {9681E7B8-4D88-4AFF-8F96-784DDF5F5B76}.Debug|Win32.ActiveCfg = Debug|Win32 {9681E7B8-4D88-4AFF-8F96-784DDF5F5B76}.Debug|Win32.Build.0 = Debug|Win32 {9681E7B8-4D88-4AFF-8F96-784DDF5F5B76}.Debug|x64.ActiveCfg = Debug|x64 @@ -1986,14 +1590,6 @@ Global {9681E7B8-4D88-4AFF-8F96-784DDF5F5B76}.Release|Win32.Build.0 = Release|Win32 {9681E7B8-4D88-4AFF-8F96-784DDF5F5B76}.Release|x64.ActiveCfg = Release|x64 {9681E7B8-4D88-4AFF-8F96-784DDF5F5B76}.Release|x64.Build.0 = Release|x64 - {10096783-388B-4B2A-806A-F0190AFB5096}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {10096783-388B-4B2A-806A-F0190AFB5096}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {10096783-388B-4B2A-806A-F0190AFB5096}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {10096783-388B-4B2A-806A-F0190AFB5096}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {10096783-388B-4B2A-806A-F0190AFB5096}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {10096783-388B-4B2A-806A-F0190AFB5096}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {10096783-388B-4B2A-806A-F0190AFB5096}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {10096783-388B-4B2A-806A-F0190AFB5096}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {10096783-388B-4B2A-806A-F0190AFB5096}.Debug|Win32.ActiveCfg = Debug|Win32 {10096783-388B-4B2A-806A-F0190AFB5096}.Debug|Win32.Build.0 = Debug|Win32 {10096783-388B-4B2A-806A-F0190AFB5096}.Debug|x64.ActiveCfg = Debug|x64 @@ -2002,14 +1598,6 @@ Global {10096783-388B-4B2A-806A-F0190AFB5096}.Release|Win32.Build.0 = Release|Win32 {10096783-388B-4B2A-806A-F0190AFB5096}.Release|x64.ActiveCfg = Release|x64 {10096783-388B-4B2A-806A-F0190AFB5096}.Release|x64.Build.0 = Release|x64 - {46204626-B8AC-4E09-88F2-0A68A5DEEF5A}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {46204626-B8AC-4E09-88F2-0A68A5DEEF5A}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {46204626-B8AC-4E09-88F2-0A68A5DEEF5A}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {46204626-B8AC-4E09-88F2-0A68A5DEEF5A}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {46204626-B8AC-4E09-88F2-0A68A5DEEF5A}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {46204626-B8AC-4E09-88F2-0A68A5DEEF5A}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {46204626-B8AC-4E09-88F2-0A68A5DEEF5A}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {46204626-B8AC-4E09-88F2-0A68A5DEEF5A}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {46204626-B8AC-4E09-88F2-0A68A5DEEF5A}.Debug|Win32.ActiveCfg = Debug|Win32 {46204626-B8AC-4E09-88F2-0A68A5DEEF5A}.Debug|Win32.Build.0 = Debug|Win32 {46204626-B8AC-4E09-88F2-0A68A5DEEF5A}.Debug|x64.ActiveCfg = Debug|x64 @@ -2018,14 +1606,6 @@ Global {46204626-B8AC-4E09-88F2-0A68A5DEEF5A}.Release|Win32.Build.0 = Release|Win32 {46204626-B8AC-4E09-88F2-0A68A5DEEF5A}.Release|x64.ActiveCfg = Release|x64 {46204626-B8AC-4E09-88F2-0A68A5DEEF5A}.Release|x64.Build.0 = Release|x64 - {57E9C935-F8A6-4C1E-BDF4-0F0EB72CACC8}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {57E9C935-F8A6-4C1E-BDF4-0F0EB72CACC8}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {57E9C935-F8A6-4C1E-BDF4-0F0EB72CACC8}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {57E9C935-F8A6-4C1E-BDF4-0F0EB72CACC8}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {57E9C935-F8A6-4C1E-BDF4-0F0EB72CACC8}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {57E9C935-F8A6-4C1E-BDF4-0F0EB72CACC8}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {57E9C935-F8A6-4C1E-BDF4-0F0EB72CACC8}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {57E9C935-F8A6-4C1E-BDF4-0F0EB72CACC8}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {57E9C935-F8A6-4C1E-BDF4-0F0EB72CACC8}.Debug|Win32.ActiveCfg = Debug|Win32 {57E9C935-F8A6-4C1E-BDF4-0F0EB72CACC8}.Debug|Win32.Build.0 = Debug|Win32 {57E9C935-F8A6-4C1E-BDF4-0F0EB72CACC8}.Debug|x64.ActiveCfg = Debug|x64 @@ -2034,14 +1614,6 @@ Global {57E9C935-F8A6-4C1E-BDF4-0F0EB72CACC8}.Release|Win32.Build.0 = Release|Win32 {57E9C935-F8A6-4C1E-BDF4-0F0EB72CACC8}.Release|x64.ActiveCfg = Release|x64 {57E9C935-F8A6-4C1E-BDF4-0F0EB72CACC8}.Release|x64.Build.0 = Release|x64 - {A364B7AB-7129-4891-A305-B2EEE2948EC4}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {A364B7AB-7129-4891-A305-B2EEE2948EC4}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {A364B7AB-7129-4891-A305-B2EEE2948EC4}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {A364B7AB-7129-4891-A305-B2EEE2948EC4}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {A364B7AB-7129-4891-A305-B2EEE2948EC4}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {A364B7AB-7129-4891-A305-B2EEE2948EC4}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {A364B7AB-7129-4891-A305-B2EEE2948EC4}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {A364B7AB-7129-4891-A305-B2EEE2948EC4}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {A364B7AB-7129-4891-A305-B2EEE2948EC4}.Debug|Win32.ActiveCfg = Debug|Win32 {A364B7AB-7129-4891-A305-B2EEE2948EC4}.Debug|Win32.Build.0 = Debug|Win32 {A364B7AB-7129-4891-A305-B2EEE2948EC4}.Debug|x64.ActiveCfg = Debug|x64 @@ -2050,14 +1622,6 @@ Global {A364B7AB-7129-4891-A305-B2EEE2948EC4}.Release|Win32.Build.0 = Release|Win32 {A364B7AB-7129-4891-A305-B2EEE2948EC4}.Release|x64.ActiveCfg = Release|x64 {A364B7AB-7129-4891-A305-B2EEE2948EC4}.Release|x64.Build.0 = Release|x64 - {1C3367B8-CCFF-4409-8847-623DFD833DAD}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {1C3367B8-CCFF-4409-8847-623DFD833DAD}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {1C3367B8-CCFF-4409-8847-623DFD833DAD}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {1C3367B8-CCFF-4409-8847-623DFD833DAD}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {1C3367B8-CCFF-4409-8847-623DFD833DAD}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {1C3367B8-CCFF-4409-8847-623DFD833DAD}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {1C3367B8-CCFF-4409-8847-623DFD833DAD}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {1C3367B8-CCFF-4409-8847-623DFD833DAD}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {1C3367B8-CCFF-4409-8847-623DFD833DAD}.Debug|Win32.ActiveCfg = Debug|Win32 {1C3367B8-CCFF-4409-8847-623DFD833DAD}.Debug|Win32.Build.0 = Debug|Win32 {1C3367B8-CCFF-4409-8847-623DFD833DAD}.Debug|x64.ActiveCfg = Debug|x64 @@ -2066,14 +1630,6 @@ Global {1C3367B8-CCFF-4409-8847-623DFD833DAD}.Release|Win32.Build.0 = Release|Win32 {1C3367B8-CCFF-4409-8847-623DFD833DAD}.Release|x64.ActiveCfg = Release|x64 {1C3367B8-CCFF-4409-8847-623DFD833DAD}.Release|x64.Build.0 = Release|x64 - {27B7CAC4-9236-4139-88B8-3B9950D2DB2C}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {27B7CAC4-9236-4139-88B8-3B9950D2DB2C}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {27B7CAC4-9236-4139-88B8-3B9950D2DB2C}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {27B7CAC4-9236-4139-88B8-3B9950D2DB2C}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {27B7CAC4-9236-4139-88B8-3B9950D2DB2C}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {27B7CAC4-9236-4139-88B8-3B9950D2DB2C}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {27B7CAC4-9236-4139-88B8-3B9950D2DB2C}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {27B7CAC4-9236-4139-88B8-3B9950D2DB2C}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {27B7CAC4-9236-4139-88B8-3B9950D2DB2C}.Debug|Win32.ActiveCfg = Debug|Win32 {27B7CAC4-9236-4139-88B8-3B9950D2DB2C}.Debug|Win32.Build.0 = Debug|Win32 {27B7CAC4-9236-4139-88B8-3B9950D2DB2C}.Debug|x64.ActiveCfg = Debug|x64 @@ -2082,14 +1638,6 @@ Global {27B7CAC4-9236-4139-88B8-3B9950D2DB2C}.Release|Win32.Build.0 = Release|Win32 {27B7CAC4-9236-4139-88B8-3B9950D2DB2C}.Release|x64.ActiveCfg = Release|x64 {27B7CAC4-9236-4139-88B8-3B9950D2DB2C}.Release|x64.Build.0 = Release|x64 - {306B9C8B-F11B-4071-AE80-CF69EF0BBB2B}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {306B9C8B-F11B-4071-AE80-CF69EF0BBB2B}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {306B9C8B-F11B-4071-AE80-CF69EF0BBB2B}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {306B9C8B-F11B-4071-AE80-CF69EF0BBB2B}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {306B9C8B-F11B-4071-AE80-CF69EF0BBB2B}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {306B9C8B-F11B-4071-AE80-CF69EF0BBB2B}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {306B9C8B-F11B-4071-AE80-CF69EF0BBB2B}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {306B9C8B-F11B-4071-AE80-CF69EF0BBB2B}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {306B9C8B-F11B-4071-AE80-CF69EF0BBB2B}.Debug|Win32.ActiveCfg = Debug|Win32 {306B9C8B-F11B-4071-AE80-CF69EF0BBB2B}.Debug|Win32.Build.0 = Debug|Win32 {306B9C8B-F11B-4071-AE80-CF69EF0BBB2B}.Debug|x64.ActiveCfg = Debug|x64 @@ -2098,14 +1646,6 @@ Global {306B9C8B-F11B-4071-AE80-CF69EF0BBB2B}.Release|Win32.Build.0 = Release|Win32 {306B9C8B-F11B-4071-AE80-CF69EF0BBB2B}.Release|x64.ActiveCfg = Release|x64 {306B9C8B-F11B-4071-AE80-CF69EF0BBB2B}.Release|x64.Build.0 = Release|x64 - {A82A6A91-4EEC-4F0A-BA2D-A689BDCDA9C2}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {A82A6A91-4EEC-4F0A-BA2D-A689BDCDA9C2}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {A82A6A91-4EEC-4F0A-BA2D-A689BDCDA9C2}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {A82A6A91-4EEC-4F0A-BA2D-A689BDCDA9C2}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {A82A6A91-4EEC-4F0A-BA2D-A689BDCDA9C2}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {A82A6A91-4EEC-4F0A-BA2D-A689BDCDA9C2}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {A82A6A91-4EEC-4F0A-BA2D-A689BDCDA9C2}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {A82A6A91-4EEC-4F0A-BA2D-A689BDCDA9C2}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {A82A6A91-4EEC-4F0A-BA2D-A689BDCDA9C2}.Debug|Win32.ActiveCfg = Debug|Win32 {A82A6A91-4EEC-4F0A-BA2D-A689BDCDA9C2}.Debug|Win32.Build.0 = Debug|Win32 {A82A6A91-4EEC-4F0A-BA2D-A689BDCDA9C2}.Debug|x64.ActiveCfg = Debug|x64 @@ -2114,14 +1654,6 @@ Global {A82A6A91-4EEC-4F0A-BA2D-A689BDCDA9C2}.Release|Win32.Build.0 = Release|Win32 {A82A6A91-4EEC-4F0A-BA2D-A689BDCDA9C2}.Release|x64.ActiveCfg = Release|x64 {A82A6A91-4EEC-4F0A-BA2D-A689BDCDA9C2}.Release|x64.Build.0 = Release|x64 - {E64764EB-2B8E-454F-9635-0729D07CCA24}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {E64764EB-2B8E-454F-9635-0729D07CCA24}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {E64764EB-2B8E-454F-9635-0729D07CCA24}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {E64764EB-2B8E-454F-9635-0729D07CCA24}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {E64764EB-2B8E-454F-9635-0729D07CCA24}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {E64764EB-2B8E-454F-9635-0729D07CCA24}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {E64764EB-2B8E-454F-9635-0729D07CCA24}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {E64764EB-2B8E-454F-9635-0729D07CCA24}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {E64764EB-2B8E-454F-9635-0729D07CCA24}.Debug|Win32.ActiveCfg = Debug|Win32 {E64764EB-2B8E-454F-9635-0729D07CCA24}.Debug|Win32.Build.0 = Debug|Win32 {E64764EB-2B8E-454F-9635-0729D07CCA24}.Debug|x64.ActiveCfg = Debug|x64 @@ -2130,14 +1662,6 @@ Global {E64764EB-2B8E-454F-9635-0729D07CCA24}.Release|Win32.Build.0 = Release|Win32 {E64764EB-2B8E-454F-9635-0729D07CCA24}.Release|x64.ActiveCfg = Release|x64 {E64764EB-2B8E-454F-9635-0729D07CCA24}.Release|x64.Build.0 = Release|x64 - {9D99D6A3-3087-4B6B-BF7E-AD1D8BB9BEDA}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {9D99D6A3-3087-4B6B-BF7E-AD1D8BB9BEDA}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {9D99D6A3-3087-4B6B-BF7E-AD1D8BB9BEDA}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {9D99D6A3-3087-4B6B-BF7E-AD1D8BB9BEDA}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {9D99D6A3-3087-4B6B-BF7E-AD1D8BB9BEDA}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {9D99D6A3-3087-4B6B-BF7E-AD1D8BB9BEDA}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {9D99D6A3-3087-4B6B-BF7E-AD1D8BB9BEDA}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {9D99D6A3-3087-4B6B-BF7E-AD1D8BB9BEDA}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {9D99D6A3-3087-4B6B-BF7E-AD1D8BB9BEDA}.Debug|Win32.ActiveCfg = Debug|Win32 {9D99D6A3-3087-4B6B-BF7E-AD1D8BB9BEDA}.Debug|Win32.Build.0 = Debug|Win32 {9D99D6A3-3087-4B6B-BF7E-AD1D8BB9BEDA}.Debug|x64.ActiveCfg = Debug|x64 @@ -2146,14 +1670,6 @@ Global {9D99D6A3-3087-4B6B-BF7E-AD1D8BB9BEDA}.Release|Win32.Build.0 = Release|Win32 {9D99D6A3-3087-4B6B-BF7E-AD1D8BB9BEDA}.Release|x64.ActiveCfg = Release|x64 {9D99D6A3-3087-4B6B-BF7E-AD1D8BB9BEDA}.Release|x64.Build.0 = Release|x64 - {EABE4465-0DDC-41CE-91C5-CCB9586B789F}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {EABE4465-0DDC-41CE-91C5-CCB9586B789F}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {EABE4465-0DDC-41CE-91C5-CCB9586B789F}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {EABE4465-0DDC-41CE-91C5-CCB9586B789F}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {EABE4465-0DDC-41CE-91C5-CCB9586B789F}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {EABE4465-0DDC-41CE-91C5-CCB9586B789F}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {EABE4465-0DDC-41CE-91C5-CCB9586B789F}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {EABE4465-0DDC-41CE-91C5-CCB9586B789F}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {EABE4465-0DDC-41CE-91C5-CCB9586B789F}.Debug|Win32.ActiveCfg = Debug|Win32 {EABE4465-0DDC-41CE-91C5-CCB9586B789F}.Debug|Win32.Build.0 = Debug|Win32 {EABE4465-0DDC-41CE-91C5-CCB9586B789F}.Debug|x64.ActiveCfg = Debug|x64 @@ -2162,14 +1678,6 @@ Global {EABE4465-0DDC-41CE-91C5-CCB9586B789F}.Release|Win32.Build.0 = Release|Win32 {EABE4465-0DDC-41CE-91C5-CCB9586B789F}.Release|x64.ActiveCfg = Release|x64 {EABE4465-0DDC-41CE-91C5-CCB9586B789F}.Release|x64.Build.0 = Release|x64 - {D0301B50-901B-4298-B8C8-B134A320E2A0}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {D0301B50-901B-4298-B8C8-B134A320E2A0}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {D0301B50-901B-4298-B8C8-B134A320E2A0}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {D0301B50-901B-4298-B8C8-B134A320E2A0}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {D0301B50-901B-4298-B8C8-B134A320E2A0}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {D0301B50-901B-4298-B8C8-B134A320E2A0}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {D0301B50-901B-4298-B8C8-B134A320E2A0}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {D0301B50-901B-4298-B8C8-B134A320E2A0}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {D0301B50-901B-4298-B8C8-B134A320E2A0}.Debug|Win32.ActiveCfg = Debug|Win32 {D0301B50-901B-4298-B8C8-B134A320E2A0}.Debug|Win32.Build.0 = Debug|Win32 {D0301B50-901B-4298-B8C8-B134A320E2A0}.Debug|x64.ActiveCfg = Debug|x64 @@ -2178,14 +1686,6 @@ Global {D0301B50-901B-4298-B8C8-B134A320E2A0}.Release|Win32.Build.0 = Release|Win32 {D0301B50-901B-4298-B8C8-B134A320E2A0}.Release|x64.ActiveCfg = Release|x64 {D0301B50-901B-4298-B8C8-B134A320E2A0}.Release|x64.Build.0 = Release|x64 - {2DAEF04A-7C9A-4C64-99E9-D0F503667FBF}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {2DAEF04A-7C9A-4C64-99E9-D0F503667FBF}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {2DAEF04A-7C9A-4C64-99E9-D0F503667FBF}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {2DAEF04A-7C9A-4C64-99E9-D0F503667FBF}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {2DAEF04A-7C9A-4C64-99E9-D0F503667FBF}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {2DAEF04A-7C9A-4C64-99E9-D0F503667FBF}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {2DAEF04A-7C9A-4C64-99E9-D0F503667FBF}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {2DAEF04A-7C9A-4C64-99E9-D0F503667FBF}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {2DAEF04A-7C9A-4C64-99E9-D0F503667FBF}.Debug|Win32.ActiveCfg = Debug|Win32 {2DAEF04A-7C9A-4C64-99E9-D0F503667FBF}.Debug|Win32.Build.0 = Debug|Win32 {2DAEF04A-7C9A-4C64-99E9-D0F503667FBF}.Debug|x64.ActiveCfg = Debug|x64 @@ -2194,14 +1694,6 @@ Global {2DAEF04A-7C9A-4C64-99E9-D0F503667FBF}.Release|Win32.Build.0 = Release|Win32 {2DAEF04A-7C9A-4C64-99E9-D0F503667FBF}.Release|x64.ActiveCfg = Release|x64 {2DAEF04A-7C9A-4C64-99E9-D0F503667FBF}.Release|x64.Build.0 = Release|x64 - {36CC0D35-FFFE-46D1-8EE1-1A3438DCC938}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {36CC0D35-FFFE-46D1-8EE1-1A3438DCC938}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {36CC0D35-FFFE-46D1-8EE1-1A3438DCC938}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {36CC0D35-FFFE-46D1-8EE1-1A3438DCC938}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {36CC0D35-FFFE-46D1-8EE1-1A3438DCC938}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {36CC0D35-FFFE-46D1-8EE1-1A3438DCC938}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {36CC0D35-FFFE-46D1-8EE1-1A3438DCC938}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {36CC0D35-FFFE-46D1-8EE1-1A3438DCC938}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {36CC0D35-FFFE-46D1-8EE1-1A3438DCC938}.Debug|Win32.ActiveCfg = Debug|Win32 {36CC0D35-FFFE-46D1-8EE1-1A3438DCC938}.Debug|Win32.Build.0 = Debug|Win32 {36CC0D35-FFFE-46D1-8EE1-1A3438DCC938}.Debug|x64.ActiveCfg = Debug|x64 @@ -2210,14 +1702,6 @@ Global {36CC0D35-FFFE-46D1-8EE1-1A3438DCC938}.Release|Win32.Build.0 = Release|Win32 {36CC0D35-FFFE-46D1-8EE1-1A3438DCC938}.Release|x64.ActiveCfg = Release|x64 {36CC0D35-FFFE-46D1-8EE1-1A3438DCC938}.Release|x64.Build.0 = Release|x64 - {59ED55DD-0EF7-4028-B7DD-AFB6488155F6}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {59ED55DD-0EF7-4028-B7DD-AFB6488155F6}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {59ED55DD-0EF7-4028-B7DD-AFB6488155F6}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {59ED55DD-0EF7-4028-B7DD-AFB6488155F6}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {59ED55DD-0EF7-4028-B7DD-AFB6488155F6}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {59ED55DD-0EF7-4028-B7DD-AFB6488155F6}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {59ED55DD-0EF7-4028-B7DD-AFB6488155F6}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {59ED55DD-0EF7-4028-B7DD-AFB6488155F6}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {59ED55DD-0EF7-4028-B7DD-AFB6488155F6}.Debug|Win32.ActiveCfg = Debug|Win32 {59ED55DD-0EF7-4028-B7DD-AFB6488155F6}.Debug|Win32.Build.0 = Debug|Win32 {59ED55DD-0EF7-4028-B7DD-AFB6488155F6}.Debug|x64.ActiveCfg = Debug|x64 @@ -2226,14 +1710,6 @@ Global {59ED55DD-0EF7-4028-B7DD-AFB6488155F6}.Release|Win32.Build.0 = Release|Win32 {59ED55DD-0EF7-4028-B7DD-AFB6488155F6}.Release|x64.ActiveCfg = Release|x64 {59ED55DD-0EF7-4028-B7DD-AFB6488155F6}.Release|x64.Build.0 = Release|x64 - {2C8EC06E-CC5B-4D04-A49E-4656CF1D199D}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {2C8EC06E-CC5B-4D04-A49E-4656CF1D199D}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {2C8EC06E-CC5B-4D04-A49E-4656CF1D199D}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {2C8EC06E-CC5B-4D04-A49E-4656CF1D199D}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {2C8EC06E-CC5B-4D04-A49E-4656CF1D199D}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {2C8EC06E-CC5B-4D04-A49E-4656CF1D199D}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {2C8EC06E-CC5B-4D04-A49E-4656CF1D199D}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {2C8EC06E-CC5B-4D04-A49E-4656CF1D199D}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {2C8EC06E-CC5B-4D04-A49E-4656CF1D199D}.Debug|Win32.ActiveCfg = Debug|Win32 {2C8EC06E-CC5B-4D04-A49E-4656CF1D199D}.Debug|Win32.Build.0 = Debug|Win32 {2C8EC06E-CC5B-4D04-A49E-4656CF1D199D}.Debug|x64.ActiveCfg = Debug|x64 @@ -2242,14 +1718,6 @@ Global {2C8EC06E-CC5B-4D04-A49E-4656CF1D199D}.Release|Win32.Build.0 = Release|Win32 {2C8EC06E-CC5B-4D04-A49E-4656CF1D199D}.Release|x64.ActiveCfg = Release|x64 {2C8EC06E-CC5B-4D04-A49E-4656CF1D199D}.Release|x64.Build.0 = Release|x64 - {9D7FD661-AA09-43D3-9772-66EC4915A848}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {9D7FD661-AA09-43D3-9772-66EC4915A848}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {9D7FD661-AA09-43D3-9772-66EC4915A848}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {9D7FD661-AA09-43D3-9772-66EC4915A848}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {9D7FD661-AA09-43D3-9772-66EC4915A848}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {9D7FD661-AA09-43D3-9772-66EC4915A848}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {9D7FD661-AA09-43D3-9772-66EC4915A848}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {9D7FD661-AA09-43D3-9772-66EC4915A848}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {9D7FD661-AA09-43D3-9772-66EC4915A848}.Debug|Win32.ActiveCfg = Debug|Win32 {9D7FD661-AA09-43D3-9772-66EC4915A848}.Debug|Win32.Build.0 = Debug|Win32 {9D7FD661-AA09-43D3-9772-66EC4915A848}.Debug|x64.ActiveCfg = Debug|x64 @@ -2258,14 +1726,6 @@ Global {9D7FD661-AA09-43D3-9772-66EC4915A848}.Release|Win32.Build.0 = Release|Win32 {9D7FD661-AA09-43D3-9772-66EC4915A848}.Release|x64.ActiveCfg = Release|x64 {9D7FD661-AA09-43D3-9772-66EC4915A848}.Release|x64.Build.0 = Release|x64 - {F689934E-7EED-4E85-A620-8FC72CD83255}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {F689934E-7EED-4E85-A620-8FC72CD83255}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {F689934E-7EED-4E85-A620-8FC72CD83255}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {F689934E-7EED-4E85-A620-8FC72CD83255}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {F689934E-7EED-4E85-A620-8FC72CD83255}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {F689934E-7EED-4E85-A620-8FC72CD83255}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {F689934E-7EED-4E85-A620-8FC72CD83255}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {F689934E-7EED-4E85-A620-8FC72CD83255}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {F689934E-7EED-4E85-A620-8FC72CD83255}.Debug|Win32.ActiveCfg = Debug|Win32 {F689934E-7EED-4E85-A620-8FC72CD83255}.Debug|Win32.Build.0 = Debug|Win32 {F689934E-7EED-4E85-A620-8FC72CD83255}.Debug|x64.ActiveCfg = Debug|x64 @@ -2274,14 +1734,6 @@ Global {F689934E-7EED-4E85-A620-8FC72CD83255}.Release|Win32.Build.0 = Release|Win32 {F689934E-7EED-4E85-A620-8FC72CD83255}.Release|x64.ActiveCfg = Release|x64 {F689934E-7EED-4E85-A620-8FC72CD83255}.Release|x64.Build.0 = Release|x64 - {3329FD4A-C510-40FF-A642-365F8F56422E}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {3329FD4A-C510-40FF-A642-365F8F56422E}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {3329FD4A-C510-40FF-A642-365F8F56422E}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {3329FD4A-C510-40FF-A642-365F8F56422E}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {3329FD4A-C510-40FF-A642-365F8F56422E}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {3329FD4A-C510-40FF-A642-365F8F56422E}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {3329FD4A-C510-40FF-A642-365F8F56422E}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {3329FD4A-C510-40FF-A642-365F8F56422E}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {3329FD4A-C510-40FF-A642-365F8F56422E}.Debug|Win32.ActiveCfg = Debug|Win32 {3329FD4A-C510-40FF-A642-365F8F56422E}.Debug|Win32.Build.0 = Debug|Win32 {3329FD4A-C510-40FF-A642-365F8F56422E}.Debug|x64.ActiveCfg = Debug|x64 @@ -2290,14 +1742,6 @@ Global {3329FD4A-C510-40FF-A642-365F8F56422E}.Release|Win32.Build.0 = Release|Win32 {3329FD4A-C510-40FF-A642-365F8F56422E}.Release|x64.ActiveCfg = Release|x64 {3329FD4A-C510-40FF-A642-365F8F56422E}.Release|x64.Build.0 = Release|x64 - {8698D5A5-EABD-4024-B3A0-A78793B39510}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {8698D5A5-EABD-4024-B3A0-A78793B39510}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {8698D5A5-EABD-4024-B3A0-A78793B39510}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {8698D5A5-EABD-4024-B3A0-A78793B39510}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {8698D5A5-EABD-4024-B3A0-A78793B39510}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {8698D5A5-EABD-4024-B3A0-A78793B39510}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {8698D5A5-EABD-4024-B3A0-A78793B39510}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {8698D5A5-EABD-4024-B3A0-A78793B39510}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {8698D5A5-EABD-4024-B3A0-A78793B39510}.Debug|Win32.ActiveCfg = Debug|Win32 {8698D5A5-EABD-4024-B3A0-A78793B39510}.Debug|Win32.Build.0 = Debug|Win32 {8698D5A5-EABD-4024-B3A0-A78793B39510}.Debug|x64.ActiveCfg = Debug|x64 @@ -2306,14 +1750,6 @@ Global {8698D5A5-EABD-4024-B3A0-A78793B39510}.Release|Win32.Build.0 = Release|Win32 {8698D5A5-EABD-4024-B3A0-A78793B39510}.Release|x64.ActiveCfg = Release|x64 {8698D5A5-EABD-4024-B3A0-A78793B39510}.Release|x64.Build.0 = Release|x64 - {2B6769F3-9C20-49D1-821C-65BB70A53F76}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {2B6769F3-9C20-49D1-821C-65BB70A53F76}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {2B6769F3-9C20-49D1-821C-65BB70A53F76}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {2B6769F3-9C20-49D1-821C-65BB70A53F76}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {2B6769F3-9C20-49D1-821C-65BB70A53F76}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {2B6769F3-9C20-49D1-821C-65BB70A53F76}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {2B6769F3-9C20-49D1-821C-65BB70A53F76}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {2B6769F3-9C20-49D1-821C-65BB70A53F76}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {2B6769F3-9C20-49D1-821C-65BB70A53F76}.Debug|Win32.ActiveCfg = Debug|Win32 {2B6769F3-9C20-49D1-821C-65BB70A53F76}.Debug|Win32.Build.0 = Debug|Win32 {2B6769F3-9C20-49D1-821C-65BB70A53F76}.Debug|x64.ActiveCfg = Debug|x64 @@ -2322,14 +1758,6 @@ Global {2B6769F3-9C20-49D1-821C-65BB70A53F76}.Release|Win32.Build.0 = Release|Win32 {2B6769F3-9C20-49D1-821C-65BB70A53F76}.Release|x64.ActiveCfg = Release|x64 {2B6769F3-9C20-49D1-821C-65BB70A53F76}.Release|x64.Build.0 = Release|x64 - {425BC777-A886-4EC9-819B-35D103A7FDD0}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {425BC777-A886-4EC9-819B-35D103A7FDD0}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {425BC777-A886-4EC9-819B-35D103A7FDD0}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {425BC777-A886-4EC9-819B-35D103A7FDD0}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {425BC777-A886-4EC9-819B-35D103A7FDD0}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {425BC777-A886-4EC9-819B-35D103A7FDD0}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {425BC777-A886-4EC9-819B-35D103A7FDD0}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {425BC777-A886-4EC9-819B-35D103A7FDD0}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {425BC777-A886-4EC9-819B-35D103A7FDD0}.Debug|Win32.ActiveCfg = Debug|Win32 {425BC777-A886-4EC9-819B-35D103A7FDD0}.Debug|Win32.Build.0 = Debug|Win32 {425BC777-A886-4EC9-819B-35D103A7FDD0}.Debug|x64.ActiveCfg = Debug|x64 @@ -2338,14 +1766,6 @@ Global {425BC777-A886-4EC9-819B-35D103A7FDD0}.Release|Win32.Build.0 = Release|Win32 {425BC777-A886-4EC9-819B-35D103A7FDD0}.Release|x64.ActiveCfg = Release|x64 {425BC777-A886-4EC9-819B-35D103A7FDD0}.Release|x64.Build.0 = Release|x64 - {07BDBE85-B3C1-4E70-91E3-B2517CFB04C1}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {07BDBE85-B3C1-4E70-91E3-B2517CFB04C1}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {07BDBE85-B3C1-4E70-91E3-B2517CFB04C1}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {07BDBE85-B3C1-4E70-91E3-B2517CFB04C1}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {07BDBE85-B3C1-4E70-91E3-B2517CFB04C1}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {07BDBE85-B3C1-4E70-91E3-B2517CFB04C1}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {07BDBE85-B3C1-4E70-91E3-B2517CFB04C1}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {07BDBE85-B3C1-4E70-91E3-B2517CFB04C1}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {07BDBE85-B3C1-4E70-91E3-B2517CFB04C1}.Debug|Win32.ActiveCfg = Debug|Win32 {07BDBE85-B3C1-4E70-91E3-B2517CFB04C1}.Debug|Win32.Build.0 = Debug|Win32 {07BDBE85-B3C1-4E70-91E3-B2517CFB04C1}.Debug|x64.ActiveCfg = Debug|x64 @@ -2354,14 +1774,6 @@ Global {07BDBE85-B3C1-4E70-91E3-B2517CFB04C1}.Release|Win32.Build.0 = Release|Win32 {07BDBE85-B3C1-4E70-91E3-B2517CFB04C1}.Release|x64.ActiveCfg = Release|x64 {07BDBE85-B3C1-4E70-91E3-B2517CFB04C1}.Release|x64.Build.0 = Release|x64 - {6476DBD1-9C4F-4107-8271-2B1DC2B535E5}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {6476DBD1-9C4F-4107-8271-2B1DC2B535E5}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {6476DBD1-9C4F-4107-8271-2B1DC2B535E5}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {6476DBD1-9C4F-4107-8271-2B1DC2B535E5}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {6476DBD1-9C4F-4107-8271-2B1DC2B535E5}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {6476DBD1-9C4F-4107-8271-2B1DC2B535E5}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {6476DBD1-9C4F-4107-8271-2B1DC2B535E5}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {6476DBD1-9C4F-4107-8271-2B1DC2B535E5}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {6476DBD1-9C4F-4107-8271-2B1DC2B535E5}.Debug|Win32.ActiveCfg = Debug|Win32 {6476DBD1-9C4F-4107-8271-2B1DC2B535E5}.Debug|Win32.Build.0 = Debug|Win32 {6476DBD1-9C4F-4107-8271-2B1DC2B535E5}.Debug|x64.ActiveCfg = Debug|x64 @@ -2370,14 +1782,6 @@ Global {6476DBD1-9C4F-4107-8271-2B1DC2B535E5}.Release|Win32.Build.0 = Release|Win32 {6476DBD1-9C4F-4107-8271-2B1DC2B535E5}.Release|x64.ActiveCfg = Release|x64 {6476DBD1-9C4F-4107-8271-2B1DC2B535E5}.Release|x64.Build.0 = Release|x64 - {CFFE56E2-BBDE-4B6E-BB76-1A1A61453570}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {CFFE56E2-BBDE-4B6E-BB76-1A1A61453570}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {CFFE56E2-BBDE-4B6E-BB76-1A1A61453570}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {CFFE56E2-BBDE-4B6E-BB76-1A1A61453570}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {CFFE56E2-BBDE-4B6E-BB76-1A1A61453570}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {CFFE56E2-BBDE-4B6E-BB76-1A1A61453570}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {CFFE56E2-BBDE-4B6E-BB76-1A1A61453570}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {CFFE56E2-BBDE-4B6E-BB76-1A1A61453570}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {CFFE56E2-BBDE-4B6E-BB76-1A1A61453570}.Debug|Win32.ActiveCfg = Debug|Win32 {CFFE56E2-BBDE-4B6E-BB76-1A1A61453570}.Debug|Win32.Build.0 = Debug|Win32 {CFFE56E2-BBDE-4B6E-BB76-1A1A61453570}.Debug|x64.ActiveCfg = Debug|x64 @@ -2386,14 +1790,6 @@ Global {CFFE56E2-BBDE-4B6E-BB76-1A1A61453570}.Release|Win32.Build.0 = Release|Win32 {CFFE56E2-BBDE-4B6E-BB76-1A1A61453570}.Release|x64.ActiveCfg = Release|x64 {CFFE56E2-BBDE-4B6E-BB76-1A1A61453570}.Release|x64.Build.0 = Release|x64 - {171056B8-17A5-4825-9110-2877A94CD933}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {171056B8-17A5-4825-9110-2877A94CD933}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {171056B8-17A5-4825-9110-2877A94CD933}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {171056B8-17A5-4825-9110-2877A94CD933}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {171056B8-17A5-4825-9110-2877A94CD933}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {171056B8-17A5-4825-9110-2877A94CD933}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {171056B8-17A5-4825-9110-2877A94CD933}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {171056B8-17A5-4825-9110-2877A94CD933}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {171056B8-17A5-4825-9110-2877A94CD933}.Debug|Win32.ActiveCfg = Debug|Win32 {171056B8-17A5-4825-9110-2877A94CD933}.Debug|Win32.Build.0 = Debug|Win32 {171056B8-17A5-4825-9110-2877A94CD933}.Debug|x64.ActiveCfg = Debug|x64 @@ -2402,14 +1798,6 @@ Global {171056B8-17A5-4825-9110-2877A94CD933}.Release|Win32.Build.0 = Release|Win32 {171056B8-17A5-4825-9110-2877A94CD933}.Release|x64.ActiveCfg = Release|x64 {171056B8-17A5-4825-9110-2877A94CD933}.Release|x64.Build.0 = Release|x64 - {ECFBC0CA-07CD-448D-8B23-660644E9D9FC}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {ECFBC0CA-07CD-448D-8B23-660644E9D9FC}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {ECFBC0CA-07CD-448D-8B23-660644E9D9FC}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {ECFBC0CA-07CD-448D-8B23-660644E9D9FC}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {ECFBC0CA-07CD-448D-8B23-660644E9D9FC}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {ECFBC0CA-07CD-448D-8B23-660644E9D9FC}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {ECFBC0CA-07CD-448D-8B23-660644E9D9FC}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {ECFBC0CA-07CD-448D-8B23-660644E9D9FC}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {ECFBC0CA-07CD-448D-8B23-660644E9D9FC}.Debug|Win32.ActiveCfg = Debug|Win32 {ECFBC0CA-07CD-448D-8B23-660644E9D9FC}.Debug|Win32.Build.0 = Debug|Win32 {ECFBC0CA-07CD-448D-8B23-660644E9D9FC}.Debug|x64.ActiveCfg = Debug|x64 @@ -2418,14 +1806,6 @@ Global {ECFBC0CA-07CD-448D-8B23-660644E9D9FC}.Release|Win32.Build.0 = Release|Win32 {ECFBC0CA-07CD-448D-8B23-660644E9D9FC}.Release|x64.ActiveCfg = Release|x64 {ECFBC0CA-07CD-448D-8B23-660644E9D9FC}.Release|x64.Build.0 = Release|x64 - {3A76C039-4054-4D6C-AA2D-D69C8806FB6E}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {3A76C039-4054-4D6C-AA2D-D69C8806FB6E}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {3A76C039-4054-4D6C-AA2D-D69C8806FB6E}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {3A76C039-4054-4D6C-AA2D-D69C8806FB6E}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {3A76C039-4054-4D6C-AA2D-D69C8806FB6E}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {3A76C039-4054-4D6C-AA2D-D69C8806FB6E}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {3A76C039-4054-4D6C-AA2D-D69C8806FB6E}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {3A76C039-4054-4D6C-AA2D-D69C8806FB6E}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {3A76C039-4054-4D6C-AA2D-D69C8806FB6E}.Debug|Win32.ActiveCfg = Debug|Win32 {3A76C039-4054-4D6C-AA2D-D69C8806FB6E}.Debug|Win32.Build.0 = Debug|Win32 {3A76C039-4054-4D6C-AA2D-D69C8806FB6E}.Debug|x64.ActiveCfg = Debug|x64 @@ -2434,14 +1814,6 @@ Global {3A76C039-4054-4D6C-AA2D-D69C8806FB6E}.Release|Win32.Build.0 = Release|Win32 {3A76C039-4054-4D6C-AA2D-D69C8806FB6E}.Release|x64.ActiveCfg = Release|x64 {3A76C039-4054-4D6C-AA2D-D69C8806FB6E}.Release|x64.Build.0 = Release|x64 - {5AB527E1-111F-4AD0-8D98-2896E1390A70}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {5AB527E1-111F-4AD0-8D98-2896E1390A70}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {5AB527E1-111F-4AD0-8D98-2896E1390A70}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {5AB527E1-111F-4AD0-8D98-2896E1390A70}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {5AB527E1-111F-4AD0-8D98-2896E1390A70}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {5AB527E1-111F-4AD0-8D98-2896E1390A70}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {5AB527E1-111F-4AD0-8D98-2896E1390A70}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {5AB527E1-111F-4AD0-8D98-2896E1390A70}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {5AB527E1-111F-4AD0-8D98-2896E1390A70}.Debug|Win32.ActiveCfg = Debug|Win32 {5AB527E1-111F-4AD0-8D98-2896E1390A70}.Debug|Win32.Build.0 = Debug|Win32 {5AB527E1-111F-4AD0-8D98-2896E1390A70}.Debug|x64.ActiveCfg = Debug|x64 @@ -2450,14 +1822,6 @@ Global {5AB527E1-111F-4AD0-8D98-2896E1390A70}.Release|Win32.Build.0 = Release|Win32 {5AB527E1-111F-4AD0-8D98-2896E1390A70}.Release|x64.ActiveCfg = Release|x64 {5AB527E1-111F-4AD0-8D98-2896E1390A70}.Release|x64.Build.0 = Release|x64 - {BDA98D7E-A92B-4B18-89C0-5F5C5D52934D}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {BDA98D7E-A92B-4B18-89C0-5F5C5D52934D}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {BDA98D7E-A92B-4B18-89C0-5F5C5D52934D}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {BDA98D7E-A92B-4B18-89C0-5F5C5D52934D}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {BDA98D7E-A92B-4B18-89C0-5F5C5D52934D}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {BDA98D7E-A92B-4B18-89C0-5F5C5D52934D}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {BDA98D7E-A92B-4B18-89C0-5F5C5D52934D}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {BDA98D7E-A92B-4B18-89C0-5F5C5D52934D}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {BDA98D7E-A92B-4B18-89C0-5F5C5D52934D}.Debug|Win32.ActiveCfg = Debug|Win32 {BDA98D7E-A92B-4B18-89C0-5F5C5D52934D}.Debug|Win32.Build.0 = Debug|Win32 {BDA98D7E-A92B-4B18-89C0-5F5C5D52934D}.Debug|x64.ActiveCfg = Debug|x64 @@ -2466,14 +1830,6 @@ Global {BDA98D7E-A92B-4B18-89C0-5F5C5D52934D}.Release|Win32.Build.0 = Release|Win32 {BDA98D7E-A92B-4B18-89C0-5F5C5D52934D}.Release|x64.ActiveCfg = Release|x64 {BDA98D7E-A92B-4B18-89C0-5F5C5D52934D}.Release|x64.Build.0 = Release|x64 - {11C94711-6AA5-4D42-8F1A-08421527376E}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {11C94711-6AA5-4D42-8F1A-08421527376E}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {11C94711-6AA5-4D42-8F1A-08421527376E}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {11C94711-6AA5-4D42-8F1A-08421527376E}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {11C94711-6AA5-4D42-8F1A-08421527376E}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {11C94711-6AA5-4D42-8F1A-08421527376E}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {11C94711-6AA5-4D42-8F1A-08421527376E}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {11C94711-6AA5-4D42-8F1A-08421527376E}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {11C94711-6AA5-4D42-8F1A-08421527376E}.Debug|Win32.ActiveCfg = Debug|Win32 {11C94711-6AA5-4D42-8F1A-08421527376E}.Debug|Win32.Build.0 = Debug|Win32 {11C94711-6AA5-4D42-8F1A-08421527376E}.Debug|x64.ActiveCfg = Debug|x64 @@ -2482,14 +1838,6 @@ Global {11C94711-6AA5-4D42-8F1A-08421527376E}.Release|Win32.Build.0 = Release|Win32 {11C94711-6AA5-4D42-8F1A-08421527376E}.Release|x64.ActiveCfg = Release|x64 {11C94711-6AA5-4D42-8F1A-08421527376E}.Release|x64.Build.0 = Release|x64 - {649FACD9-76C7-4184-A34C-269E7F302952}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {649FACD9-76C7-4184-A34C-269E7F302952}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {649FACD9-76C7-4184-A34C-269E7F302952}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {649FACD9-76C7-4184-A34C-269E7F302952}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {649FACD9-76C7-4184-A34C-269E7F302952}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {649FACD9-76C7-4184-A34C-269E7F302952}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {649FACD9-76C7-4184-A34C-269E7F302952}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {649FACD9-76C7-4184-A34C-269E7F302952}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {649FACD9-76C7-4184-A34C-269E7F302952}.Debug|Win32.ActiveCfg = Debug|Win32 {649FACD9-76C7-4184-A34C-269E7F302952}.Debug|Win32.Build.0 = Debug|Win32 {649FACD9-76C7-4184-A34C-269E7F302952}.Debug|x64.ActiveCfg = Debug|x64 @@ -2498,14 +1846,6 @@ Global {649FACD9-76C7-4184-A34C-269E7F302952}.Release|Win32.Build.0 = Release|Win32 {649FACD9-76C7-4184-A34C-269E7F302952}.Release|x64.ActiveCfg = Release|x64 {649FACD9-76C7-4184-A34C-269E7F302952}.Release|x64.Build.0 = Release|x64 - {03ECBDF1-F8FB-40B0-8CC4-7F26D045B894}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {03ECBDF1-F8FB-40B0-8CC4-7F26D045B894}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {03ECBDF1-F8FB-40B0-8CC4-7F26D045B894}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {03ECBDF1-F8FB-40B0-8CC4-7F26D045B894}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {03ECBDF1-F8FB-40B0-8CC4-7F26D045B894}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {03ECBDF1-F8FB-40B0-8CC4-7F26D045B894}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {03ECBDF1-F8FB-40B0-8CC4-7F26D045B894}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {03ECBDF1-F8FB-40B0-8CC4-7F26D045B894}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {03ECBDF1-F8FB-40B0-8CC4-7F26D045B894}.Debug|Win32.ActiveCfg = Debug|Win32 {03ECBDF1-F8FB-40B0-8CC4-7F26D045B894}.Debug|Win32.Build.0 = Debug|Win32 {03ECBDF1-F8FB-40B0-8CC4-7F26D045B894}.Debug|x64.ActiveCfg = Debug|x64 @@ -2514,14 +1854,6 @@ Global {03ECBDF1-F8FB-40B0-8CC4-7F26D045B894}.Release|Win32.Build.0 = Release|Win32 {03ECBDF1-F8FB-40B0-8CC4-7F26D045B894}.Release|x64.ActiveCfg = Release|x64 {03ECBDF1-F8FB-40B0-8CC4-7F26D045B894}.Release|x64.Build.0 = Release|x64 - {CFB00773-94A6-411F-A2C1-20BC52772510}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {CFB00773-94A6-411F-A2C1-20BC52772510}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {CFB00773-94A6-411F-A2C1-20BC52772510}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {CFB00773-94A6-411F-A2C1-20BC52772510}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {CFB00773-94A6-411F-A2C1-20BC52772510}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {CFB00773-94A6-411F-A2C1-20BC52772510}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {CFB00773-94A6-411F-A2C1-20BC52772510}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {CFB00773-94A6-411F-A2C1-20BC52772510}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {CFB00773-94A6-411F-A2C1-20BC52772510}.Debug|Win32.ActiveCfg = Debug|Win32 {CFB00773-94A6-411F-A2C1-20BC52772510}.Debug|Win32.Build.0 = Debug|Win32 {CFB00773-94A6-411F-A2C1-20BC52772510}.Debug|x64.ActiveCfg = Debug|x64 @@ -2530,14 +1862,6 @@ Global {CFB00773-94A6-411F-A2C1-20BC52772510}.Release|Win32.Build.0 = Release|Win32 {CFB00773-94A6-411F-A2C1-20BC52772510}.Release|x64.ActiveCfg = Release|x64 {CFB00773-94A6-411F-A2C1-20BC52772510}.Release|x64.Build.0 = Release|x64 - {6D50FDCA-D1EB-4C60-9654-BB9FB9EA148B}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {6D50FDCA-D1EB-4C60-9654-BB9FB9EA148B}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {6D50FDCA-D1EB-4C60-9654-BB9FB9EA148B}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {6D50FDCA-D1EB-4C60-9654-BB9FB9EA148B}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {6D50FDCA-D1EB-4C60-9654-BB9FB9EA148B}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {6D50FDCA-D1EB-4C60-9654-BB9FB9EA148B}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {6D50FDCA-D1EB-4C60-9654-BB9FB9EA148B}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {6D50FDCA-D1EB-4C60-9654-BB9FB9EA148B}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {6D50FDCA-D1EB-4C60-9654-BB9FB9EA148B}.Debug|Win32.ActiveCfg = Debug|Win32 {6D50FDCA-D1EB-4C60-9654-BB9FB9EA148B}.Debug|Win32.Build.0 = Debug|Win32 {6D50FDCA-D1EB-4C60-9654-BB9FB9EA148B}.Debug|x64.ActiveCfg = Debug|x64 @@ -2546,14 +1870,6 @@ Global {6D50FDCA-D1EB-4C60-9654-BB9FB9EA148B}.Release|Win32.Build.0 = Release|Win32 {6D50FDCA-D1EB-4C60-9654-BB9FB9EA148B}.Release|x64.ActiveCfg = Release|x64 {6D50FDCA-D1EB-4C60-9654-BB9FB9EA148B}.Release|x64.Build.0 = Release|x64 - {6408610F-33BC-4BAE-B0E0-F366C7B93B88}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {6408610F-33BC-4BAE-B0E0-F366C7B93B88}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {6408610F-33BC-4BAE-B0E0-F366C7B93B88}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {6408610F-33BC-4BAE-B0E0-F366C7B93B88}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {6408610F-33BC-4BAE-B0E0-F366C7B93B88}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {6408610F-33BC-4BAE-B0E0-F366C7B93B88}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {6408610F-33BC-4BAE-B0E0-F366C7B93B88}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {6408610F-33BC-4BAE-B0E0-F366C7B93B88}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {6408610F-33BC-4BAE-B0E0-F366C7B93B88}.Debug|Win32.ActiveCfg = Debug|Win32 {6408610F-33BC-4BAE-B0E0-F366C7B93B88}.Debug|Win32.Build.0 = Debug|Win32 {6408610F-33BC-4BAE-B0E0-F366C7B93B88}.Debug|x64.ActiveCfg = Debug|x64 @@ -2562,14 +1878,6 @@ Global {6408610F-33BC-4BAE-B0E0-F366C7B93B88}.Release|Win32.Build.0 = Release|Win32 {6408610F-33BC-4BAE-B0E0-F366C7B93B88}.Release|x64.ActiveCfg = Release|x64 {6408610F-33BC-4BAE-B0E0-F366C7B93B88}.Release|x64.Build.0 = Release|x64 - {66CF01A0-7BE5-482E-8D27-6294E691B084}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {66CF01A0-7BE5-482E-8D27-6294E691B084}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {66CF01A0-7BE5-482E-8D27-6294E691B084}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {66CF01A0-7BE5-482E-8D27-6294E691B084}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {66CF01A0-7BE5-482E-8D27-6294E691B084}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {66CF01A0-7BE5-482E-8D27-6294E691B084}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {66CF01A0-7BE5-482E-8D27-6294E691B084}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {66CF01A0-7BE5-482E-8D27-6294E691B084}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {66CF01A0-7BE5-482E-8D27-6294E691B084}.Debug|Win32.ActiveCfg = Debug|Win32 {66CF01A0-7BE5-482E-8D27-6294E691B084}.Debug|Win32.Build.0 = Debug|Win32 {66CF01A0-7BE5-482E-8D27-6294E691B084}.Debug|x64.ActiveCfg = Debug|x64 @@ -2578,14 +1886,6 @@ Global {66CF01A0-7BE5-482E-8D27-6294E691B084}.Release|Win32.Build.0 = Release|Win32 {66CF01A0-7BE5-482E-8D27-6294E691B084}.Release|x64.ActiveCfg = Release|x64 {66CF01A0-7BE5-482E-8D27-6294E691B084}.Release|x64.Build.0 = Release|x64 - {15F7115E-5CD1-4CC9-9B8C-9C9357801302}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {15F7115E-5CD1-4CC9-9B8C-9C9357801302}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {15F7115E-5CD1-4CC9-9B8C-9C9357801302}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {15F7115E-5CD1-4CC9-9B8C-9C9357801302}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {15F7115E-5CD1-4CC9-9B8C-9C9357801302}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {15F7115E-5CD1-4CC9-9B8C-9C9357801302}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {15F7115E-5CD1-4CC9-9B8C-9C9357801302}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {15F7115E-5CD1-4CC9-9B8C-9C9357801302}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {15F7115E-5CD1-4CC9-9B8C-9C9357801302}.Debug|Win32.ActiveCfg = Debug|Win32 {15F7115E-5CD1-4CC9-9B8C-9C9357801302}.Debug|Win32.Build.0 = Debug|Win32 {15F7115E-5CD1-4CC9-9B8C-9C9357801302}.Debug|x64.ActiveCfg = Debug|x64 @@ -2594,14 +1894,6 @@ Global {15F7115E-5CD1-4CC9-9B8C-9C9357801302}.Release|Win32.Build.0 = Release|Win32 {15F7115E-5CD1-4CC9-9B8C-9C9357801302}.Release|x64.ActiveCfg = Release|x64 {15F7115E-5CD1-4CC9-9B8C-9C9357801302}.Release|x64.Build.0 = Release|x64 - {2C646634-969C-4A25-B9F2-ACE22302A89C}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {2C646634-969C-4A25-B9F2-ACE22302A89C}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {2C646634-969C-4A25-B9F2-ACE22302A89C}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {2C646634-969C-4A25-B9F2-ACE22302A89C}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {2C646634-969C-4A25-B9F2-ACE22302A89C}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {2C646634-969C-4A25-B9F2-ACE22302A89C}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {2C646634-969C-4A25-B9F2-ACE22302A89C}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {2C646634-969C-4A25-B9F2-ACE22302A89C}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {2C646634-969C-4A25-B9F2-ACE22302A89C}.Debug|Win32.ActiveCfg = Debug|Win32 {2C646634-969C-4A25-B9F2-ACE22302A89C}.Debug|Win32.Build.0 = Debug|Win32 {2C646634-969C-4A25-B9F2-ACE22302A89C}.Debug|x64.ActiveCfg = Debug|x64 @@ -2610,14 +1902,6 @@ Global {2C646634-969C-4A25-B9F2-ACE22302A89C}.Release|Win32.Build.0 = Release|Win32 {2C646634-969C-4A25-B9F2-ACE22302A89C}.Release|x64.ActiveCfg = Release|x64 {2C646634-969C-4A25-B9F2-ACE22302A89C}.Release|x64.Build.0 = Release|x64 - {2D412D9D-49F4-4259-A175-D6BBA1E8DFFD}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {2D412D9D-49F4-4259-A175-D6BBA1E8DFFD}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {2D412D9D-49F4-4259-A175-D6BBA1E8DFFD}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {2D412D9D-49F4-4259-A175-D6BBA1E8DFFD}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {2D412D9D-49F4-4259-A175-D6BBA1E8DFFD}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {2D412D9D-49F4-4259-A175-D6BBA1E8DFFD}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {2D412D9D-49F4-4259-A175-D6BBA1E8DFFD}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {2D412D9D-49F4-4259-A175-D6BBA1E8DFFD}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {2D412D9D-49F4-4259-A175-D6BBA1E8DFFD}.Debug|Win32.ActiveCfg = Debug|Win32 {2D412D9D-49F4-4259-A175-D6BBA1E8DFFD}.Debug|Win32.Build.0 = Debug|Win32 {2D412D9D-49F4-4259-A175-D6BBA1E8DFFD}.Debug|x64.ActiveCfg = Debug|x64 @@ -2626,14 +1910,6 @@ Global {2D412D9D-49F4-4259-A175-D6BBA1E8DFFD}.Release|Win32.Build.0 = Release|Win32 {2D412D9D-49F4-4259-A175-D6BBA1E8DFFD}.Release|x64.ActiveCfg = Release|x64 {2D412D9D-49F4-4259-A175-D6BBA1E8DFFD}.Release|x64.Build.0 = Release|x64 - {74127AED-9D17-4789-8B2F-9CCD660E7204}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {74127AED-9D17-4789-8B2F-9CCD660E7204}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {74127AED-9D17-4789-8B2F-9CCD660E7204}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {74127AED-9D17-4789-8B2F-9CCD660E7204}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {74127AED-9D17-4789-8B2F-9CCD660E7204}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {74127AED-9D17-4789-8B2F-9CCD660E7204}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {74127AED-9D17-4789-8B2F-9CCD660E7204}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {74127AED-9D17-4789-8B2F-9CCD660E7204}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {74127AED-9D17-4789-8B2F-9CCD660E7204}.Debug|Win32.ActiveCfg = Debug|Win32 {74127AED-9D17-4789-8B2F-9CCD660E7204}.Debug|Win32.Build.0 = Debug|Win32 {74127AED-9D17-4789-8B2F-9CCD660E7204}.Debug|x64.ActiveCfg = Debug|x64 @@ -2642,207 +1918,134 @@ Global {74127AED-9D17-4789-8B2F-9CCD660E7204}.Release|Win32.Build.0 = Release|Win32 {74127AED-9D17-4789-8B2F-9CCD660E7204}.Release|x64.ActiveCfg = Release|x64 {74127AED-9D17-4789-8B2F-9CCD660E7204}.Release|x64.Build.0 = Release|x64 - {DE360450-9BF9-42FB-98FD-3D29C5CAF6DA}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {DE360450-9BF9-42FB-98FD-3D29C5CAF6DA}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {DE360450-9BF9-42FB-98FD-3D29C5CAF6DA}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {DE360450-9BF9-42FB-98FD-3D29C5CAF6DA}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {DE360450-9BF9-42FB-98FD-3D29C5CAF6DA}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {DE360450-9BF9-42FB-98FD-3D29C5CAF6DA}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {DE360450-9BF9-42FB-98FD-3D29C5CAF6DA}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {DE360450-9BF9-42FB-98FD-3D29C5CAF6DA}.Debug|Win32.ActiveCfg = Debug|Win32 {DE360450-9BF9-42FB-98FD-3D29C5CAF6DA}.Debug|Win32.Build.0 = Debug|Win32 {DE360450-9BF9-42FB-98FD-3D29C5CAF6DA}.Debug|x64.ActiveCfg = Debug|x64 + {DE360450-9BF9-42FB-98FD-3D29C5CAF6DA}.Debug|x64.Build.0 = Debug|x64 {DE360450-9BF9-42FB-98FD-3D29C5CAF6DA}.Release|Win32.ActiveCfg = Release|Win32 + {DE360450-9BF9-42FB-98FD-3D29C5CAF6DA}.Release|Win32.Build.0 = Release|Win32 {DE360450-9BF9-42FB-98FD-3D29C5CAF6DA}.Release|x64.ActiveCfg = Release|x64 - {D6C3E453-ED0B-41CA-84E6-7D07D8867A2D}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {D6C3E453-ED0B-41CA-84E6-7D07D8867A2D}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {D6C3E453-ED0B-41CA-84E6-7D07D8867A2D}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {D6C3E453-ED0B-41CA-84E6-7D07D8867A2D}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {D6C3E453-ED0B-41CA-84E6-7D07D8867A2D}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {D6C3E453-ED0B-41CA-84E6-7D07D8867A2D}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {D6C3E453-ED0B-41CA-84E6-7D07D8867A2D}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {D6C3E453-ED0B-41CA-84E6-7D07D8867A2D}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {DE360450-9BF9-42FB-98FD-3D29C5CAF6DA}.Release|x64.Build.0 = Release|x64 {D6C3E453-ED0B-41CA-84E6-7D07D8867A2D}.Debug|Win32.ActiveCfg = Debug|Win32 + {D6C3E453-ED0B-41CA-84E6-7D07D8867A2D}.Debug|Win32.Build.0 = Debug|Win32 {D6C3E453-ED0B-41CA-84E6-7D07D8867A2D}.Debug|x64.ActiveCfg = Debug|x64 + {D6C3E453-ED0B-41CA-84E6-7D07D8867A2D}.Debug|x64.Build.0 = Debug|x64 {D6C3E453-ED0B-41CA-84E6-7D07D8867A2D}.Release|Win32.ActiveCfg = Release|Win32 + {D6C3E453-ED0B-41CA-84E6-7D07D8867A2D}.Release|Win32.Build.0 = Release|Win32 {D6C3E453-ED0B-41CA-84E6-7D07D8867A2D}.Release|x64.ActiveCfg = Release|x64 - {14C78FC0-F80C-425F-A504-1DD264BCDD01}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {14C78FC0-F80C-425F-A504-1DD264BCDD01}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {14C78FC0-F80C-425F-A504-1DD264BCDD01}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {14C78FC0-F80C-425F-A504-1DD264BCDD01}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {14C78FC0-F80C-425F-A504-1DD264BCDD01}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {14C78FC0-F80C-425F-A504-1DD264BCDD01}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {14C78FC0-F80C-425F-A504-1DD264BCDD01}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {D6C3E453-ED0B-41CA-84E6-7D07D8867A2D}.Release|x64.Build.0 = Release|x64 {14C78FC0-F80C-425F-A504-1DD264BCDD01}.Debug|Win32.ActiveCfg = Debug|Win32 {14C78FC0-F80C-425F-A504-1DD264BCDD01}.Debug|Win32.Build.0 = Debug|Win32 {14C78FC0-F80C-425F-A504-1DD264BCDD01}.Debug|x64.ActiveCfg = Debug|x64 + {14C78FC0-F80C-425F-A504-1DD264BCDD01}.Debug|x64.Build.0 = Debug|x64 {14C78FC0-F80C-425F-A504-1DD264BCDD01}.Release|Win32.ActiveCfg = Release|Win32 + {14C78FC0-F80C-425F-A504-1DD264BCDD01}.Release|Win32.Build.0 = Release|Win32 {14C78FC0-F80C-425F-A504-1DD264BCDD01}.Release|x64.ActiveCfg = Release|x64 - {814690FE-2C4F-4EF4-82CB-720BC4C8FF9B}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {814690FE-2C4F-4EF4-82CB-720BC4C8FF9B}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {814690FE-2C4F-4EF4-82CB-720BC4C8FF9B}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {814690FE-2C4F-4EF4-82CB-720BC4C8FF9B}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {814690FE-2C4F-4EF4-82CB-720BC4C8FF9B}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {814690FE-2C4F-4EF4-82CB-720BC4C8FF9B}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {814690FE-2C4F-4EF4-82CB-720BC4C8FF9B}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {814690FE-2C4F-4EF4-82CB-720BC4C8FF9B}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {14C78FC0-F80C-425F-A504-1DD264BCDD01}.Release|x64.Build.0 = Release|x64 {814690FE-2C4F-4EF4-82CB-720BC4C8FF9B}.Debug|Win32.ActiveCfg = Debug|Win32 + {814690FE-2C4F-4EF4-82CB-720BC4C8FF9B}.Debug|Win32.Build.0 = Debug|Win32 {814690FE-2C4F-4EF4-82CB-720BC4C8FF9B}.Debug|x64.ActiveCfg = Debug|x64 + {814690FE-2C4F-4EF4-82CB-720BC4C8FF9B}.Debug|x64.Build.0 = Debug|x64 {814690FE-2C4F-4EF4-82CB-720BC4C8FF9B}.Release|Win32.ActiveCfg = Release|Win32 + {814690FE-2C4F-4EF4-82CB-720BC4C8FF9B}.Release|Win32.Build.0 = Release|Win32 {814690FE-2C4F-4EF4-82CB-720BC4C8FF9B}.Release|x64.ActiveCfg = Release|x64 - {3C394401-8E95-475B-8B35-B90A7CCAE578}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {3C394401-8E95-475B-8B35-B90A7CCAE578}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {3C394401-8E95-475B-8B35-B90A7CCAE578}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {3C394401-8E95-475B-8B35-B90A7CCAE578}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {3C394401-8E95-475B-8B35-B90A7CCAE578}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {3C394401-8E95-475B-8B35-B90A7CCAE578}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {3C394401-8E95-475B-8B35-B90A7CCAE578}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {814690FE-2C4F-4EF4-82CB-720BC4C8FF9B}.Release|x64.Build.0 = Release|x64 {3C394401-8E95-475B-8B35-B90A7CCAE578}.Debug|Win32.ActiveCfg = Debug|Win32 {3C394401-8E95-475B-8B35-B90A7CCAE578}.Debug|Win32.Build.0 = Debug|Win32 {3C394401-8E95-475B-8B35-B90A7CCAE578}.Debug|x64.ActiveCfg = Debug|x64 + {3C394401-8E95-475B-8B35-B90A7CCAE578}.Debug|x64.Build.0 = Debug|x64 {3C394401-8E95-475B-8B35-B90A7CCAE578}.Release|Win32.ActiveCfg = Release|Win32 + {3C394401-8E95-475B-8B35-B90A7CCAE578}.Release|Win32.Build.0 = Release|Win32 {3C394401-8E95-475B-8B35-B90A7CCAE578}.Release|x64.ActiveCfg = Release|x64 - {E1510790-AF0B-4FFE-B6AA-B75119793AFC}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {E1510790-AF0B-4FFE-B6AA-B75119793AFC}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {E1510790-AF0B-4FFE-B6AA-B75119793AFC}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {E1510790-AF0B-4FFE-B6AA-B75119793AFC}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {E1510790-AF0B-4FFE-B6AA-B75119793AFC}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {E1510790-AF0B-4FFE-B6AA-B75119793AFC}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {E1510790-AF0B-4FFE-B6AA-B75119793AFC}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {E1510790-AF0B-4FFE-B6AA-B75119793AFC}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {3C394401-8E95-475B-8B35-B90A7CCAE578}.Release|x64.Build.0 = Release|x64 {E1510790-AF0B-4FFE-B6AA-B75119793AFC}.Debug|Win32.ActiveCfg = Debug|Win32 + {E1510790-AF0B-4FFE-B6AA-B75119793AFC}.Debug|Win32.Build.0 = Debug|Win32 {E1510790-AF0B-4FFE-B6AA-B75119793AFC}.Debug|x64.ActiveCfg = Debug|x64 + {E1510790-AF0B-4FFE-B6AA-B75119793AFC}.Debug|x64.Build.0 = Debug|x64 {E1510790-AF0B-4FFE-B6AA-B75119793AFC}.Release|Win32.ActiveCfg = Release|Win32 + {E1510790-AF0B-4FFE-B6AA-B75119793AFC}.Release|Win32.Build.0 = Release|Win32 {E1510790-AF0B-4FFE-B6AA-B75119793AFC}.Release|x64.ActiveCfg = Release|x64 - {7CB05069-58C9-4C7D-A6A6-DBFB1CE7C58C}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {7CB05069-58C9-4C7D-A6A6-DBFB1CE7C58C}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {7CB05069-58C9-4C7D-A6A6-DBFB1CE7C58C}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {7CB05069-58C9-4C7D-A6A6-DBFB1CE7C58C}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {7CB05069-58C9-4C7D-A6A6-DBFB1CE7C58C}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {7CB05069-58C9-4C7D-A6A6-DBFB1CE7C58C}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {7CB05069-58C9-4C7D-A6A6-DBFB1CE7C58C}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {E1510790-AF0B-4FFE-B6AA-B75119793AFC}.Release|x64.Build.0 = Release|x64 {7CB05069-58C9-4C7D-A6A6-DBFB1CE7C58C}.Debug|Win32.ActiveCfg = Debug|Win32 {7CB05069-58C9-4C7D-A6A6-DBFB1CE7C58C}.Debug|Win32.Build.0 = Debug|Win32 {7CB05069-58C9-4C7D-A6A6-DBFB1CE7C58C}.Debug|x64.ActiveCfg = Debug|x64 + {7CB05069-58C9-4C7D-A6A6-DBFB1CE7C58C}.Debug|x64.Build.0 = Debug|x64 {7CB05069-58C9-4C7D-A6A6-DBFB1CE7C58C}.Release|Win32.ActiveCfg = Release|Win32 + {7CB05069-58C9-4C7D-A6A6-DBFB1CE7C58C}.Release|Win32.Build.0 = Release|Win32 {7CB05069-58C9-4C7D-A6A6-DBFB1CE7C58C}.Release|x64.ActiveCfg = Release|x64 - {3BD0D95D-8DC6-4A07-B4D9-72EC85C4C97A}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {3BD0D95D-8DC6-4A07-B4D9-72EC85C4C97A}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {3BD0D95D-8DC6-4A07-B4D9-72EC85C4C97A}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {3BD0D95D-8DC6-4A07-B4D9-72EC85C4C97A}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {3BD0D95D-8DC6-4A07-B4D9-72EC85C4C97A}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {3BD0D95D-8DC6-4A07-B4D9-72EC85C4C97A}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {3BD0D95D-8DC6-4A07-B4D9-72EC85C4C97A}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {3BD0D95D-8DC6-4A07-B4D9-72EC85C4C97A}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {7CB05069-58C9-4C7D-A6A6-DBFB1CE7C58C}.Release|x64.Build.0 = Release|x64 {3BD0D95D-8DC6-4A07-B4D9-72EC85C4C97A}.Debug|Win32.ActiveCfg = Debug|Win32 + {3BD0D95D-8DC6-4A07-B4D9-72EC85C4C97A}.Debug|Win32.Build.0 = Debug|Win32 {3BD0D95D-8DC6-4A07-B4D9-72EC85C4C97A}.Debug|x64.ActiveCfg = Debug|x64 + {3BD0D95D-8DC6-4A07-B4D9-72EC85C4C97A}.Debug|x64.Build.0 = Debug|x64 {3BD0D95D-8DC6-4A07-B4D9-72EC85C4C97A}.Release|Win32.ActiveCfg = Release|Win32 + {3BD0D95D-8DC6-4A07-B4D9-72EC85C4C97A}.Release|Win32.Build.0 = Release|Win32 {3BD0D95D-8DC6-4A07-B4D9-72EC85C4C97A}.Release|x64.ActiveCfg = Release|x64 - {8CCBFE0A-E0EE-40B7-A78A-C36B7615618A}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {8CCBFE0A-E0EE-40B7-A78A-C36B7615618A}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {8CCBFE0A-E0EE-40B7-A78A-C36B7615618A}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {8CCBFE0A-E0EE-40B7-A78A-C36B7615618A}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {8CCBFE0A-E0EE-40B7-A78A-C36B7615618A}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {8CCBFE0A-E0EE-40B7-A78A-C36B7615618A}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {8CCBFE0A-E0EE-40B7-A78A-C36B7615618A}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {3BD0D95D-8DC6-4A07-B4D9-72EC85C4C97A}.Release|x64.Build.0 = Release|x64 {8CCBFE0A-E0EE-40B7-A78A-C36B7615618A}.Debug|Win32.ActiveCfg = Debug|Win32 {8CCBFE0A-E0EE-40B7-A78A-C36B7615618A}.Debug|Win32.Build.0 = Debug|Win32 {8CCBFE0A-E0EE-40B7-A78A-C36B7615618A}.Debug|x64.ActiveCfg = Debug|x64 + {8CCBFE0A-E0EE-40B7-A78A-C36B7615618A}.Debug|x64.Build.0 = Debug|x64 {8CCBFE0A-E0EE-40B7-A78A-C36B7615618A}.Release|Win32.ActiveCfg = Release|Win32 + {8CCBFE0A-E0EE-40B7-A78A-C36B7615618A}.Release|Win32.Build.0 = Release|Win32 {8CCBFE0A-E0EE-40B7-A78A-C36B7615618A}.Release|x64.ActiveCfg = Release|x64 - {40C0ABA8-A839-4988-AC60-04F649B44C54}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {40C0ABA8-A839-4988-AC60-04F649B44C54}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {40C0ABA8-A839-4988-AC60-04F649B44C54}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {40C0ABA8-A839-4988-AC60-04F649B44C54}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {40C0ABA8-A839-4988-AC60-04F649B44C54}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {40C0ABA8-A839-4988-AC60-04F649B44C54}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {40C0ABA8-A839-4988-AC60-04F649B44C54}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {40C0ABA8-A839-4988-AC60-04F649B44C54}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {8CCBFE0A-E0EE-40B7-A78A-C36B7615618A}.Release|x64.Build.0 = Release|x64 {40C0ABA8-A839-4988-AC60-04F649B44C54}.Debug|Win32.ActiveCfg = Debug|Win32 + {40C0ABA8-A839-4988-AC60-04F649B44C54}.Debug|Win32.Build.0 = Debug|Win32 {40C0ABA8-A839-4988-AC60-04F649B44C54}.Debug|x64.ActiveCfg = Debug|x64 + {40C0ABA8-A839-4988-AC60-04F649B44C54}.Debug|x64.Build.0 = Debug|x64 {40C0ABA8-A839-4988-AC60-04F649B44C54}.Release|Win32.ActiveCfg = Release|Win32 + {40C0ABA8-A839-4988-AC60-04F649B44C54}.Release|Win32.Build.0 = Release|Win32 {40C0ABA8-A839-4988-AC60-04F649B44C54}.Release|x64.ActiveCfg = Release|x64 - {BF42E24D-954E-47A6-8699-B2F764939757}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {BF42E24D-954E-47A6-8699-B2F764939757}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {BF42E24D-954E-47A6-8699-B2F764939757}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {BF42E24D-954E-47A6-8699-B2F764939757}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {BF42E24D-954E-47A6-8699-B2F764939757}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {BF42E24D-954E-47A6-8699-B2F764939757}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {BF42E24D-954E-47A6-8699-B2F764939757}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {BF42E24D-954E-47A6-8699-B2F764939757}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {40C0ABA8-A839-4988-AC60-04F649B44C54}.Release|x64.Build.0 = Release|x64 {BF42E24D-954E-47A6-8699-B2F764939757}.Debug|Win32.ActiveCfg = Debug|Win32 {BF42E24D-954E-47A6-8699-B2F764939757}.Debug|Win32.Build.0 = Debug|Win32 {BF42E24D-954E-47A6-8699-B2F764939757}.Debug|x64.ActiveCfg = Debug|x64 + {BF42E24D-954E-47A6-8699-B2F764939757}.Debug|x64.Build.0 = Debug|x64 {BF42E24D-954E-47A6-8699-B2F764939757}.Release|Win32.ActiveCfg = Release|Win32 + {BF42E24D-954E-47A6-8699-B2F764939757}.Release|Win32.Build.0 = Release|Win32 {BF42E24D-954E-47A6-8699-B2F764939757}.Release|x64.ActiveCfg = Release|x64 - {D3978518-2640-48BE-9D42-F664742BCB45}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {D3978518-2640-48BE-9D42-F664742BCB45}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {D3978518-2640-48BE-9D42-F664742BCB45}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {D3978518-2640-48BE-9D42-F664742BCB45}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {D3978518-2640-48BE-9D42-F664742BCB45}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {D3978518-2640-48BE-9D42-F664742BCB45}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {D3978518-2640-48BE-9D42-F664742BCB45}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {D3978518-2640-48BE-9D42-F664742BCB45}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {BF42E24D-954E-47A6-8699-B2F764939757}.Release|x64.Build.0 = Release|x64 {D3978518-2640-48BE-9D42-F664742BCB45}.Debug|Win32.ActiveCfg = Debug|Win32 + {D3978518-2640-48BE-9D42-F664742BCB45}.Debug|Win32.Build.0 = Debug|Win32 {D3978518-2640-48BE-9D42-F664742BCB45}.Debug|x64.ActiveCfg = Debug|x64 + {D3978518-2640-48BE-9D42-F664742BCB45}.Debug|x64.Build.0 = Debug|x64 {D3978518-2640-48BE-9D42-F664742BCB45}.Release|Win32.ActiveCfg = Release|Win32 + {D3978518-2640-48BE-9D42-F664742BCB45}.Release|Win32.Build.0 = Release|Win32 {D3978518-2640-48BE-9D42-F664742BCB45}.Release|x64.ActiveCfg = Release|x64 - {F0F9CA32-65BC-4F71-9901-E231FD485CDA}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {F0F9CA32-65BC-4F71-9901-E231FD485CDA}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {F0F9CA32-65BC-4F71-9901-E231FD485CDA}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {F0F9CA32-65BC-4F71-9901-E231FD485CDA}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {F0F9CA32-65BC-4F71-9901-E231FD485CDA}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {F0F9CA32-65BC-4F71-9901-E231FD485CDA}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {F0F9CA32-65BC-4F71-9901-E231FD485CDA}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {D3978518-2640-48BE-9D42-F664742BCB45}.Release|x64.Build.0 = Release|x64 {F0F9CA32-65BC-4F71-9901-E231FD485CDA}.Debug|Win32.ActiveCfg = Debug|Win32 {F0F9CA32-65BC-4F71-9901-E231FD485CDA}.Debug|Win32.Build.0 = Debug|Win32 {F0F9CA32-65BC-4F71-9901-E231FD485CDA}.Debug|x64.ActiveCfg = Debug|x64 + {F0F9CA32-65BC-4F71-9901-E231FD485CDA}.Debug|x64.Build.0 = Debug|x64 {F0F9CA32-65BC-4F71-9901-E231FD485CDA}.Release|Win32.ActiveCfg = Release|Win32 + {F0F9CA32-65BC-4F71-9901-E231FD485CDA}.Release|Win32.Build.0 = Release|Win32 {F0F9CA32-65BC-4F71-9901-E231FD485CDA}.Release|x64.ActiveCfg = Release|x64 - {5579253D-24F6-4001-BF9E-D0D6DA3EF928}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {5579253D-24F6-4001-BF9E-D0D6DA3EF928}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {5579253D-24F6-4001-BF9E-D0D6DA3EF928}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {5579253D-24F6-4001-BF9E-D0D6DA3EF928}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {5579253D-24F6-4001-BF9E-D0D6DA3EF928}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {5579253D-24F6-4001-BF9E-D0D6DA3EF928}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {5579253D-24F6-4001-BF9E-D0D6DA3EF928}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {5579253D-24F6-4001-BF9E-D0D6DA3EF928}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {F0F9CA32-65BC-4F71-9901-E231FD485CDA}.Release|x64.Build.0 = Release|x64 {5579253D-24F6-4001-BF9E-D0D6DA3EF928}.Debug|Win32.ActiveCfg = Debug|Win32 + {5579253D-24F6-4001-BF9E-D0D6DA3EF928}.Debug|Win32.Build.0 = Debug|Win32 {5579253D-24F6-4001-BF9E-D0D6DA3EF928}.Debug|x64.ActiveCfg = Debug|x64 + {5579253D-24F6-4001-BF9E-D0D6DA3EF928}.Debug|x64.Build.0 = Debug|x64 {5579253D-24F6-4001-BF9E-D0D6DA3EF928}.Release|Win32.ActiveCfg = Release|Win32 + {5579253D-24F6-4001-BF9E-D0D6DA3EF928}.Release|Win32.Build.0 = Release|Win32 {5579253D-24F6-4001-BF9E-D0D6DA3EF928}.Release|x64.ActiveCfg = Release|x64 - {C02402BC-608E-4E46-B432-3C0C39E3B346}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {C02402BC-608E-4E46-B432-3C0C39E3B346}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {C02402BC-608E-4E46-B432-3C0C39E3B346}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {C02402BC-608E-4E46-B432-3C0C39E3B346}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {C02402BC-608E-4E46-B432-3C0C39E3B346}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {C02402BC-608E-4E46-B432-3C0C39E3B346}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {C02402BC-608E-4E46-B432-3C0C39E3B346}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {5579253D-24F6-4001-BF9E-D0D6DA3EF928}.Release|x64.Build.0 = Release|x64 {C02402BC-608E-4E46-B432-3C0C39E3B346}.Debug|Win32.ActiveCfg = Debug|Win32 {C02402BC-608E-4E46-B432-3C0C39E3B346}.Debug|Win32.Build.0 = Debug|Win32 {C02402BC-608E-4E46-B432-3C0C39E3B346}.Debug|x64.ActiveCfg = Debug|x64 + {C02402BC-608E-4E46-B432-3C0C39E3B346}.Debug|x64.Build.0 = Debug|x64 {C02402BC-608E-4E46-B432-3C0C39E3B346}.Release|Win32.ActiveCfg = Release|Win32 + {C02402BC-608E-4E46-B432-3C0C39E3B346}.Release|Win32.Build.0 = Release|Win32 {C02402BC-608E-4E46-B432-3C0C39E3B346}.Release|x64.ActiveCfg = Release|x64 - {5ED6FC18-EAED-4833-8CE8-FA19F5CD713B}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {5ED6FC18-EAED-4833-8CE8-FA19F5CD713B}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {5ED6FC18-EAED-4833-8CE8-FA19F5CD713B}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {5ED6FC18-EAED-4833-8CE8-FA19F5CD713B}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {5ED6FC18-EAED-4833-8CE8-FA19F5CD713B}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {5ED6FC18-EAED-4833-8CE8-FA19F5CD713B}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {5ED6FC18-EAED-4833-8CE8-FA19F5CD713B}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {5ED6FC18-EAED-4833-8CE8-FA19F5CD713B}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {C02402BC-608E-4E46-B432-3C0C39E3B346}.Release|x64.Build.0 = Release|x64 {5ED6FC18-EAED-4833-8CE8-FA19F5CD713B}.Debug|Win32.ActiveCfg = Debug|Win32 + {5ED6FC18-EAED-4833-8CE8-FA19F5CD713B}.Debug|Win32.Build.0 = Debug|Win32 {5ED6FC18-EAED-4833-8CE8-FA19F5CD713B}.Debug|x64.ActiveCfg = Debug|x64 + {5ED6FC18-EAED-4833-8CE8-FA19F5CD713B}.Debug|x64.Build.0 = Debug|x64 {5ED6FC18-EAED-4833-8CE8-FA19F5CD713B}.Release|Win32.ActiveCfg = Release|Win32 + {5ED6FC18-EAED-4833-8CE8-FA19F5CD713B}.Release|Win32.Build.0 = Release|Win32 {5ED6FC18-EAED-4833-8CE8-FA19F5CD713B}.Release|x64.ActiveCfg = Release|x64 - {0AF7FE2E-9C7F-4F87-A999-D397D39CE752}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {0AF7FE2E-9C7F-4F87-A999-D397D39CE752}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {0AF7FE2E-9C7F-4F87-A999-D397D39CE752}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {0AF7FE2E-9C7F-4F87-A999-D397D39CE752}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {0AF7FE2E-9C7F-4F87-A999-D397D39CE752}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {0AF7FE2E-9C7F-4F87-A999-D397D39CE752}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {0AF7FE2E-9C7F-4F87-A999-D397D39CE752}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {0AF7FE2E-9C7F-4F87-A999-D397D39CE752}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {5ED6FC18-EAED-4833-8CE8-FA19F5CD713B}.Release|x64.Build.0 = Release|x64 {0AF7FE2E-9C7F-4F87-A999-D397D39CE752}.Debug|Win32.ActiveCfg = Debug|Win32 {0AF7FE2E-9C7F-4F87-A999-D397D39CE752}.Debug|Win32.Build.0 = Debug|Win32 {0AF7FE2E-9C7F-4F87-A999-D397D39CE752}.Debug|x64.ActiveCfg = Debug|x64 @@ -2851,14 +2054,6 @@ Global {0AF7FE2E-9C7F-4F87-A999-D397D39CE752}.Release|Win32.Build.0 = Release|Win32 {0AF7FE2E-9C7F-4F87-A999-D397D39CE752}.Release|x64.ActiveCfg = Release|x64 {0AF7FE2E-9C7F-4F87-A999-D397D39CE752}.Release|x64.Build.0 = Release|x64 - {508275B8-D93D-4F1B-BD48-1A4B7420F860}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {508275B8-D93D-4F1B-BD48-1A4B7420F860}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {508275B8-D93D-4F1B-BD48-1A4B7420F860}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {508275B8-D93D-4F1B-BD48-1A4B7420F860}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {508275B8-D93D-4F1B-BD48-1A4B7420F860}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {508275B8-D93D-4F1B-BD48-1A4B7420F860}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {508275B8-D93D-4F1B-BD48-1A4B7420F860}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {508275B8-D93D-4F1B-BD48-1A4B7420F860}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {508275B8-D93D-4F1B-BD48-1A4B7420F860}.Debug|Win32.ActiveCfg = Debug|Win32 {508275B8-D93D-4F1B-BD48-1A4B7420F860}.Debug|Win32.Build.0 = Debug|Win32 {508275B8-D93D-4F1B-BD48-1A4B7420F860}.Debug|x64.ActiveCfg = Debug|x64 @@ -2867,14 +2062,6 @@ Global {508275B8-D93D-4F1B-BD48-1A4B7420F860}.Release|Win32.Build.0 = Release|Win32 {508275B8-D93D-4F1B-BD48-1A4B7420F860}.Release|x64.ActiveCfg = Release|x64 {508275B8-D93D-4F1B-BD48-1A4B7420F860}.Release|x64.Build.0 = Release|x64 - {6854119E-CB5F-4B6F-9AB9-49538B9219F6}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {6854119E-CB5F-4B6F-9AB9-49538B9219F6}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {6854119E-CB5F-4B6F-9AB9-49538B9219F6}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {6854119E-CB5F-4B6F-9AB9-49538B9219F6}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {6854119E-CB5F-4B6F-9AB9-49538B9219F6}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {6854119E-CB5F-4B6F-9AB9-49538B9219F6}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {6854119E-CB5F-4B6F-9AB9-49538B9219F6}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {6854119E-CB5F-4B6F-9AB9-49538B9219F6}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {6854119E-CB5F-4B6F-9AB9-49538B9219F6}.Debug|Win32.ActiveCfg = Debug|Win32 {6854119E-CB5F-4B6F-9AB9-49538B9219F6}.Debug|Win32.Build.0 = Debug|Win32 {6854119E-CB5F-4B6F-9AB9-49538B9219F6}.Debug|x64.ActiveCfg = Debug|x64 @@ -2883,14 +2070,6 @@ Global {6854119E-CB5F-4B6F-9AB9-49538B9219F6}.Release|Win32.Build.0 = Release|Win32 {6854119E-CB5F-4B6F-9AB9-49538B9219F6}.Release|x64.ActiveCfg = Release|x64 {6854119E-CB5F-4B6F-9AB9-49538B9219F6}.Release|x64.Build.0 = Release|x64 - {C4A93019-9757-4999-A1E5-3C019569A525}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {C4A93019-9757-4999-A1E5-3C019569A525}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {C4A93019-9757-4999-A1E5-3C019569A525}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {C4A93019-9757-4999-A1E5-3C019569A525}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {C4A93019-9757-4999-A1E5-3C019569A525}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {C4A93019-9757-4999-A1E5-3C019569A525}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {C4A93019-9757-4999-A1E5-3C019569A525}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {C4A93019-9757-4999-A1E5-3C019569A525}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {C4A93019-9757-4999-A1E5-3C019569A525}.Debug|Win32.ActiveCfg = Debug|Win32 {C4A93019-9757-4999-A1E5-3C019569A525}.Debug|Win32.Build.0 = Debug|Win32 {C4A93019-9757-4999-A1E5-3C019569A525}.Debug|x64.ActiveCfg = Debug|x64 @@ -2899,14 +2078,6 @@ Global {C4A93019-9757-4999-A1E5-3C019569A525}.Release|Win32.Build.0 = Release|Win32 {C4A93019-9757-4999-A1E5-3C019569A525}.Release|x64.ActiveCfg = Release|x64 {C4A93019-9757-4999-A1E5-3C019569A525}.Release|x64.Build.0 = Release|x64 - {8458C2DB-4B5E-4CC9-9365-571C62B2832F}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {8458C2DB-4B5E-4CC9-9365-571C62B2832F}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {8458C2DB-4B5E-4CC9-9365-571C62B2832F}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {8458C2DB-4B5E-4CC9-9365-571C62B2832F}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {8458C2DB-4B5E-4CC9-9365-571C62B2832F}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {8458C2DB-4B5E-4CC9-9365-571C62B2832F}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {8458C2DB-4B5E-4CC9-9365-571C62B2832F}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {8458C2DB-4B5E-4CC9-9365-571C62B2832F}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {8458C2DB-4B5E-4CC9-9365-571C62B2832F}.Debug|Win32.ActiveCfg = Debug|Win32 {8458C2DB-4B5E-4CC9-9365-571C62B2832F}.Debug|Win32.Build.0 = Debug|Win32 {8458C2DB-4B5E-4CC9-9365-571C62B2832F}.Debug|x64.ActiveCfg = Debug|x64 @@ -2915,14 +2086,6 @@ Global {8458C2DB-4B5E-4CC9-9365-571C62B2832F}.Release|Win32.Build.0 = Release|Win32 {8458C2DB-4B5E-4CC9-9365-571C62B2832F}.Release|x64.ActiveCfg = Release|x64 {8458C2DB-4B5E-4CC9-9365-571C62B2832F}.Release|x64.Build.0 = Release|x64 - {667B765B-502E-46C3-92EE-DDDDC657ED2D}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {667B765B-502E-46C3-92EE-DDDDC657ED2D}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {667B765B-502E-46C3-92EE-DDDDC657ED2D}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {667B765B-502E-46C3-92EE-DDDDC657ED2D}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {667B765B-502E-46C3-92EE-DDDDC657ED2D}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {667B765B-502E-46C3-92EE-DDDDC657ED2D}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {667B765B-502E-46C3-92EE-DDDDC657ED2D}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {667B765B-502E-46C3-92EE-DDDDC657ED2D}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {667B765B-502E-46C3-92EE-DDDDC657ED2D}.Debug|Win32.ActiveCfg = Debug|Win32 {667B765B-502E-46C3-92EE-DDDDC657ED2D}.Debug|Win32.Build.0 = Debug|Win32 {667B765B-502E-46C3-92EE-DDDDC657ED2D}.Debug|x64.ActiveCfg = Debug|x64 @@ -2931,14 +2094,6 @@ Global {667B765B-502E-46C3-92EE-DDDDC657ED2D}.Release|Win32.Build.0 = Release|Win32 {667B765B-502E-46C3-92EE-DDDDC657ED2D}.Release|x64.ActiveCfg = Release|x64 {667B765B-502E-46C3-92EE-DDDDC657ED2D}.Release|x64.Build.0 = Release|x64 - {4CDBBDDD-7CB7-4063-ACCE-667D6162C5CA}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {4CDBBDDD-7CB7-4063-ACCE-667D6162C5CA}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {4CDBBDDD-7CB7-4063-ACCE-667D6162C5CA}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {4CDBBDDD-7CB7-4063-ACCE-667D6162C5CA}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {4CDBBDDD-7CB7-4063-ACCE-667D6162C5CA}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {4CDBBDDD-7CB7-4063-ACCE-667D6162C5CA}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {4CDBBDDD-7CB7-4063-ACCE-667D6162C5CA}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {4CDBBDDD-7CB7-4063-ACCE-667D6162C5CA}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {4CDBBDDD-7CB7-4063-ACCE-667D6162C5CA}.Debug|Win32.ActiveCfg = Debug|Win32 {4CDBBDDD-7CB7-4063-ACCE-667D6162C5CA}.Debug|Win32.Build.0 = Debug|Win32 {4CDBBDDD-7CB7-4063-ACCE-667D6162C5CA}.Debug|x64.ActiveCfg = Debug|x64 @@ -2947,14 +2102,6 @@ Global {4CDBBDDD-7CB7-4063-ACCE-667D6162C5CA}.Release|Win32.Build.0 = Release|Win32 {4CDBBDDD-7CB7-4063-ACCE-667D6162C5CA}.Release|x64.ActiveCfg = Release|x64 {4CDBBDDD-7CB7-4063-ACCE-667D6162C5CA}.Release|x64.Build.0 = Release|x64 - {8A420B3E-C5C5-403B-874A-6D2A5A51783B}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {8A420B3E-C5C5-403B-874A-6D2A5A51783B}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {8A420B3E-C5C5-403B-874A-6D2A5A51783B}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {8A420B3E-C5C5-403B-874A-6D2A5A51783B}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {8A420B3E-C5C5-403B-874A-6D2A5A51783B}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {8A420B3E-C5C5-403B-874A-6D2A5A51783B}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {8A420B3E-C5C5-403B-874A-6D2A5A51783B}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {8A420B3E-C5C5-403B-874A-6D2A5A51783B}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {8A420B3E-C5C5-403B-874A-6D2A5A51783B}.Debug|Win32.ActiveCfg = Debug|Win32 {8A420B3E-C5C5-403B-874A-6D2A5A51783B}.Debug|Win32.Build.0 = Debug|Win32 {8A420B3E-C5C5-403B-874A-6D2A5A51783B}.Debug|x64.ActiveCfg = Debug|x64 @@ -2963,151 +2110,94 @@ Global {8A420B3E-C5C5-403B-874A-6D2A5A51783B}.Release|Win32.Build.0 = Release|Win32 {8A420B3E-C5C5-403B-874A-6D2A5A51783B}.Release|x64.ActiveCfg = Release|x64 {8A420B3E-C5C5-403B-874A-6D2A5A51783B}.Release|x64.Build.0 = Release|x64 - {F2FC008C-2972-481A-9E30-2D194E1DBAD7}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {F2FC008C-2972-481A-9E30-2D194E1DBAD7}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {F2FC008C-2972-481A-9E30-2D194E1DBAD7}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {F2FC008C-2972-481A-9E30-2D194E1DBAD7}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {F2FC008C-2972-481A-9E30-2D194E1DBAD7}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {F2FC008C-2972-481A-9E30-2D194E1DBAD7}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {F2FC008C-2972-481A-9E30-2D194E1DBAD7}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {F2FC008C-2972-481A-9E30-2D194E1DBAD7}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {F2FC008C-2972-481A-9E30-2D194E1DBAD7}.Debug|Win32.ActiveCfg = Debug|Win32 {F2FC008C-2972-481A-9E30-2D194E1DBAD7}.Debug|Win32.Build.0 = Debug|Win32 {F2FC008C-2972-481A-9E30-2D194E1DBAD7}.Debug|x64.ActiveCfg = Debug|x64 + {F2FC008C-2972-481A-9E30-2D194E1DBAD7}.Debug|x64.Build.0 = Debug|x64 {F2FC008C-2972-481A-9E30-2D194E1DBAD7}.Release|Win32.ActiveCfg = Release|Win32 + {F2FC008C-2972-481A-9E30-2D194E1DBAD7}.Release|Win32.Build.0 = Release|Win32 {F2FC008C-2972-481A-9E30-2D194E1DBAD7}.Release|x64.ActiveCfg = Release|x64 - {5150E36B-EDF1-410B-A7D7-7B0D75AB92C4}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {5150E36B-EDF1-410B-A7D7-7B0D75AB92C4}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {5150E36B-EDF1-410B-A7D7-7B0D75AB92C4}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {5150E36B-EDF1-410B-A7D7-7B0D75AB92C4}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {5150E36B-EDF1-410B-A7D7-7B0D75AB92C4}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {5150E36B-EDF1-410B-A7D7-7B0D75AB92C4}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {5150E36B-EDF1-410B-A7D7-7B0D75AB92C4}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {5150E36B-EDF1-410B-A7D7-7B0D75AB92C4}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {F2FC008C-2972-481A-9E30-2D194E1DBAD7}.Release|x64.Build.0 = Release|x64 {5150E36B-EDF1-410B-A7D7-7B0D75AB92C4}.Debug|Win32.ActiveCfg = Debug|Win32 + {5150E36B-EDF1-410B-A7D7-7B0D75AB92C4}.Debug|Win32.Build.0 = Debug|Win32 {5150E36B-EDF1-410B-A7D7-7B0D75AB92C4}.Debug|x64.ActiveCfg = Debug|x64 + {5150E36B-EDF1-410B-A7D7-7B0D75AB92C4}.Debug|x64.Build.0 = Debug|x64 {5150E36B-EDF1-410B-A7D7-7B0D75AB92C4}.Release|Win32.ActiveCfg = Release|Win32 + {5150E36B-EDF1-410B-A7D7-7B0D75AB92C4}.Release|Win32.Build.0 = Release|Win32 {5150E36B-EDF1-410B-A7D7-7B0D75AB92C4}.Release|x64.ActiveCfg = Release|x64 - {FA05E973-3F45-4C5A-8226-BBDAD8F9DE4F}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {FA05E973-3F45-4C5A-8226-BBDAD8F9DE4F}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {FA05E973-3F45-4C5A-8226-BBDAD8F9DE4F}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {FA05E973-3F45-4C5A-8226-BBDAD8F9DE4F}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {FA05E973-3F45-4C5A-8226-BBDAD8F9DE4F}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {FA05E973-3F45-4C5A-8226-BBDAD8F9DE4F}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {FA05E973-3F45-4C5A-8226-BBDAD8F9DE4F}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {FA05E973-3F45-4C5A-8226-BBDAD8F9DE4F}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {5150E36B-EDF1-410B-A7D7-7B0D75AB92C4}.Release|x64.Build.0 = Release|x64 {FA05E973-3F45-4C5A-8226-BBDAD8F9DE4F}.Debug|Win32.ActiveCfg = Debug|Win32 {FA05E973-3F45-4C5A-8226-BBDAD8F9DE4F}.Debug|Win32.Build.0 = Debug|Win32 {FA05E973-3F45-4C5A-8226-BBDAD8F9DE4F}.Debug|x64.ActiveCfg = Debug|x64 + {FA05E973-3F45-4C5A-8226-BBDAD8F9DE4F}.Debug|x64.Build.0 = Debug|x64 {FA05E973-3F45-4C5A-8226-BBDAD8F9DE4F}.Release|Win32.ActiveCfg = Release|Win32 + {FA05E973-3F45-4C5A-8226-BBDAD8F9DE4F}.Release|Win32.Build.0 = Release|Win32 {FA05E973-3F45-4C5A-8226-BBDAD8F9DE4F}.Release|x64.ActiveCfg = Release|x64 - {E879E538-6746-4EEE-8D70-0FC80B8A2FAC}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {E879E538-6746-4EEE-8D70-0FC80B8A2FAC}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {E879E538-6746-4EEE-8D70-0FC80B8A2FAC}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {E879E538-6746-4EEE-8D70-0FC80B8A2FAC}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {E879E538-6746-4EEE-8D70-0FC80B8A2FAC}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {E879E538-6746-4EEE-8D70-0FC80B8A2FAC}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {E879E538-6746-4EEE-8D70-0FC80B8A2FAC}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {E879E538-6746-4EEE-8D70-0FC80B8A2FAC}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {FA05E973-3F45-4C5A-8226-BBDAD8F9DE4F}.Release|x64.Build.0 = Release|x64 {E879E538-6746-4EEE-8D70-0FC80B8A2FAC}.Debug|Win32.ActiveCfg = Debug|Win32 + {E879E538-6746-4EEE-8D70-0FC80B8A2FAC}.Debug|Win32.Build.0 = Debug|Win32 {E879E538-6746-4EEE-8D70-0FC80B8A2FAC}.Debug|x64.ActiveCfg = Debug|x64 + {E879E538-6746-4EEE-8D70-0FC80B8A2FAC}.Debug|x64.Build.0 = Debug|x64 {E879E538-6746-4EEE-8D70-0FC80B8A2FAC}.Release|Win32.ActiveCfg = Release|Win32 + {E879E538-6746-4EEE-8D70-0FC80B8A2FAC}.Release|Win32.Build.0 = Release|Win32 {E879E538-6746-4EEE-8D70-0FC80B8A2FAC}.Release|x64.ActiveCfg = Release|x64 - {58B8CF53-AC7C-4FE5-ABA1-A356034BFE10}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {58B8CF53-AC7C-4FE5-ABA1-A356034BFE10}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {58B8CF53-AC7C-4FE5-ABA1-A356034BFE10}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {58B8CF53-AC7C-4FE5-ABA1-A356034BFE10}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {58B8CF53-AC7C-4FE5-ABA1-A356034BFE10}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {58B8CF53-AC7C-4FE5-ABA1-A356034BFE10}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {58B8CF53-AC7C-4FE5-ABA1-A356034BFE10}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {58B8CF53-AC7C-4FE5-ABA1-A356034BFE10}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {E879E538-6746-4EEE-8D70-0FC80B8A2FAC}.Release|x64.Build.0 = Release|x64 {58B8CF53-AC7C-4FE5-ABA1-A356034BFE10}.Debug|Win32.ActiveCfg = Debug|Win32 {58B8CF53-AC7C-4FE5-ABA1-A356034BFE10}.Debug|Win32.Build.0 = Debug|Win32 {58B8CF53-AC7C-4FE5-ABA1-A356034BFE10}.Debug|x64.ActiveCfg = Debug|x64 + {58B8CF53-AC7C-4FE5-ABA1-A356034BFE10}.Debug|x64.Build.0 = Debug|x64 {58B8CF53-AC7C-4FE5-ABA1-A356034BFE10}.Release|Win32.ActiveCfg = Release|Win32 + {58B8CF53-AC7C-4FE5-ABA1-A356034BFE10}.Release|Win32.Build.0 = Release|Win32 {58B8CF53-AC7C-4FE5-ABA1-A356034BFE10}.Release|x64.ActiveCfg = Release|x64 - {CB22725D-1669-4945-83D3-81CA767F0B56}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {CB22725D-1669-4945-83D3-81CA767F0B56}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {CB22725D-1669-4945-83D3-81CA767F0B56}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {CB22725D-1669-4945-83D3-81CA767F0B56}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {CB22725D-1669-4945-83D3-81CA767F0B56}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {CB22725D-1669-4945-83D3-81CA767F0B56}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {CB22725D-1669-4945-83D3-81CA767F0B56}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {CB22725D-1669-4945-83D3-81CA767F0B56}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {58B8CF53-AC7C-4FE5-ABA1-A356034BFE10}.Release|x64.Build.0 = Release|x64 {CB22725D-1669-4945-83D3-81CA767F0B56}.Debug|Win32.ActiveCfg = Debug|Win32 + {CB22725D-1669-4945-83D3-81CA767F0B56}.Debug|Win32.Build.0 = Debug|Win32 {CB22725D-1669-4945-83D3-81CA767F0B56}.Debug|x64.ActiveCfg = Debug|x64 + {CB22725D-1669-4945-83D3-81CA767F0B56}.Debug|x64.Build.0 = Debug|x64 {CB22725D-1669-4945-83D3-81CA767F0B56}.Release|Win32.ActiveCfg = Release|Win32 + {CB22725D-1669-4945-83D3-81CA767F0B56}.Release|Win32.Build.0 = Release|Win32 {CB22725D-1669-4945-83D3-81CA767F0B56}.Release|x64.ActiveCfg = Release|x64 - {E6690528-7BB9-4B8E-8F15-4F3C58A736B9}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {E6690528-7BB9-4B8E-8F15-4F3C58A736B9}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {E6690528-7BB9-4B8E-8F15-4F3C58A736B9}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {E6690528-7BB9-4B8E-8F15-4F3C58A736B9}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {E6690528-7BB9-4B8E-8F15-4F3C58A736B9}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {E6690528-7BB9-4B8E-8F15-4F3C58A736B9}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {E6690528-7BB9-4B8E-8F15-4F3C58A736B9}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {E6690528-7BB9-4B8E-8F15-4F3C58A736B9}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {CB22725D-1669-4945-83D3-81CA767F0B56}.Release|x64.Build.0 = Release|x64 {E6690528-7BB9-4B8E-8F15-4F3C58A736B9}.Debug|Win32.ActiveCfg = Debug|Win32 + {E6690528-7BB9-4B8E-8F15-4F3C58A736B9}.Debug|Win32.Build.0 = Debug|Win32 {E6690528-7BB9-4B8E-8F15-4F3C58A736B9}.Debug|x64.ActiveCfg = Debug|x64 + {E6690528-7BB9-4B8E-8F15-4F3C58A736B9}.Debug|x64.Build.0 = Debug|x64 {E6690528-7BB9-4B8E-8F15-4F3C58A736B9}.Release|Win32.ActiveCfg = Release|Win32 + {E6690528-7BB9-4B8E-8F15-4F3C58A736B9}.Release|Win32.Build.0 = Release|Win32 {E6690528-7BB9-4B8E-8F15-4F3C58A736B9}.Release|x64.ActiveCfg = Release|x64 - {C988F9AD-ED3C-4796-A7F5-CE7678FD689A}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {C988F9AD-ED3C-4796-A7F5-CE7678FD689A}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {C988F9AD-ED3C-4796-A7F5-CE7678FD689A}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {C988F9AD-ED3C-4796-A7F5-CE7678FD689A}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {C988F9AD-ED3C-4796-A7F5-CE7678FD689A}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {C988F9AD-ED3C-4796-A7F5-CE7678FD689A}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {C988F9AD-ED3C-4796-A7F5-CE7678FD689A}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {C988F9AD-ED3C-4796-A7F5-CE7678FD689A}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {E6690528-7BB9-4B8E-8F15-4F3C58A736B9}.Release|x64.Build.0 = Release|x64 {C988F9AD-ED3C-4796-A7F5-CE7678FD689A}.Debug|Win32.ActiveCfg = Debug|Win32 {C988F9AD-ED3C-4796-A7F5-CE7678FD689A}.Debug|Win32.Build.0 = Debug|Win32 {C988F9AD-ED3C-4796-A7F5-CE7678FD689A}.Debug|x64.ActiveCfg = Debug|x64 + {C988F9AD-ED3C-4796-A7F5-CE7678FD689A}.Debug|x64.Build.0 = Debug|x64 {C988F9AD-ED3C-4796-A7F5-CE7678FD689A}.Release|Win32.ActiveCfg = Release|Win32 + {C988F9AD-ED3C-4796-A7F5-CE7678FD689A}.Release|Win32.Build.0 = Release|Win32 {C988F9AD-ED3C-4796-A7F5-CE7678FD689A}.Release|x64.ActiveCfg = Release|x64 - {7C5AB509-3BB9-43F7-B4BA-D8D57BDED7BA}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {7C5AB509-3BB9-43F7-B4BA-D8D57BDED7BA}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {7C5AB509-3BB9-43F7-B4BA-D8D57BDED7BA}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {7C5AB509-3BB9-43F7-B4BA-D8D57BDED7BA}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {7C5AB509-3BB9-43F7-B4BA-D8D57BDED7BA}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {7C5AB509-3BB9-43F7-B4BA-D8D57BDED7BA}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {7C5AB509-3BB9-43F7-B4BA-D8D57BDED7BA}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {7C5AB509-3BB9-43F7-B4BA-D8D57BDED7BA}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {C988F9AD-ED3C-4796-A7F5-CE7678FD689A}.Release|x64.Build.0 = Release|x64 {7C5AB509-3BB9-43F7-B4BA-D8D57BDED7BA}.Debug|Win32.ActiveCfg = Debug|Win32 {7C5AB509-3BB9-43F7-B4BA-D8D57BDED7BA}.Debug|Win32.Build.0 = Debug|Win32 {7C5AB509-3BB9-43F7-B4BA-D8D57BDED7BA}.Debug|x64.ActiveCfg = Debug|x64 + {7C5AB509-3BB9-43F7-B4BA-D8D57BDED7BA}.Debug|x64.Build.0 = Debug|x64 {7C5AB509-3BB9-43F7-B4BA-D8D57BDED7BA}.Release|Win32.ActiveCfg = Release|Win32 + {7C5AB509-3BB9-43F7-B4BA-D8D57BDED7BA}.Release|Win32.Build.0 = Release|Win32 {7C5AB509-3BB9-43F7-B4BA-D8D57BDED7BA}.Release|x64.ActiveCfg = Release|x64 - {A6F10BA0-D8BC-4CE6-A6B0-E9C556F4FCC0}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {A6F10BA0-D8BC-4CE6-A6B0-E9C556F4FCC0}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {A6F10BA0-D8BC-4CE6-A6B0-E9C556F4FCC0}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {A6F10BA0-D8BC-4CE6-A6B0-E9C556F4FCC0}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {A6F10BA0-D8BC-4CE6-A6B0-E9C556F4FCC0}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {A6F10BA0-D8BC-4CE6-A6B0-E9C556F4FCC0}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {A6F10BA0-D8BC-4CE6-A6B0-E9C556F4FCC0}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {A6F10BA0-D8BC-4CE6-A6B0-E9C556F4FCC0}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {7C5AB509-3BB9-43F7-B4BA-D8D57BDED7BA}.Release|x64.Build.0 = Release|x64 {A6F10BA0-D8BC-4CE6-A6B0-E9C556F4FCC0}.Debug|Win32.ActiveCfg = Debug|Win32 + {A6F10BA0-D8BC-4CE6-A6B0-E9C556F4FCC0}.Debug|Win32.Build.0 = Debug|Win32 {A6F10BA0-D8BC-4CE6-A6B0-E9C556F4FCC0}.Debug|x64.ActiveCfg = Debug|x64 + {A6F10BA0-D8BC-4CE6-A6B0-E9C556F4FCC0}.Debug|x64.Build.0 = Debug|x64 {A6F10BA0-D8BC-4CE6-A6B0-E9C556F4FCC0}.Release|Win32.ActiveCfg = Release|Win32 + {A6F10BA0-D8BC-4CE6-A6B0-E9C556F4FCC0}.Release|Win32.Build.0 = Release|Win32 {A6F10BA0-D8BC-4CE6-A6B0-E9C556F4FCC0}.Release|x64.ActiveCfg = Release|x64 - {6020F924-5846-452A-B704-BA762AC106DD}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {6020F924-5846-452A-B704-BA762AC106DD}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {6020F924-5846-452A-B704-BA762AC106DD}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {6020F924-5846-452A-B704-BA762AC106DD}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {6020F924-5846-452A-B704-BA762AC106DD}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {6020F924-5846-452A-B704-BA762AC106DD}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {6020F924-5846-452A-B704-BA762AC106DD}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {6020F924-5846-452A-B704-BA762AC106DD}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {A6F10BA0-D8BC-4CE6-A6B0-E9C556F4FCC0}.Release|x64.Build.0 = Release|x64 {6020F924-5846-452A-B704-BA762AC106DD}.Debug|Win32.ActiveCfg = Debug|Win32 + {6020F924-5846-452A-B704-BA762AC106DD}.Debug|Win32.Build.0 = Debug|Win32 {6020F924-5846-452A-B704-BA762AC106DD}.Debug|x64.ActiveCfg = Debug|x64 + {6020F924-5846-452A-B704-BA762AC106DD}.Debug|x64.Build.0 = Debug|x64 {6020F924-5846-452A-B704-BA762AC106DD}.Release|Win32.ActiveCfg = Release|Win32 + {6020F924-5846-452A-B704-BA762AC106DD}.Release|Win32.Build.0 = Release|Win32 {6020F924-5846-452A-B704-BA762AC106DD}.Release|x64.ActiveCfg = Release|x64 - {076446BE-553C-4938-9CF8-BC7DEB1BF235}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {076446BE-553C-4938-9CF8-BC7DEB1BF235}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {076446BE-553C-4938-9CF8-BC7DEB1BF235}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {076446BE-553C-4938-9CF8-BC7DEB1BF235}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {076446BE-553C-4938-9CF8-BC7DEB1BF235}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {076446BE-553C-4938-9CF8-BC7DEB1BF235}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {076446BE-553C-4938-9CF8-BC7DEB1BF235}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {076446BE-553C-4938-9CF8-BC7DEB1BF235}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {6020F924-5846-452A-B704-BA762AC106DD}.Release|x64.Build.0 = Release|x64 {076446BE-553C-4938-9CF8-BC7DEB1BF235}.Debug|Win32.ActiveCfg = Debug|Win32 {076446BE-553C-4938-9CF8-BC7DEB1BF235}.Debug|Win32.Build.0 = Debug|Win32 {076446BE-553C-4938-9CF8-BC7DEB1BF235}.Debug|x64.ActiveCfg = Debug|x64 @@ -3116,14 +2206,6 @@ Global {076446BE-553C-4938-9CF8-BC7DEB1BF235}.Release|Win32.Build.0 = Release|Win32 {076446BE-553C-4938-9CF8-BC7DEB1BF235}.Release|x64.ActiveCfg = Release|x64 {076446BE-553C-4938-9CF8-BC7DEB1BF235}.Release|x64.Build.0 = Release|x64 - {1733A0D9-A75C-47DB-86B9-EF199E48482B}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {1733A0D9-A75C-47DB-86B9-EF199E48482B}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {1733A0D9-A75C-47DB-86B9-EF199E48482B}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {1733A0D9-A75C-47DB-86B9-EF199E48482B}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {1733A0D9-A75C-47DB-86B9-EF199E48482B}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {1733A0D9-A75C-47DB-86B9-EF199E48482B}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {1733A0D9-A75C-47DB-86B9-EF199E48482B}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {1733A0D9-A75C-47DB-86B9-EF199E48482B}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {1733A0D9-A75C-47DB-86B9-EF199E48482B}.Debug|Win32.ActiveCfg = Debug|Win32 {1733A0D9-A75C-47DB-86B9-EF199E48482B}.Debug|Win32.Build.0 = Debug|Win32 {1733A0D9-A75C-47DB-86B9-EF199E48482B}.Debug|x64.ActiveCfg = Debug|x64 @@ -3132,14 +2214,6 @@ Global {1733A0D9-A75C-47DB-86B9-EF199E48482B}.Release|Win32.Build.0 = Release|Win32 {1733A0D9-A75C-47DB-86B9-EF199E48482B}.Release|x64.ActiveCfg = Release|x64 {1733A0D9-A75C-47DB-86B9-EF199E48482B}.Release|x64.Build.0 = Release|x64 - {CEDE5677-D376-4859-AEAE-55608D8F0440}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {CEDE5677-D376-4859-AEAE-55608D8F0440}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {CEDE5677-D376-4859-AEAE-55608D8F0440}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {CEDE5677-D376-4859-AEAE-55608D8F0440}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {CEDE5677-D376-4859-AEAE-55608D8F0440}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {CEDE5677-D376-4859-AEAE-55608D8F0440}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {CEDE5677-D376-4859-AEAE-55608D8F0440}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {CEDE5677-D376-4859-AEAE-55608D8F0440}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {CEDE5677-D376-4859-AEAE-55608D8F0440}.Debug|Win32.ActiveCfg = Debug|Win32 {CEDE5677-D376-4859-AEAE-55608D8F0440}.Debug|Win32.Build.0 = Debug|Win32 {CEDE5677-D376-4859-AEAE-55608D8F0440}.Debug|x64.ActiveCfg = Debug|x64 @@ -3148,14 +2222,6 @@ Global {CEDE5677-D376-4859-AEAE-55608D8F0440}.Release|Win32.Build.0 = Release|Win32 {CEDE5677-D376-4859-AEAE-55608D8F0440}.Release|x64.ActiveCfg = Release|x64 {CEDE5677-D376-4859-AEAE-55608D8F0440}.Release|x64.Build.0 = Release|x64 - {54CA937D-F425-4EEA-B1A4-5DEC87BDDC19}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {54CA937D-F425-4EEA-B1A4-5DEC87BDDC19}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {54CA937D-F425-4EEA-B1A4-5DEC87BDDC19}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {54CA937D-F425-4EEA-B1A4-5DEC87BDDC19}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {54CA937D-F425-4EEA-B1A4-5DEC87BDDC19}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {54CA937D-F425-4EEA-B1A4-5DEC87BDDC19}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {54CA937D-F425-4EEA-B1A4-5DEC87BDDC19}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {54CA937D-F425-4EEA-B1A4-5DEC87BDDC19}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {54CA937D-F425-4EEA-B1A4-5DEC87BDDC19}.Debug|Win32.ActiveCfg = Debug|Win32 {54CA937D-F425-4EEA-B1A4-5DEC87BDDC19}.Debug|Win32.Build.0 = Debug|Win32 {54CA937D-F425-4EEA-B1A4-5DEC87BDDC19}.Debug|x64.ActiveCfg = Debug|x64 @@ -3164,14 +2230,6 @@ Global {54CA937D-F425-4EEA-B1A4-5DEC87BDDC19}.Release|Win32.Build.0 = Release|Win32 {54CA937D-F425-4EEA-B1A4-5DEC87BDDC19}.Release|x64.ActiveCfg = Release|x64 {54CA937D-F425-4EEA-B1A4-5DEC87BDDC19}.Release|x64.Build.0 = Release|x64 - {FE519629-8AB6-4E36-AE0A-4D8FCF67C2B9}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {FE519629-8AB6-4E36-AE0A-4D8FCF67C2B9}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {FE519629-8AB6-4E36-AE0A-4D8FCF67C2B9}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {FE519629-8AB6-4E36-AE0A-4D8FCF67C2B9}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {FE519629-8AB6-4E36-AE0A-4D8FCF67C2B9}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {FE519629-8AB6-4E36-AE0A-4D8FCF67C2B9}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {FE519629-8AB6-4E36-AE0A-4D8FCF67C2B9}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {FE519629-8AB6-4E36-AE0A-4D8FCF67C2B9}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {FE519629-8AB6-4E36-AE0A-4D8FCF67C2B9}.Debug|Win32.ActiveCfg = Debug|Win32 {FE519629-8AB6-4E36-AE0A-4D8FCF67C2B9}.Debug|Win32.Build.0 = Debug|Win32 {FE519629-8AB6-4E36-AE0A-4D8FCF67C2B9}.Debug|x64.ActiveCfg = Debug|x64 @@ -3180,14 +2238,6 @@ Global {FE519629-8AB6-4E36-AE0A-4D8FCF67C2B9}.Release|Win32.Build.0 = Release|Win32 {FE519629-8AB6-4E36-AE0A-4D8FCF67C2B9}.Release|x64.ActiveCfg = Release|x64 {FE519629-8AB6-4E36-AE0A-4D8FCF67C2B9}.Release|x64.Build.0 = Release|x64 - {2EE3C8C1-B890-4B24-932D-D699F1825C01}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {2EE3C8C1-B890-4B24-932D-D699F1825C01}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {2EE3C8C1-B890-4B24-932D-D699F1825C01}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {2EE3C8C1-B890-4B24-932D-D699F1825C01}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {2EE3C8C1-B890-4B24-932D-D699F1825C01}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {2EE3C8C1-B890-4B24-932D-D699F1825C01}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {2EE3C8C1-B890-4B24-932D-D699F1825C01}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {2EE3C8C1-B890-4B24-932D-D699F1825C01}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {2EE3C8C1-B890-4B24-932D-D699F1825C01}.Debug|Win32.ActiveCfg = Debug|Win32 {2EE3C8C1-B890-4B24-932D-D699F1825C01}.Debug|Win32.Build.0 = Debug|Win32 {2EE3C8C1-B890-4B24-932D-D699F1825C01}.Debug|x64.ActiveCfg = Debug|x64 @@ -3196,14 +2246,6 @@ Global {2EE3C8C1-B890-4B24-932D-D699F1825C01}.Release|Win32.Build.0 = Release|Win32 {2EE3C8C1-B890-4B24-932D-D699F1825C01}.Release|x64.ActiveCfg = Release|x64 {2EE3C8C1-B890-4B24-932D-D699F1825C01}.Release|x64.Build.0 = Release|x64 - {ACB2D1AC-CD6D-4AF9-9C11-B0B0AA5C5A8F}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {ACB2D1AC-CD6D-4AF9-9C11-B0B0AA5C5A8F}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {ACB2D1AC-CD6D-4AF9-9C11-B0B0AA5C5A8F}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {ACB2D1AC-CD6D-4AF9-9C11-B0B0AA5C5A8F}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {ACB2D1AC-CD6D-4AF9-9C11-B0B0AA5C5A8F}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {ACB2D1AC-CD6D-4AF9-9C11-B0B0AA5C5A8F}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {ACB2D1AC-CD6D-4AF9-9C11-B0B0AA5C5A8F}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {ACB2D1AC-CD6D-4AF9-9C11-B0B0AA5C5A8F}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {ACB2D1AC-CD6D-4AF9-9C11-B0B0AA5C5A8F}.Debug|Win32.ActiveCfg = Debug|Win32 {ACB2D1AC-CD6D-4AF9-9C11-B0B0AA5C5A8F}.Debug|Win32.Build.0 = Debug|Win32 {ACB2D1AC-CD6D-4AF9-9C11-B0B0AA5C5A8F}.Debug|x64.ActiveCfg = Debug|x64 @@ -3212,14 +2254,6 @@ Global {ACB2D1AC-CD6D-4AF9-9C11-B0B0AA5C5A8F}.Release|Win32.Build.0 = Release|Win32 {ACB2D1AC-CD6D-4AF9-9C11-B0B0AA5C5A8F}.Release|x64.ActiveCfg = Release|x64 {ACB2D1AC-CD6D-4AF9-9C11-B0B0AA5C5A8F}.Release|x64.Build.0 = Release|x64 - {C2A13189-B75A-4ACA-98A0-326956F1F6EA}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {C2A13189-B75A-4ACA-98A0-326956F1F6EA}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {C2A13189-B75A-4ACA-98A0-326956F1F6EA}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {C2A13189-B75A-4ACA-98A0-326956F1F6EA}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {C2A13189-B75A-4ACA-98A0-326956F1F6EA}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {C2A13189-B75A-4ACA-98A0-326956F1F6EA}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {C2A13189-B75A-4ACA-98A0-326956F1F6EA}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {C2A13189-B75A-4ACA-98A0-326956F1F6EA}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {C2A13189-B75A-4ACA-98A0-326956F1F6EA}.Debug|Win32.ActiveCfg = Debug|Win32 {C2A13189-B75A-4ACA-98A0-326956F1F6EA}.Debug|Win32.Build.0 = Debug|Win32 {C2A13189-B75A-4ACA-98A0-326956F1F6EA}.Debug|x64.ActiveCfg = Debug|x64 @@ -3228,14 +2262,6 @@ Global {C2A13189-B75A-4ACA-98A0-326956F1F6EA}.Release|Win32.Build.0 = Release|Win32 {C2A13189-B75A-4ACA-98A0-326956F1F6EA}.Release|x64.ActiveCfg = Release|x64 {C2A13189-B75A-4ACA-98A0-326956F1F6EA}.Release|x64.Build.0 = Release|x64 - {B2DDDBC0-559B-46E9-898F-958A1AA8991F}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {B2DDDBC0-559B-46E9-898F-958A1AA8991F}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {B2DDDBC0-559B-46E9-898F-958A1AA8991F}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {B2DDDBC0-559B-46E9-898F-958A1AA8991F}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {B2DDDBC0-559B-46E9-898F-958A1AA8991F}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {B2DDDBC0-559B-46E9-898F-958A1AA8991F}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {B2DDDBC0-559B-46E9-898F-958A1AA8991F}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {B2DDDBC0-559B-46E9-898F-958A1AA8991F}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {B2DDDBC0-559B-46E9-898F-958A1AA8991F}.Debug|Win32.ActiveCfg = Debug|Win32 {B2DDDBC0-559B-46E9-898F-958A1AA8991F}.Debug|Win32.Build.0 = Debug|Win32 {B2DDDBC0-559B-46E9-898F-958A1AA8991F}.Debug|x64.ActiveCfg = Debug|x64 @@ -3244,14 +2270,6 @@ Global {B2DDDBC0-559B-46E9-898F-958A1AA8991F}.Release|Win32.Build.0 = Release|Win32 {B2DDDBC0-559B-46E9-898F-958A1AA8991F}.Release|x64.ActiveCfg = Release|x64 {B2DDDBC0-559B-46E9-898F-958A1AA8991F}.Release|x64.Build.0 = Release|x64 - {F5827922-7493-4DB4-AA42-3DCFF59CCA0D}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {F5827922-7493-4DB4-AA42-3DCFF59CCA0D}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {F5827922-7493-4DB4-AA42-3DCFF59CCA0D}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {F5827922-7493-4DB4-AA42-3DCFF59CCA0D}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {F5827922-7493-4DB4-AA42-3DCFF59CCA0D}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {F5827922-7493-4DB4-AA42-3DCFF59CCA0D}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {F5827922-7493-4DB4-AA42-3DCFF59CCA0D}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {F5827922-7493-4DB4-AA42-3DCFF59CCA0D}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {F5827922-7493-4DB4-AA42-3DCFF59CCA0D}.Debug|Win32.ActiveCfg = Debug|Win32 {F5827922-7493-4DB4-AA42-3DCFF59CCA0D}.Debug|Win32.Build.0 = Debug|Win32 {F5827922-7493-4DB4-AA42-3DCFF59CCA0D}.Debug|x64.ActiveCfg = Debug|x64 @@ -3260,14 +2278,6 @@ Global {F5827922-7493-4DB4-AA42-3DCFF59CCA0D}.Release|Win32.Build.0 = Release|Win32 {F5827922-7493-4DB4-AA42-3DCFF59CCA0D}.Release|x64.ActiveCfg = Release|x64 {F5827922-7493-4DB4-AA42-3DCFF59CCA0D}.Release|x64.Build.0 = Release|x64 - {C1228BE2-FC54-4D44-94B1-964F62A569C3}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {C1228BE2-FC54-4D44-94B1-964F62A569C3}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {C1228BE2-FC54-4D44-94B1-964F62A569C3}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {C1228BE2-FC54-4D44-94B1-964F62A569C3}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {C1228BE2-FC54-4D44-94B1-964F62A569C3}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {C1228BE2-FC54-4D44-94B1-964F62A569C3}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {C1228BE2-FC54-4D44-94B1-964F62A569C3}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {C1228BE2-FC54-4D44-94B1-964F62A569C3}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {C1228BE2-FC54-4D44-94B1-964F62A569C3}.Debug|Win32.ActiveCfg = Debug|Win32 {C1228BE2-FC54-4D44-94B1-964F62A569C3}.Debug|Win32.Build.0 = Debug|Win32 {C1228BE2-FC54-4D44-94B1-964F62A569C3}.Debug|x64.ActiveCfg = Debug|x64 @@ -3276,14 +2286,6 @@ Global {C1228BE2-FC54-4D44-94B1-964F62A569C3}.Release|Win32.Build.0 = Release|Win32 {C1228BE2-FC54-4D44-94B1-964F62A569C3}.Release|x64.ActiveCfg = Release|x64 {C1228BE2-FC54-4D44-94B1-964F62A569C3}.Release|x64.Build.0 = Release|x64 - {01C495B5-93BE-424E-BB7C-5110A3952A75}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {01C495B5-93BE-424E-BB7C-5110A3952A75}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {01C495B5-93BE-424E-BB7C-5110A3952A75}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {01C495B5-93BE-424E-BB7C-5110A3952A75}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {01C495B5-93BE-424E-BB7C-5110A3952A75}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {01C495B5-93BE-424E-BB7C-5110A3952A75}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {01C495B5-93BE-424E-BB7C-5110A3952A75}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {01C495B5-93BE-424E-BB7C-5110A3952A75}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {01C495B5-93BE-424E-BB7C-5110A3952A75}.Debug|Win32.ActiveCfg = Debug|Win32 {01C495B5-93BE-424E-BB7C-5110A3952A75}.Debug|Win32.Build.0 = Debug|Win32 {01C495B5-93BE-424E-BB7C-5110A3952A75}.Debug|x64.ActiveCfg = Debug|x64 @@ -3292,14 +2294,6 @@ Global {01C495B5-93BE-424E-BB7C-5110A3952A75}.Release|Win32.Build.0 = Release|Win32 {01C495B5-93BE-424E-BB7C-5110A3952A75}.Release|x64.ActiveCfg = Release|x64 {01C495B5-93BE-424E-BB7C-5110A3952A75}.Release|x64.Build.0 = Release|x64 - {B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Debug|Win32.ActiveCfg = Debug|Win32 {B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Debug|Win32.Build.0 = Debug|Win32 {B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Debug|x64.ActiveCfg = Debug|x64 @@ -3308,14 +2302,6 @@ Global {B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Release|Win32.Build.0 = Release|Win32 {B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Release|x64.ActiveCfg = Release|x64 {B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Release|x64.Build.0 = Release|x64 - {F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Debug|Win32.ActiveCfg = Debug|Win32 {F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Debug|Win32.Build.0 = Debug|Win32 {F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Debug|x64.ActiveCfg = Debug|x64 @@ -3324,14 +2310,6 @@ Global {F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Release|Win32.Build.0 = Release|Win32 {F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Release|x64.ActiveCfg = Release|x64 {F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Release|x64.Build.0 = Release|x64 - {C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Debug|Win32.ActiveCfg = Debug|Win32 {C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Debug|Win32.Build.0 = Debug|Win32 {C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Debug|x64.ActiveCfg = Debug|x64 @@ -3340,14 +2318,6 @@ Global {C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Release|Win32.Build.0 = Release|Win32 {C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Release|x64.ActiveCfg = Release|x64 {C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Release|x64.Build.0 = Release|x64 - {ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Debug|Win32.ActiveCfg = Debug|Win32 {ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Debug|Win32.Build.0 = Debug|Win32 {ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Debug|x64.ActiveCfg = Debug|x64 @@ -3356,26 +2326,14 @@ Global {ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Release|Win32.Build.0 = Release|Win32 {ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Release|x64.ActiveCfg = Release|x64 {ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Release|x64.Build.0 = Release|x64 - {D638D692-8549-48F7-897B-1EF24D0E3A59}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {D638D692-8549-48F7-897B-1EF24D0E3A59}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {D638D692-8549-48F7-897B-1EF24D0E3A59}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {D638D692-8549-48F7-897B-1EF24D0E3A59}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {D638D692-8549-48F7-897B-1EF24D0E3A59}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {D638D692-8549-48F7-897B-1EF24D0E3A59}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {D638D692-8549-48F7-897B-1EF24D0E3A59}.Debug|Win32.ActiveCfg = Debug|Win32 + {D638D692-8549-48F7-897B-1EF24D0E3A59}.Debug|Win32.Build.0 = Debug|Win32 {D638D692-8549-48F7-897B-1EF24D0E3A59}.Debug|x64.ActiveCfg = Debug|x64 {D638D692-8549-48F7-897B-1EF24D0E3A59}.Debug|x64.Build.0 = Debug|x64 {D638D692-8549-48F7-897B-1EF24D0E3A59}.Release|Win32.ActiveCfg = Release|Win32 + {D638D692-8549-48F7-897B-1EF24D0E3A59}.Release|Win32.Build.0 = Release|Win32 {D638D692-8549-48F7-897B-1EF24D0E3A59}.Release|x64.ActiveCfg = Release|x64 {D638D692-8549-48F7-897B-1EF24D0E3A59}.Release|x64.Build.0 = Release|x64 - {EF33CB6A-A655-4812-995B-4000D85FC8B6}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {EF33CB6A-A655-4812-995B-4000D85FC8B6}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {EF33CB6A-A655-4812-995B-4000D85FC8B6}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {EF33CB6A-A655-4812-995B-4000D85FC8B6}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {EF33CB6A-A655-4812-995B-4000D85FC8B6}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {EF33CB6A-A655-4812-995B-4000D85FC8B6}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {EF33CB6A-A655-4812-995B-4000D85FC8B6}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {EF33CB6A-A655-4812-995B-4000D85FC8B6}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {EF33CB6A-A655-4812-995B-4000D85FC8B6}.Debug|Win32.ActiveCfg = Debug|Win32 {EF33CB6A-A655-4812-995B-4000D85FC8B6}.Debug|Win32.Build.0 = Debug|Win32 {EF33CB6A-A655-4812-995B-4000D85FC8B6}.Debug|x64.ActiveCfg = Debug|x64 @@ -3384,14 +2342,6 @@ Global {EF33CB6A-A655-4812-995B-4000D85FC8B6}.Release|Win32.Build.0 = Release|Win32 {EF33CB6A-A655-4812-995B-4000D85FC8B6}.Release|x64.ActiveCfg = Release|x64 {EF33CB6A-A655-4812-995B-4000D85FC8B6}.Release|x64.Build.0 = Release|x64 - {3182D709-1DDE-495B-8CE9-D1A4DACED7DA}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {3182D709-1DDE-495B-8CE9-D1A4DACED7DA}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {3182D709-1DDE-495B-8CE9-D1A4DACED7DA}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {3182D709-1DDE-495B-8CE9-D1A4DACED7DA}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {3182D709-1DDE-495B-8CE9-D1A4DACED7DA}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {3182D709-1DDE-495B-8CE9-D1A4DACED7DA}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {3182D709-1DDE-495B-8CE9-D1A4DACED7DA}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {3182D709-1DDE-495B-8CE9-D1A4DACED7DA}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {3182D709-1DDE-495B-8CE9-D1A4DACED7DA}.Debug|Win32.ActiveCfg = Debug|Win32 {3182D709-1DDE-495B-8CE9-D1A4DACED7DA}.Debug|Win32.Build.0 = Debug|Win32 {3182D709-1DDE-495B-8CE9-D1A4DACED7DA}.Debug|x64.ActiveCfg = Debug|x64 @@ -3400,14 +2350,6 @@ Global {3182D709-1DDE-495B-8CE9-D1A4DACED7DA}.Release|Win32.Build.0 = Release|Win32 {3182D709-1DDE-495B-8CE9-D1A4DACED7DA}.Release|x64.ActiveCfg = Release|x64 {3182D709-1DDE-495B-8CE9-D1A4DACED7DA}.Release|x64.Build.0 = Release|x64 - {83B9B9F0-EFF4-447B-A7DD-60BAE22123F8}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {83B9B9F0-EFF4-447B-A7DD-60BAE22123F8}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {83B9B9F0-EFF4-447B-A7DD-60BAE22123F8}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {83B9B9F0-EFF4-447B-A7DD-60BAE22123F8}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {83B9B9F0-EFF4-447B-A7DD-60BAE22123F8}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {83B9B9F0-EFF4-447B-A7DD-60BAE22123F8}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {83B9B9F0-EFF4-447B-A7DD-60BAE22123F8}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {83B9B9F0-EFF4-447B-A7DD-60BAE22123F8}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {83B9B9F0-EFF4-447B-A7DD-60BAE22123F8}.Debug|Win32.ActiveCfg = Debug|Win32 {83B9B9F0-EFF4-447B-A7DD-60BAE22123F8}.Debug|Win32.Build.0 = Debug|Win32 {83B9B9F0-EFF4-447B-A7DD-60BAE22123F8}.Debug|x64.ActiveCfg = Debug|x64 @@ -3416,14 +2358,6 @@ Global {83B9B9F0-EFF4-447B-A7DD-60BAE22123F8}.Release|Win32.Build.0 = Release|Win32 {83B9B9F0-EFF4-447B-A7DD-60BAE22123F8}.Release|x64.ActiveCfg = Release|x64 {83B9B9F0-EFF4-447B-A7DD-60BAE22123F8}.Release|x64.Build.0 = Release|x64 - {948059F3-CD57-4ACC-9EA5-C4550D06CB19}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {948059F3-CD57-4ACC-9EA5-C4550D06CB19}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {948059F3-CD57-4ACC-9EA5-C4550D06CB19}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {948059F3-CD57-4ACC-9EA5-C4550D06CB19}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {948059F3-CD57-4ACC-9EA5-C4550D06CB19}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {948059F3-CD57-4ACC-9EA5-C4550D06CB19}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {948059F3-CD57-4ACC-9EA5-C4550D06CB19}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {948059F3-CD57-4ACC-9EA5-C4550D06CB19}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {948059F3-CD57-4ACC-9EA5-C4550D06CB19}.Debug|Win32.ActiveCfg = Debug|Win32 {948059F3-CD57-4ACC-9EA5-C4550D06CB19}.Debug|Win32.Build.0 = Debug|Win32 {948059F3-CD57-4ACC-9EA5-C4550D06CB19}.Debug|x64.ActiveCfg = Debug|x64 @@ -3432,386 +2366,254 @@ Global {948059F3-CD57-4ACC-9EA5-C4550D06CB19}.Release|Win32.Build.0 = Release|Win32 {948059F3-CD57-4ACC-9EA5-C4550D06CB19}.Release|x64.ActiveCfg = Release|x64 {948059F3-CD57-4ACC-9EA5-C4550D06CB19}.Release|x64.Build.0 = Release|x64 - {83801760-CFF3-4B11-9CA5-4598C0DBC442}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {83801760-CFF3-4B11-9CA5-4598C0DBC442}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {83801760-CFF3-4B11-9CA5-4598C0DBC442}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {83801760-CFF3-4B11-9CA5-4598C0DBC442}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {83801760-CFF3-4B11-9CA5-4598C0DBC442}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {83801760-CFF3-4B11-9CA5-4598C0DBC442}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {83801760-CFF3-4B11-9CA5-4598C0DBC442}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {83801760-CFF3-4B11-9CA5-4598C0DBC442}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {83801760-CFF3-4B11-9CA5-4598C0DBC442}.Debug|Win32.ActiveCfg = Debug|Win32 + {83801760-CFF3-4B11-9CA5-4598C0DBC442}.Debug|Win32.Build.0 = Debug|Win32 {83801760-CFF3-4B11-9CA5-4598C0DBC442}.Debug|x64.ActiveCfg = Debug|x64 + {83801760-CFF3-4B11-9CA5-4598C0DBC442}.Debug|x64.Build.0 = Debug|x64 {83801760-CFF3-4B11-9CA5-4598C0DBC442}.Release|Win32.ActiveCfg = Release|Win32 + {83801760-CFF3-4B11-9CA5-4598C0DBC442}.Release|Win32.Build.0 = Release|Win32 {83801760-CFF3-4B11-9CA5-4598C0DBC442}.Release|x64.ActiveCfg = Release|x64 - {7186CBA9-18FE-4868-8A2F-2CF50F66132A}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {7186CBA9-18FE-4868-8A2F-2CF50F66132A}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {7186CBA9-18FE-4868-8A2F-2CF50F66132A}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {7186CBA9-18FE-4868-8A2F-2CF50F66132A}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {7186CBA9-18FE-4868-8A2F-2CF50F66132A}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {7186CBA9-18FE-4868-8A2F-2CF50F66132A}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {7186CBA9-18FE-4868-8A2F-2CF50F66132A}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {7186CBA9-18FE-4868-8A2F-2CF50F66132A}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {83801760-CFF3-4B11-9CA5-4598C0DBC442}.Release|x64.Build.0 = Release|x64 {7186CBA9-18FE-4868-8A2F-2CF50F66132A}.Debug|Win32.ActiveCfg = Debug|Win32 + {7186CBA9-18FE-4868-8A2F-2CF50F66132A}.Debug|Win32.Build.0 = Debug|Win32 {7186CBA9-18FE-4868-8A2F-2CF50F66132A}.Debug|x64.ActiveCfg = Debug|x64 + {7186CBA9-18FE-4868-8A2F-2CF50F66132A}.Debug|x64.Build.0 = Debug|x64 {7186CBA9-18FE-4868-8A2F-2CF50F66132A}.Release|Win32.ActiveCfg = Release|Win32 + {7186CBA9-18FE-4868-8A2F-2CF50F66132A}.Release|Win32.Build.0 = Release|Win32 {7186CBA9-18FE-4868-8A2F-2CF50F66132A}.Release|x64.ActiveCfg = Release|x64 - {1F040862-DAB3-4F65-893D-0023BD2BD0E4}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {1F040862-DAB3-4F65-893D-0023BD2BD0E4}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {1F040862-DAB3-4F65-893D-0023BD2BD0E4}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {1F040862-DAB3-4F65-893D-0023BD2BD0E4}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {1F040862-DAB3-4F65-893D-0023BD2BD0E4}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {1F040862-DAB3-4F65-893D-0023BD2BD0E4}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {1F040862-DAB3-4F65-893D-0023BD2BD0E4}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {1F040862-DAB3-4F65-893D-0023BD2BD0E4}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {7186CBA9-18FE-4868-8A2F-2CF50F66132A}.Release|x64.Build.0 = Release|x64 {1F040862-DAB3-4F65-893D-0023BD2BD0E4}.Debug|Win32.ActiveCfg = Debug|Win32 + {1F040862-DAB3-4F65-893D-0023BD2BD0E4}.Debug|Win32.Build.0 = Debug|Win32 {1F040862-DAB3-4F65-893D-0023BD2BD0E4}.Debug|x64.ActiveCfg = Debug|x64 + {1F040862-DAB3-4F65-893D-0023BD2BD0E4}.Debug|x64.Build.0 = Debug|x64 {1F040862-DAB3-4F65-893D-0023BD2BD0E4}.Release|Win32.ActiveCfg = Release|Win32 + {1F040862-DAB3-4F65-893D-0023BD2BD0E4}.Release|Win32.Build.0 = Release|Win32 {1F040862-DAB3-4F65-893D-0023BD2BD0E4}.Release|x64.ActiveCfg = Release|x64 - {529BDB9A-7714-4CC6-A116-189159D8CC4A}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {529BDB9A-7714-4CC6-A116-189159D8CC4A}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {529BDB9A-7714-4CC6-A116-189159D8CC4A}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {529BDB9A-7714-4CC6-A116-189159D8CC4A}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {529BDB9A-7714-4CC6-A116-189159D8CC4A}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {529BDB9A-7714-4CC6-A116-189159D8CC4A}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {529BDB9A-7714-4CC6-A116-189159D8CC4A}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {529BDB9A-7714-4CC6-A116-189159D8CC4A}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {1F040862-DAB3-4F65-893D-0023BD2BD0E4}.Release|x64.Build.0 = Release|x64 {529BDB9A-7714-4CC6-A116-189159D8CC4A}.Debug|Win32.ActiveCfg = Debug|Win32 + {529BDB9A-7714-4CC6-A116-189159D8CC4A}.Debug|Win32.Build.0 = Debug|Win32 {529BDB9A-7714-4CC6-A116-189159D8CC4A}.Debug|x64.ActiveCfg = Debug|x64 + {529BDB9A-7714-4CC6-A116-189159D8CC4A}.Debug|x64.Build.0 = Debug|x64 {529BDB9A-7714-4CC6-A116-189159D8CC4A}.Release|Win32.ActiveCfg = Release|Win32 + {529BDB9A-7714-4CC6-A116-189159D8CC4A}.Release|Win32.Build.0 = Release|Win32 {529BDB9A-7714-4CC6-A116-189159D8CC4A}.Release|x64.ActiveCfg = Release|x64 - {F0DEFABC-1F27-4CDB-835A-1AF2958C3F9B}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {F0DEFABC-1F27-4CDB-835A-1AF2958C3F9B}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {F0DEFABC-1F27-4CDB-835A-1AF2958C3F9B}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {F0DEFABC-1F27-4CDB-835A-1AF2958C3F9B}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {F0DEFABC-1F27-4CDB-835A-1AF2958C3F9B}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {F0DEFABC-1F27-4CDB-835A-1AF2958C3F9B}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {F0DEFABC-1F27-4CDB-835A-1AF2958C3F9B}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {F0DEFABC-1F27-4CDB-835A-1AF2958C3F9B}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {529BDB9A-7714-4CC6-A116-189159D8CC4A}.Release|x64.Build.0 = Release|x64 {F0DEFABC-1F27-4CDB-835A-1AF2958C3F9B}.Debug|Win32.ActiveCfg = Debug|Win32 + {F0DEFABC-1F27-4CDB-835A-1AF2958C3F9B}.Debug|Win32.Build.0 = Debug|Win32 {F0DEFABC-1F27-4CDB-835A-1AF2958C3F9B}.Debug|x64.ActiveCfg = Debug|x64 + {F0DEFABC-1F27-4CDB-835A-1AF2958C3F9B}.Debug|x64.Build.0 = Debug|x64 {F0DEFABC-1F27-4CDB-835A-1AF2958C3F9B}.Release|Win32.ActiveCfg = Release|Win32 + {F0DEFABC-1F27-4CDB-835A-1AF2958C3F9B}.Release|Win32.Build.0 = Release|Win32 {F0DEFABC-1F27-4CDB-835A-1AF2958C3F9B}.Release|x64.ActiveCfg = Release|x64 - {C00984F2-B825-45AF-86EC-A4FEF70B02C8}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {C00984F2-B825-45AF-86EC-A4FEF70B02C8}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {C00984F2-B825-45AF-86EC-A4FEF70B02C8}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {C00984F2-B825-45AF-86EC-A4FEF70B02C8}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {C00984F2-B825-45AF-86EC-A4FEF70B02C8}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {C00984F2-B825-45AF-86EC-A4FEF70B02C8}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {C00984F2-B825-45AF-86EC-A4FEF70B02C8}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {C00984F2-B825-45AF-86EC-A4FEF70B02C8}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {F0DEFABC-1F27-4CDB-835A-1AF2958C3F9B}.Release|x64.Build.0 = Release|x64 {C00984F2-B825-45AF-86EC-A4FEF70B02C8}.Debug|Win32.ActiveCfg = Debug|Win32 + {C00984F2-B825-45AF-86EC-A4FEF70B02C8}.Debug|Win32.Build.0 = Debug|Win32 {C00984F2-B825-45AF-86EC-A4FEF70B02C8}.Debug|x64.ActiveCfg = Debug|x64 + {C00984F2-B825-45AF-86EC-A4FEF70B02C8}.Debug|x64.Build.0 = Debug|x64 {C00984F2-B825-45AF-86EC-A4FEF70B02C8}.Release|Win32.ActiveCfg = Release|Win32 + {C00984F2-B825-45AF-86EC-A4FEF70B02C8}.Release|Win32.Build.0 = Release|Win32 {C00984F2-B825-45AF-86EC-A4FEF70B02C8}.Release|x64.ActiveCfg = Release|x64 - {2CF45619-1C69-4072-B869-817D7954CABF}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {2CF45619-1C69-4072-B869-817D7954CABF}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {2CF45619-1C69-4072-B869-817D7954CABF}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {2CF45619-1C69-4072-B869-817D7954CABF}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {2CF45619-1C69-4072-B869-817D7954CABF}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {2CF45619-1C69-4072-B869-817D7954CABF}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {2CF45619-1C69-4072-B869-817D7954CABF}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {2CF45619-1C69-4072-B869-817D7954CABF}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {C00984F2-B825-45AF-86EC-A4FEF70B02C8}.Release|x64.Build.0 = Release|x64 {2CF45619-1C69-4072-B869-817D7954CABF}.Debug|Win32.ActiveCfg = Debug|Win32 + {2CF45619-1C69-4072-B869-817D7954CABF}.Debug|Win32.Build.0 = Debug|Win32 {2CF45619-1C69-4072-B869-817D7954CABF}.Debug|x64.ActiveCfg = Debug|x64 + {2CF45619-1C69-4072-B869-817D7954CABF}.Debug|x64.Build.0 = Debug|x64 {2CF45619-1C69-4072-B869-817D7954CABF}.Release|Win32.ActiveCfg = Release|Win32 + {2CF45619-1C69-4072-B869-817D7954CABF}.Release|Win32.Build.0 = Release|Win32 {2CF45619-1C69-4072-B869-817D7954CABF}.Release|x64.ActiveCfg = Release|x64 - {0FC21E44-5EF6-4725-8B9E-CC3C91552BDE}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {0FC21E44-5EF6-4725-8B9E-CC3C91552BDE}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {0FC21E44-5EF6-4725-8B9E-CC3C91552BDE}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {0FC21E44-5EF6-4725-8B9E-CC3C91552BDE}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {0FC21E44-5EF6-4725-8B9E-CC3C91552BDE}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {0FC21E44-5EF6-4725-8B9E-CC3C91552BDE}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {0FC21E44-5EF6-4725-8B9E-CC3C91552BDE}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {0FC21E44-5EF6-4725-8B9E-CC3C91552BDE}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {2CF45619-1C69-4072-B869-817D7954CABF}.Release|x64.Build.0 = Release|x64 {0FC21E44-5EF6-4725-8B9E-CC3C91552BDE}.Debug|Win32.ActiveCfg = Debug|Win32 + {0FC21E44-5EF6-4725-8B9E-CC3C91552BDE}.Debug|Win32.Build.0 = Debug|Win32 {0FC21E44-5EF6-4725-8B9E-CC3C91552BDE}.Debug|x64.ActiveCfg = Debug|x64 + {0FC21E44-5EF6-4725-8B9E-CC3C91552BDE}.Debug|x64.Build.0 = Debug|x64 {0FC21E44-5EF6-4725-8B9E-CC3C91552BDE}.Release|Win32.ActiveCfg = Release|Win32 + {0FC21E44-5EF6-4725-8B9E-CC3C91552BDE}.Release|Win32.Build.0 = Release|Win32 {0FC21E44-5EF6-4725-8B9E-CC3C91552BDE}.Release|x64.ActiveCfg = Release|x64 - {5DBA95DD-954C-4B77-A2D1-42E959B27C36}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {5DBA95DD-954C-4B77-A2D1-42E959B27C36}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {5DBA95DD-954C-4B77-A2D1-42E959B27C36}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {5DBA95DD-954C-4B77-A2D1-42E959B27C36}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {5DBA95DD-954C-4B77-A2D1-42E959B27C36}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {5DBA95DD-954C-4B77-A2D1-42E959B27C36}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {5DBA95DD-954C-4B77-A2D1-42E959B27C36}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {5DBA95DD-954C-4B77-A2D1-42E959B27C36}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {0FC21E44-5EF6-4725-8B9E-CC3C91552BDE}.Release|x64.Build.0 = Release|x64 {5DBA95DD-954C-4B77-A2D1-42E959B27C36}.Debug|Win32.ActiveCfg = Debug|Win32 + {5DBA95DD-954C-4B77-A2D1-42E959B27C36}.Debug|Win32.Build.0 = Debug|Win32 {5DBA95DD-954C-4B77-A2D1-42E959B27C36}.Debug|x64.ActiveCfg = Debug|x64 + {5DBA95DD-954C-4B77-A2D1-42E959B27C36}.Debug|x64.Build.0 = Debug|x64 {5DBA95DD-954C-4B77-A2D1-42E959B27C36}.Release|Win32.ActiveCfg = Release|Win32 + {5DBA95DD-954C-4B77-A2D1-42E959B27C36}.Release|Win32.Build.0 = Release|Win32 {5DBA95DD-954C-4B77-A2D1-42E959B27C36}.Release|x64.ActiveCfg = Release|x64 - {9EA751B7-04D5-484C-89EF-03AA2782B1D6}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {9EA751B7-04D5-484C-89EF-03AA2782B1D6}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {9EA751B7-04D5-484C-89EF-03AA2782B1D6}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {9EA751B7-04D5-484C-89EF-03AA2782B1D6}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {9EA751B7-04D5-484C-89EF-03AA2782B1D6}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {9EA751B7-04D5-484C-89EF-03AA2782B1D6}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {9EA751B7-04D5-484C-89EF-03AA2782B1D6}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {9EA751B7-04D5-484C-89EF-03AA2782B1D6}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {5DBA95DD-954C-4B77-A2D1-42E959B27C36}.Release|x64.Build.0 = Release|x64 {9EA751B7-04D5-484C-89EF-03AA2782B1D6}.Debug|Win32.ActiveCfg = Debug|Win32 + {9EA751B7-04D5-484C-89EF-03AA2782B1D6}.Debug|Win32.Build.0 = Debug|Win32 {9EA751B7-04D5-484C-89EF-03AA2782B1D6}.Debug|x64.ActiveCfg = Debug|x64 + {9EA751B7-04D5-484C-89EF-03AA2782B1D6}.Debug|x64.Build.0 = Debug|x64 {9EA751B7-04D5-484C-89EF-03AA2782B1D6}.Release|Win32.ActiveCfg = Release|Win32 + {9EA751B7-04D5-484C-89EF-03AA2782B1D6}.Release|Win32.Build.0 = Release|Win32 {9EA751B7-04D5-484C-89EF-03AA2782B1D6}.Release|x64.ActiveCfg = Release|x64 - {3DF7D787-3F9C-48E9-BECE-B9E7030E01A7}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {3DF7D787-3F9C-48E9-BECE-B9E7030E01A7}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {3DF7D787-3F9C-48E9-BECE-B9E7030E01A7}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {3DF7D787-3F9C-48E9-BECE-B9E7030E01A7}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {3DF7D787-3F9C-48E9-BECE-B9E7030E01A7}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {3DF7D787-3F9C-48E9-BECE-B9E7030E01A7}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {3DF7D787-3F9C-48E9-BECE-B9E7030E01A7}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {3DF7D787-3F9C-48E9-BECE-B9E7030E01A7}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {9EA751B7-04D5-484C-89EF-03AA2782B1D6}.Release|x64.Build.0 = Release|x64 {3DF7D787-3F9C-48E9-BECE-B9E7030E01A7}.Debug|Win32.ActiveCfg = Debug|Win32 + {3DF7D787-3F9C-48E9-BECE-B9E7030E01A7}.Debug|Win32.Build.0 = Debug|Win32 {3DF7D787-3F9C-48E9-BECE-B9E7030E01A7}.Debug|x64.ActiveCfg = Debug|x64 + {3DF7D787-3F9C-48E9-BECE-B9E7030E01A7}.Debug|x64.Build.0 = Debug|x64 {3DF7D787-3F9C-48E9-BECE-B9E7030E01A7}.Release|Win32.ActiveCfg = Release|Win32 + {3DF7D787-3F9C-48E9-BECE-B9E7030E01A7}.Release|Win32.Build.0 = Release|Win32 {3DF7D787-3F9C-48E9-BECE-B9E7030E01A7}.Release|x64.ActiveCfg = Release|x64 - {727351F3-D1CC-42C5-9AA2-5840AD3F7A1A}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {727351F3-D1CC-42C5-9AA2-5840AD3F7A1A}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {727351F3-D1CC-42C5-9AA2-5840AD3F7A1A}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {727351F3-D1CC-42C5-9AA2-5840AD3F7A1A}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {727351F3-D1CC-42C5-9AA2-5840AD3F7A1A}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {727351F3-D1CC-42C5-9AA2-5840AD3F7A1A}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {727351F3-D1CC-42C5-9AA2-5840AD3F7A1A}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {727351F3-D1CC-42C5-9AA2-5840AD3F7A1A}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {3DF7D787-3F9C-48E9-BECE-B9E7030E01A7}.Release|x64.Build.0 = Release|x64 {727351F3-D1CC-42C5-9AA2-5840AD3F7A1A}.Debug|Win32.ActiveCfg = Debug|Win32 + {727351F3-D1CC-42C5-9AA2-5840AD3F7A1A}.Debug|Win32.Build.0 = Debug|Win32 {727351F3-D1CC-42C5-9AA2-5840AD3F7A1A}.Debug|x64.ActiveCfg = Debug|x64 + {727351F3-D1CC-42C5-9AA2-5840AD3F7A1A}.Debug|x64.Build.0 = Debug|x64 {727351F3-D1CC-42C5-9AA2-5840AD3F7A1A}.Release|Win32.ActiveCfg = Release|Win32 + {727351F3-D1CC-42C5-9AA2-5840AD3F7A1A}.Release|Win32.Build.0 = Release|Win32 {727351F3-D1CC-42C5-9AA2-5840AD3F7A1A}.Release|x64.ActiveCfg = Release|x64 - {C3955110-CB5E-484A-938C-D7861E08D43B}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {C3955110-CB5E-484A-938C-D7861E08D43B}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {C3955110-CB5E-484A-938C-D7861E08D43B}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {C3955110-CB5E-484A-938C-D7861E08D43B}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {C3955110-CB5E-484A-938C-D7861E08D43B}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {C3955110-CB5E-484A-938C-D7861E08D43B}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {C3955110-CB5E-484A-938C-D7861E08D43B}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {C3955110-CB5E-484A-938C-D7861E08D43B}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {727351F3-D1CC-42C5-9AA2-5840AD3F7A1A}.Release|x64.Build.0 = Release|x64 {C3955110-CB5E-484A-938C-D7861E08D43B}.Debug|Win32.ActiveCfg = Debug|Win32 + {C3955110-CB5E-484A-938C-D7861E08D43B}.Debug|Win32.Build.0 = Debug|Win32 {C3955110-CB5E-484A-938C-D7861E08D43B}.Debug|x64.ActiveCfg = Debug|x64 + {C3955110-CB5E-484A-938C-D7861E08D43B}.Debug|x64.Build.0 = Debug|x64 {C3955110-CB5E-484A-938C-D7861E08D43B}.Release|Win32.ActiveCfg = Release|Win32 + {C3955110-CB5E-484A-938C-D7861E08D43B}.Release|Win32.Build.0 = Release|Win32 {C3955110-CB5E-484A-938C-D7861E08D43B}.Release|x64.ActiveCfg = Release|x64 - {DFDF7BA0-4F61-4060-B919-7C8B2D40172E}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {DFDF7BA0-4F61-4060-B919-7C8B2D40172E}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {DFDF7BA0-4F61-4060-B919-7C8B2D40172E}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {DFDF7BA0-4F61-4060-B919-7C8B2D40172E}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {DFDF7BA0-4F61-4060-B919-7C8B2D40172E}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {DFDF7BA0-4F61-4060-B919-7C8B2D40172E}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {DFDF7BA0-4F61-4060-B919-7C8B2D40172E}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {DFDF7BA0-4F61-4060-B919-7C8B2D40172E}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {C3955110-CB5E-484A-938C-D7861E08D43B}.Release|x64.Build.0 = Release|x64 {DFDF7BA0-4F61-4060-B919-7C8B2D40172E}.Debug|Win32.ActiveCfg = Debug|Win32 + {DFDF7BA0-4F61-4060-B919-7C8B2D40172E}.Debug|Win32.Build.0 = Debug|Win32 {DFDF7BA0-4F61-4060-B919-7C8B2D40172E}.Debug|x64.ActiveCfg = Debug|x64 + {DFDF7BA0-4F61-4060-B919-7C8B2D40172E}.Debug|x64.Build.0 = Debug|x64 {DFDF7BA0-4F61-4060-B919-7C8B2D40172E}.Release|Win32.ActiveCfg = Release|Win32 + {DFDF7BA0-4F61-4060-B919-7C8B2D40172E}.Release|Win32.Build.0 = Release|Win32 {DFDF7BA0-4F61-4060-B919-7C8B2D40172E}.Release|x64.ActiveCfg = Release|x64 - {E4DC9D1E-8282-491F-A1FA-AF497EB1FF9C}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {E4DC9D1E-8282-491F-A1FA-AF497EB1FF9C}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {E4DC9D1E-8282-491F-A1FA-AF497EB1FF9C}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {E4DC9D1E-8282-491F-A1FA-AF497EB1FF9C}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {E4DC9D1E-8282-491F-A1FA-AF497EB1FF9C}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {E4DC9D1E-8282-491F-A1FA-AF497EB1FF9C}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {E4DC9D1E-8282-491F-A1FA-AF497EB1FF9C}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {E4DC9D1E-8282-491F-A1FA-AF497EB1FF9C}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {DFDF7BA0-4F61-4060-B919-7C8B2D40172E}.Release|x64.Build.0 = Release|x64 {E4DC9D1E-8282-491F-A1FA-AF497EB1FF9C}.Debug|Win32.ActiveCfg = Debug|Win32 + {E4DC9D1E-8282-491F-A1FA-AF497EB1FF9C}.Debug|Win32.Build.0 = Debug|Win32 {E4DC9D1E-8282-491F-A1FA-AF497EB1FF9C}.Debug|x64.ActiveCfg = Debug|x64 + {E4DC9D1E-8282-491F-A1FA-AF497EB1FF9C}.Debug|x64.Build.0 = Debug|x64 {E4DC9D1E-8282-491F-A1FA-AF497EB1FF9C}.Release|Win32.ActiveCfg = Release|Win32 + {E4DC9D1E-8282-491F-A1FA-AF497EB1FF9C}.Release|Win32.Build.0 = Release|Win32 {E4DC9D1E-8282-491F-A1FA-AF497EB1FF9C}.Release|x64.ActiveCfg = Release|x64 - {D7F18F42-AD57-4F5C-B66E-FA0061BEB54F}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {D7F18F42-AD57-4F5C-B66E-FA0061BEB54F}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {D7F18F42-AD57-4F5C-B66E-FA0061BEB54F}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {D7F18F42-AD57-4F5C-B66E-FA0061BEB54F}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {D7F18F42-AD57-4F5C-B66E-FA0061BEB54F}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {D7F18F42-AD57-4F5C-B66E-FA0061BEB54F}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {D7F18F42-AD57-4F5C-B66E-FA0061BEB54F}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {D7F18F42-AD57-4F5C-B66E-FA0061BEB54F}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {E4DC9D1E-8282-491F-A1FA-AF497EB1FF9C}.Release|x64.Build.0 = Release|x64 {D7F18F42-AD57-4F5C-B66E-FA0061BEB54F}.Debug|Win32.ActiveCfg = Debug|Win32 + {D7F18F42-AD57-4F5C-B66E-FA0061BEB54F}.Debug|Win32.Build.0 = Debug|Win32 {D7F18F42-AD57-4F5C-B66E-FA0061BEB54F}.Debug|x64.ActiveCfg = Debug|x64 + {D7F18F42-AD57-4F5C-B66E-FA0061BEB54F}.Debug|x64.Build.0 = Debug|x64 {D7F18F42-AD57-4F5C-B66E-FA0061BEB54F}.Release|Win32.ActiveCfg = Release|Win32 + {D7F18F42-AD57-4F5C-B66E-FA0061BEB54F}.Release|Win32.Build.0 = Release|Win32 {D7F18F42-AD57-4F5C-B66E-FA0061BEB54F}.Release|x64.ActiveCfg = Release|x64 - {8680F272-78C1-41E2-AE78-10E37BFC6F53}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {8680F272-78C1-41E2-AE78-10E37BFC6F53}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {8680F272-78C1-41E2-AE78-10E37BFC6F53}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {8680F272-78C1-41E2-AE78-10E37BFC6F53}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {8680F272-78C1-41E2-AE78-10E37BFC6F53}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {8680F272-78C1-41E2-AE78-10E37BFC6F53}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {8680F272-78C1-41E2-AE78-10E37BFC6F53}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {8680F272-78C1-41E2-AE78-10E37BFC6F53}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {D7F18F42-AD57-4F5C-B66E-FA0061BEB54F}.Release|x64.Build.0 = Release|x64 {8680F272-78C1-41E2-AE78-10E37BFC6F53}.Debug|Win32.ActiveCfg = Debug|Win32 + {8680F272-78C1-41E2-AE78-10E37BFC6F53}.Debug|Win32.Build.0 = Debug|Win32 {8680F272-78C1-41E2-AE78-10E37BFC6F53}.Debug|x64.ActiveCfg = Debug|x64 + {8680F272-78C1-41E2-AE78-10E37BFC6F53}.Debug|x64.Build.0 = Debug|x64 {8680F272-78C1-41E2-AE78-10E37BFC6F53}.Release|Win32.ActiveCfg = Release|Win32 + {8680F272-78C1-41E2-AE78-10E37BFC6F53}.Release|Win32.Build.0 = Release|Win32 {8680F272-78C1-41E2-AE78-10E37BFC6F53}.Release|x64.ActiveCfg = Release|x64 - {6D4BA8B0-63B8-47D8-8B37-0A56A464BD4D}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {6D4BA8B0-63B8-47D8-8B37-0A56A464BD4D}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {6D4BA8B0-63B8-47D8-8B37-0A56A464BD4D}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {6D4BA8B0-63B8-47D8-8B37-0A56A464BD4D}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {6D4BA8B0-63B8-47D8-8B37-0A56A464BD4D}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {6D4BA8B0-63B8-47D8-8B37-0A56A464BD4D}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {6D4BA8B0-63B8-47D8-8B37-0A56A464BD4D}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {6D4BA8B0-63B8-47D8-8B37-0A56A464BD4D}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {8680F272-78C1-41E2-AE78-10E37BFC6F53}.Release|x64.Build.0 = Release|x64 {6D4BA8B0-63B8-47D8-8B37-0A56A464BD4D}.Debug|Win32.ActiveCfg = Debug|Win32 + {6D4BA8B0-63B8-47D8-8B37-0A56A464BD4D}.Debug|Win32.Build.0 = Debug|Win32 {6D4BA8B0-63B8-47D8-8B37-0A56A464BD4D}.Debug|x64.ActiveCfg = Debug|x64 + {6D4BA8B0-63B8-47D8-8B37-0A56A464BD4D}.Debug|x64.Build.0 = Debug|x64 {6D4BA8B0-63B8-47D8-8B37-0A56A464BD4D}.Release|Win32.ActiveCfg = Release|Win32 + {6D4BA8B0-63B8-47D8-8B37-0A56A464BD4D}.Release|Win32.Build.0 = Release|Win32 {6D4BA8B0-63B8-47D8-8B37-0A56A464BD4D}.Release|x64.ActiveCfg = Release|x64 - {849F83BA-7817-419C-93E5-9F92541F773F}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {849F83BA-7817-419C-93E5-9F92541F773F}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {849F83BA-7817-419C-93E5-9F92541F773F}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {849F83BA-7817-419C-93E5-9F92541F773F}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {849F83BA-7817-419C-93E5-9F92541F773F}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {849F83BA-7817-419C-93E5-9F92541F773F}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {849F83BA-7817-419C-93E5-9F92541F773F}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {849F83BA-7817-419C-93E5-9F92541F773F}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {6D4BA8B0-63B8-47D8-8B37-0A56A464BD4D}.Release|x64.Build.0 = Release|x64 {849F83BA-7817-419C-93E5-9F92541F773F}.Debug|Win32.ActiveCfg = Debug|Win32 + {849F83BA-7817-419C-93E5-9F92541F773F}.Debug|Win32.Build.0 = Debug|Win32 {849F83BA-7817-419C-93E5-9F92541F773F}.Debug|x64.ActiveCfg = Debug|x64 + {849F83BA-7817-419C-93E5-9F92541F773F}.Debug|x64.Build.0 = Debug|x64 {849F83BA-7817-419C-93E5-9F92541F773F}.Release|Win32.ActiveCfg = Release|Win32 + {849F83BA-7817-419C-93E5-9F92541F773F}.Release|Win32.Build.0 = Release|Win32 {849F83BA-7817-419C-93E5-9F92541F773F}.Release|x64.ActiveCfg = Release|x64 - {DA51489E-AC9D-4D59-89FC-1F103449CC5A}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {DA51489E-AC9D-4D59-89FC-1F103449CC5A}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {DA51489E-AC9D-4D59-89FC-1F103449CC5A}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {DA51489E-AC9D-4D59-89FC-1F103449CC5A}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {DA51489E-AC9D-4D59-89FC-1F103449CC5A}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {DA51489E-AC9D-4D59-89FC-1F103449CC5A}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {DA51489E-AC9D-4D59-89FC-1F103449CC5A}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {DA51489E-AC9D-4D59-89FC-1F103449CC5A}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {849F83BA-7817-419C-93E5-9F92541F773F}.Release|x64.Build.0 = Release|x64 {DA51489E-AC9D-4D59-89FC-1F103449CC5A}.Debug|Win32.ActiveCfg = Debug|Win32 + {DA51489E-AC9D-4D59-89FC-1F103449CC5A}.Debug|Win32.Build.0 = Debug|Win32 {DA51489E-AC9D-4D59-89FC-1F103449CC5A}.Debug|x64.ActiveCfg = Debug|x64 + {DA51489E-AC9D-4D59-89FC-1F103449CC5A}.Debug|x64.Build.0 = Debug|x64 {DA51489E-AC9D-4D59-89FC-1F103449CC5A}.Release|Win32.ActiveCfg = Release|Win32 + {DA51489E-AC9D-4D59-89FC-1F103449CC5A}.Release|Win32.Build.0 = Release|Win32 {DA51489E-AC9D-4D59-89FC-1F103449CC5A}.Release|x64.ActiveCfg = Release|x64 - {299B54D9-A682-40D5-B87B-A0C21BF1E839}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {299B54D9-A682-40D5-B87B-A0C21BF1E839}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {299B54D9-A682-40D5-B87B-A0C21BF1E839}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {299B54D9-A682-40D5-B87B-A0C21BF1E839}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {299B54D9-A682-40D5-B87B-A0C21BF1E839}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {299B54D9-A682-40D5-B87B-A0C21BF1E839}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {299B54D9-A682-40D5-B87B-A0C21BF1E839}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {299B54D9-A682-40D5-B87B-A0C21BF1E839}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {DA51489E-AC9D-4D59-89FC-1F103449CC5A}.Release|x64.Build.0 = Release|x64 {299B54D9-A682-40D5-B87B-A0C21BF1E839}.Debug|Win32.ActiveCfg = Debug|Win32 + {299B54D9-A682-40D5-B87B-A0C21BF1E839}.Debug|Win32.Build.0 = Debug|Win32 {299B54D9-A682-40D5-B87B-A0C21BF1E839}.Debug|x64.ActiveCfg = Debug|x64 + {299B54D9-A682-40D5-B87B-A0C21BF1E839}.Debug|x64.Build.0 = Debug|x64 {299B54D9-A682-40D5-B87B-A0C21BF1E839}.Release|Win32.ActiveCfg = Release|Win32 + {299B54D9-A682-40D5-B87B-A0C21BF1E839}.Release|Win32.Build.0 = Release|Win32 {299B54D9-A682-40D5-B87B-A0C21BF1E839}.Release|x64.ActiveCfg = Release|x64 - {77CB36FD-F130-4416-B6B7-C24EFD83630E}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {77CB36FD-F130-4416-B6B7-C24EFD83630E}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {77CB36FD-F130-4416-B6B7-C24EFD83630E}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {77CB36FD-F130-4416-B6B7-C24EFD83630E}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {77CB36FD-F130-4416-B6B7-C24EFD83630E}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {77CB36FD-F130-4416-B6B7-C24EFD83630E}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {77CB36FD-F130-4416-B6B7-C24EFD83630E}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {77CB36FD-F130-4416-B6B7-C24EFD83630E}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {299B54D9-A682-40D5-B87B-A0C21BF1E839}.Release|x64.Build.0 = Release|x64 {77CB36FD-F130-4416-B6B7-C24EFD83630E}.Debug|Win32.ActiveCfg = Debug|Win32 + {77CB36FD-F130-4416-B6B7-C24EFD83630E}.Debug|Win32.Build.0 = Debug|Win32 {77CB36FD-F130-4416-B6B7-C24EFD83630E}.Debug|x64.ActiveCfg = Debug|x64 + {77CB36FD-F130-4416-B6B7-C24EFD83630E}.Debug|x64.Build.0 = Debug|x64 {77CB36FD-F130-4416-B6B7-C24EFD83630E}.Release|Win32.ActiveCfg = Release|Win32 + {77CB36FD-F130-4416-B6B7-C24EFD83630E}.Release|Win32.Build.0 = Release|Win32 {77CB36FD-F130-4416-B6B7-C24EFD83630E}.Release|x64.ActiveCfg = Release|x64 - {D306ADCE-34A1-4599-BD50-8598BB92B47F}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {D306ADCE-34A1-4599-BD50-8598BB92B47F}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {D306ADCE-34A1-4599-BD50-8598BB92B47F}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {D306ADCE-34A1-4599-BD50-8598BB92B47F}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {D306ADCE-34A1-4599-BD50-8598BB92B47F}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {D306ADCE-34A1-4599-BD50-8598BB92B47F}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {D306ADCE-34A1-4599-BD50-8598BB92B47F}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {D306ADCE-34A1-4599-BD50-8598BB92B47F}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {77CB36FD-F130-4416-B6B7-C24EFD83630E}.Release|x64.Build.0 = Release|x64 {D306ADCE-34A1-4599-BD50-8598BB92B47F}.Debug|Win32.ActiveCfg = Debug|Win32 + {D306ADCE-34A1-4599-BD50-8598BB92B47F}.Debug|Win32.Build.0 = Debug|Win32 {D306ADCE-34A1-4599-BD50-8598BB92B47F}.Debug|x64.ActiveCfg = Debug|x64 + {D306ADCE-34A1-4599-BD50-8598BB92B47F}.Debug|x64.Build.0 = Debug|x64 {D306ADCE-34A1-4599-BD50-8598BB92B47F}.Release|Win32.ActiveCfg = Release|Win32 + {D306ADCE-34A1-4599-BD50-8598BB92B47F}.Release|Win32.Build.0 = Release|Win32 {D306ADCE-34A1-4599-BD50-8598BB92B47F}.Release|x64.ActiveCfg = Release|x64 - {3A517759-2BC3-4110-97AA-E5E7E45EA3D8}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {3A517759-2BC3-4110-97AA-E5E7E45EA3D8}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {3A517759-2BC3-4110-97AA-E5E7E45EA3D8}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {3A517759-2BC3-4110-97AA-E5E7E45EA3D8}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {3A517759-2BC3-4110-97AA-E5E7E45EA3D8}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {3A517759-2BC3-4110-97AA-E5E7E45EA3D8}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {3A517759-2BC3-4110-97AA-E5E7E45EA3D8}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {3A517759-2BC3-4110-97AA-E5E7E45EA3D8}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {D306ADCE-34A1-4599-BD50-8598BB92B47F}.Release|x64.Build.0 = Release|x64 {3A517759-2BC3-4110-97AA-E5E7E45EA3D8}.Debug|Win32.ActiveCfg = Debug|Win32 + {3A517759-2BC3-4110-97AA-E5E7E45EA3D8}.Debug|Win32.Build.0 = Debug|Win32 {3A517759-2BC3-4110-97AA-E5E7E45EA3D8}.Debug|x64.ActiveCfg = Debug|x64 + {3A517759-2BC3-4110-97AA-E5E7E45EA3D8}.Debug|x64.Build.0 = Debug|x64 {3A517759-2BC3-4110-97AA-E5E7E45EA3D8}.Release|Win32.ActiveCfg = Release|Win32 + {3A517759-2BC3-4110-97AA-E5E7E45EA3D8}.Release|Win32.Build.0 = Release|Win32 {3A517759-2BC3-4110-97AA-E5E7E45EA3D8}.Release|x64.ActiveCfg = Release|x64 - {8EBD7C12-5623-467F-B80D-CFBB4C695771}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {8EBD7C12-5623-467F-B80D-CFBB4C695771}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {8EBD7C12-5623-467F-B80D-CFBB4C695771}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {8EBD7C12-5623-467F-B80D-CFBB4C695771}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {8EBD7C12-5623-467F-B80D-CFBB4C695771}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {8EBD7C12-5623-467F-B80D-CFBB4C695771}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {8EBD7C12-5623-467F-B80D-CFBB4C695771}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {8EBD7C12-5623-467F-B80D-CFBB4C695771}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {3A517759-2BC3-4110-97AA-E5E7E45EA3D8}.Release|x64.Build.0 = Release|x64 {8EBD7C12-5623-467F-B80D-CFBB4C695771}.Debug|Win32.ActiveCfg = Debug|Win32 + {8EBD7C12-5623-467F-B80D-CFBB4C695771}.Debug|Win32.Build.0 = Debug|Win32 {8EBD7C12-5623-467F-B80D-CFBB4C695771}.Debug|x64.ActiveCfg = Debug|x64 + {8EBD7C12-5623-467F-B80D-CFBB4C695771}.Debug|x64.Build.0 = Debug|x64 {8EBD7C12-5623-467F-B80D-CFBB4C695771}.Release|Win32.ActiveCfg = Release|Win32 + {8EBD7C12-5623-467F-B80D-CFBB4C695771}.Release|Win32.Build.0 = Release|Win32 {8EBD7C12-5623-467F-B80D-CFBB4C695771}.Release|x64.ActiveCfg = Release|x64 - {00000035-0000-0000-0000-000000000000}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {00000035-0000-0000-0000-000000000000}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {00000035-0000-0000-0000-000000000000}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {00000035-0000-0000-0000-000000000000}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {00000035-0000-0000-0000-000000000000}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {00000035-0000-0000-0000-000000000000}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {00000035-0000-0000-0000-000000000000}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {00000035-0000-0000-0000-000000000000}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {8EBD7C12-5623-467F-B80D-CFBB4C695771}.Release|x64.Build.0 = Release|x64 {00000035-0000-0000-0000-000000000000}.Debug|Win32.ActiveCfg = Debug|Win32 + {00000035-0000-0000-0000-000000000000}.Debug|Win32.Build.0 = Debug|Win32 {00000035-0000-0000-0000-000000000000}.Debug|x64.ActiveCfg = Debug|x64 + {00000035-0000-0000-0000-000000000000}.Debug|x64.Build.0 = Debug|x64 {00000035-0000-0000-0000-000000000000}.Release|Win32.ActiveCfg = Release|Win32 + {00000035-0000-0000-0000-000000000000}.Release|Win32.Build.0 = Release|Win32 {00000035-0000-0000-0000-000000000000}.Release|x64.ActiveCfg = Release|x64 - {16EED45E-8D20-40EF-BB30-9DDD5A11B352}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {16EED45E-8D20-40EF-BB30-9DDD5A11B352}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {16EED45E-8D20-40EF-BB30-9DDD5A11B352}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {16EED45E-8D20-40EF-BB30-9DDD5A11B352}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {16EED45E-8D20-40EF-BB30-9DDD5A11B352}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {16EED45E-8D20-40EF-BB30-9DDD5A11B352}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {16EED45E-8D20-40EF-BB30-9DDD5A11B352}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {16EED45E-8D20-40EF-BB30-9DDD5A11B352}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {00000035-0000-0000-0000-000000000000}.Release|x64.Build.0 = Release|x64 {16EED45E-8D20-40EF-BB30-9DDD5A11B352}.Debug|Win32.ActiveCfg = Debug|Win32 + {16EED45E-8D20-40EF-BB30-9DDD5A11B352}.Debug|Win32.Build.0 = Debug|Win32 {16EED45E-8D20-40EF-BB30-9DDD5A11B352}.Debug|x64.ActiveCfg = Debug|x64 + {16EED45E-8D20-40EF-BB30-9DDD5A11B352}.Debug|x64.Build.0 = Debug|x64 {16EED45E-8D20-40EF-BB30-9DDD5A11B352}.Release|Win32.ActiveCfg = Release|Win32 + {16EED45E-8D20-40EF-BB30-9DDD5A11B352}.Release|Win32.Build.0 = Release|Win32 {16EED45E-8D20-40EF-BB30-9DDD5A11B352}.Release|x64.ActiveCfg = Release|x64 - {2B721A85-96F1-4B92-BB31-1BCEF6ACFC8E}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {2B721A85-96F1-4B92-BB31-1BCEF6ACFC8E}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {2B721A85-96F1-4B92-BB31-1BCEF6ACFC8E}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {2B721A85-96F1-4B92-BB31-1BCEF6ACFC8E}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {2B721A85-96F1-4B92-BB31-1BCEF6ACFC8E}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {2B721A85-96F1-4B92-BB31-1BCEF6ACFC8E}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {2B721A85-96F1-4B92-BB31-1BCEF6ACFC8E}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {2B721A85-96F1-4B92-BB31-1BCEF6ACFC8E}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {16EED45E-8D20-40EF-BB30-9DDD5A11B352}.Release|x64.Build.0 = Release|x64 {2B721A85-96F1-4B92-BB31-1BCEF6ACFC8E}.Debug|Win32.ActiveCfg = Debug|Win32 + {2B721A85-96F1-4B92-BB31-1BCEF6ACFC8E}.Debug|Win32.Build.0 = Debug|Win32 {2B721A85-96F1-4B92-BB31-1BCEF6ACFC8E}.Debug|x64.ActiveCfg = Debug|x64 + {2B721A85-96F1-4B92-BB31-1BCEF6ACFC8E}.Debug|x64.Build.0 = Debug|x64 {2B721A85-96F1-4B92-BB31-1BCEF6ACFC8E}.Release|Win32.ActiveCfg = Release|Win32 + {2B721A85-96F1-4B92-BB31-1BCEF6ACFC8E}.Release|Win32.Build.0 = Release|Win32 {2B721A85-96F1-4B92-BB31-1BCEF6ACFC8E}.Release|x64.ActiveCfg = Release|x64 - {C5606B09-9FB7-4337-A490-2024CDCE4036}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {C5606B09-9FB7-4337-A490-2024CDCE4036}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {C5606B09-9FB7-4337-A490-2024CDCE4036}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {C5606B09-9FB7-4337-A490-2024CDCE4036}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {C5606B09-9FB7-4337-A490-2024CDCE4036}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {C5606B09-9FB7-4337-A490-2024CDCE4036}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {C5606B09-9FB7-4337-A490-2024CDCE4036}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {C5606B09-9FB7-4337-A490-2024CDCE4036}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {2B721A85-96F1-4B92-BB31-1BCEF6ACFC8E}.Release|x64.Build.0 = Release|x64 {C5606B09-9FB7-4337-A490-2024CDCE4036}.Debug|Win32.ActiveCfg = Debug|Win32 + {C5606B09-9FB7-4337-A490-2024CDCE4036}.Debug|Win32.Build.0 = Debug|Win32 {C5606B09-9FB7-4337-A490-2024CDCE4036}.Debug|x64.ActiveCfg = Debug|x64 + {C5606B09-9FB7-4337-A490-2024CDCE4036}.Debug|x64.Build.0 = Debug|x64 {C5606B09-9FB7-4337-A490-2024CDCE4036}.Release|Win32.ActiveCfg = Release|Win32 + {C5606B09-9FB7-4337-A490-2024CDCE4036}.Release|Win32.Build.0 = Release|Win32 {C5606B09-9FB7-4337-A490-2024CDCE4036}.Release|x64.ActiveCfg = Release|x64 - {12405F8D-7361-450D-8AFE-85BFD3AEEFD7}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {12405F8D-7361-450D-8AFE-85BFD3AEEFD7}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {12405F8D-7361-450D-8AFE-85BFD3AEEFD7}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {12405F8D-7361-450D-8AFE-85BFD3AEEFD7}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {12405F8D-7361-450D-8AFE-85BFD3AEEFD7}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {12405F8D-7361-450D-8AFE-85BFD3AEEFD7}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {12405F8D-7361-450D-8AFE-85BFD3AEEFD7}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {12405F8D-7361-450D-8AFE-85BFD3AEEFD7}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {C5606B09-9FB7-4337-A490-2024CDCE4036}.Release|x64.Build.0 = Release|x64 {12405F8D-7361-450D-8AFE-85BFD3AEEFD7}.Debug|Win32.ActiveCfg = Debug|Win32 + {12405F8D-7361-450D-8AFE-85BFD3AEEFD7}.Debug|Win32.Build.0 = Debug|Win32 {12405F8D-7361-450D-8AFE-85BFD3AEEFD7}.Debug|x64.ActiveCfg = Debug|x64 + {12405F8D-7361-450D-8AFE-85BFD3AEEFD7}.Debug|x64.Build.0 = Debug|x64 {12405F8D-7361-450D-8AFE-85BFD3AEEFD7}.Release|Win32.ActiveCfg = Release|Win32 + {12405F8D-7361-450D-8AFE-85BFD3AEEFD7}.Release|Win32.Build.0 = Release|Win32 {12405F8D-7361-450D-8AFE-85BFD3AEEFD7}.Release|x64.ActiveCfg = Release|x64 - {D7224A94-13EF-4253-B3EA-801295D5966B}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {D7224A94-13EF-4253-B3EA-801295D5966B}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {D7224A94-13EF-4253-B3EA-801295D5966B}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {D7224A94-13EF-4253-B3EA-801295D5966B}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {D7224A94-13EF-4253-B3EA-801295D5966B}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {D7224A94-13EF-4253-B3EA-801295D5966B}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {D7224A94-13EF-4253-B3EA-801295D5966B}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {D7224A94-13EF-4253-B3EA-801295D5966B}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {12405F8D-7361-450D-8AFE-85BFD3AEEFD7}.Release|x64.Build.0 = Release|x64 {D7224A94-13EF-4253-B3EA-801295D5966B}.Debug|Win32.ActiveCfg = Debug|Win32 + {D7224A94-13EF-4253-B3EA-801295D5966B}.Debug|Win32.Build.0 = Debug|Win32 {D7224A94-13EF-4253-B3EA-801295D5966B}.Debug|x64.ActiveCfg = Debug|x64 + {D7224A94-13EF-4253-B3EA-801295D5966B}.Debug|x64.Build.0 = Debug|x64 {D7224A94-13EF-4253-B3EA-801295D5966B}.Release|Win32.ActiveCfg = Release|Win32 + {D7224A94-13EF-4253-B3EA-801295D5966B}.Release|Win32.Build.0 = Release|Win32 {D7224A94-13EF-4253-B3EA-801295D5966B}.Release|x64.ActiveCfg = Release|x64 - {4FA5930A-77B1-46D8-B1F0-EF3D00C2E0A3}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {4FA5930A-77B1-46D8-B1F0-EF3D00C2E0A3}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {4FA5930A-77B1-46D8-B1F0-EF3D00C2E0A3}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {4FA5930A-77B1-46D8-B1F0-EF3D00C2E0A3}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {4FA5930A-77B1-46D8-B1F0-EF3D00C2E0A3}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {4FA5930A-77B1-46D8-B1F0-EF3D00C2E0A3}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {4FA5930A-77B1-46D8-B1F0-EF3D00C2E0A3}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {4FA5930A-77B1-46D8-B1F0-EF3D00C2E0A3}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {D7224A94-13EF-4253-B3EA-801295D5966B}.Release|x64.Build.0 = Release|x64 {4FA5930A-77B1-46D8-B1F0-EF3D00C2E0A3}.Debug|Win32.ActiveCfg = Debug|Win32 {4FA5930A-77B1-46D8-B1F0-EF3D00C2E0A3}.Debug|Win32.Build.0 = Debug|Win32 {4FA5930A-77B1-46D8-B1F0-EF3D00C2E0A3}.Debug|x64.ActiveCfg = Debug|x64 @@ -3820,14 +2622,6 @@ Global {4FA5930A-77B1-46D8-B1F0-EF3D00C2E0A3}.Release|Win32.Build.0 = Release|Win32 {4FA5930A-77B1-46D8-B1F0-EF3D00C2E0A3}.Release|x64.ActiveCfg = Release|x64 {4FA5930A-77B1-46D8-B1F0-EF3D00C2E0A3}.Release|x64.Build.0 = Release|x64 - {BFB8253B-4233-410B-AC03-BBC876DAB68D}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {BFB8253B-4233-410B-AC03-BBC876DAB68D}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {BFB8253B-4233-410B-AC03-BBC876DAB68D}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {BFB8253B-4233-410B-AC03-BBC876DAB68D}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {BFB8253B-4233-410B-AC03-BBC876DAB68D}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {BFB8253B-4233-410B-AC03-BBC876DAB68D}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {BFB8253B-4233-410B-AC03-BBC876DAB68D}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {BFB8253B-4233-410B-AC03-BBC876DAB68D}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {BFB8253B-4233-410B-AC03-BBC876DAB68D}.Debug|Win32.ActiveCfg = Debug|Win32 {BFB8253B-4233-410B-AC03-BBC876DAB68D}.Debug|Win32.Build.0 = Debug|Win32 {BFB8253B-4233-410B-AC03-BBC876DAB68D}.Debug|x64.ActiveCfg = Debug|x64 @@ -3836,14 +2630,6 @@ Global {BFB8253B-4233-410B-AC03-BBC876DAB68D}.Release|Win32.Build.0 = Release|Win32 {BFB8253B-4233-410B-AC03-BBC876DAB68D}.Release|x64.ActiveCfg = Release|x64 {BFB8253B-4233-410B-AC03-BBC876DAB68D}.Release|x64.Build.0 = Release|x64 - {24E0F8DA-F197-4E4B-8820-0614713CD8A9}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {24E0F8DA-F197-4E4B-8820-0614713CD8A9}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {24E0F8DA-F197-4E4B-8820-0614713CD8A9}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {24E0F8DA-F197-4E4B-8820-0614713CD8A9}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {24E0F8DA-F197-4E4B-8820-0614713CD8A9}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {24E0F8DA-F197-4E4B-8820-0614713CD8A9}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {24E0F8DA-F197-4E4B-8820-0614713CD8A9}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {24E0F8DA-F197-4E4B-8820-0614713CD8A9}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {24E0F8DA-F197-4E4B-8820-0614713CD8A9}.Debug|Win32.ActiveCfg = Debug|Win32 {24E0F8DA-F197-4E4B-8820-0614713CD8A9}.Debug|Win32.Build.0 = Debug|Win32 {24E0F8DA-F197-4E4B-8820-0614713CD8A9}.Debug|x64.ActiveCfg = Debug|x64 @@ -3852,14 +2638,6 @@ Global {24E0F8DA-F197-4E4B-8820-0614713CD8A9}.Release|Win32.Build.0 = Release|Win32 {24E0F8DA-F197-4E4B-8820-0614713CD8A9}.Release|x64.ActiveCfg = Release|x64 {24E0F8DA-F197-4E4B-8820-0614713CD8A9}.Release|x64.Build.0 = Release|x64 - {078030B1-68CF-4ABC-A21F-7C867477AEAC}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {078030B1-68CF-4ABC-A21F-7C867477AEAC}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {078030B1-68CF-4ABC-A21F-7C867477AEAC}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {078030B1-68CF-4ABC-A21F-7C867477AEAC}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {078030B1-68CF-4ABC-A21F-7C867477AEAC}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {078030B1-68CF-4ABC-A21F-7C867477AEAC}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {078030B1-68CF-4ABC-A21F-7C867477AEAC}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {078030B1-68CF-4ABC-A21F-7C867477AEAC}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {078030B1-68CF-4ABC-A21F-7C867477AEAC}.Debug|Win32.ActiveCfg = Debug|Win32 {078030B1-68CF-4ABC-A21F-7C867477AEAC}.Debug|Win32.Build.0 = Debug|Win32 {078030B1-68CF-4ABC-A21F-7C867477AEAC}.Debug|x64.ActiveCfg = Debug|x64 @@ -3868,14 +2646,6 @@ Global {078030B1-68CF-4ABC-A21F-7C867477AEAC}.Release|Win32.Build.0 = Release|Win32 {078030B1-68CF-4ABC-A21F-7C867477AEAC}.Release|x64.ActiveCfg = Release|x64 {078030B1-68CF-4ABC-A21F-7C867477AEAC}.Release|x64.Build.0 = Release|x64 - {263E5E46-AE57-4B3B-A3CE-7B639674F3A6}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {263E5E46-AE57-4B3B-A3CE-7B639674F3A6}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {263E5E46-AE57-4B3B-A3CE-7B639674F3A6}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {263E5E46-AE57-4B3B-A3CE-7B639674F3A6}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {263E5E46-AE57-4B3B-A3CE-7B639674F3A6}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {263E5E46-AE57-4B3B-A3CE-7B639674F3A6}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {263E5E46-AE57-4B3B-A3CE-7B639674F3A6}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {263E5E46-AE57-4B3B-A3CE-7B639674F3A6}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {263E5E46-AE57-4B3B-A3CE-7B639674F3A6}.Debug|Win32.ActiveCfg = Debug|Win32 {263E5E46-AE57-4B3B-A3CE-7B639674F3A6}.Debug|Win32.Build.0 = Debug|Win32 {263E5E46-AE57-4B3B-A3CE-7B639674F3A6}.Debug|x64.ActiveCfg = Debug|x64 @@ -3884,14 +2654,6 @@ Global {263E5E46-AE57-4B3B-A3CE-7B639674F3A6}.Release|Win32.Build.0 = Release|Win32 {263E5E46-AE57-4B3B-A3CE-7B639674F3A6}.Release|x64.ActiveCfg = Release|x64 {263E5E46-AE57-4B3B-A3CE-7B639674F3A6}.Release|x64.Build.0 = Release|x64 - {A4E94959-FD6B-4280-B1B3-99E4829153C9}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {A4E94959-FD6B-4280-B1B3-99E4829153C9}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {A4E94959-FD6B-4280-B1B3-99E4829153C9}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {A4E94959-FD6B-4280-B1B3-99E4829153C9}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {A4E94959-FD6B-4280-B1B3-99E4829153C9}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {A4E94959-FD6B-4280-B1B3-99E4829153C9}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {A4E94959-FD6B-4280-B1B3-99E4829153C9}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {A4E94959-FD6B-4280-B1B3-99E4829153C9}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {A4E94959-FD6B-4280-B1B3-99E4829153C9}.Debug|Win32.ActiveCfg = Debug|Win32 {A4E94959-FD6B-4280-B1B3-99E4829153C9}.Debug|Win32.Build.0 = Debug|Win32 {A4E94959-FD6B-4280-B1B3-99E4829153C9}.Debug|x64.ActiveCfg = Debug|x64 @@ -3900,14 +2662,6 @@ Global {A4E94959-FD6B-4280-B1B3-99E4829153C9}.Release|Win32.Build.0 = Release|Win32 {A4E94959-FD6B-4280-B1B3-99E4829153C9}.Release|x64.ActiveCfg = Release|x64 {A4E94959-FD6B-4280-B1B3-99E4829153C9}.Release|x64.Build.0 = Release|x64 - {2454F754-3A55-4875-9D8E-57B63673C231}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {2454F754-3A55-4875-9D8E-57B63673C231}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {2454F754-3A55-4875-9D8E-57B63673C231}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {2454F754-3A55-4875-9D8E-57B63673C231}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {2454F754-3A55-4875-9D8E-57B63673C231}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {2454F754-3A55-4875-9D8E-57B63673C231}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {2454F754-3A55-4875-9D8E-57B63673C231}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {2454F754-3A55-4875-9D8E-57B63673C231}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {2454F754-3A55-4875-9D8E-57B63673C231}.Debug|Win32.ActiveCfg = Debug|Win32 {2454F754-3A55-4875-9D8E-57B63673C231}.Debug|Win32.Build.0 = Debug|Win32 {2454F754-3A55-4875-9D8E-57B63673C231}.Debug|x64.ActiveCfg = Debug|x64 @@ -3916,14 +2670,6 @@ Global {2454F754-3A55-4875-9D8E-57B63673C231}.Release|Win32.Build.0 = Release|Win32 {2454F754-3A55-4875-9D8E-57B63673C231}.Release|x64.ActiveCfg = Release|x64 {2454F754-3A55-4875-9D8E-57B63673C231}.Release|x64.Build.0 = Release|x64 - {73C0E333-6476-4B7E-A52D-AB5E9CA36906}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {73C0E333-6476-4B7E-A52D-AB5E9CA36906}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {73C0E333-6476-4B7E-A52D-AB5E9CA36906}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {73C0E333-6476-4B7E-A52D-AB5E9CA36906}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {73C0E333-6476-4B7E-A52D-AB5E9CA36906}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {73C0E333-6476-4B7E-A52D-AB5E9CA36906}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {73C0E333-6476-4B7E-A52D-AB5E9CA36906}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {73C0E333-6476-4B7E-A52D-AB5E9CA36906}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {73C0E333-6476-4B7E-A52D-AB5E9CA36906}.Debug|Win32.ActiveCfg = Debug|Win32 {73C0E333-6476-4B7E-A52D-AB5E9CA36906}.Debug|Win32.Build.0 = Debug|Win32 {73C0E333-6476-4B7E-A52D-AB5E9CA36906}.Debug|x64.ActiveCfg = Debug|x64 @@ -3932,14 +2678,6 @@ Global {73C0E333-6476-4B7E-A52D-AB5E9CA36906}.Release|Win32.Build.0 = Release|Win32 {73C0E333-6476-4B7E-A52D-AB5E9CA36906}.Release|x64.ActiveCfg = Release|x64 {73C0E333-6476-4B7E-A52D-AB5E9CA36906}.Release|x64.Build.0 = Release|x64 - {A9537443-BB6C-4324-B1B9-B9492CAE1CD5}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {A9537443-BB6C-4324-B1B9-B9492CAE1CD5}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {A9537443-BB6C-4324-B1B9-B9492CAE1CD5}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {A9537443-BB6C-4324-B1B9-B9492CAE1CD5}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {A9537443-BB6C-4324-B1B9-B9492CAE1CD5}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {A9537443-BB6C-4324-B1B9-B9492CAE1CD5}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {A9537443-BB6C-4324-B1B9-B9492CAE1CD5}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {A9537443-BB6C-4324-B1B9-B9492CAE1CD5}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {A9537443-BB6C-4324-B1B9-B9492CAE1CD5}.Debug|Win32.ActiveCfg = Debug|Win32 {A9537443-BB6C-4324-B1B9-B9492CAE1CD5}.Debug|Win32.Build.0 = Debug|Win32 {A9537443-BB6C-4324-B1B9-B9492CAE1CD5}.Debug|x64.ActiveCfg = Debug|x64 @@ -3948,14 +2686,6 @@ Global {A9537443-BB6C-4324-B1B9-B9492CAE1CD5}.Release|Win32.Build.0 = Release|Win32 {A9537443-BB6C-4324-B1B9-B9492CAE1CD5}.Release|x64.ActiveCfg = Release|x64 {A9537443-BB6C-4324-B1B9-B9492CAE1CD5}.Release|x64.Build.0 = Release|x64 - {28347243-F75F-4B28-89F9-7EA84478D9C9}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {28347243-F75F-4B28-89F9-7EA84478D9C9}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {28347243-F75F-4B28-89F9-7EA84478D9C9}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {28347243-F75F-4B28-89F9-7EA84478D9C9}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {28347243-F75F-4B28-89F9-7EA84478D9C9}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {28347243-F75F-4B28-89F9-7EA84478D9C9}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {28347243-F75F-4B28-89F9-7EA84478D9C9}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {28347243-F75F-4B28-89F9-7EA84478D9C9}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {28347243-F75F-4B28-89F9-7EA84478D9C9}.Debug|Win32.ActiveCfg = Debug|Win32 {28347243-F75F-4B28-89F9-7EA84478D9C9}.Debug|Win32.Build.0 = Debug|Win32 {28347243-F75F-4B28-89F9-7EA84478D9C9}.Debug|x64.ActiveCfg = Debug|x64 @@ -3964,14 +2694,6 @@ Global {28347243-F75F-4B28-89F9-7EA84478D9C9}.Release|Win32.Build.0 = Release|Win32 {28347243-F75F-4B28-89F9-7EA84478D9C9}.Release|x64.ActiveCfg = Release|x64 {28347243-F75F-4B28-89F9-7EA84478D9C9}.Release|x64.Build.0 = Release|x64 - {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Debug|Win32.ActiveCfg = Debug|Win32 {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Debug|Win32.Build.0 = Debug|Win32 {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Debug|x64.ActiveCfg = Debug|x64 @@ -3980,39 +2702,22 @@ Global {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Release|Win32.Build.0 = Release|Win32 {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Release|x64.ActiveCfg = Release|x64 {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Release|x64.Build.0 = Release|x64 - {24916CD9-F28F-436C-8F20-B22BE0555601}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {24916CD9-F28F-436C-8F20-B22BE0555601}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {24916CD9-F28F-436C-8F20-B22BE0555601}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {24916CD9-F28F-436C-8F20-B22BE0555601}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {24916CD9-F28F-436C-8F20-B22BE0555601}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {24916CD9-F28F-436C-8F20-B22BE0555601}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {24916CD9-F28F-436C-8F20-B22BE0555601}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {24916CD9-F28F-436C-8F20-B22BE0555601}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 - {24916CD9-F28F-436C-8F20-B22BE0555601}.Debug|Win32.ActiveCfg = Debug|Win32 - {24916CD9-F28F-436C-8F20-B22BE0555601}.Debug|Win32.Build.0 = Debug|Win32 + {24916CD9-F28F-436C-8F20-B22BE0555601}.Debug|Win32.ActiveCfg = Cpp11-Release|Win32 + {24916CD9-F28F-436C-8F20-B22BE0555601}.Debug|Win32.Build.0 = Cpp11-Release|Win32 {24916CD9-F28F-436C-8F20-B22BE0555601}.Debug|x64.ActiveCfg = Debug|x64 + {24916CD9-F28F-436C-8F20-B22BE0555601}.Debug|x64.Build.0 = Debug|x64 {24916CD9-F28F-436C-8F20-B22BE0555601}.Release|Win32.ActiveCfg = Release|Win32 + {24916CD9-F28F-436C-8F20-B22BE0555601}.Release|Win32.Build.0 = Release|Win32 {24916CD9-F28F-436C-8F20-B22BE0555601}.Release|x64.ActiveCfg = Release|x64 - {E17093DB-4940-4EB4-A7BB-6958A96475E2}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {E17093DB-4940-4EB4-A7BB-6958A96475E2}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {E17093DB-4940-4EB4-A7BB-6958A96475E2}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {E17093DB-4940-4EB4-A7BB-6958A96475E2}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {E17093DB-4940-4EB4-A7BB-6958A96475E2}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {E17093DB-4940-4EB4-A7BB-6958A96475E2}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {E17093DB-4940-4EB4-A7BB-6958A96475E2}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {E17093DB-4940-4EB4-A7BB-6958A96475E2}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {24916CD9-F28F-436C-8F20-B22BE0555601}.Release|x64.Build.0 = Release|x64 {E17093DB-4940-4EB4-A7BB-6958A96475E2}.Debug|Win32.ActiveCfg = Debug|Win32 + {E17093DB-4940-4EB4-A7BB-6958A96475E2}.Debug|Win32.Build.0 = Debug|Win32 {E17093DB-4940-4EB4-A7BB-6958A96475E2}.Debug|x64.ActiveCfg = Debug|x64 + {E17093DB-4940-4EB4-A7BB-6958A96475E2}.Debug|x64.Build.0 = Debug|x64 {E17093DB-4940-4EB4-A7BB-6958A96475E2}.Release|Win32.ActiveCfg = Release|Win32 + {E17093DB-4940-4EB4-A7BB-6958A96475E2}.Release|Win32.Build.0 = Release|Win32 {E17093DB-4940-4EB4-A7BB-6958A96475E2}.Release|x64.ActiveCfg = Release|x64 - {806A4720-1E5E-4479-A92B-07D3253E72ED}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {806A4720-1E5E-4479-A92B-07D3253E72ED}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {806A4720-1E5E-4479-A92B-07D3253E72ED}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {806A4720-1E5E-4479-A92B-07D3253E72ED}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {806A4720-1E5E-4479-A92B-07D3253E72ED}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {806A4720-1E5E-4479-A92B-07D3253E72ED}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {806A4720-1E5E-4479-A92B-07D3253E72ED}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {806A4720-1E5E-4479-A92B-07D3253E72ED}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {E17093DB-4940-4EB4-A7BB-6958A96475E2}.Release|x64.Build.0 = Release|x64 {806A4720-1E5E-4479-A92B-07D3253E72ED}.Debug|Win32.ActiveCfg = Debug|Win32 {806A4720-1E5E-4479-A92B-07D3253E72ED}.Debug|Win32.Build.0 = Debug|Win32 {806A4720-1E5E-4479-A92B-07D3253E72ED}.Debug|x64.ActiveCfg = Debug|x64 @@ -4021,38 +2726,21 @@ Global {806A4720-1E5E-4479-A92B-07D3253E72ED}.Release|Win32.Build.0 = Release|Win32 {806A4720-1E5E-4479-A92B-07D3253E72ED}.Release|x64.ActiveCfg = Release|x64 {806A4720-1E5E-4479-A92B-07D3253E72ED}.Release|x64.Build.0 = Release|x64 - {86FA255C-ED2F-44E3-989B-F9291165D3E1}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {86FA255C-ED2F-44E3-989B-F9291165D3E1}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {86FA255C-ED2F-44E3-989B-F9291165D3E1}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {86FA255C-ED2F-44E3-989B-F9291165D3E1}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {86FA255C-ED2F-44E3-989B-F9291165D3E1}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {86FA255C-ED2F-44E3-989B-F9291165D3E1}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {86FA255C-ED2F-44E3-989B-F9291165D3E1}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {86FA255C-ED2F-44E3-989B-F9291165D3E1}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {86FA255C-ED2F-44E3-989B-F9291165D3E1}.Debug|Win32.ActiveCfg = Debug|Win32 + {86FA255C-ED2F-44E3-989B-F9291165D3E1}.Debug|Win32.Build.0 = Debug|Win32 {86FA255C-ED2F-44E3-989B-F9291165D3E1}.Debug|x64.ActiveCfg = Debug|x64 {86FA255C-ED2F-44E3-989B-F9291165D3E1}.Release|Win32.ActiveCfg = Release|Win32 + {86FA255C-ED2F-44E3-989B-F9291165D3E1}.Release|Win32.Build.0 = Release|Win32 {86FA255C-ED2F-44E3-989B-F9291165D3E1}.Release|x64.ActiveCfg = Release|x64 - {4D76D578-E858-485E-8498-9FC604B3B069}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {4D76D578-E858-485E-8498-9FC604B3B069}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {4D76D578-E858-485E-8498-9FC604B3B069}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {4D76D578-E858-485E-8498-9FC604B3B069}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {4D76D578-E858-485E-8498-9FC604B3B069}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {4D76D578-E858-485E-8498-9FC604B3B069}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {4D76D578-E858-485E-8498-9FC604B3B069}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {4D76D578-E858-485E-8498-9FC604B3B069}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {86FA255C-ED2F-44E3-989B-F9291165D3E1}.Release|x64.Build.0 = Release|x64 {4D76D578-E858-485E-8498-9FC604B3B069}.Debug|Win32.ActiveCfg = Debug|Win32 + {4D76D578-E858-485E-8498-9FC604B3B069}.Debug|Win32.Build.0 = Debug|Win32 {4D76D578-E858-485E-8498-9FC604B3B069}.Debug|x64.ActiveCfg = Debug|x64 + {4D76D578-E858-485E-8498-9FC604B3B069}.Debug|x64.Build.0 = Debug|x64 {4D76D578-E858-485E-8498-9FC604B3B069}.Release|Win32.ActiveCfg = Release|Win32 + {4D76D578-E858-485E-8498-9FC604B3B069}.Release|Win32.Build.0 = Release|Win32 {4D76D578-E858-485E-8498-9FC604B3B069}.Release|x64.ActiveCfg = Release|x64 - {A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {4D76D578-E858-485E-8498-9FC604B3B069}.Release|x64.Build.0 = Release|x64 {A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Debug|Win32.ActiveCfg = Debug|Win32 {A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Debug|Win32.Build.0 = Debug|Win32 {A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Debug|x64.ActiveCfg = Debug|x64 @@ -4061,14 +2749,6 @@ Global {A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Release|Win32.Build.0 = Release|Win32 {A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Release|x64.ActiveCfg = Release|x64 {A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Release|x64.Build.0 = Release|x64 - {0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Debug|Win32.ActiveCfg = Debug|Win32 {0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Debug|Win32.Build.0 = Debug|Win32 {0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Debug|x64.ActiveCfg = Debug|x64 @@ -4077,27 +2757,14 @@ Global {0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Release|Win32.Build.0 = Release|Win32 {0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Release|x64.ActiveCfg = Release|x64 {0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Release|x64.Build.0 = Release|x64 - {7D48DD81-247D-467E-B94C-D23EC94BDAB0}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {7D48DD81-247D-467E-B94C-D23EC94BDAB0}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {7D48DD81-247D-467E-B94C-D23EC94BDAB0}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {7D48DD81-247D-467E-B94C-D23EC94BDAB0}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {7D48DD81-247D-467E-B94C-D23EC94BDAB0}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {7D48DD81-247D-467E-B94C-D23EC94BDAB0}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {7D48DD81-247D-467E-B94C-D23EC94BDAB0}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {7D48DD81-247D-467E-B94C-D23EC94BDAB0}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {7D48DD81-247D-467E-B94C-D23EC94BDAB0}.Debug|Win32.ActiveCfg = Debug|Win32 {7D48DD81-247D-467E-B94C-D23EC94BDAB0}.Debug|Win32.Build.0 = Debug|Win32 {7D48DD81-247D-467E-B94C-D23EC94BDAB0}.Debug|x64.ActiveCfg = Debug|x64 + {7D48DD81-247D-467E-B94C-D23EC94BDAB0}.Debug|x64.Build.0 = Debug|x64 {7D48DD81-247D-467E-B94C-D23EC94BDAB0}.Release|Win32.ActiveCfg = Release|Win32 + {7D48DD81-247D-467E-B94C-D23EC94BDAB0}.Release|Win32.Build.0 = Release|Win32 {7D48DD81-247D-467E-B94C-D23EC94BDAB0}.Release|x64.ActiveCfg = Release|x64 - {B1C09F91-405B-448C-84FE-1BB4E29CA620}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {B1C09F91-405B-448C-84FE-1BB4E29CA620}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {B1C09F91-405B-448C-84FE-1BB4E29CA620}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {B1C09F91-405B-448C-84FE-1BB4E29CA620}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {B1C09F91-405B-448C-84FE-1BB4E29CA620}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {B1C09F91-405B-448C-84FE-1BB4E29CA620}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {B1C09F91-405B-448C-84FE-1BB4E29CA620}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {B1C09F91-405B-448C-84FE-1BB4E29CA620}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {7D48DD81-247D-467E-B94C-D23EC94BDAB0}.Release|x64.Build.0 = Release|x64 {B1C09F91-405B-448C-84FE-1BB4E29CA620}.Debug|Win32.ActiveCfg = Debug|Win32 {B1C09F91-405B-448C-84FE-1BB4E29CA620}.Debug|Win32.Build.0 = Debug|Win32 {B1C09F91-405B-448C-84FE-1BB4E29CA620}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/cpp/src/Glacier2/msbuild/glacier2router.vcxproj b/cpp/src/Glacier2/msbuild/glacier2router.vcxproj index 1c9dd2c9f1e..19ccf81d235 100644 --- a/cpp/src/Glacier2/msbuild/glacier2router.vcxproj +++ b/cpp/src/Glacier2/msbuild/glacier2router.vcxproj @@ -21,7 +21,7 @@ {541CF1D6-95FD-4499-AB02-75CCCEE660B0} - glacier2router++11 + glacier2router @@ -45,7 +45,7 @@ $(DefaultPlatformToolset) - + diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/msbuild/glacier2cryptpermissionsverifier++11/glacier2cryptpermissionsverifier++11.vcxproj b/cpp/src/Glacier2CryptPermissionsVerifier/msbuild/glacier2cryptpermissionsverifier++11/glacier2cryptpermissionsverifier++11.vcxproj deleted file mode 100644 index bddffc68dac..00000000000 --- a/cpp/src/Glacier2CryptPermissionsVerifier/msbuild/glacier2cryptpermissionsverifier++11/glacier2cryptpermissionsverifier++11.vcxproj +++ /dev/null @@ -1,111 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {BF2077E4-D837-486B-9356-24FA5F659808} - Glacier2CryptPermissionsVerifier - - - - DynamicLibrary - true - $(DefaultPlatformToolset) - - - DynamicLibrary - false - $(DefaultPlatformToolset) - - - DynamicLibrary - true - $(DefaultPlatformToolset) - - - DynamicLibrary - false - $(DefaultPlatformToolset) - - - - - - - - - - - - - - - - - - - - - - - - - - - CRYPT_PERMISSIONS_VERIFIER_API_EXPORTS;%(PreprocessorDefinitions) - - - crypt32.lib;bcrypt.lib - - - - - CRYPT_PERMISSIONS_VERIFIER_API_EXPORTS;%(PreprocessorDefinitions) - - - crypt32.lib;bcrypt.lib - - - - - CRYPT_PERMISSIONS_VERIFIER_API_EXPORTS;%(PreprocessorDefinitions) - - - crypt32.lib;bcrypt.lib - - - - - CRYPT_PERMISSIONS_VERIFIER_API_EXPORTS;%(PreprocessorDefinitions) - - - crypt32.lib;bcrypt.lib - - - - - - - - - - - - - \ No newline at end of file diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/msbuild/glacier2cryptpermissionsverifier++11/glacier2cryptpermissionsverifier++11.vcxproj.filters b/cpp/src/Glacier2CryptPermissionsVerifier/msbuild/glacier2cryptpermissionsverifier++11/glacier2cryptpermissionsverifier++11.vcxproj.filters deleted file mode 100644 index 05d527e9a45..00000000000 --- a/cpp/src/Glacier2CryptPermissionsVerifier/msbuild/glacier2cryptpermissionsverifier++11/glacier2cryptpermissionsverifier++11.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {a7b5adff-15af-48c2-9491-a6fbe9b5ed99} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {7bcfbb57-99ea-410a-be73-9059546f3b4d} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {6c7fbad5-7deb-4d8b-b0c7-4452a2cb7ed0} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/msbuild/glacier2cryptpermissionsverifier/glacier2cryptpermissionsverifier.vcxproj b/cpp/src/Glacier2CryptPermissionsVerifier/msbuild/glacier2cryptpermissionsverifier/glacier2cryptpermissionsverifier.vcxproj index a57561779a7..c8be1023f5e 100644 --- a/cpp/src/Glacier2CryptPermissionsVerifier/msbuild/glacier2cryptpermissionsverifier/glacier2cryptpermissionsverifier.vcxproj +++ b/cpp/src/Glacier2CryptPermissionsVerifier/msbuild/glacier2cryptpermissionsverifier/glacier2cryptpermissionsverifier.vcxproj @@ -19,7 +19,7 @@ - {519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3} + {BF2077E4-D837-486B-9356-24FA5F659808} Glacier2CryptPermissionsVerifier @@ -44,7 +44,7 @@ $(DefaultPlatformToolset) - + diff --git a/cpp/src/Glacier2Lib/msbuild/glacier2++11/glacier2++11.vcxproj b/cpp/src/Glacier2Lib/msbuild/glacier2++11/glacier2++11.vcxproj deleted file mode 100644 index 2b81d585be2..00000000000 --- a/cpp/src/Glacier2Lib/msbuild/glacier2++11/glacier2++11.vcxproj +++ /dev/null @@ -1,369 +0,0 @@ - - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {2940A3C2-A9BA-44AA-AF65-00479C783407} - Glacier2 - - - - DynamicLibrary - true - $(DefaultPlatformToolset) - - - DynamicLibrary - false - $(DefaultPlatformToolset) - - - DynamicLibrary - true - $(DefaultPlatformToolset) - - - DynamicLibrary - false - $(DefaultPlatformToolset) - - - - - - - - - - - - - - - - - - - - - - - GLACIER2_API_EXPORTS;%(PreprocessorDefinitions) - - - - - GLACIER2_API_EXPORTS;%(PreprocessorDefinitions) - - - - - GLACIER2_API_EXPORTS;%(PreprocessorDefinitions) - - - - - GLACIER2_API_EXPORTS;%(PreprocessorDefinitions) - - - - - $(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Glacier2\ - Glacier2 - - - - - - - - - - - - - - - true - true - true - ..\..\..\..\..\slice\Glacier2\Metrics.ice - - - true - true - true - ..\..\..\..\..\slice\Glacier2\PermissionsVerifier.ice - - - true - true - true - ..\..\..\..\..\slice\Glacier2\Router.ice - - - true - true - true - ..\..\..\..\..\slice\Glacier2\Session.ice - - - true - true - true - ..\..\..\..\..\slice\Glacier2\SSLInfo.ice - - - true - true - true - ..\..\..\..\..\slice\Glacier2\Metrics.ice - - - true - true - true - ..\..\..\..\..\slice\Glacier2\PermissionsVerifier.ice - - - true - true - true - ..\..\..\..\..\slice\Glacier2\Router.ice - - - true - true - true - ..\..\..\..\..\slice\Glacier2\Session.ice - - - true - true - true - ..\..\..\..\..\slice\Glacier2\SSLInfo.ice - - - true - true - true - ..\..\..\..\..\slice\Glacier2\Metrics.ice - - - true - true - true - ..\..\..\..\..\slice\Glacier2\PermissionsVerifier.ice - - - true - true - true - ..\..\..\..\..\slice\Glacier2\Router.ice - - - true - true - true - ..\..\..\..\..\slice\Glacier2\Session.ice - - - true - true - true - ..\..\..\..\..\slice\Glacier2\SSLInfo.ice - - - true - true - true - ..\..\..\..\..\slice\Glacier2\Metrics.ice - - - true - true - true - ..\..\..\..\..\slice\Glacier2\PermissionsVerifier.ice - - - true - true - true - ..\..\..\..\..\slice\Glacier2\Router.ice - - - true - true - true - ..\..\..\..\..\slice\Glacier2\Session.ice - - - true - true - true - ..\..\..\..\..\slice\Glacier2\SSLInfo.ice - - - - - true - true - true - ..\..\..\..\..\slice\Glacier2\Metrics.ice - - - true - true - true - ..\..\..\..\..\slice\Glacier2\PermissionsVerifier.ice - - - true - true - true - ..\..\..\..\..\slice\Glacier2\Router.ice - - - true - true - true - ..\..\..\..\..\slice\Glacier2\Session.ice - - - true - true - true - ..\..\..\..\..\slice\Glacier2\SSLInfo.ice - - - true - true - true - ..\..\..\..\..\slice\Glacier2\Metrics.ice - - - true - true - true - ..\..\..\..\..\slice\Glacier2\PermissionsVerifier.ice - - - true - true - true - ..\..\..\..\..\slice\Glacier2\Router.ice - - - true - true - true - ..\..\..\..\..\slice\Glacier2\Session.ice - - - true - true - true - ..\..\..\..\..\slice\Glacier2\SSLInfo.ice - - - true - true - true - ..\..\..\..\..\slice\Glacier2\Metrics.ice - - - true - true - true - ..\..\..\..\..\slice\Glacier2\PermissionsVerifier.ice - - - true - true - true - ..\..\..\..\..\slice\Glacier2\Router.ice - - - true - true - true - ..\..\..\..\..\slice\Glacier2\Session.ice - - - true - true - true - ..\..\..\..\..\slice\Glacier2\SSLInfo.ice - - - true - true - true - ..\..\..\..\..\slice\Glacier2\Metrics.ice - - - true - true - true - ..\..\..\..\..\slice\Glacier2\PermissionsVerifier.ice - - - true - true - true - ..\..\..\..\..\slice\Glacier2\Router.ice - - - true - true - true - ..\..\..\..\..\slice\Glacier2\Session.ice - - - true - true - true - ..\..\..\..\..\slice\Glacier2\SSLInfo.ice - - - - - - - - - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - \ No newline at end of file diff --git a/cpp/src/Glacier2Lib/msbuild/glacier2++11/glacier2++11.vcxproj.filters b/cpp/src/Glacier2Lib/msbuild/glacier2++11/glacier2++11.vcxproj.filters deleted file mode 100644 index dd5d333eb14..00000000000 --- a/cpp/src/Glacier2Lib/msbuild/glacier2++11/glacier2++11.vcxproj.filters +++ /dev/null @@ -1,230 +0,0 @@ - - - - - {19067830-5e84-4162-af65-26ef2415cad2} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {30dab033-f9de-4a4e-a655-6c3811814a3b} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {051b77b0-3b86-458b-9c9e-3cc24b1078fe} - ice - - - {00cd6ee0-25d3-456b-aa33-0a7367a74bb9} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {546d2186-061f-493e-86ed-1f270e422965} - - - {84ab636b-a0a9-463d-8fde-62f90f8c0426} - - - {443526eb-a840-4516-a351-4026c1f65ad1} - - - {983aa4d5-0aaf-4b62-b3ba-94e69b726806} - - - {70b58eb5-32ce-4593-ac95-d4c4a28050cd} - - - {d7638a16-c644-40ae-a13d-588b9bcabc56} - - - {c01c1098-f126-4621-ae7b-d6fc50917bc2} - - - {b27c1b4c-5b23-4bdc-8cef-9bd339d7271d} - - - {4029b63e-ecaf-4c53-a39b-4bee08f9821d} - - - {7569fa48-5b83-4413-854f-88e7d23bfae1} - - - {dae76d01-7739-43c5-88df-15fe9bb84fef} - - - {1205887c-b371-498b-8026-13f21d32fc65} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files\Win32\Debug - - - Source Files\Win32\Debug - - - Source Files\Win32\Debug - - - Source Files\Win32\Debug - - - Source Files\Win32\Debug - - - Source Files\x64\Debug - - - Source Files\x64\Debug - - - Source Files\x64\Debug - - - Source Files\x64\Debug - - - Source Files\x64\Debug - - - Source Files\Win32\Release - - - Source Files\Win32\Release - - - Source Files\Win32\Release - - - Source Files\Win32\Release - - - Source Files\Win32\Release - - - Source Files\x64\Release - - - Source Files\x64\Release - - - Source Files\x64\Release - - - Source Files\x64\Release - - - Source Files\x64\Release - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files\Win32\Debug - - - Header Files\Win32\Debug - - - Header Files\Win32\Debug - - - Header Files\Win32\Debug - - - Header Files\Win32\Debug - - - Header Files\x64\Debug - - - Header Files\x64\Debug - - - Header Files\x64\Debug - - - Header Files\x64\Debug - - - Header Files\x64\Debug - - - Header Files\Win32\Release - - - Header Files\Win32\Release - - - Header Files\Win32\Release - - - Header Files\Win32\Release - - - Header Files\Win32\Release - - - Header Files\x64\Release - - - Header Files\x64\Release - - - Header Files\x64\Release - - - Header Files\x64\Release - - - Header Files\x64\Release - - - - - Resource Files - - - - - Slice Files - - - Slice Files - - - Slice Files - - - Slice Files - - - Slice Files - - - - - - \ No newline at end of file diff --git a/cpp/src/Glacier2Lib/msbuild/glacier2++11/packages.config b/cpp/src/Glacier2Lib/msbuild/glacier2++11/packages.config deleted file mode 100644 index fb43e38f42f..00000000000 --- a/cpp/src/Glacier2Lib/msbuild/glacier2++11/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/cpp/src/Glacier2Lib/msbuild/glacier2/glacier2.vcxproj b/cpp/src/Glacier2Lib/msbuild/glacier2/glacier2.vcxproj index 4b4316e9bd2..46c410f6eba 100644 --- a/cpp/src/Glacier2Lib/msbuild/glacier2/glacier2.vcxproj +++ b/cpp/src/Glacier2Lib/msbuild/glacier2/glacier2.vcxproj @@ -20,7 +20,7 @@ - {C7223CC8-0AAA-470B-ACB3-12B9DE75525C} + {2940A3C2-A9BA-44AA-AF65-00479C783407} Glacier2 @@ -45,7 +45,7 @@ $(DefaultPlatformToolset) - + @@ -63,10 +63,6 @@ - - - - GLACIER2_API_EXPORTS;%(PreprocessorDefinitions) @@ -89,10 +85,17 @@ - $(IceSrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\Glacier2\ + $(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Glacier2\ Glacier2 + + + + + + + @@ -219,121 +222,121 @@ - + true true true ..\..\..\..\..\slice\Glacier2\Metrics.ice - + true true true ..\..\..\..\..\slice\Glacier2\PermissionsVerifier.ice - + true true true ..\..\..\..\..\slice\Glacier2\Router.ice - + true true true ..\..\..\..\..\slice\Glacier2\Session.ice - + true true true ..\..\..\..\..\slice\Glacier2\SSLInfo.ice - + true true true ..\..\..\..\..\slice\Glacier2\Metrics.ice - + true true true ..\..\..\..\..\slice\Glacier2\PermissionsVerifier.ice - + true true true ..\..\..\..\..\slice\Glacier2\Router.ice - + true true true ..\..\..\..\..\slice\Glacier2\Session.ice - + true true true ..\..\..\..\..\slice\Glacier2\SSLInfo.ice - + true true true ..\..\..\..\..\slice\Glacier2\Metrics.ice - + true true true ..\..\..\..\..\slice\Glacier2\PermissionsVerifier.ice - + true true true ..\..\..\..\..\slice\Glacier2\Router.ice - + true true true ..\..\..\..\..\slice\Glacier2\Session.ice - + true true true ..\..\..\..\..\slice\Glacier2\SSLInfo.ice - + true true true ..\..\..\..\..\slice\Glacier2\Metrics.ice - + true true true ..\..\..\..\..\slice\Glacier2\PermissionsVerifier.ice - + true true true ..\..\..\..\..\slice\Glacier2\Router.ice - + true true true ..\..\..\..\..\slice\Glacier2\Session.ice - + true true true @@ -348,13 +351,6 @@ - - - - - - - diff --git a/cpp/src/Ice/ConnectionFactory.h b/cpp/src/Ice/ConnectionFactory.h index 1f1c553f9c6..fdb41790d27 100644 --- a/cpp/src/Ice/ConnectionFactory.h +++ b/cpp/src/Ice/ConnectionFactory.h @@ -245,7 +245,7 @@ class IncomingConnectionFactory : public EventHandler, State _state; #if defined(ICE_USE_IOCP) - IceInternal::UniquePtr _acceptorException; + std::unique_ptr _acceptorException; #endif }; diff --git a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj deleted file mode 100644 index bbca3ff7042..00000000000 --- a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj +++ /dev/null @@ -1,948 +0,0 @@ - - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {3AB9772C-6113-4F1C-90FB-5368E7486C11} - Ice - - - - DynamicLibrary - true - $(DefaultPlatformToolset) - - - DynamicLibrary - false - $(DefaultPlatformToolset) - - - DynamicLibrary - true - $(DefaultPlatformToolset) - - - DynamicLibrary - false - $(DefaultPlatformToolset) - - - - - - - - - - - - - - - - - - - - - - ICE_API_EXPORTS;%(PreprocessorDefinitions) - 4996;%(DisableSpecificWarnings) - - - advapi32.lib;ws2_32.lib;Iphlpapi.lib;rpcrt4.lib;DbgHelp.lib;Shlwapi.lib - - - - - ICE_API_EXPORTS;%(PreprocessorDefinitions) - 4996;%(DisableSpecificWarnings) - - - advapi32.lib;ws2_32.lib;Iphlpapi.lib;rpcrt4.lib;DbgHelp.lib;Shlwapi.lib - - - - - ICE_API_EXPORTS;%(PreprocessorDefinitions) - 4996;%(DisableSpecificWarnings) - - - advapi32.lib;ws2_32.lib;Iphlpapi.lib;rpcrt4.lib;DbgHelp.lib;Shlwapi.lib - - - - - ICE_API_EXPORTS;%(PreprocessorDefinitions) - 4996;%(DisableSpecificWarnings) - - - advapi32.lib;ws2_32.lib;Iphlpapi.lib;rpcrt4.lib;DbgHelp.lib;Shlwapi.lib - - - - - $(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\ - Ice - - - - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - - - - - - - - - - - - - - - - - Document - mc -r $(Platform)\$(Configuration)\ ..\..\EventLoggerMsg.mc && move EventLoggerMsg.h $(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h - - - mc -r $(Platform)\$(Configuration)\ ..\..\EventLoggerMsg.mc && move EventLoggerMsg.h $(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h - - - mc -r $(Platform)\$(Configuration)\ ..\..\EventLoggerMsg.mc && move EventLoggerMsg.h $(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h - - - mc -r $(Platform)\$(Configuration)\ ..\..\EventLoggerMsg.mc && move EventLoggerMsg.h $(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h - - - $(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h;$(Platform)\$(Configuration)\EventLoggerMsg.rc - $(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h;$(Platform)\$(Configuration)\EventLoggerMsg.rc - $(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h;$(Platform)\$(Configuration)\EventLoggerMsg.rc - $(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h;$(Platform)\$(Configuration)\EventLoggerMsg.rc - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - ..\..\..\..\..\slice\Ice\BuiltinSequences.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Context.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\EndpointTypes.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Identity.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Locator.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Metrics.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\OperationMode.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Process.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\PropertiesAdmin.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\PropertyDict.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\RemoteLogger.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Router.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Version.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\BuiltinSequences.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Context.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\EndpointTypes.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Identity.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Locator.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Metrics.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\OperationMode.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Process.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\PropertiesAdmin.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\PropertyDict.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\RemoteLogger.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Router.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Version.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\BuiltinSequences.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Context.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\EndpointTypes.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Identity.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Locator.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Metrics.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\OperationMode.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Process.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\PropertiesAdmin.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\PropertyDict.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\RemoteLogger.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Router.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Version.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\BuiltinSequences.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Context.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\EndpointTypes.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Identity.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Locator.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Metrics.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\OperationMode.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Process.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\PropertiesAdmin.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\PropertyDict.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\RemoteLogger.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Router.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Version.ice - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - ..\..\..\..\..\slice\Ice\BuiltinSequences.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Context.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\EndpointTypes.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Identity.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Locator.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Metrics.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\OperationMode.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Process.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\PropertiesAdmin.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\PropertyDict.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\RemoteLogger.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Router.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Version.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\BuiltinSequences.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Context.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\EndpointTypes.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Identity.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Locator.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Metrics.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\OperationMode.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Process.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\PropertiesAdmin.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\PropertyDict.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\RemoteLogger.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Router.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Version.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\BuiltinSequences.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Context.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\EndpointTypes.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Identity.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Locator.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Metrics.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\OperationMode.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Process.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\PropertiesAdmin.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\PropertyDict.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\RemoteLogger.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Router.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Version.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\BuiltinSequences.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Context.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\EndpointTypes.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Identity.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Locator.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Metrics.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\OperationMode.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Process.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\PropertiesAdmin.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\PropertyDict.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\RemoteLogger.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Router.ice - - - true - true - true - ..\..\..\..\..\slice\Ice\Version.ice - - - - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - \ No newline at end of file diff --git a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj.filters b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj.filters deleted file mode 100644 index 89ae81892c7..00000000000 --- a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj.filters +++ /dev/null @@ -1,868 +0,0 @@ - - - - - {10409629-905B-4370-AAEE-B0458725C38C} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {605E3CFB-F312-46C4-ABF2-A8E26A66E152} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {7191E98D-DD02-4836-934B-E25571A72CDD} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {76D8992F-EDA3-4FAE-B303-05D9A03B2125} - ice - - - {1c1296c4-dd4b-420f-8e31-fbf5993a5c28} - - - {c280c0f1-e313-436a-9966-234aff49a6ea} - - - {7ece7fb8-49d8-4051-8d17-2e2e38cea90c} - - - {3e379faf-c6c1-4ece-8cce-42f0121006e5} - - - {e411c020-22be-424c-9a70-605e8d4fa06c} - - - {3dc1cea9-e62c-4da9-8654-3a358e27a2b4} - - - {2a73cac1-73f5-4c26-86d9-ea2fb5174687} - - - {8f6918f6-4939-479d-8d59-aec203c3a608} - - - {2ec9c6f6-a705-42e0-b4e3-249cea21bab5} - - - {b9f3875a-5a8b-44ac-937b-c8872d43e684} - - - {7fc12f50-71b7-471e-a537-c4b42dac1654} - - - {cccab72e-1120-4343-8390-810a0deeefdb} - - - {dc4de605-8105-436b-bf9e-e67775ddfd3f} - - - {a534641f-afba-4a5c-a89e-1170f0f7a5c6} - - - {ad43740b-66eb-43ea-9b0b-2dd3a07cefab} - - - {2467dd5d-5a35-4a5b-ab85-0cdfaed7a3a5} - - - {a523c5a1-c83b-4c8f-9c0f-61402d19a8da} - - - {efb1387e-a41e-4b1e-958c-88d9bb342a60} - - - - - Resource Files - - - Resource Files\Win32\Debug - - - Resource Files\Win32\Release - - - Resource Files\x64\Debug - - - Resource Files\x64\Release - - - - - Source Files\Win32\Debug - - - Source Files\Win32\Debug - - - Source Files\Win32\Debug - - - Source Files\Win32\Debug - - - Source Files\Win32\Debug - - - Source Files\Win32\Debug - - - Source Files\Win32\Debug - - - Source Files\Win32\Debug - - - Source Files\Win32\Debug - - - Source Files\Win32\Debug - - - Source Files\x64\Debug - - - Source Files\x64\Debug - - - Source Files\x64\Debug - - - Source Files\x64\Debug - - - Source Files\x64\Debug - - - Source Files\x64\Debug - - - Source Files\x64\Debug - - - Source Files\x64\Debug - - - Source Files\x64\Debug - - - Source Files\x64\Debug - - - Source Files\Win32\Release - - - Source Files\Win32\Release - - - Source Files\Win32\Release - - - Source Files\Win32\Release - - - Source Files\Win32\Release - - - Source Files\Win32\Release - - - Source Files\Win32\Release - - - Source Files\Win32\Release - - - Source Files\Win32\Release - - - Source Files\Win32\Release - - - Source Files\x64\Release - - - Source Files\x64\Release - - - Source Files\x64\Release - - - Source Files\x64\Release - - - Source Files\x64\Release - - - Source Files\x64\Release - - - Source Files\x64\Release - - - Source Files\x64\Release - - - Source Files\x64\Release - - - Source Files\x64\Release - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\Win32\Debug - - - Source Files\x64\Debug - - - Source Files\Win32\Release - - - Source Files\x64\Release - - - Source Files\Win32\Debug - - - Source Files\x64\Debug - - - Source Files\Win32\Release - - - Source Files\x64\Release - - - Source Files\Win32\Debug - - - Source Files\x64\Debug - - - Source Files\Win32\Release - - - Source Files\x64\Release - - - - - Resource Files - - - - - - - - Header Files\Win32\Debug - - - Header Files\Win32\Debug - - - Header Files\Win32\Debug - - - Header Files\Win32\Debug - - - Header Files\Win32\Debug - - - Header Files\Win32\Debug - - - Header Files\Win32\Debug - - - Header Files\Win32\Debug - - - Header Files\Win32\Debug - - - Header Files\Win32\Debug - - - Header Files\x64\Debug - - - Header Files\x64\Debug - - - Header Files\x64\Debug - - - Header Files\x64\Debug - - - Header Files\x64\Debug - - - Header Files\x64\Debug - - - Header Files\x64\Debug - - - Header Files\x64\Debug - - - Header Files\x64\Debug - - - Header Files\x64\Debug - - - Header Files\Win32\Release - - - Header Files\Win32\Release - - - Header Files\Win32\Release - - - Header Files\Win32\Release - - - Header Files\Win32\Release - - - Header Files\Win32\Release - - - Header Files\Win32\Release - - - Header Files\Win32\Release - - - Header Files\Win32\Release - - - Header Files\Win32\Release - - - Header Files\x64\Release - - - Header Files\x64\Release - - - Header Files\x64\Release - - - Header Files\x64\Release - - - Header Files\x64\Release - - - Header Files\x64\Release - - - Header Files\x64\Release - - - Header Files\x64\Release - - - Header Files\x64\Release - - - Header Files\x64\Release - - - Source Files - - - Header Files\Win32\Debug - - - Header Files\x64\Debug - - - Header Files\Win32\Release - - - Header Files\x64\Release - - - Header Files\Win32\Debug - - - Header Files\x64\Debug - - - Header Files\Win32\Release - - - Header Files\x64\Release - - - Header Files\Win32\Debug - - - Header Files\x64\Debug - - - Header Files\Win32\Release - - - Header Files\x64\Release - - - - - Slice Files - - - Slice Files - - - Slice Files - - - Slice Files - - - Slice Files - - - Slice Files - - - Slice Files - - - Slice Files - - - Slice Files - - - Slice Files - - - Slice Files - - - Slice Files - - - Slice Files - - - \ No newline at end of file diff --git a/cpp/src/Ice/msbuild/ice++11/packages.config b/cpp/src/Ice/msbuild/ice++11/packages.config deleted file mode 100644 index 7c322b5c366..00000000000 --- a/cpp/src/Ice/msbuild/ice++11/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/cpp/src/Ice/msbuild/ice/ice.vcxproj b/cpp/src/Ice/msbuild/ice/ice.vcxproj index 81ce1498d73..ced469e5e29 100644 --- a/cpp/src/Ice/msbuild/ice/ice.vcxproj +++ b/cpp/src/Ice/msbuild/ice/ice.vcxproj @@ -20,7 +20,7 @@ - {6485EC94-6B47-428D-B42D-AAA11F08DB59} + {3AB9772C-6113-4F1C-90FB-5368E7486C11} Ice @@ -45,7 +45,7 @@ $(DefaultPlatformToolset) - + @@ -62,11 +62,6 @@ - - - - - ICE_API_EXPORTS;%(PreprocessorDefinitions) @@ -105,7 +100,7 @@ - $(IceSrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\Ice\ + $(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\ Ice @@ -149,43 +144,35 @@ Document - mc -r $(Platform)\$(Configuration)\ ..\..\EventLoggerMsg.mc && move EventLoggerMsg.h $(IceSrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h + mc -r $(Platform)\$(Configuration)\ ..\..\EventLoggerMsg.mc && move EventLoggerMsg.h $(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h - mc -r $(Platform)\$(Configuration)\ ..\..\EventLoggerMsg.mc && move EventLoggerMsg.h $(IceSrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h + mc -r $(Platform)\$(Configuration)\ ..\..\EventLoggerMsg.mc && move EventLoggerMsg.h $(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h - mc -r $(Platform)\$(Configuration)\ ..\..\EventLoggerMsg.mc && move EventLoggerMsg.h $(IceSrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h + mc -r $(Platform)\$(Configuration)\ ..\..\EventLoggerMsg.mc && move EventLoggerMsg.h $(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h - mc -r $(Platform)\$(Configuration)\ ..\..\EventLoggerMsg.mc && move EventLoggerMsg.h $(IceSrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h + mc -r $(Platform)\$(Configuration)\ ..\..\EventLoggerMsg.mc && move EventLoggerMsg.h $(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h - $(IceSrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h;$(Platform)\$(Configuration)\EventLoggerMsg.rc - $(IceSrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h;$(Platform)\$(Configuration)\EventLoggerMsg.rc - $(IceSrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h;$(Platform)\$(Configuration)\EventLoggerMsg.rc - $(IceSrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h;$(Platform)\$(Configuration)\EventLoggerMsg.rc + $(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h;$(Platform)\$(Configuration)\EventLoggerMsg.rc + $(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h;$(Platform)\$(Configuration)\EventLoggerMsg.rc + $(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h;$(Platform)\$(Configuration)\EventLoggerMsg.rc + $(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h;$(Platform)\$(Configuration)\EventLoggerMsg.rc - - - - - - - - @@ -520,7 +507,6 @@ - @@ -585,7 +571,6 @@ - @@ -618,313 +603,313 @@ - + true true true ..\..\..\..\..\slice\Ice\BuiltinSequences.ice - + true true true ..\..\..\..\..\slice\Ice\Context.ice - + true true true ..\..\..\..\..\slice\Ice\EndpointTypes.ice - + true true true ..\..\..\..\..\slice\Ice\Identity.ice - + true true true ..\..\..\..\..\slice\Ice\Locator.ice - + true true true ..\..\..\..\..\slice\Ice\Metrics.ice - + true true true ..\..\..\..\..\slice\Ice\OperationMode.ice - + true true true ..\..\..\..\..\slice\Ice\Process.ice - + true true true ..\..\..\..\..\slice\Ice\PropertiesAdmin.ice - + true true true ..\..\..\..\..\slice\Ice\PropertyDict.ice - + true true true ..\..\..\..\..\slice\Ice\RemoteLogger.ice - + true true true ..\..\..\..\..\slice\Ice\Router.ice - + true true true ..\..\..\..\..\slice\Ice\Version.ice - + true true true ..\..\..\..\..\slice\Ice\BuiltinSequences.ice - + true true true ..\..\..\..\..\slice\Ice\Context.ice - + true true true ..\..\..\..\..\slice\Ice\EndpointTypes.ice - + true true true ..\..\..\..\..\slice\Ice\Identity.ice - + true true true ..\..\..\..\..\slice\Ice\Locator.ice - + true true true ..\..\..\..\..\slice\Ice\Metrics.ice - + true true true ..\..\..\..\..\slice\Ice\OperationMode.ice - + true true true ..\..\..\..\..\slice\Ice\Process.ice - + true true true ..\..\..\..\..\slice\Ice\PropertiesAdmin.ice - + true true true ..\..\..\..\..\slice\Ice\PropertyDict.ice - + true true true ..\..\..\..\..\slice\Ice\RemoteLogger.ice - + true true true ..\..\..\..\..\slice\Ice\Router.ice - + true true true ..\..\..\..\..\slice\Ice\Version.ice - + true true true ..\..\..\..\..\slice\Ice\BuiltinSequences.ice - + true true true ..\..\..\..\..\slice\Ice\Context.ice - + true true true ..\..\..\..\..\slice\Ice\EndpointTypes.ice - + true true true ..\..\..\..\..\slice\Ice\Identity.ice - + true true true ..\..\..\..\..\slice\Ice\Locator.ice - + true true true ..\..\..\..\..\slice\Ice\Metrics.ice - + true true true ..\..\..\..\..\slice\Ice\OperationMode.ice - + true true true ..\..\..\..\..\slice\Ice\Process.ice - + true true true ..\..\..\..\..\slice\Ice\PropertiesAdmin.ice - + true true true ..\..\..\..\..\slice\Ice\PropertyDict.ice - + true true true ..\..\..\..\..\slice\Ice\RemoteLogger.ice - + true true true ..\..\..\..\..\slice\Ice\Router.ice - + true true true ..\..\..\..\..\slice\Ice\Version.ice - + true true true ..\..\..\..\..\slice\Ice\BuiltinSequences.ice - + true true true ..\..\..\..\..\slice\Ice\Context.ice - + true true true ..\..\..\..\..\slice\Ice\EndpointTypes.ice - + true true true ..\..\..\..\..\slice\Ice\Identity.ice - + true true true ..\..\..\..\..\slice\Ice\Locator.ice - + true true true ..\..\..\..\..\slice\Ice\Metrics.ice - + true true true ..\..\..\..\..\slice\Ice\OperationMode.ice - + true true true ..\..\..\..\..\slice\Ice\Process.ice - + true true true ..\..\..\..\..\slice\Ice\PropertiesAdmin.ice - + true true true ..\..\..\..\..\slice\Ice\PropertyDict.ice - + true true true ..\..\..\..\..\slice\Ice\RemoteLogger.ice - + true true true ..\..\..\..\..\slice\Ice\Router.ice - + true true true @@ -933,9 +918,7 @@ - - Document - + diff --git a/cpp/src/Ice/msbuild/ice/ice.vcxproj.filters b/cpp/src/Ice/msbuild/ice/ice.vcxproj.filters index 0215ad5a0a2..288b5fa28df 100644 --- a/cpp/src/Ice/msbuild/ice/ice.vcxproj.filters +++ b/cpp/src/Ice/msbuild/ice/ice.vcxproj.filters @@ -2,73 +2,74 @@ - {8B3A9001-4005-4944-A6DA-971BBAD133FC} + {10409629-905B-4370-AAEE-B0458725C38C} cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + {605E3CFB-F312-46C4-ABF2-A8E26A66E152} + h;hh;hpp;hxx;hm;inl;inc;xsd + - {E6261236-F264-49AD-97FE-C4A2103E10C4} + {7191E98D-DD02-4836-934B-E25571A72CDD} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - {6CF148F1-D3A5-45BD-A9B8-6E1E209A8E92} + {76D8992F-EDA3-4FAE-B303-05D9A03B2125} ice - - {6dc90333-23f5-4ed6-b6d0-48df24ec0545} - - {14fb601d-0523-42d1-b4e1-bbf25c602d36} + {1c1296c4-dd4b-420f-8e31-fbf5993a5c28} - {88d72eee-23e6-4033-915d-1e268d063f36} + {c280c0f1-e313-436a-9966-234aff49a6ea} - {72477db4-8b14-4cdc-ba09-19a721bc131a} + {7ece7fb8-49d8-4051-8d17-2e2e38cea90c} - {643e71da-f232-440b-8ec5-d4916249347d} + {3e379faf-c6c1-4ece-8cce-42f0121006e5} - {f85aa59a-c843-4df8-b3e7-514badf1e59e} + {e411c020-22be-424c-9a70-605e8d4fa06c} - {99571211-c8c7-4917-a515-d7d1bee0ecae} + {3dc1cea9-e62c-4da9-8654-3a358e27a2b4} - {25888d28-c6bd-4068-ae55-e39110dbad15} + {2a73cac1-73f5-4c26-86d9-ea2fb5174687} - {6926d289-853c-4bfe-956b-9d0a950097a0} + {8f6918f6-4939-479d-8d59-aec203c3a608} - {693371b0-6e63-4b9b-8df7-6ed3b01b1a81} + {2ec9c6f6-a705-42e0-b4e3-249cea21bab5} - {c7408825-208d-4c1f-9b48-5b2bdcc68ba7} + {b9f3875a-5a8b-44ac-937b-c8872d43e684} - {f2e3b40a-e592-4dd0-b767-2dc53ec2e7a0} + {7fc12f50-71b7-471e-a537-c4b42dac1654} - {7d6cb962-958b-4fb8-b327-4ba7b45d3343} + {cccab72e-1120-4343-8390-810a0deeefdb} - {f1d4165d-43bb-42b6-989b-6ae32e040283} + {dc4de605-8105-436b-bf9e-e67775ddfd3f} - {4b1059af-9da4-45dc-b9c1-09cad4f7b4ef} + {a534641f-afba-4a5c-a89e-1170f0f7a5c6} - {e00f420e-cf07-4b10-9d34-02d15dc5a2c6} + {ad43740b-66eb-43ea-9b0b-2dd3a07cefab} - {8d2f9581-52d9-4df1-ad88-097b536ae295} + {2467dd5d-5a35-4a5b-ab85-0cdfaed7a3a5} - {28c3a03b-8420-4895-ac52-31e759608807} + {a523c5a1-c83b-4c8f-9c0f-61402d19a8da} - {fd1e942c-59c4-4773-b1ed-19f0af1bb042} + {efb1387e-a41e-4b1e-958c-88d9bb342a60} @@ -78,12 +79,12 @@ Resource Files\Win32\Debug - - Resource Files\x64\Debug - Resource Files\Win32\Release + + Resource Files\x64\Debug + Resource Files\x64\Release @@ -269,9 +270,6 @@ Source Files - - Source Files - Source Files @@ -464,9 +462,6 @@ Source Files - - Source Files - Source Files @@ -557,57 +552,18 @@ Source Files - - Source Files\Win32\Debug - - - Source Files\x64\Debug - - - Source Files\Win32\Release - - - Source Files\x64\Release - - - Source Files\Win32\Debug - - - Source Files\x64\Debug - - - Source Files\Win32\Release - - - Source Files\x64\Release - Source Files - - Source Files - Source Files - - Source Files - - - Source Files - Source Files - - Source Files - Source Files - - Source Files - Source Files @@ -617,30 +573,45 @@ Source Files - - Source Files - Source Files Source Files - - Source Files - Source Files - - Source Files - Source Files Source Files + + Source Files\Win32\Debug + + + Source Files\x64\Debug + + + Source Files\Win32\Release + + + Source Files\x64\Release + + + Source Files\Win32\Debug + + + Source Files\x64\Debug + + + Source Files\Win32\Release + + + Source Files\x64\Release + Source Files\Win32\Debug @@ -654,172 +625,172 @@ Source Files\x64\Release - - - Resource Files - + + + + Header Files\Win32\Debug - + Header Files\Win32\Debug - + Header Files\Win32\Debug - + Header Files\Win32\Debug - + Header Files\Win32\Debug - + Header Files\Win32\Debug - + Header Files\Win32\Debug - + Header Files\Win32\Debug - + Header Files\Win32\Debug - + Header Files\Win32\Debug - + Header Files\x64\Debug - + Header Files\x64\Debug - + Header Files\x64\Debug - + Header Files\x64\Debug - + Header Files\x64\Debug - + Header Files\x64\Debug - + Header Files\x64\Debug - + Header Files\x64\Debug - + Header Files\x64\Debug - + Header Files\x64\Debug - + Header Files\Win32\Release - + Header Files\Win32\Release - + Header Files\Win32\Release - + Header Files\Win32\Release - + Header Files\Win32\Release - + Header Files\Win32\Release - + Header Files\Win32\Release - + Header Files\Win32\Release - + Header Files\Win32\Release - + Header Files\Win32\Release - + Header Files\x64\Release - + Header Files\x64\Release - + Header Files\x64\Release - + Header Files\x64\Release - + Header Files\x64\Release - + Header Files\x64\Release - + Header Files\x64\Release - + Header Files\x64\Release - + Header Files\x64\Release - + Header Files\x64\Release - + + Source Files + + Header Files\Win32\Debug - + Header Files\x64\Debug - + Header Files\Win32\Release - + Header Files\x64\Release - + Header Files\Win32\Debug - + Header Files\x64\Debug - + Header Files\Win32\Release - + Header Files\x64\Release - - Source Files - - + Header Files\Win32\Debug - + Header Files\x64\Debug - + Header Files\Win32\Release - + Header Files\x64\Release diff --git a/cpp/src/IceBox/msbuild/icebox++11/icebox++11.vcxproj b/cpp/src/IceBox/msbuild/icebox++11/icebox++11.vcxproj deleted file mode 100644 index 8027fc4f71c..00000000000 --- a/cpp/src/IceBox/msbuild/icebox++11/icebox++11.vcxproj +++ /dev/null @@ -1,83 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {96161748-CE5E-4548-BC1D-AFD2F137A1DC} - IceBox - - - - Application - true - $(DefaultPlatformToolset) - - - Application - false - $(DefaultPlatformToolset) - - - Application - true - $(DefaultPlatformToolset) - - - Application - false - $(DefaultPlatformToolset) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cpp/src/IceBox/msbuild/icebox++11/icebox++11.vcxproj.filters b/cpp/src/IceBox/msbuild/icebox++11/icebox++11.vcxproj.filters deleted file mode 100644 index bdc056d94e1..00000000000 --- a/cpp/src/IceBox/msbuild/icebox++11/icebox++11.vcxproj.filters +++ /dev/null @@ -1,35 +0,0 @@ - - - - - {c50f6f00-874d-4385-a28f-a4eaed2d1453} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {550b5072-9ef7-47b7-aa9a-b0402092674b} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {4acb87da-1ee1-43fb-a602-f720db05cd45} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - Source Files - - - - - Header Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/cpp/src/IceBox/msbuild/icebox/icebox.vcxproj b/cpp/src/IceBox/msbuild/icebox/icebox.vcxproj index 0f3d8ee0d28..3d09bfab2db 100644 --- a/cpp/src/IceBox/msbuild/icebox/icebox.vcxproj +++ b/cpp/src/IceBox/msbuild/icebox/icebox.vcxproj @@ -19,7 +19,7 @@ - {81C8FC6A-CAC3-4B6D-AE4D-5DEAD29726C5} + {96161748-CE5E-4548-BC1D-AFD2F137A1DC} IceBox @@ -44,7 +44,7 @@ $(DefaultPlatformToolset) - + @@ -67,14 +67,14 @@ - + + - + - - + diff --git a/cpp/src/IceBox/msbuild/iceboxadmin/iceboxadmin.vcxproj b/cpp/src/IceBox/msbuild/iceboxadmin/iceboxadmin.vcxproj index b03c9a76c67..1107667fa0b 100644 --- a/cpp/src/IceBox/msbuild/iceboxadmin/iceboxadmin.vcxproj +++ b/cpp/src/IceBox/msbuild/iceboxadmin/iceboxadmin.vcxproj @@ -45,7 +45,7 @@ $(DefaultPlatformToolset) - + diff --git a/cpp/src/IceBox/msbuild/iceboxlib++11/iceboxlib++11.vcxproj b/cpp/src/IceBox/msbuild/iceboxlib++11/iceboxlib++11.vcxproj deleted file mode 100644 index 249ccf072f8..00000000000 --- a/cpp/src/IceBox/msbuild/iceboxlib++11/iceboxlib++11.vcxproj +++ /dev/null @@ -1,180 +0,0 @@ - - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} - IceBox - - - - DynamicLibrary - true - $(DefaultPlatformToolset) - - - DynamicLibrary - false - $(DefaultPlatformToolset) - - - DynamicLibrary - true - $(DefaultPlatformToolset) - - - DynamicLibrary - false - $(DefaultPlatformToolset) - - - - - - - - - - - - - - - - - - - - - - icebox$(IceSoVersion)++11d - - - icebox$(IceSoVersion)++11d - - - icebox$(IceSoVersion)++11 - - - icebox$(IceSoVersion)++11 - - - - ICEBOX_API_EXPORTS;%(PreprocessorDefinitions) - - - - - ICEBOX_API_EXPORTS;%(PreprocessorDefinitions) - - - - - ;ICEBOX_API_EXPORTS;%(PreprocessorDefinitions) - - - - - ICEBOX_API_EXPORTS;%(PreprocessorDefinitions) - - - - - $(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\IceBox\ - IceBox - - - - - - - - - - true - true - true - ..\..\..\..\..\slice\IceBox\ServiceManager.ice - - - true - true - true - ..\..\..\..\..\slice\IceBox\ServiceManager.ice - - - true - true - true - ..\..\..\..\..\slice\IceBox\ServiceManager.ice - - - true - true - true - ..\..\..\..\..\slice\IceBox\ServiceManager.ice - - - - - true - true - true - ..\..\..\..\..\slice\IceBox\ServiceManager.ice - - - true - true - true - ..\..\..\..\..\slice\IceBox\ServiceManager.ice - - - true - true - true - ..\..\..\..\..\slice\IceBox\ServiceManager.ice - - - true - true - true - ..\..\..\..\..\slice\IceBox\ServiceManager.ice - - - - - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - \ No newline at end of file diff --git a/cpp/src/IceBox/msbuild/iceboxlib++11/iceboxlib++11.vcxproj.filters b/cpp/src/IceBox/msbuild/iceboxlib++11/iceboxlib++11.vcxproj.filters deleted file mode 100644 index 38012006e9d..00000000000 --- a/cpp/src/IceBox/msbuild/iceboxlib++11/iceboxlib++11.vcxproj.filters +++ /dev/null @@ -1,107 +0,0 @@ - - - - - {fe706a83-f7c0-414b-9066-8f505b496c17} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {f1740024-30e3-43ac-8d2a-e53d871d4855} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {950f9a47-b724-47d3-aedf-702395d5ed1b} - ice - - - {2e66cd0c-e5f4-4607-9eff-416366abd01a} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {e0a0e4ff-c010-4502-87d5-84289f4c5d74} - - - {c9dab923-b562-4940-9bf2-496116270bb2} - - - {fb3d8fc2-89c8-4a93-9fbd-16daad40cfdf} - - - {06cbdc9b-f7b5-467c-9ca7-e655ad6e9c58} - - - {3dd772c9-c7d3-4cc6-b05a-aa298b346591} - - - {69c221db-d6f1-41b4-9cd8-76a57742c97e} - - - {43f6a95b-c02e-4958-9b6e-e0f6346aed51} - - - {8f458818-81f2-486c-8aee-33b208d9a178} - - - {cfff3ea0-4e96-4c3b-b2a1-9f38d8f2492b} - - - {0ccc023b-3644-415f-860f-8e358c680580} - - - {ff5c68c3-18cf-4d01-b540-98e37d7912af} - - - {7cd8ec76-fa21-40fc-a9f6-b371a67d0ac6} - - - - - Resource Files - - - - - Source Files - - - Source Files - - - Source Files\Win32\Debug - - - Source Files\x64\Debug - - - Source Files\Win32\Release - - - Source Files\x64\Release - - - - - Header Files - - - Header Files\Win32\Debug - - - Header Files\x64\Debug - - - Header Files\Win32\Release - - - Header Files\x64\Release - - - - - - - - Slice Files - - - \ No newline at end of file diff --git a/cpp/src/IceBox/msbuild/iceboxlib++11/packages.config b/cpp/src/IceBox/msbuild/iceboxlib++11/packages.config deleted file mode 100644 index fb43e38f42f..00000000000 --- a/cpp/src/IceBox/msbuild/iceboxlib++11/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/cpp/src/IceBox/msbuild/iceboxlib/iceboxlib.vcxproj b/cpp/src/IceBox/msbuild/iceboxlib/iceboxlib.vcxproj index 261a9e4422b..e84c0af051b 100644 --- a/cpp/src/IceBox/msbuild/iceboxlib/iceboxlib.vcxproj +++ b/cpp/src/IceBox/msbuild/iceboxlib/iceboxlib.vcxproj @@ -20,7 +20,7 @@ - {588F90CA-62AC-4101-83FC-19AB9DB6B509} + {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} IceBox @@ -45,7 +45,7 @@ $(DefaultPlatformToolset) - + @@ -87,7 +87,7 @@ - ICEBOX_API_EXPORTS;%(PreprocessorDefinitions) + ;ICEBOX_API_EXPORTS;%(PreprocessorDefinitions) @@ -97,7 +97,7 @@ - $(IceSrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\IceBox\ + $(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\IceBox\ IceBox @@ -133,25 +133,25 @@ - + true true true ..\..\..\..\..\slice\IceBox\ServiceManager.ice - + true true true ..\..\..\..\..\slice\IceBox\ServiceManager.ice - + true true true ..\..\..\..\..\slice\IceBox\ServiceManager.ice - + true true true diff --git a/cpp/src/IceBox/msbuild/iceboxlib/iceboxlib.vcxproj.filters b/cpp/src/IceBox/msbuild/iceboxlib/iceboxlib.vcxproj.filters index 1ebd2de8b9d..38012006e9d 100644 --- a/cpp/src/IceBox/msbuild/iceboxlib/iceboxlib.vcxproj.filters +++ b/cpp/src/IceBox/msbuild/iceboxlib/iceboxlib.vcxproj.filters @@ -1,62 +1,62 @@  - - {16fe5a16-4c1f-4744-a027-b65285798e89} - h;hh;hpp;hxx;hm;inl;inc;xsd - - {0fb8c781-92ed-48bc-99e0-77377ad8de2d} + {fe706a83-f7c0-414b-9066-8f505b496c17} cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + {f1740024-30e3-43ac-8d2a-e53d871d4855} + h;hh;hpp;hxx;hm;inl;inc;xsd + - {5708ffda-4b52-47de-9526-0ee9c65a0cf6} + {950f9a47-b724-47d3-aedf-702395d5ed1b} ice - - {7d67c05f-eb36-475b-8202-bf12a66b96ea} + + {2e66cd0c-e5f4-4607-9eff-416366abd01a} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - {89224a95-891d-4a3d-8451-7c10008c93a8} + {e0a0e4ff-c010-4502-87d5-84289f4c5d74} - {884f3cc9-ac30-4c20-81e1-1a8323abfc33} + {c9dab923-b562-4940-9bf2-496116270bb2} - {7ba80332-c4fd-4ed6-9337-d6b8d6e34440} + {fb3d8fc2-89c8-4a93-9fbd-16daad40cfdf} - {a342ad70-776b-434e-bd4b-67a1b1869cf8} + {06cbdc9b-f7b5-467c-9ca7-e655ad6e9c58} - {e4f59326-89f7-414f-ade9-b3f596be0988} + {3dd772c9-c7d3-4cc6-b05a-aa298b346591} - {939eff4a-17c7-4624-abde-f8924907b010} + {69c221db-d6f1-41b4-9cd8-76a57742c97e} - {b7be1d68-8842-4511-b64c-36380f3abb12} + {43f6a95b-c02e-4958-9b6e-e0f6346aed51} - {283c9267-83ed-40b7-bc7a-b7969aa0309e} + {8f458818-81f2-486c-8aee-33b208d9a178} - {a92244cc-94f4-4a05-b23f-e170d9d4605e} + {cfff3ea0-4e96-4c3b-b2a1-9f38d8f2492b} - {c41bb75e-519d-4012-a214-274d4bcef057} + {0ccc023b-3644-415f-860f-8e358c680580} - {51c73dd2-880a-4c8b-80d1-73b166522ce9} + {ff5c68c3-18cf-4d01-b540-98e37d7912af} - {06521905-c627-44c7-924c-3abaf3d436c7} + {7cd8ec76-fa21-40fc-a9f6-b371a67d0ac6} - Resources + Resource Files @@ -83,16 +83,16 @@ Header Files - + Header Files\Win32\Debug - + Header Files\x64\Debug - + Header Files\Win32\Release - + Header Files\x64\Release diff --git a/cpp/src/IceBridge/msbuild/icebridge.vcxproj b/cpp/src/IceBridge/msbuild/icebridge.vcxproj index 37c62c453fe..0a357cb4d6c 100644 --- a/cpp/src/IceBridge/msbuild/icebridge.vcxproj +++ b/cpp/src/IceBridge/msbuild/icebridge.vcxproj @@ -21,7 +21,7 @@ {1D6E8807-7C28-421F-B49E-BCB482FCB21D} - icebridge++11 + icebridge @@ -45,7 +45,7 @@ $(DefaultPlatformToolset) - + diff --git a/cpp/src/IceDB/msbuild/icedb.vcxproj b/cpp/src/IceDB/msbuild/icedb.vcxproj index f1665dc4526..0e7c54e4fe1 100644 --- a/cpp/src/IceDB/msbuild/icedb.vcxproj +++ b/cpp/src/IceDB/msbuild/icedb.vcxproj @@ -21,7 +21,7 @@ {E8ACC848-F7DA-4B29-B52F-81D66E7D397E} IceDB - icedb++11 + icedb @@ -45,7 +45,7 @@ $(DefaultPlatformToolset) - + diff --git a/cpp/src/IceDiscovery/msbuild/icediscovery++11/icediscovery++11.vcxproj b/cpp/src/IceDiscovery/msbuild/icediscovery++11/icediscovery++11.vcxproj deleted file mode 100644 index cf1a264e103..00000000000 --- a/cpp/src/IceDiscovery/msbuild/icediscovery++11/icediscovery++11.vcxproj +++ /dev/null @@ -1,171 +0,0 @@ - - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {270BB666-62FB-49ED-BFA2-8F279DC9ABDD} - IceDiscovery - - - - DynamicLibrary - true - $(DefaultPlatformToolset) - - - DynamicLibrary - false - $(DefaultPlatformToolset) - - - DynamicLibrary - true - $(DefaultPlatformToolset) - - - DynamicLibrary - false - $(DefaultPlatformToolset) - - - - - - - - - - - - - - - - - - - - - - - ICE_DISCOVERY_API_EXPORTS;%(PreprocessorDefinitions) - - - - - ICE_DISCOVERY_API_EXPORTS;%(PreprocessorDefinitions) - - - - - ICE_DISCOVERY_API_EXPORTS;%(PreprocessorDefinitions) - - - - - ICE_DISCOVERY_API_EXPORTS;%(PreprocessorDefinitions) - - - - - $(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\IceDiscovery\ - IceDiscovery - - - - - - - - - - - - - - true - true - true - ..\..\..\..\..\slice\IceDiscovery\IceDiscovery.ice - - - true - true - true - ..\..\..\..\..\slice\IceDiscovery\IceDiscovery.ice - - - true - true - true - ..\..\..\..\..\slice\IceDiscovery\IceDiscovery.ice - - - true - true - true - ..\..\..\..\..\slice\IceDiscovery\IceDiscovery.ice - - - - - true - true - true - ..\..\..\..\..\slice\IceDiscovery\IceDiscovery.ice - - - true - true - true - ..\..\..\..\..\slice\IceDiscovery\IceDiscovery.ice - - - true - true - true - ..\..\..\..\..\slice\IceDiscovery\IceDiscovery.ice - - - true - true - true - ..\..\..\..\..\slice\IceDiscovery\IceDiscovery.ice - - - - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - \ No newline at end of file diff --git a/cpp/src/IceDiscovery/msbuild/icediscovery++11/icediscovery++11.vcxproj.filters b/cpp/src/IceDiscovery/msbuild/icediscovery++11/icediscovery++11.vcxproj.filters deleted file mode 100644 index dd6f35786fb..00000000000 --- a/cpp/src/IceDiscovery/msbuild/icediscovery++11/icediscovery++11.vcxproj.filters +++ /dev/null @@ -1,116 +0,0 @@ - - - - - {0d6861f5-22e7-44f6-acd3-41036cc59969} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {be69da66-385a-4f67-a8ee-7e916d149ce7} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {0f9986eb-4f31-4c93-9427-d185c046b582} - ice - - - {614de963-a575-41cd-9676-4aafa0959c5f} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {bc8d9c93-cb4c-4572-85c4-802ee4aa9abd} - - - {9d647877-d834-4fc9-9bb0-c9e81b22af9e} - - - {7e07e6af-48f1-4aac-887c-f4a1f5b66663} - - - {ae84873f-54d9-439a-9a91-a4426eac1d8e} - - - {cae30a2b-a080-4a2e-8aaf-81c9fdd49aa3} - - - {4136cbcb-a4ef-4825-8dbd-f52a75d07512} - - - {40fda4f9-f0c5-4859-b3e1-239238503f8c} - - - {2f63945c-e7b3-40f7-9c14-1bc619182cc3} - - - {e740ce81-b1e1-4ed2-8175-d51046baebbc} - - - {7cb92079-40d3-4846-aa80-85c432bb1665} - - - {3fd46de4-5960-450c-9ad3-fffcdbe4eed1} - - - {148be7ea-c8b5-46b1-a34b-5644d53498dd} - - - - - Resource Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files\Win32\Debug - - - Source Files\x64\Debug - - - Source Files\Win32\Release - - - Source Files\x64\Release - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files\Win32\Debug - - - Header Files\x64\Debug - - - Header Files\Win32\Release - - - Header Files\x64\Release - - - - - Slice Files - - - - - - \ No newline at end of file diff --git a/cpp/src/IceDiscovery/msbuild/icediscovery++11/packages.config b/cpp/src/IceDiscovery/msbuild/icediscovery++11/packages.config deleted file mode 100644 index fb43e38f42f..00000000000 --- a/cpp/src/IceDiscovery/msbuild/icediscovery++11/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/cpp/src/IceDiscovery/msbuild/icediscovery/icediscovery.vcxproj b/cpp/src/IceDiscovery/msbuild/icediscovery/icediscovery.vcxproj index 07d2ff9a1e4..3376b3a750f 100644 --- a/cpp/src/IceDiscovery/msbuild/icediscovery/icediscovery.vcxproj +++ b/cpp/src/IceDiscovery/msbuild/icediscovery/icediscovery.vcxproj @@ -20,7 +20,7 @@ - {3850C9C9-BA92-4EE6-9E77-E5BAE2A9BC81} + {270BB666-62FB-49ED-BFA2-8F279DC9ABDD} IceDiscovery @@ -45,7 +45,7 @@ $(DefaultPlatformToolset) - + @@ -63,10 +63,6 @@ - - - - ICE_DISCOVERY_API_EXPORTS;%(PreprocessorDefinitions) @@ -89,10 +85,13 @@ - $(IceSrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\IceDiscovery\ + $(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\IceDiscovery\ IceDiscovery + + + @@ -126,25 +125,25 @@ - + true true true ..\..\..\..\..\slice\IceDiscovery\IceDiscovery.ice - + true true true ..\..\..\..\..\slice\IceDiscovery\IceDiscovery.ice - + true true true ..\..\..\..\..\slice\IceDiscovery\IceDiscovery.ice - + true true true @@ -154,9 +153,6 @@ - - - diff --git a/cpp/src/IceGrid/msbuild/icegridadmin/icegridadmin.vcxproj b/cpp/src/IceGrid/msbuild/icegridadmin/icegridadmin.vcxproj index 66b56aa16e1..88d2eb5638d 100644 --- a/cpp/src/IceGrid/msbuild/icegridadmin/icegridadmin.vcxproj +++ b/cpp/src/IceGrid/msbuild/icegridadmin/icegridadmin.vcxproj @@ -21,7 +21,7 @@ {1F4CA1BE-B405-400F-912E-F0CC7E369D59} - icegridadmin++11 + icegridadmin @@ -45,7 +45,7 @@ $(DefaultPlatformToolset) - + diff --git a/cpp/src/IceGrid/msbuild/icegridnode/icegridnode.vcxproj b/cpp/src/IceGrid/msbuild/icegridnode/icegridnode.vcxproj index fd92cc87f37..bf2e12e6913 100644 --- a/cpp/src/IceGrid/msbuild/icegridnode/icegridnode.vcxproj +++ b/cpp/src/IceGrid/msbuild/icegridnode/icegridnode.vcxproj @@ -21,7 +21,7 @@ {48EF9416-336F-4FA5-A376-FDFB7726ADBA} - icegridnode++11 + icegridnode @@ -45,7 +45,7 @@ $(DefaultPlatformToolset) - + diff --git a/cpp/src/IceGrid/msbuild/icegridregistry/icegridregistry.vcxproj b/cpp/src/IceGrid/msbuild/icegridregistry/icegridregistry.vcxproj index b4a8a7404d5..0bd1489f5a2 100644 --- a/cpp/src/IceGrid/msbuild/icegridregistry/icegridregistry.vcxproj +++ b/cpp/src/IceGrid/msbuild/icegridregistry/icegridregistry.vcxproj @@ -21,7 +21,7 @@ {64490115-464B-4DC3-B7C6-D0AF1B68B6F9} - icegridregistry++11 + icegridregistry @@ -45,7 +45,7 @@ $(DefaultPlatformToolset) - + diff --git a/cpp/src/IceGridLib/msbuild/icegrid++11/icegrid++11.vcxproj b/cpp/src/IceGridLib/msbuild/icegrid++11/icegrid++11.vcxproj deleted file mode 100644 index f82a2d85940..00000000000 --- a/cpp/src/IceGridLib/msbuild/icegrid++11/icegrid++11.vcxproj +++ /dev/null @@ -1,468 +0,0 @@ - - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {142A9562-8DEC-4B1B-9B15-2CAD8304447B} - IceGrid - - - - DynamicLibrary - true - $(DefaultPlatformToolset) - - - DynamicLibrary - false - $(DefaultPlatformToolset) - - - DynamicLibrary - true - $(DefaultPlatformToolset) - - - DynamicLibrary - false - $(DefaultPlatformToolset) - - - - - - - - - - - - - - - - - - - - - - - ICEGRID_API_EXPORTS;%(PreprocessorDefinitions) - 4250;4251;4275;4503 - - - - - ICEGRID_API_EXPORTS;%(PreprocessorDefinitions) - 4250;4251;4275;4503 - - - - - ICEGRID_API_EXPORTS;%(PreprocessorDefinitions) - 4250;4251;4275;4503 - - - - - ICEGRID_API_EXPORTS;%(PreprocessorDefinitions) - 4250;4251;4275;4503 - - - - - $(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\IceGrid\ - IceGrid - - - - - - - - - - - - - - - - - - - true - true - true - ..\..\..\..\..\slice\IceGrid\Admin.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\Descriptor.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\Exception.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\FileParser.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\Registry.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\Session.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\UserAccountMapper.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\Admin.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\Descriptor.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\Exception.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\FileParser.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\Registry.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\Session.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\UserAccountMapper.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\Admin.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\Descriptor.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\Exception.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\FileParser.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\Registry.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\Session.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\UserAccountMapper.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\Admin.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\Descriptor.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\Exception.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\FileParser.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\Registry.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\Session.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\UserAccountMapper.ice - - - - - true - true - true - ..\..\..\..\..\slice\IceGrid\Admin.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\Descriptor.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\Exception.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\FileParser.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\Registry.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\Session.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\UserAccountMapper.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\Admin.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\Descriptor.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\Exception.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\FileParser.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\Registry.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\Session.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\UserAccountMapper.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\Admin.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\Descriptor.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\Exception.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\FileParser.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\Registry.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\Session.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\UserAccountMapper.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\Admin.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\Descriptor.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\Exception.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\FileParser.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\Registry.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\Session.ice - - - true - true - true - ..\..\..\..\..\slice\IceGrid\UserAccountMapper.ice - - - - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - \ No newline at end of file diff --git a/cpp/src/IceGridLib/msbuild/icegrid++11/icegrid++11.vcxproj.filters b/cpp/src/IceGridLib/msbuild/icegrid++11/icegrid++11.vcxproj.filters deleted file mode 100644 index 20efb395301..00000000000 --- a/cpp/src/IceGridLib/msbuild/icegrid++11/icegrid++11.vcxproj.filters +++ /dev/null @@ -1,275 +0,0 @@ - - - - - {d07074eb-a264-439f-9709-467dcc45e696} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {bb42e106-19a7-4222-9c82-c27c94e52a2a} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {d2124f84-df2b-46b7-b03b-9385b365f141} - ice - - - {d1771d9e-b527-4a80-ba53-22851dd5cbc3} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {4e703415-35bf-4c8f-8501-0e0416aa80ea} - - - {d6cb9b27-7968-4819-be22-f66aa720a4bd} - - - {31f0c88c-0465-4026-9b70-90b0a8eee328} - - - {944c24b3-e108-48d2-9a14-dd13c2d8cc2e} - - - {65ef2178-4949-4567-88f3-16e171895521} - - - {ff405661-7a7c-48e3-b6d0-9e55ebc530e9} - - - {5b8d22a6-d1cc-4032-9ecd-f653b1c56a48} - - - {f7d9b719-6575-4e11-8319-8eae2750f5a7} - - - {a2cb9d0b-86f6-4fb7-8e9f-41ad9a893a10} - - - {8a29e740-1aff-4882-bcdb-3c9e0777ad40} - - - {da2b5143-4ad7-4fdf-845d-5a3224e86284} - - - {f4c0cc81-674f-4e51-87c6-6c63c73672a8} - - - - - Resource Files - - - - - Source Files - - - Source Files\Win32\Debug - - - Source Files\Win32\Debug - - - Source Files\Win32\Debug - - - Source Files\Win32\Debug - - - Source Files\Win32\Debug - - - Source Files\Win32\Debug - - - Source Files\Win32\Debug - - - Source Files\x64\Debug - - - Source Files\x64\Debug - - - Source Files\x64\Debug - - - Source Files\x64\Debug - - - Source Files\x64\Debug - - - Source Files\x64\Debug - - - Source Files\x64\Debug - - - Source Files\Win32\Release - - - Source Files\Win32\Release - - - Source Files\Win32\Release - - - Source Files\Win32\Release - - - Source Files\Win32\Release - - - Source Files\Win32\Release - - - Source Files\Win32\Release - - - Source Files\x64\Release - - - Source Files\x64\Release - - - Source Files\x64\Release - - - Source Files\x64\Release - - - Source Files\x64\Release - - - Source Files\x64\Release - - - Source Files\x64\Release - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files\Win32\Debug - - - Header Files\Win32\Debug - - - Header Files\Win32\Debug - - - Header Files\Win32\Debug - - - Header Files\Win32\Debug - - - Header Files\Win32\Debug - - - Header Files\Win32\Debug - - - Header Files\x64\Debug - - - Header Files\x64\Debug - - - Header Files\x64\Debug - - - Header Files\x64\Debug - - - Header Files\x64\Debug - - - Header Files\x64\Debug - - - Header Files\x64\Debug - - - Header Files\Win32\Release - - - Header Files\Win32\Release - - - Header Files\Win32\Release - - - Header Files\Win32\Release - - - Header Files\Win32\Release - - - Header Files\Win32\Release - - - Header Files\Win32\Release - - - Header Files\x64\Release - - - Header Files\x64\Release - - - Header Files\x64\Release - - - Header Files\x64\Release - - - Header Files\x64\Release - - - Header Files\x64\Release - - - Header Files\x64\Release - - - - - Slice Files - - - Slice Files - - - Slice Files - - - Slice Files - - - Slice Files - - - Slice Files - - - Slice Files - - - - - - \ No newline at end of file diff --git a/cpp/src/IceGridLib/msbuild/icegrid++11/packages.config b/cpp/src/IceGridLib/msbuild/icegrid++11/packages.config deleted file mode 100644 index fb43e38f42f..00000000000 --- a/cpp/src/IceGridLib/msbuild/icegrid++11/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/cpp/src/IceGridLib/msbuild/icegrid/icegrid.vcxproj b/cpp/src/IceGridLib/msbuild/icegrid/icegrid.vcxproj index 4dad820960b..444b0362b71 100644 --- a/cpp/src/IceGridLib/msbuild/icegrid/icegrid.vcxproj +++ b/cpp/src/IceGridLib/msbuild/icegrid/icegrid.vcxproj @@ -20,7 +20,7 @@ - {18BF13D3-85D3-43A5-8C96-E52EB0672F72} + {142A9562-8DEC-4B1B-9B15-2CAD8304447B} IceGrid @@ -45,7 +45,7 @@ $(DefaultPlatformToolset) - + @@ -63,37 +63,33 @@ - - - - ICEGRID_API_EXPORTS;%(PreprocessorDefinitions) + 4250;4251;4275;4503 - ICEGRID_API_EXPORTS;%(PreprocessorDefinitions) + 4250;4251;4275;4503 - ICEGRID_API_EXPORTS;%(PreprocessorDefinitions) + 4250;4251;4275;4503 - ICEGRID_API_EXPORTS;%(PreprocessorDefinitions) + 4250;4251;4275;4503 - - $(IceSrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\IceGrid\ + $(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\IceGrid\ IceGrid @@ -282,169 +278,169 @@ - + true true true ..\..\..\..\..\slice\IceGrid\Admin.ice - + true true true ..\..\..\..\..\slice\IceGrid\Descriptor.ice - + true true true ..\..\..\..\..\slice\IceGrid\Exception.ice - + true true true ..\..\..\..\..\slice\IceGrid\FileParser.ice - + true true true ..\..\..\..\..\slice\IceGrid\Registry.ice - + true true true ..\..\..\..\..\slice\IceGrid\Session.ice - + true true true ..\..\..\..\..\slice\IceGrid\UserAccountMapper.ice - + true true true ..\..\..\..\..\slice\IceGrid\Admin.ice - + true true true ..\..\..\..\..\slice\IceGrid\Descriptor.ice - + true true true ..\..\..\..\..\slice\IceGrid\Exception.ice - + true true true ..\..\..\..\..\slice\IceGrid\FileParser.ice - + true true true ..\..\..\..\..\slice\IceGrid\Registry.ice - + true true true ..\..\..\..\..\slice\IceGrid\Session.ice - + true true true ..\..\..\..\..\slice\IceGrid\UserAccountMapper.ice - + true true true ..\..\..\..\..\slice\IceGrid\Admin.ice - + true true true ..\..\..\..\..\slice\IceGrid\Descriptor.ice - + true true true ..\..\..\..\..\slice\IceGrid\Exception.ice - + true true true ..\..\..\..\..\slice\IceGrid\FileParser.ice - + true true true ..\..\..\..\..\slice\IceGrid\Registry.ice - + true true true ..\..\..\..\..\slice\IceGrid\Session.ice - + true true true ..\..\..\..\..\slice\IceGrid\UserAccountMapper.ice - + true true true ..\..\..\..\..\slice\IceGrid\Admin.ice - + true true true ..\..\..\..\..\slice\IceGrid\Descriptor.ice - + true true true ..\..\..\..\..\slice\IceGrid\Exception.ice - + true true true ..\..\..\..\..\slice\IceGrid\FileParser.ice - + true true true ..\..\..\..\..\slice\IceGrid\Registry.ice - + true true true ..\..\..\..\..\slice\IceGrid\Session.ice - + true true true diff --git a/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery++11/icelocatordiscovery++11.vcxproj b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery++11/icelocatordiscovery++11.vcxproj deleted file mode 100644 index 098bb600bed..00000000000 --- a/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery++11/icelocatordiscovery++11.vcxproj +++ /dev/null @@ -1,167 +0,0 @@ - - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {C694B856-3393-41B4-B3DC-3A5AD9A92A3D} - IceLocatorDiscovery - - - - DynamicLibrary - true - $(DefaultPlatformToolset) - - - DynamicLibrary - false - $(DefaultPlatformToolset) - - - DynamicLibrary - true - $(DefaultPlatformToolset) - - - DynamicLibrary - false - $(DefaultPlatformToolset) - - - - - - - - - - - - - - - - - - - - - - - ICE_LOCATOR_DISCOVERY_API_EXPORTS;%(PreprocessorDefinitions) - - - - - ICE_LOCATOR_DISCOVERY_API_EXPORTS;%(PreprocessorDefinitions) - - - - - ICE_LOCATOR_DISCOVERY_API_EXPORTS;%(PreprocessorDefinitions) - - - - - ICE_LOCATOR_DISCOVERY_API_EXPORTS;%(PreprocessorDefinitions) - - - - - $(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\IceLocatorDiscovery\ - IceLocatorDiscovery - - - - - - - - - true - true - true - ..\..\..\..\..\slice\IceLocatorDiscovery\IceLocatorDiscovery.ice - - - true - true - true - ..\..\..\..\..\slice\IceLocatorDiscovery\IceLocatorDiscovery.ice - - - true - true - true - ..\..\..\..\..\slice\IceLocatorDiscovery\IceLocatorDiscovery.ice - - - true - true - true - ..\..\..\..\..\slice\IceLocatorDiscovery\IceLocatorDiscovery.ice - - - - - true - true - true - ..\..\..\..\..\slice\IceLocatorDiscovery\IceLocatorDiscovery.ice - - - true - true - true - ..\..\..\..\..\slice\IceLocatorDiscovery\IceLocatorDiscovery.ice - - - true - true - true - ..\..\..\..\..\slice\IceLocatorDiscovery\IceLocatorDiscovery.ice - - - true - true - true - ..\..\..\..\..\slice\IceLocatorDiscovery\IceLocatorDiscovery.ice - - - - - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - \ No newline at end of file diff --git a/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery++11/packages.config b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery++11/packages.config deleted file mode 100644 index fb43e38f42f..00000000000 --- a/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery++11/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery/icelocatordiscovery.vcxproj b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery/icelocatordiscovery.vcxproj index f515e79060c..87187434cd5 100644 --- a/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery/icelocatordiscovery.vcxproj +++ b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery/icelocatordiscovery.vcxproj @@ -20,7 +20,7 @@ - {5A8CEAB6-9F57-495C-B554-F93F842A0A28} + {C694B856-3393-41B4-B3DC-3A5AD9A92A3D} IceLocatorDiscovery @@ -45,7 +45,7 @@ $(DefaultPlatformToolset) - + @@ -63,10 +63,6 @@ - - - - ICE_LOCATOR_DISCOVERY_API_EXPORTS;%(PreprocessorDefinitions) @@ -89,16 +85,13 @@ - $(IceSrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\IceLocatorDiscovery\ + $(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\IceLocatorDiscovery\ IceLocatorDiscovery - - - @@ -127,25 +120,25 @@ - + true true true ..\..\..\..\..\slice\IceLocatorDiscovery\IceLocatorDiscovery.ice - + true true true ..\..\..\..\..\slice\IceLocatorDiscovery\IceLocatorDiscovery.ice - + true true true ..\..\..\..\..\slice\IceLocatorDiscovery\IceLocatorDiscovery.ice - + true true true @@ -153,6 +146,9 @@ + + + diff --git a/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery/icelocatordiscovery.vcxproj.filters b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery/icelocatordiscovery.vcxproj.filters deleted file mode 100644 index 56433055cc8..00000000000 --- a/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery/icelocatordiscovery.vcxproj.filters +++ /dev/null @@ -1,104 +0,0 @@ - - - - - {be8c295d-c044-4588-aa7a-7a736c943c18} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {7a8d59f7-5027-44e2-91f0-e541a2d8fcca} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {4d707cfd-623d-46cf-8ac4-7ac2db3e7391} - ice - - - {cec55549-450a-4788-b3dd-f13dfd49b66c} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {96259bf5-c0d6-410f-80f1-b403fc34cc70} - - - {b4194be2-e394-45cd-b5f8-56b8cc3d8495} - - - {ea698cc2-3195-4348-9b68-e503548159a7} - - - {5f935f77-bc71-4d9f-be77-9cc1858fe8c0} - - - {71fc2ce0-2940-4620-9d6a-1f116a5527ea} - - - {d481ed31-8900-45ef-99c5-bad8becbf0e6} - - - {efd1b0d5-43e1-4e8a-9716-f52fa6cb142c} - - - {cc509251-f9ab-4618-b996-a20614e4a14e} - - - {a80008ce-cd6f-40b0-b234-d3a000f6a588} - - - {f70fb6af-7aa1-4a69-b11e-bdd9851308b3} - - - {ff4b930b-1b14-4043-9f09-b2252a6a57f8} - - - {0ddbd7cc-30eb-41f5-a858-cfea0661f71b} - - - - - Source Files - - - Source Files\Win32\Debug - - - Source Files\x64\Debug - - - Source Files\Win32\Release - - - Source Files\x64\Release - - - - - Header Files\Win32\Debug - - - Header Files\x64\Debug - - - Header Files\Win32\Release - - - Header Files\x64\Release - - - Header Files - - - - - Resource Files - - - - - Slice Files - - - - - - \ No newline at end of file diff --git a/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery++11/icelocatordiscovery++11.vcxproj.filters b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery/icelocatordiscoveryvcxproj.filters similarity index 100% rename from cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery++11/icelocatordiscovery++11.vcxproj.filters rename to cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery/icelocatordiscoveryvcxproj.filters diff --git a/cpp/src/IcePatch2/msbuild/icepatch2calc++11/icepatch2calc++11.vcxproj b/cpp/src/IcePatch2/msbuild/icepatch2calc/icepatch2calc.vcxproj similarity index 99% rename from cpp/src/IcePatch2/msbuild/icepatch2calc++11/icepatch2calc++11.vcxproj rename to cpp/src/IcePatch2/msbuild/icepatch2calc/icepatch2calc.vcxproj index 8210e1701bd..f4db323c598 100644 --- a/cpp/src/IcePatch2/msbuild/icepatch2calc++11/icepatch2calc++11.vcxproj +++ b/cpp/src/IcePatch2/msbuild/icepatch2calc/icepatch2calc.vcxproj @@ -44,7 +44,7 @@ $(DefaultPlatformToolset) - + diff --git a/cpp/src/IcePatch2/msbuild/icepatch2calc++11/icepatch2calc++11.vcxproj.filters b/cpp/src/IcePatch2/msbuild/icepatch2calc/icepatch2calc.vcxproj.filters similarity index 100% rename from cpp/src/IcePatch2/msbuild/icepatch2calc++11/icepatch2calc++11.vcxproj.filters rename to cpp/src/IcePatch2/msbuild/icepatch2calc/icepatch2calc.vcxproj.filters diff --git a/cpp/src/IcePatch2/msbuild/icepatch2client++11/icepatch2client++11.vcxproj b/cpp/src/IcePatch2/msbuild/icepatch2client/icepatch2client.vcxproj similarity index 99% rename from cpp/src/IcePatch2/msbuild/icepatch2client++11/icepatch2client++11.vcxproj rename to cpp/src/IcePatch2/msbuild/icepatch2client/icepatch2client.vcxproj index eb02c3b17a3..e7f539574d3 100644 --- a/cpp/src/IcePatch2/msbuild/icepatch2client++11/icepatch2client++11.vcxproj +++ b/cpp/src/IcePatch2/msbuild/icepatch2client/icepatch2client.vcxproj @@ -44,7 +44,7 @@ $(DefaultPlatformToolset) - + diff --git a/cpp/src/IcePatch2/msbuild/icepatch2client++11/icepatch2client++11.vcxproj.filters b/cpp/src/IcePatch2/msbuild/icepatch2client/icepatch2client.vcxproj.filters similarity index 100% rename from cpp/src/IcePatch2/msbuild/icepatch2client++11/icepatch2client++11.vcxproj.filters rename to cpp/src/IcePatch2/msbuild/icepatch2client/icepatch2client.vcxproj.filters diff --git a/cpp/src/IcePatch2/msbuild/icepatch2server++11/icepatch2server++11.vcxproj b/cpp/src/IcePatch2/msbuild/icepatch2server/icepatch2server.vcxproj similarity index 99% rename from cpp/src/IcePatch2/msbuild/icepatch2server++11/icepatch2server++11.vcxproj rename to cpp/src/IcePatch2/msbuild/icepatch2server/icepatch2server.vcxproj index 34a7edc81a2..e5c4b5a2f1d 100644 --- a/cpp/src/IcePatch2/msbuild/icepatch2server++11/icepatch2server++11.vcxproj +++ b/cpp/src/IcePatch2/msbuild/icepatch2server/icepatch2server.vcxproj @@ -44,7 +44,7 @@ $(DefaultPlatformToolset) - + diff --git a/cpp/src/IcePatch2/msbuild/icepatch2server++11/icepatch2server++11.vcxproj.filters b/cpp/src/IcePatch2/msbuild/icepatch2server/icepatch2server.vcxproj.filters similarity index 100% rename from cpp/src/IcePatch2/msbuild/icepatch2server++11/icepatch2server++11.vcxproj.filters rename to cpp/src/IcePatch2/msbuild/icepatch2server/icepatch2server.vcxproj.filters diff --git a/cpp/src/IcePatch2Lib/msbuild/icepatch2++11/icepatch2++11.vcxproj b/cpp/src/IcePatch2Lib/msbuild/icepatch2++11/icepatch2++11.vcxproj deleted file mode 100644 index df6d8bb7453..00000000000 --- a/cpp/src/IcePatch2Lib/msbuild/icepatch2++11/icepatch2++11.vcxproj +++ /dev/null @@ -1,226 +0,0 @@ - - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {18F381D8-BA61-4E6A-B877-9F6BC28C07E5} - IcePatch2 - 10.0 - - - - DynamicLibrary - true - $(DefaultPlatformToolset) - - - DynamicLibrary - false - $(DefaultPlatformToolset) - - - DynamicLibrary - true - $(DefaultPlatformToolset) - - - DynamicLibrary - false - $(DefaultPlatformToolset) - - - - - - - - - - - - - - - - - - - - - - ICEPATCH2_API_EXPORTS;%(PreprocessorDefinitions) - 4996;%(DisableSpecificWarnings) - - - - - ICEPATCH2_API_EXPORTS;%(PreprocessorDefinitions) - 4996;%(DisableSpecificWarnings) - - - - - ICEPATCH2_API_EXPORTS;%(PreprocessorDefinitions) - 4996;%(DisableSpecificWarnings) - - - - - ICEPATCH2_API_EXPORTS;%(PreprocessorDefinitions) - 4996;%(DisableSpecificWarnings) - - - - - $(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\IcePatch2\ - IcePatch2 - - - - - - - - - - - true - true - true - ..\..\..\..\..\slice\IcePatch2\FileInfo.ice - - - true - true - true - ..\..\..\..\..\slice\IcePatch2\FileServer.ice - - - true - true - true - ..\..\..\..\..\slice\IcePatch2\FileInfo.ice - - - true - true - true - ..\..\..\..\..\slice\IcePatch2\FileServer.ice - - - true - true - true - ..\..\..\..\..\slice\IcePatch2\FileInfo.ice - - - true - true - true - ..\..\..\..\..\slice\IcePatch2\FileServer.ice - - - true - true - true - ..\..\..\..\..\slice\IcePatch2\FileInfo.ice - - - true - true - true - ..\..\..\..\..\slice\IcePatch2\FileServer.ice - - - - - true - true - true - ..\..\..\..\..\slice\IcePatch2\FileInfo.ice - - - true - true - true - ..\..\..\..\..\slice\IcePatch2\FileServer.ice - - - true - true - true - ..\..\..\..\..\slice\IcePatch2\FileInfo.ice - - - true - true - true - ..\..\..\..\..\slice\IcePatch2\FileServer.ice - - - true - true - true - ..\..\..\..\..\slice\IcePatch2\FileInfo.ice - - - true - true - true - ..\..\..\..\..\slice\IcePatch2\FileServer.ice - - - true - true - true - ..\..\..\..\..\slice\IcePatch2\FileInfo.ice - - - true - true - true - ..\..\..\..\..\slice\IcePatch2\FileServer.ice - - - - - - - - - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - \ No newline at end of file diff --git a/cpp/src/IcePatch2Lib/msbuild/icepatch2++11/icepatch2++11.vcxproj.filters b/cpp/src/IcePatch2Lib/msbuild/icepatch2++11/icepatch2++11.vcxproj.filters deleted file mode 100644 index f0f9eb6ecfd..00000000000 --- a/cpp/src/IcePatch2Lib/msbuild/icepatch2++11/icepatch2++11.vcxproj.filters +++ /dev/null @@ -1,143 +0,0 @@ - - - - - {d2712066-1923-447a-ad64-c80f747fb1ea} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {af5258c0-2b8d-40ab-be90-0b7b080169c2} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {f59eb29a-8e4d-4f96-956f-912bb71723f5} - ice - - - {efca70d0-5c94-455a-b115-a1627cd37f1f} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {b2de4f44-f7bf-4d2b-8b1f-7a7eb14023b8} - - - {53019a64-4101-485f-9cbc-06003a1dbf05} - - - {9e5ee2e4-9fa9-4c5c-a39f-e25b5abadf9b} - - - {c6d023b5-a4f9-4400-acf3-492ab13e1559} - - - {c290a809-84db-4a63-b1ab-d797afc58dbe} - - - {28be0f87-bd50-4e44-b1ba-0e1ae0fca153} - - - {69f748d0-0821-4b05-8824-22b83945880a} - - - {859e3a89-2f71-4335-806c-3c306d75b0c8} - - - {46937cff-2db3-4117-8063-dbe9fd345624} - - - {d98eb1b4-139b-4c19-b728-3eb412a4b718} - - - {f630f65f-1553-46f9-b40b-c7a0731de52a} - - - {6a79f0b3-e47f-4f69-9431-d0d1fe23696e} - - - - - Source Files - - - Source Files - - - Source Files\Win32\Debug - - - Source Files\x64\Debug - - - Source Files\Win32\Release - - - Source Files\x64\Release - - - Source Files\Win32\Debug - - - Source Files\x64\Debug - - - Source Files\Win32\Release - - - Source Files\x64\Release - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files\Win32\Debug - - - Header Files\x64\Debug - - - Header Files\Win32\Release - - - Header Files\x64\Release - - - Header Files\Win32\Debug - - - Header Files\x64\Debug - - - Header Files\Win32\Release - - - Header Files\x64\Release - - - - - Resource Files - - - - - - - - Slice Files - - - Slice Files - - - \ No newline at end of file diff --git a/cpp/src/IcePatch2Lib/msbuild/icepatch2++11/packages.config b/cpp/src/IcePatch2Lib/msbuild/icepatch2++11/packages.config deleted file mode 100644 index 7c322b5c366..00000000000 --- a/cpp/src/IcePatch2Lib/msbuild/icepatch2++11/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/cpp/src/IcePatch2Lib/msbuild/icepatch2/icepatch2.vcxproj b/cpp/src/IcePatch2Lib/msbuild/icepatch2/icepatch2.vcxproj index c3dcc9837bf..0184df8ccb1 100644 --- a/cpp/src/IcePatch2Lib/msbuild/icepatch2/icepatch2.vcxproj +++ b/cpp/src/IcePatch2Lib/msbuild/icepatch2/icepatch2.vcxproj @@ -20,8 +20,9 @@ - {994ADD25-20A0-4715-A3EC-9F86AFD481D0} + {18F381D8-BA61-4E6A-B877-9F6BC28C07E5} IcePatch2 + 10.0 @@ -45,7 +46,7 @@ $(DefaultPlatformToolset) - + @@ -88,7 +89,7 @@ - $(IceSrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\IcePatch2\ + $(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\IcePatch2\ IcePatch2 @@ -149,49 +150,49 @@ - + true true true ..\..\..\..\..\slice\IcePatch2\FileInfo.ice - + true true true ..\..\..\..\..\slice\IcePatch2\FileServer.ice - + true true true ..\..\..\..\..\slice\IcePatch2\FileInfo.ice - + true true true ..\..\..\..\..\slice\IcePatch2\FileServer.ice - + true true true ..\..\..\..\..\slice\IcePatch2\FileInfo.ice - + true true true ..\..\..\..\..\slice\IcePatch2\FileServer.ice - + true true true ..\..\..\..\..\slice\IcePatch2\FileInfo.ice - + true true true diff --git a/cpp/src/IceSSL/msbuild/icessl++11/icessl++11.vcxproj b/cpp/src/IceSSL/msbuild/icessl++11/icessl++11.vcxproj deleted file mode 100644 index 33da6aeeaf5..00000000000 --- a/cpp/src/IceSSL/msbuild/icessl++11/icessl++11.vcxproj +++ /dev/null @@ -1,160 +0,0 @@ - - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {5923B17D-2873-4245-87A7-FB8F4BE12501} - IceSSL - - - - DynamicLibrary - true - $(DefaultPlatformToolset) - - - DynamicLibrary - false - $(DefaultPlatformToolset) - - - DynamicLibrary - true - $(DefaultPlatformToolset) - - - DynamicLibrary - false - $(DefaultPlatformToolset) - - - - - - - - - - - - - - - - - - - - - - ICESSL_API_EXPORTS;%(PreprocessorDefinitions) - - - advapi32.lib;secur32.lib;crypt32.lib;ws2_32.lib - - - - - ICESSL_API_EXPORTS;%(PreprocessorDefinitions) - - - advapi32.lib;secur32.lib;crypt32.lib;ws2_32.lib - - - - - ICESSL_API_EXPORTS;%(PreprocessorDefinitions) - - - advapi32.lib;secur32.lib;crypt32.lib;ws2_32.lib - - - - - ICESSL_API_EXPORTS;%(PreprocessorDefinitions) - - - advapi32.lib;secur32.lib;crypt32.lib;ws2_32.lib - - - - - $(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\IceSSL\ - IceSSL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - \ No newline at end of file diff --git a/cpp/src/IceSSL/msbuild/icessl++11/icessl++11.vcxproj.filters b/cpp/src/IceSSL/msbuild/icessl++11/icessl++11.vcxproj.filters deleted file mode 100644 index c0d0da7aa77..00000000000 --- a/cpp/src/IceSSL/msbuild/icessl++11/icessl++11.vcxproj.filters +++ /dev/null @@ -1,174 +0,0 @@ - - - - - {4d9f616e-1934-41a2-8ba4-83b5113d1ee9} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {dc46ba85-888a-44c6-a892-02ca81802a4f} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {7f20c422-9df1-492a-8b6f-5dd7f3188a7a} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {9007c33c-0c7e-42bb-8400-baae022a4a6d} - ice - - - {e9fe80ae-1aff-4267-84d9-1f75b1b573a6} - - - {0f9d0820-dd66-4cea-a839-576ef894e6da} - - - {85447365-08ad-4445-93c9-5b2d697c26d3} - - - {3970e819-06e0-4ff0-90ae-36e4d3e2599e} - - - {e29283e2-0bcc-4737-ba65-4d7818277667} - - - {37734e94-4269-46ce-a869-b343baada79c} - - - {799ccbb8-b61f-49d0-ab9b-c35577f4fc90} - - - {919084ad-57a8-4656-8e9c-7e297ade0cba} - - - {a9faf6cb-dac5-4226-b78f-e8d540941d95} - - - {5b553fdf-f103-40de-901e-e625bbac9df6} - - - {4a704c57-97d4-44e6-a7fe-54071c38a0d1} - - - {d5c1d6b6-0241-4fb2-8d58-451aee18ef20} - - - - - Resource Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - - \ No newline at end of file diff --git a/cpp/src/IceSSL/msbuild/icessl++11/packages.config b/cpp/src/IceSSL/msbuild/icessl++11/packages.config deleted file mode 100644 index fb43e38f42f..00000000000 --- a/cpp/src/IceSSL/msbuild/icessl++11/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/cpp/src/IceSSL/msbuild/icessl/icessl.vcxproj b/cpp/src/IceSSL/msbuild/icessl/icessl.vcxproj index ae7d44a8ca0..1ec0bee393d 100644 --- a/cpp/src/IceSSL/msbuild/icessl/icessl.vcxproj +++ b/cpp/src/IceSSL/msbuild/icessl/icessl.vcxproj @@ -20,7 +20,7 @@ - {72FA68A9-49B6-4AB6-94AE-34BB03770A51} + {5923B17D-2873-4245-87A7-FB8F4BE12501} IceSSL @@ -45,7 +45,7 @@ $(DefaultPlatformToolset) - + @@ -62,11 +62,6 @@ - - - - - ICESSL_API_EXPORTS;%(PreprocessorDefinitions) @@ -101,7 +96,7 @@ - $(IceSrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\IceSSL\ + $(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\IceSSL\ IceSSL @@ -112,7 +107,6 @@ - @@ -132,7 +126,6 @@ - @@ -140,6 +133,7 @@ + diff --git a/cpp/src/IceSSL/msbuild/icessl/icessl.vcxproj.filters b/cpp/src/IceSSL/msbuild/icessl/icessl.vcxproj.filters index f8bc2134c65..2cc8c9907b7 100644 --- a/cpp/src/IceSSL/msbuild/icessl/icessl.vcxproj.filters +++ b/cpp/src/IceSSL/msbuild/icessl/icessl.vcxproj.filters @@ -1,57 +1,57 @@  - - {0255b63a-660b-4a1c-805f-0abe632c5677} - ice + + {4d9f616e-1934-41a2-8ba4-83b5113d1ee9} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - {956d2580-1d49-4b49-a059-988288782db2} + {dc46ba85-888a-44c6-a892-02ca81802a4f} h;hh;hpp;hxx;hm;inl;inc;xsd - {e83d242d-b1ea-4c9c-b23c-e89105597587} + {7f20c422-9df1-492a-8b6f-5dd7f3188a7a} cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - {448e5844-aa20-4e5e-8876-57eb2a5cbe2f} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + {9007c33c-0c7e-42bb-8400-baae022a4a6d} + ice - {8fbefc16-ee09-44ab-b2b4-d752bd5377ea} + {e9fe80ae-1aff-4267-84d9-1f75b1b573a6} - {9ad49193-c783-4a96-a912-221addf43f04} + {0f9d0820-dd66-4cea-a839-576ef894e6da} - {0feba132-cf9d-4d8f-b4d6-20001d1d8ae6} + {85447365-08ad-4445-93c9-5b2d697c26d3} - {c0691be0-ad4d-45b0-9b58-ff51634b7abe} + {3970e819-06e0-4ff0-90ae-36e4d3e2599e} - {c9a4873d-7104-447e-a4c6-393349a8ff39} + {e29283e2-0bcc-4737-ba65-4d7818277667} - {e34f5387-2c17-4311-b257-1344b9008865} + {37734e94-4269-46ce-a869-b343baada79c} - {c662649c-a902-4c7e-8616-ea54f436eb45} + {799ccbb8-b61f-49d0-ab9b-c35577f4fc90} - {9ff83beb-868b-4a94-9b0e-3afc3bab37d6} + {919084ad-57a8-4656-8e9c-7e297ade0cba} - {2a739cdd-800d-4fb5-b656-2e647b26bd3f} + {a9faf6cb-dac5-4226-b78f-e8d540941d95} - {bf287f75-264e-406d-a75e-b19d15f4a387} + {5b553fdf-f103-40de-901e-e625bbac9df6} - {2d055007-bfcb-4301-8c18-3c394e9d2b71} + {4a704c57-97d4-44e6-a7fe-54071c38a0d1} - {d89224e9-0392-47b3-9a1a-f4b0b186ab08} + {d5c1d6b6-0241-4fb2-8d58-451aee18ef20} @@ -60,6 +60,9 @@ + + Source Files + Source Files @@ -90,9 +93,6 @@ Source Files - - Source Files - Source Files @@ -105,9 +105,6 @@ Source Files - - Source Files - Source Files @@ -164,7 +161,7 @@ Header Files - + Header Files diff --git a/cpp/src/IceSSL/msbuild/icesslopenssl++11/icesslopenssl++11.vcxproj b/cpp/src/IceSSL/msbuild/icesslopenssl++11/icesslopenssl++11.vcxproj deleted file mode 100644 index e02b20b7776..00000000000 --- a/cpp/src/IceSSL/msbuild/icesslopenssl++11/icesslopenssl++11.vcxproj +++ /dev/null @@ -1,120 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {D0DC2305-37FE-4D03-BE05-AC8912678DC8} - - - - DynamicLibrary - true - $(DefaultPlatformToolset) - - - DynamicLibrary - false - $(DefaultPlatformToolset) - - - DynamicLibrary - true - $(DefaultPlatformToolset) - - - DynamicLibrary - false - $(DefaultPlatformToolset) - - - - - - - - - - - - - - - - - - - - - - ICESSL_OPENSSL_API_EXPORTS;%(PreprocessorDefinitions) - - - - - ICESSL_OPENSSL_API_EXPORTS;%(PreprocessorDefinitions) - - - - - ICESSL_OPENSSL_API_EXPORTS;%(PreprocessorDefinitions) - - - - - ICESSL_OPENSSL_API_EXPORTS;%(PreprocessorDefinitions) - - - - - generated - $(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\IceSSL\ - IceSSL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/cpp/src/IceSSL/msbuild/icesslopenssl++11/icesslopenssl++11.vcxproj.filters b/cpp/src/IceSSL/msbuild/icesslopenssl++11/icesslopenssl++11.vcxproj.filters deleted file mode 100644 index b93125e12cf..00000000000 --- a/cpp/src/IceSSL/msbuild/icesslopenssl++11/icesslopenssl++11.vcxproj.filters +++ /dev/null @@ -1,96 +0,0 @@ - - - - - {4d9f616e-1934-41a2-8ba4-83b5113d1ee9} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {dc46ba85-888a-44c6-a892-02ca81802a4f} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {7f20c422-9df1-492a-8b6f-5dd7f3188a7a} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {9007c33c-0c7e-42bb-8400-baae022a4a6d} - ice - - - {e9fe80ae-1aff-4267-84d9-1f75b1b573a6} - - - {0f9d0820-dd66-4cea-a839-576ef894e6da} - - - {85447365-08ad-4445-93c9-5b2d697c26d3} - - - {3970e819-06e0-4ff0-90ae-36e4d3e2599e} - - - {e29283e2-0bcc-4737-ba65-4d7818277667} - - - {37734e94-4269-46ce-a869-b343baada79c} - - - {799ccbb8-b61f-49d0-ab9b-c35577f4fc90} - - - {919084ad-57a8-4656-8e9c-7e297ade0cba} - - - {a9faf6cb-dac5-4226-b78f-e8d540941d95} - - - {5b553fdf-f103-40de-901e-e625bbac9df6} - - - {4a704c57-97d4-44e6-a7fe-54071c38a0d1} - - - {d5c1d6b6-0241-4fb2-8d58-451aee18ef20} - - - - - Resource Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - - \ No newline at end of file diff --git a/cpp/src/IceSSL/msbuild/icesslopenssl++11/packages.config b/cpp/src/IceSSL/msbuild/icesslopenssl++11/packages.config deleted file mode 100644 index 4eec2753837..00000000000 --- a/cpp/src/IceSSL/msbuild/icesslopenssl++11/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/cpp/src/IceSSL/msbuild/icesslopenssl/icesslopenssl.vcxproj b/cpp/src/IceSSL/msbuild/icesslopenssl/icesslopenssl.vcxproj index f24b41a7f22..1bec0649b4a 100644 --- a/cpp/src/IceSSL/msbuild/icesslopenssl/icesslopenssl.vcxproj +++ b/cpp/src/IceSSL/msbuild/icesslopenssl/icesslopenssl.vcxproj @@ -19,7 +19,7 @@ - {0D08F6B8-39C0-413B-84CE-D73230BCC740} + {D0DC2305-37FE-4D03-BE05-AC8912678DC8} @@ -43,7 +43,7 @@ $(DefaultPlatformToolset) - + @@ -60,11 +60,6 @@ - - - - - ICESSL_OPENSSL_API_EXPORTS;%(PreprocessorDefinitions) @@ -88,7 +83,7 @@ generated - $(IceSrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\IceSSL\ + $(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\IceSSL\ IceSSL diff --git a/cpp/src/IceStorm/msbuild/icestormadmin/icestormadmin.vcxproj b/cpp/src/IceStorm/msbuild/icestormadmin/icestormadmin.vcxproj index c7f56156733..3e3025fec65 100644 --- a/cpp/src/IceStorm/msbuild/icestormadmin/icestormadmin.vcxproj +++ b/cpp/src/IceStorm/msbuild/icestormadmin/icestormadmin.vcxproj @@ -21,7 +21,7 @@ {8F1A1F99-DBE0-408D-99F7-D59142BD008C} - icestormadmin++11 + icestormadmin @@ -45,7 +45,7 @@ $(DefaultPlatformToolset) - + diff --git a/cpp/src/IceStorm/msbuild/icestormdb/icestormdb.vcxproj b/cpp/src/IceStorm/msbuild/icestormdb/icestormdb.vcxproj index da01758edbb..698a5a39d3b 100644 --- a/cpp/src/IceStorm/msbuild/icestormdb/icestormdb.vcxproj +++ b/cpp/src/IceStorm/msbuild/icestormdb/icestormdb.vcxproj @@ -21,7 +21,7 @@ {F0B74B00-F252-4D38-A352-ED379CB196E9} - icestormdb++11 + icestormdb @@ -45,7 +45,7 @@ $(DefaultPlatformToolset) - + diff --git a/cpp/src/IceStorm/msbuild/icestormservice/icestormservice.vcxproj b/cpp/src/IceStorm/msbuild/icestormservice/icestormservice.vcxproj index bfdd4a83452..93f22d10006 100644 --- a/cpp/src/IceStorm/msbuild/icestormservice/icestormservice.vcxproj +++ b/cpp/src/IceStorm/msbuild/icestormservice/icestormservice.vcxproj @@ -22,7 +22,7 @@ {9E13C4B5-5DA9-43C1-9304-AEAC035E854D} IceStorm - icestormservice++11 + icestormservice @@ -46,7 +46,7 @@ $(DefaultPlatformToolset) - + diff --git a/cpp/src/IceStormLib/msbuild/icestorm++11/icestorm++11.vcxproj b/cpp/src/IceStormLib/msbuild/icestorm++11/icestorm++11.vcxproj deleted file mode 100644 index 41a3ebfbc92..00000000000 --- a/cpp/src/IceStormLib/msbuild/icestorm++11/icestorm++11.vcxproj +++ /dev/null @@ -1,213 +0,0 @@ - - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {A28E5839-97F3-4874-BB77-E425787CF2ED} - IceStorm - - - - DynamicLibrary - true - $(DefaultPlatformToolset) - - - DynamicLibrary - false - $(DefaultPlatformToolset) - - - DynamicLibrary - true - $(DefaultPlatformToolset) - - - DynamicLibrary - false - $(DefaultPlatformToolset) - - - - - - - - - - - - - - - - - - - - - - ICESTORM_API_EXPORTS;%(PreprocessorDefinitions) - - - - - ICESTORM_API_EXPORTS;%(PreprocessorDefinitions) - - - - - ICESTORM_API_EXPORTS;%(PreprocessorDefinitions) - - - - - ICESTORM_API_EXPORTS;%(PreprocessorDefinitions) - - - - - $(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\IceStorm\ - IceStorm - - - - - - - - - - - - true - true - true - ..\..\..\..\..\slice\IceStorm\IceStorm.ice - - - true - true - true - ..\..\..\..\..\slice\IceStorm\Metrics.ice - - - true - true - true - ..\..\..\..\..\slice\IceStorm\IceStorm.ice - - - true - true - true - ..\..\..\..\..\slice\IceStorm\Metrics.ice - - - true - true - true - ..\..\..\..\..\slice\IceStorm\IceStorm.ice - - - true - true - true - ..\..\..\..\..\slice\IceStorm\Metrics.ice - - - true - true - true - ..\..\..\..\..\slice\IceStorm\IceStorm.ice - - - true - true - true - ..\..\..\..\..\slice\IceStorm\Metrics.ice - - - - - true - true - true - ..\..\..\..\..\slice\IceStorm\IceStorm.ice - - - true - true - true - ..\..\..\..\..\slice\IceStorm\Metrics.ice - - - true - true - true - ..\..\..\..\..\slice\IceStorm\IceStorm.ice - - - true - true - true - ..\..\..\..\..\slice\IceStorm\Metrics.ice - - - true - true - true - ..\..\..\..\..\slice\IceStorm\IceStorm.ice - - - true - true - true - ..\..\..\..\..\slice\IceStorm\Metrics.ice - - - true - true - true - ..\..\..\..\..\slice\IceStorm\IceStorm.ice - - - true - true - true - ..\..\..\..\..\slice\IceStorm\Metrics.ice - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - \ No newline at end of file diff --git a/cpp/src/IceStormLib/msbuild/icestorm++11/icestorm++11.vcxproj.filters b/cpp/src/IceStormLib/msbuild/icestorm++11/icestorm++11.vcxproj.filters deleted file mode 100644 index 0a6c2e4dd10..00000000000 --- a/cpp/src/IceStormLib/msbuild/icestorm++11/icestorm++11.vcxproj.filters +++ /dev/null @@ -1,125 +0,0 @@ - - - - - {b8b35839-3d95-4a6e-874b-3b82ec9258cf} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {31a74e25-ed70-4dde-b2d0-ef4315b96442} - ice - - - {763f2143-e02e-4e23-90f4-213609844681} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {e7126bd6-6e50-47f2-99cc-2b84b7a85087} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {a1d22df0-4627-4dcb-aa49-f74b2df0d00a} - - - {7e49ea6d-98c7-4b44-9f41-91320a38609e} - - - {17e2d958-fa13-49c1-a0d1-17393c87f057} - - - {f62a6b5a-3839-4539-858e-dba4aebf3d26} - - - {a19fe40b-b9f9-4226-ae74-5e0243617338} - - - {4f4d67cb-65c1-49a5-b1d7-e09d6d7eac2e} - - - {ae037344-ac35-4a20-9892-ce30ac676749} - - - {ed9d252f-7d9c-425a-8e0c-11a323b60bf6} - - - {6fef6341-b091-424b-9dce-dd721938b9eb} - - - {19f1ac5f-f082-4e81-bbba-bfe97dec134c} - - - {29170abc-3eed-42ea-883a-f498d947772a} - - - {9ead4e15-9721-408a-923a-6dc8c56f71cf} - - - - - Resource Files - - - - - Source Files\Win32\Debug - - - Source Files\Win32\Debug - - - Source Files\x64\Debug - - - Source Files\x64\Debug - - - Source Files\Win32\Release - - - Source Files\Win32\Release - - - Source Files\x64\Release - - - Source Files\x64\Release - - - - - Header Files\Win32\Debug - - - Header Files\Win32\Debug - - - Header Files\x64\Debug - - - Header Files\x64\Debug - - - Header Files\Win32\Release - - - Header Files\Win32\Release - - - Header Files\x64\Release - - - Header Files\x64\Release - - - - - Slice Files - - - Slice Files - - - - - - \ No newline at end of file diff --git a/cpp/src/IceStormLib/msbuild/icestorm++11/packages.config b/cpp/src/IceStormLib/msbuild/icestorm++11/packages.config deleted file mode 100644 index fb43e38f42f..00000000000 --- a/cpp/src/IceStormLib/msbuild/icestorm++11/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/cpp/src/IceStormLib/msbuild/icestorm/icestorm.vcxproj b/cpp/src/IceStormLib/msbuild/icestorm/icestorm.vcxproj index 50475e570de..7287b659d69 100644 --- a/cpp/src/IceStormLib/msbuild/icestorm/icestorm.vcxproj +++ b/cpp/src/IceStormLib/msbuild/icestorm/icestorm.vcxproj @@ -20,7 +20,7 @@ - {E6864F0D-B2ED-406A-B98C-F3668A680005} + {A28E5839-97F3-4874-BB77-E425787CF2ED} IceStorm @@ -45,7 +45,7 @@ $(DefaultPlatformToolset) - + @@ -84,7 +84,7 @@ - $(IceSrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\IceStorm\ + $(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\IceStorm\ IceStorm @@ -146,49 +146,49 @@ - + true true true ..\..\..\..\..\slice\IceStorm\IceStorm.ice - + true true true ..\..\..\..\..\slice\IceStorm\Metrics.ice - + true true true ..\..\..\..\..\slice\IceStorm\IceStorm.ice - + true true true ..\..\..\..\..\slice\IceStorm\Metrics.ice - + true true true ..\..\..\..\..\slice\IceStorm\IceStorm.ice - + true true true ..\..\..\..\..\slice\IceStorm\Metrics.ice - + true true true ..\..\..\..\..\slice\IceStorm\IceStorm.ice - + true true true diff --git a/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj b/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj index 71e80c8ceea..66254ccd03a 100644 --- a/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj +++ b/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj @@ -45,7 +45,7 @@ $(DefaultPlatformToolset) - + diff --git a/cpp/src/IceXML/msbuild/icexml.vcxproj b/cpp/src/IceXML/msbuild/icexml.vcxproj index 0342322e2db..55fa85c2478 100644 --- a/cpp/src/IceXML/msbuild/icexml.vcxproj +++ b/cpp/src/IceXML/msbuild/icexml.vcxproj @@ -21,7 +21,7 @@ {90EC26E8-AFFA-4E44-B068-AB5849A96FDD} IceXML - icexml++11 + icexml @@ -45,7 +45,7 @@ $(DefaultPlatformToolset) - + diff --git a/cpp/src/Slice/msbuild/slice.vcxproj b/cpp/src/Slice/msbuild/slice.vcxproj index 012725fe77c..1d3c9a44684 100644 --- a/cpp/src/Slice/msbuild/slice.vcxproj +++ b/cpp/src/Slice/msbuild/slice.vcxproj @@ -45,7 +45,7 @@ $(DefaultPlatformToolset) - + diff --git a/cpp/src/ice2slice/msbuild/ice2slice.vcxproj b/cpp/src/ice2slice/msbuild/ice2slice.vcxproj index efd407e7816..ceaada0fe63 100644 --- a/cpp/src/ice2slice/msbuild/ice2slice.vcxproj +++ b/cpp/src/ice2slice/msbuild/ice2slice.vcxproj @@ -44,7 +44,7 @@ $(DefaultPlatformToolset) - + diff --git a/cpp/src/icegriddb/msbuild/icegriddb.vcxproj b/cpp/src/icegriddb/msbuild/icegriddb.vcxproj index e88502855f8..44dcfef78e6 100644 --- a/cpp/src/icegriddb/msbuild/icegriddb.vcxproj +++ b/cpp/src/icegriddb/msbuild/icegriddb.vcxproj @@ -21,7 +21,7 @@ {369524F4-D374-44F4-BCFD-408934595701} - icegriddb++11 + icegriddb @@ -45,7 +45,7 @@ $(DefaultPlatformToolset) - + diff --git a/cpp/src/iceserviceinstall/ServiceInstaller.cpp b/cpp/src/iceserviceinstall/ServiceInstaller.cpp index 0dad28f56a8..69bf2509570 100644 --- a/cpp/src/iceserviceinstall/ServiceInstaller.cpp +++ b/cpp/src/iceserviceinstall/ServiceInstaller.cpp @@ -57,7 +57,7 @@ IceServiceInstaller::IceServiceInstaller(int serviceType, const string& configFi } else { - Ice::LocatorPrx defaultLocator = LocatorPrx::uncheckedCast( + auto defaultLocator = Ice::uncheckedCast( _communicator->stringToProxy(_serviceProperties->getProperty("Ice.Default.Locator"))); if(defaultLocator != 0) { diff --git a/cpp/src/iceserviceinstall/msbuild/iceserviceinstall.vcxproj b/cpp/src/iceserviceinstall/msbuild/iceserviceinstall.vcxproj index 1e3dff9878d..ee172640e04 100644 --- a/cpp/src/iceserviceinstall/msbuild/iceserviceinstall.vcxproj +++ b/cpp/src/iceserviceinstall/msbuild/iceserviceinstall.vcxproj @@ -43,7 +43,7 @@ $(DefaultPlatformToolset) - + diff --git a/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj b/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj index 536601c3bd0..963d66ffd33 100644 --- a/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj +++ b/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj @@ -45,7 +45,7 @@ $(DefaultPlatformToolset) - + diff --git a/cpp/src/slice2cs/msbuild/slice2cs.vcxproj b/cpp/src/slice2cs/msbuild/slice2cs.vcxproj index b23f401a610..85c76e4b7e4 100644 --- a/cpp/src/slice2cs/msbuild/slice2cs.vcxproj +++ b/cpp/src/slice2cs/msbuild/slice2cs.vcxproj @@ -45,7 +45,7 @@ $(DefaultPlatformToolset) - + diff --git a/cpp/src/slice2java/msbuild/slice2java.vcxproj b/cpp/src/slice2java/msbuild/slice2java.vcxproj index 50705c78d46..d3653330074 100644 --- a/cpp/src/slice2java/msbuild/slice2java.vcxproj +++ b/cpp/src/slice2java/msbuild/slice2java.vcxproj @@ -45,7 +45,7 @@ $(DefaultPlatformToolset) - + diff --git a/cpp/src/slice2js/msbuild/slice2js.vcxproj b/cpp/src/slice2js/msbuild/slice2js.vcxproj index f547a186a53..6f3bfb33bbe 100644 --- a/cpp/src/slice2js/msbuild/slice2js.vcxproj +++ b/cpp/src/slice2js/msbuild/slice2js.vcxproj @@ -44,7 +44,7 @@ $(DefaultPlatformToolset) - + diff --git a/cpp/src/slice2matlab/msbuild/slice2matlab.vcxproj b/cpp/src/slice2matlab/msbuild/slice2matlab.vcxproj index 60e11d1c346..91bee261b20 100644 --- a/cpp/src/slice2matlab/msbuild/slice2matlab.vcxproj +++ b/cpp/src/slice2matlab/msbuild/slice2matlab.vcxproj @@ -45,7 +45,7 @@ $(DefaultPlatformToolset) - + diff --git a/cpp/src/slice2php/msbuild/slice2php.vcxproj b/cpp/src/slice2php/msbuild/slice2php.vcxproj index 0e24e15dee1..f78f6f9bc92 100644 --- a/cpp/src/slice2php/msbuild/slice2php.vcxproj +++ b/cpp/src/slice2php/msbuild/slice2php.vcxproj @@ -45,7 +45,7 @@ $(DefaultPlatformToolset) - + diff --git a/cpp/src/slice2py/msbuild/slice2py.vcxproj b/cpp/src/slice2py/msbuild/slice2py.vcxproj index d22b23c726e..7417b91bbd2 100644 --- a/cpp/src/slice2py/msbuild/slice2py.vcxproj +++ b/cpp/src/slice2py/msbuild/slice2py.vcxproj @@ -45,7 +45,7 @@ $(DefaultPlatformToolset) - + diff --git a/cpp/src/slice2rb/msbuild/slice2rb.vcxproj b/cpp/src/slice2rb/msbuild/slice2rb.vcxproj index 481aa4d0671..ee13a03eeda 100644 --- a/cpp/src/slice2rb/msbuild/slice2rb.vcxproj +++ b/cpp/src/slice2rb/msbuild/slice2rb.vcxproj @@ -44,7 +44,7 @@ $(DefaultPlatformToolset) - + diff --git a/cpp/src/slice2swift/msbuild/slice2swift.vcxproj b/cpp/src/slice2swift/msbuild/slice2swift.vcxproj index f8fa259df57..d50fb6940fb 100644 --- a/cpp/src/slice2swift/msbuild/slice2swift.vcxproj +++ b/cpp/src/slice2swift/msbuild/slice2swift.vcxproj @@ -44,7 +44,7 @@ $(DefaultPlatformToolset) - + diff --git a/cpp/test/Common/msbuild/testcommon.vcxproj.filters b/cpp/test/Common/msbuild/testcommon.vcxproj.filters index f94239df21d..58e1ec08138 100644 --- a/cpp/test/Common/msbuild/testcommon.vcxproj.filters +++ b/cpp/test/Common/msbuild/testcommon.vcxproj.filters @@ -17,27 +17,15 @@ {e18e2ea6-cda2-4ff7-80ab-056dd8bfaf5d} - - {f55fc6fd-aed1-49cc-8035-5d6602d1d572} - {31933557-e89e-4807-92f7-1a10aa651a59} - - {05785e62-af95-43f7-994c-028c6dcc6995} - {efb65914-1dff-4773-981a-cf2b82b326bf} - - {19ee1f0c-b939-4ba0-a728-94ea7bbf60d7} - {e4bcbb52-596d-425c-9fa7-a61bbdda0a8a} - - {b719013e-6ab6-4cea-a483-6b16bbbb0dc2} - {c650ce03-3899-48c9-afbc-e8ed87713303} @@ -62,18 +50,6 @@ {d6325046-14ed-41e0-97ae-1a2ee45da4ce} - - {2b809205-f540-41a5-9206-a3f816232536} - - - {596d74f4-9f61-44f1-8229-e8470a3a6d32} - - - {56011fe2-c497-45c3-b804-84a05d4e52cc} - - - {a1ae8950-630c-4ab6-9c6f-87bc3732ebba} - diff --git a/cpp/test/Glacier2/application/msbuild/client/client.vcxproj b/cpp/test/Glacier2/application/msbuild/client/client.vcxproj index ca1ba623ee2..b11e0d09c19 100644 --- a/cpp/test/Glacier2/application/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/application/msbuild/client/client.vcxproj @@ -38,26 +38,6 @@ - - true - true - true - true - true - true - true - ..\..\Callback.ice - - - true - true - true - true - true - true - true - ..\..\Callback.ice - true true @@ -78,26 +58,6 @@ true ..\..\Callback.ice - - true - true - true - true - true - true - true - ..\..\Callback.ice - - - true - true - true - true - true - true - true - ..\..\Callback.ice - true true @@ -123,26 +83,6 @@ - - true - true - true - true - true - true - true - ..\..\Callback.ice - - - true - true - true - true - true - true - true - ..\..\Callback.ice - true true @@ -163,26 +103,6 @@ true ..\..\Callback.ice - - true - true - true - true - true - true - true - ..\..\Callback.ice - - - true - true - true - true - true - true - true - ..\..\Callback.ice - true true diff --git a/cpp/test/Glacier2/application/msbuild/client/client.vcxproj.filters b/cpp/test/Glacier2/application/msbuild/client/client.vcxproj.filters index e8aeb3b7b56..994045f9609 100644 --- a/cpp/test/Glacier2/application/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Glacier2/application/msbuild/client/client.vcxproj.filters @@ -14,27 +14,15 @@ {88bd7ae4-6c8f-44dc-931a-ba357d00b12f} - - {8f989f90-694e-4fa1-bf6c-3bf5fd271428} - {8fc9f9d6-650f-497a-afd2-1a8d6e024ebc} - - {b66a1974-9417-412d-a2af-5b170bfe1d82} - {50dd5049-f2ea-467a-bba2-d0d9c8d59279} - - {055389ac-0ac8-4f0d-b8fb-c0812c773bb3} - {1f525397-1eb1-4c02-bc95-f222f3c8540f} - - {1a869942-bfa4-49e7-b3fc-bacf830f4a90} - {cc80a20c-a151-47f2-8938-42c2ca6cd442} @@ -59,29 +47,11 @@ {01fdf776-1917-46c8-bd0a-5f836deeb0fd} - - {2848c29f-1ac7-4488-af2b-0dde6a110b29} - - - {215a0913-787e-4310-82fe-d33b84b61d82} - - - {df2011e3-2bcf-4597-8312-bbfee3924ef2} - - - {e19e13c7-f8e7-45a9-8716-c21069970ab2} - Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -94,20 +64,8 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -120,12 +78,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Glacier2/application/msbuild/server/server.vcxproj b/cpp/test/Glacier2/application/msbuild/server/server.vcxproj index a928a8a592f..c6be90bc9fa 100644 --- a/cpp/test/Glacier2/application/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/application/msbuild/server/server.vcxproj @@ -155,26 +155,6 @@ - - true - true - true - true - true - true - true - ..\..\Callback.ice - - - true - true - true - true - true - true - true - ..\..\Callback.ice - true true @@ -195,26 +175,6 @@ true ..\..\Callback.ice - - true - true - true - true - true - true - true - ..\..\Callback.ice - - - true - true - true - true - true - true - true - ..\..\Callback.ice - true true @@ -240,26 +200,6 @@ - - true - true - true - true - true - true - true - ..\..\Callback.ice - - - true - true - true - true - true - true - true - ..\..\Callback.ice - true true @@ -280,26 +220,6 @@ true ..\..\Callback.ice - - true - true - true - true - true - true - true - ..\..\Callback.ice - - - true - true - true - true - true - true - true - ..\..\Callback.ice - true true diff --git a/cpp/test/Glacier2/application/msbuild/server/server.vcxproj.filters b/cpp/test/Glacier2/application/msbuild/server/server.vcxproj.filters index 27a3784a1fa..7b02f7ed039 100644 --- a/cpp/test/Glacier2/application/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Glacier2/application/msbuild/server/server.vcxproj.filters @@ -14,27 +14,15 @@ {893a9720-546f-447b-840c-676c4c25407d} - - {9e822431-f253-4588-88d5-fbeea4017928} - {ae45d567-212a-438e-b97f-6fa4cef9cb82} - - {9ea797ca-88bd-4b4d-afd9-e507a346c950} - {9791cfde-3e93-48d1-840d-0d313ebd4079} - - {e2a6d33e-5eaa-4d0e-963f-72b8c30d7f3e} - {add40582-ecb6-4f16-9588-97c9e5931602} - - {57720470-5ab5-450f-9c3a-1f8962685464} - {a341f046-db86-4534-b0e9-83a598b8afad} @@ -59,29 +47,11 @@ {84bd3212-268b-4f34-a192-665b0554940a} - - {f35081e8-8bf4-4794-89b2-82a6420d68cc} - - - {3dbd5f85-1c6d-49b1-8cd8-2319c4275f1b} - - - {5651fca8-a6d0-485d-a6b0-67f51b1ac266} - - - {fc438b99-77ba-4c1a-95a4-07c67f17ea70} - Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -94,20 +64,8 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -120,12 +78,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Glacier2/attack/msbuild/client/client.vcxproj b/cpp/test/Glacier2/attack/msbuild/client/client.vcxproj index dc25f1c3b7c..dec823bcf2b 100644 --- a/cpp/test/Glacier2/attack/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/attack/msbuild/client/client.vcxproj @@ -157,26 +157,6 @@ - - true - true - true - true - true - true - true - ..\..\Backend.ice - - - true - true - true - true - true - true - true - ..\..\Backend.ice - true true @@ -197,26 +177,6 @@ true ..\..\Backend.ice - - true - true - true - true - true - true - true - ..\..\Backend.ice - - - true - true - true - true - true - true - true - ..\..\Backend.ice - true true @@ -239,26 +199,6 @@ - - true - true - true - true - true - true - true - ..\..\Backend.ice - - - true - true - true - true - true - true - true - ..\..\Backend.ice - true true @@ -279,26 +219,6 @@ true ..\..\Backend.ice - - true - true - true - true - true - true - true - ..\..\Backend.ice - - - true - true - true - true - true - true - true - ..\..\Backend.ice - true true diff --git a/cpp/test/Glacier2/attack/msbuild/client/client.vcxproj.filters b/cpp/test/Glacier2/attack/msbuild/client/client.vcxproj.filters index 5d66c3f559b..0d16efe0ad7 100644 --- a/cpp/test/Glacier2/attack/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Glacier2/attack/msbuild/client/client.vcxproj.filters @@ -4,12 +4,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -22,12 +16,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - Source Files @@ -46,27 +34,15 @@ {3cd489ef-b818-42d3-b295-3f82c237d4bb} - - {9adc9283-3454-4ca8-8ff5-45ba7b5e4d43} - {b44c3efa-c597-41de-8cbb-90412070e7fa} - - {70d15df3-89c2-4e06-b33a-9e5a4cb0901b} - {cc418600-9fb9-4eb9-9777-cb7470a344d6} - - {7966925c-510b-49e5-a743-6b769602bc63} - {3e8e371b-fb78-4598-be3d-796e7048cfab} - - {c08ac05b-49f1-46f5-a65f-d4c2a2ca6ad3} - {f4ea24af-67d9-4875-9eb8-72d1c215d588} @@ -91,26 +67,8 @@ {393e410d-5089-460d-b20c-2a310b5d25f2} - - {6d6485c2-96e5-485b-892d-75accb20b2ae} - - - {22e0f417-caac-4b8f-8c51-57bc0ac1e798} - - - {53a1ffbf-ff47-43f9-be9f-e9e5192c9a57} - - - {210d1f83-d8d4-4c1f-87aa-e6c6665d9798} - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Glacier2/attack/msbuild/server/server.vcxproj b/cpp/test/Glacier2/attack/msbuild/server/server.vcxproj index dcf215bd77e..8b06d42b5db 100644 --- a/cpp/test/Glacier2/attack/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/attack/msbuild/server/server.vcxproj @@ -156,26 +156,6 @@ - - true - true - true - true - true - true - true - ..\..\Backend.ice - - - true - true - true - true - true - true - true - ..\..\Backend.ice - true true @@ -196,26 +176,6 @@ true ..\..\Backend.ice - - true - true - true - true - true - true - true - ..\..\Backend.ice - - - true - true - true - true - true - true - true - ..\..\Backend.ice - true true @@ -242,26 +202,6 @@ - - true - true - true - true - true - true - true - ..\..\Backend.ice - - - true - true - true - true - true - true - true - ..\..\Backend.ice - true true @@ -282,26 +222,6 @@ true ..\..\Backend.ice - - true - true - true - true - true - true - true - ..\..\Backend.ice - - - true - true - true - true - true - true - true - ..\..\Backend.ice - true true diff --git a/cpp/test/Glacier2/attack/msbuild/server/server.vcxproj.filters b/cpp/test/Glacier2/attack/msbuild/server/server.vcxproj.filters index 226672e9f61..87daa7d7480 100644 --- a/cpp/test/Glacier2/attack/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Glacier2/attack/msbuild/server/server.vcxproj.filters @@ -14,27 +14,15 @@ {7f753940-4ffb-4f48-a295-a9e4e3cd6db1} - - {2f992769-a245-45fc-8d77-6e5bdb386eb8} - {794820d0-0622-47a9-bc19-191eeea9bc38} - - {5d0e6fa9-2cd6-4951-9e86-1ef5d520ce98} - {039aa19d-334d-40a8-b7cc-3328a6fccc9b} - - {6b5ee23c-264e-4714-a2ae-5de48ed71e24} - {1f9d73fb-f355-42a9-8ef7-8e539cebdb92} - - {49091d98-7033-40b0-9090-23c8408e7a00} - {a04bd95a-c3ea-4258-b628-d1c6d2f5592b} @@ -59,18 +47,6 @@ {3f223056-6f06-49fb-9d59-59769e4d7f29} - - {81b627c5-55c1-446e-a206-2b11ed3c55b3} - - - {347a94e6-231f-4df3-8488-a9eb67b4fc21} - - - {4cb2e875-2684-4a01-a3e4-dfdba26bf351} - - - {502200fe-4612-45a2-8c72-07ad6927ba0f} - @@ -79,12 +55,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -97,20 +67,8 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - Header Files diff --git a/cpp/test/Glacier2/dynamicFiltering/msbuild/client/client.vcxproj b/cpp/test/Glacier2/dynamicFiltering/msbuild/client/client.vcxproj index b0ea9659d30..2af1509b1bb 100644 --- a/cpp/test/Glacier2/dynamicFiltering/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/dynamicFiltering/msbuild/client/client.vcxproj @@ -156,26 +156,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -196,26 +176,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -241,26 +201,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -281,26 +221,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Glacier2/dynamicFiltering/msbuild/client/client.vcxproj.filters b/cpp/test/Glacier2/dynamicFiltering/msbuild/client/client.vcxproj.filters index 21ea09b2d58..894212fc91d 100644 --- a/cpp/test/Glacier2/dynamicFiltering/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Glacier2/dynamicFiltering/msbuild/client/client.vcxproj.filters @@ -4,12 +4,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -22,12 +16,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -43,27 +31,15 @@ {0a4e5482-bae9-47e2-80c0-04997a1c3372} - - {f2ad5cda-0655-480b-919f-9105c5375bb9} - {4820f753-7eec-4607-a7d2-d9ba44177999} - - {00226253-4b9e-44f5-bf60-fed3e9d10694} - {f3eb0dd6-3d25-427f-a577-eee39af955ef} - - {6d11dc57-b465-4d6a-b263-968b10ee0f96} - {f6b481b9-3062-419f-9242-622026e14e07} - - {ccdd18fe-8c24-417a-b9c9-42f26847d1a7} - {82502817-d53c-41b7-b50a-ae2fc291c098} @@ -88,26 +64,8 @@ {320ccb75-fadd-4054-8777-d814034b16ba} - - {27d9e4c3-a859-443e-8f1a-e1c7e5481706} - - - {2fe99aac-6e5b-44a5-a9d9-4093f68bfcd9} - - - {7d9e5ad3-bd0e-4658-9848-75bc2b4c0a90} - - - {d2672c1d-4c28-454e-b608-ef2b600e8b8e} - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -120,12 +78,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Glacier2/dynamicFiltering/msbuild/server/server.vcxproj b/cpp/test/Glacier2/dynamicFiltering/msbuild/server/server.vcxproj index 695066f023f..a0f8c7b7e90 100644 --- a/cpp/test/Glacier2/dynamicFiltering/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/dynamicFiltering/msbuild/server/server.vcxproj @@ -158,26 +158,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -198,26 +178,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -243,26 +203,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -283,26 +223,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Glacier2/dynamicFiltering/msbuild/server/server.vcxproj.filters b/cpp/test/Glacier2/dynamicFiltering/msbuild/server/server.vcxproj.filters index a8e1e159aac..5f63190735c 100644 --- a/cpp/test/Glacier2/dynamicFiltering/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Glacier2/dynamicFiltering/msbuild/server/server.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - Source Files @@ -52,27 +40,15 @@ {41f85971-44c7-48e8-a5c8-925b348e0c85} - - {3a5e10f8-6ed1-440e-a224-596043a48b22} - {33bcbe2a-bee9-4286-81ec-2f938eef1a8f} - - {bc454037-7815-4612-af46-361062db1e9c} - {f8c3f272-cb07-47ac-b60f-e807e3302204} - - {3fabd2f0-ea56-41a8-bc8c-b32d1becee39} - {f1cc806c-12c2-4e32-ac13-cce328833b41} - - {8c05cb46-8797-4690-ab41-2f62e27fbf3d} - {d2d45c4d-672d-49f6-a050-21bc34081cf1} @@ -97,29 +73,11 @@ {d4830063-c349-45aa-b7ed-2faed8fb4af7} - - {6238672b-8976-4900-9513-0db5bc7976b1} - - - {81b16617-1e98-423e-8e5a-0bf805c80c8c} - - - {9611258a-489f-49ba-b729-c7123c046940} - - - {669cae00-ff7c-487c-88c8-495818ffb7c2} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -132,12 +90,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - Header Files diff --git a/cpp/test/Glacier2/override/msbuild/client/client.vcxproj b/cpp/test/Glacier2/override/msbuild/client/client.vcxproj index aa896245abe..f7b30bf0086 100644 --- a/cpp/test/Glacier2/override/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/override/msbuild/client/client.vcxproj @@ -42,26 +42,6 @@ - - true - true - true - true - true - true - true - ..\..\Callback.ice - - - true - true - true - true - true - true - true - ..\..\Callback.ice - true true @@ -82,26 +62,6 @@ true ..\..\Callback.ice - - true - true - true - true - true - true - true - ..\..\Callback.ice - - - true - true - true - true - true - true - true - ..\..\Callback.ice - true true @@ -125,26 +85,6 @@ - - true - true - true - true - true - true - true - ..\..\Callback.ice - - - true - true - true - true - true - true - true - ..\..\Callback.ice - true true @@ -165,26 +105,6 @@ true ..\..\Callback.ice - - true - true - true - true - true - true - true - ..\..\Callback.ice - - - true - true - true - true - true - true - true - ..\..\Callback.ice - true true diff --git a/cpp/test/Glacier2/override/msbuild/client/client.vcxproj.filters b/cpp/test/Glacier2/override/msbuild/client/client.vcxproj.filters index b743734fc6a..88426a16255 100644 --- a/cpp/test/Glacier2/override/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Glacier2/override/msbuild/client/client.vcxproj.filters @@ -14,27 +14,15 @@ {8dbf43f1-473f-4860-a688-d7f31f84952c} - - {06fc4245-58ba-4e30-85e5-4922f181665b} - {eaf90c9c-749b-4fe2-a63e-4ebbc16fdac8} - - {467b8c21-1de0-4b71-b523-a873d35a5c7e} - {3ceb9acf-c760-4180-915f-4a39ce536e87} - - {a0d594e1-d1fe-47f0-bc27-ccb430a304b5} - {f3a97207-8db1-4529-9046-f637449fd20d} - - {c579ea01-fd29-4b42-bb0a-d53ab65135fb} - {1f0c51a8-60a7-4f4f-b969-8a6f780fe8f5} @@ -59,26 +47,8 @@ {ec3e3a08-657f-421b-8b85-0fdb3fe76e74} - - {6ef7a2fb-9ff8-420f-af19-21252a0c58ff} - - - {0a7ec9e1-4d0e-40a2-bb13-148b278982b2} - - - {21b59f6f-626e-46fd-91ca-708a9d65ba4e} - - - {27e861f6-2483-4716-98c1-4cb3bf9d6000} - - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -91,12 +61,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - Source Files @@ -105,12 +69,6 @@ - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - Header Files diff --git a/cpp/test/Glacier2/override/msbuild/server/server.vcxproj b/cpp/test/Glacier2/override/msbuild/server/server.vcxproj index 27fa9f138c4..07afe9c4a70 100644 --- a/cpp/test/Glacier2/override/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/override/msbuild/server/server.vcxproj @@ -156,26 +156,6 @@ - - true - true - true - true - true - true - true - ..\..\Callback.ice - - - true - true - true - true - true - true - true - ..\..\Callback.ice - true true @@ -196,26 +176,6 @@ true ..\..\Callback.ice - - true - true - true - true - true - true - true - ..\..\Callback.ice - - - true - true - true - true - true - true - true - ..\..\Callback.ice - true true @@ -242,26 +202,6 @@ - - true - true - true - true - true - true - true - ..\..\Callback.ice - - - true - true - true - true - true - true - true - ..\..\Callback.ice - true true @@ -282,26 +222,6 @@ true ..\..\Callback.ice - - true - true - true - true - true - true - true - ..\..\Callback.ice - - - true - true - true - true - true - true - true - ..\..\Callback.ice - true true diff --git a/cpp/test/Glacier2/override/msbuild/server/server.vcxproj.filters b/cpp/test/Glacier2/override/msbuild/server/server.vcxproj.filters index 8cb0d5178e6..438e7a78b1c 100644 --- a/cpp/test/Glacier2/override/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Glacier2/override/msbuild/server/server.vcxproj.filters @@ -14,27 +14,15 @@ {79fde8f6-1add-428e-a166-1b6ba5fb6b25} - - {962fd292-7319-44d8-b058-0048d2aa7cde} - {4f3855d4-9a99-4ca6-8ce0-010465006442} - - {121ad937-278b-4b32-a4dd-7e218aa59a49} - {09d92148-9751-4d5e-9795-b3f0d0550668} - - {9615bb73-e4f8-4dbc-8706-6271aa2e2f3e} - {29d93376-539b-4858-a285-1cc30a97bf1c} - - {061e5014-64fc-46bf-a699-f06f6c1c8825} - {0f17563e-9124-402d-ab36-45c6e0693884} @@ -59,18 +47,6 @@ {6e78fbb2-64c5-48fb-a480-781b60bfbc47} - - {2128542f-a38a-4c17-8d70-6c5cf9217705} - - - {a8f3179f-595e-4a0e-b299-52c7c72ef5ed} - - - {630b5e13-14c8-4494-8dee-6c15405e93fc} - - - {2ea39731-f5ec-46e6-b500-5ce4d8d09475} - @@ -79,12 +55,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -97,20 +67,8 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - Header Files diff --git a/cpp/test/Glacier2/router/msbuild/client/client.vcxproj b/cpp/test/Glacier2/router/msbuild/client/client.vcxproj index 59286efd11b..9c86cb381ef 100644 --- a/cpp/test/Glacier2/router/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/router/msbuild/client/client.vcxproj @@ -42,26 +42,6 @@ - - true - true - true - true - true - true - true - ..\..\Callback.ice - - - true - true - true - true - true - true - true - ..\..\Callback.ice - true true @@ -82,26 +62,6 @@ true ..\..\Callback.ice - - true - true - true - true - true - true - true - ..\..\Callback.ice - - - true - true - true - true - true - true - true - ..\..\Callback.ice - true true @@ -125,26 +85,6 @@ - - true - true - true - true - true - true - true - ..\..\Callback.ice - - - true - true - true - true - true - true - true - ..\..\Callback.ice - true true @@ -165,26 +105,6 @@ true ..\..\Callback.ice - - true - true - true - true - true - true - true - ..\..\Callback.ice - - - true - true - true - true - true - true - true - ..\..\Callback.ice - true true diff --git a/cpp/test/Glacier2/router/msbuild/client/client.vcxproj.filters b/cpp/test/Glacier2/router/msbuild/client/client.vcxproj.filters index 18608fc3f89..a574845349d 100644 --- a/cpp/test/Glacier2/router/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Glacier2/router/msbuild/client/client.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {d33a72dc-e2d0-4d15-8d6e-b58009011d05} - - {f79f9d08-9b54-4114-97ea-9e825b5ba8da} - {5fbb1a4f-b76d-43b0-abe4-82298b05215c} - - {2882b5dd-e074-45ff-9eea-eab8bf89fdf3} - {ce2e5999-27e2-44da-a473-44b759a360d3} - - {e053af21-eae5-4ce6-8384-2a55ded4023a} - {88a8284f-19be-4a01-aec2-5c3c684df119} - - {94ff144f-dc51-4822-bd27-03044d228204} - {df321826-ed43-4530-bf18-b5302ef10aae} @@ -91,29 +67,11 @@ {64fd03f0-309b-4d10-be22-d39b6e6259d5} - - {b6c37d5a-7c79-484f-b6a4-98ee10f76eb3} - - - {d039b90e-ef50-4784-9743-ee5842d1476c} - - - {1fb414f1-a973-453b-b5ab-34bde25a06e1} - - - {fff65593-f42e-4e93-bfdc-0fc36e69b67f} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Glacier2/router/msbuild/server/server.vcxproj b/cpp/test/Glacier2/router/msbuild/server/server.vcxproj index e618822c74c..b45c203e109 100644 --- a/cpp/test/Glacier2/router/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/router/msbuild/server/server.vcxproj @@ -156,26 +156,6 @@ - - true - true - true - true - true - true - true - ..\..\Callback.ice - - - true - true - true - true - true - true - true - ..\..\Callback.ice - true true @@ -196,26 +176,6 @@ true ..\..\Callback.ice - - true - true - true - true - true - true - true - ..\..\Callback.ice - - - true - true - true - true - true - true - true - ..\..\Callback.ice - true true @@ -242,26 +202,6 @@ - - true - true - true - true - true - true - true - ..\..\Callback.ice - - - true - true - true - true - true - true - true - ..\..\Callback.ice - true true @@ -282,26 +222,6 @@ true ..\..\Callback.ice - - true - true - true - true - true - true - true - ..\..\Callback.ice - - - true - true - true - true - true - true - true - ..\..\Callback.ice - true true diff --git a/cpp/test/Glacier2/router/msbuild/server/server.vcxproj.filters b/cpp/test/Glacier2/router/msbuild/server/server.vcxproj.filters index 0a42d022f7c..65a327d44a7 100644 --- a/cpp/test/Glacier2/router/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Glacier2/router/msbuild/server/server.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {302fd812-f439-41cd-8dd3-86c3df3a906a} - - {cdc99476-a9d5-4a85-bdcf-9ca633ed0a9c} - {7297bba2-be13-4028-9e09-cc924f79663e} - - {23c73998-fb52-4184-8041-d8f82c0c64d2} - {bef5273a-fce4-4049-b012-d0fc3bbaa888} - - {792c0781-4a3b-4bdd-bbf3-146c94865eb7} - {2eb2f1dc-49f6-4a41-81cc-d845c2877f37} - - {2352d28b-a0c9-43af-8e5a-114dffb8abb4} - {044240d2-b7f3-454f-8fb8-05634b73d40f} @@ -91,29 +67,11 @@ {f3316063-3aa4-4e48-b410-32ce932b58e5} - - {5b631fe9-2a25-4632-abbe-eb796cf3dc03} - - - {79de4428-97d2-4fc0-8240-08ba5e8206b0} - - - {ba02aeba-c704-438f-8694-5ea1278d7ab8} - - - {40dc5ac1-6303-4668-a5b0-ec85a3263366} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Glacier2/sessionControl/msbuild/client/client.vcxproj b/cpp/test/Glacier2/sessionControl/msbuild/client/client.vcxproj index 93e2828c5e1..3f2a3b379ab 100644 --- a/cpp/test/Glacier2/sessionControl/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/sessionControl/msbuild/client/client.vcxproj @@ -38,26 +38,6 @@ - - true - true - true - true - true - true - true - ..\..\Session.ice - - - true - true - true - true - true - true - true - ..\..\Session.ice - true true @@ -78,26 +58,6 @@ true ..\..\Session.ice - - true - true - true - true - true - true - true - ..\..\Session.ice - - - true - true - true - true - true - true - true - ..\..\Session.ice - true true @@ -123,26 +83,6 @@ - - true - true - true - true - true - true - true - ..\..\Session.ice - - - true - true - true - true - true - true - true - ..\..\Session.ice - true true @@ -163,26 +103,6 @@ true ..\..\Session.ice - - true - true - true - true - true - true - true - ..\..\Session.ice - - - true - true - true - true - true - true - true - ..\..\Session.ice - true true diff --git a/cpp/test/Glacier2/sessionControl/msbuild/client/client.vcxproj.filters b/cpp/test/Glacier2/sessionControl/msbuild/client/client.vcxproj.filters index c1377c45fc0..76011898832 100644 --- a/cpp/test/Glacier2/sessionControl/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Glacier2/sessionControl/msbuild/client/client.vcxproj.filters @@ -14,27 +14,15 @@ {9f1990d2-3b76-43a3-894b-be360f9c80e8} - - {b71d8b91-e7d7-4536-8d64-4966722e01a2} - {bbfd2aac-e742-4967-bb43-c17ae8b8e807} - - {510cae53-0c53-4756-af57-ca5b45ce19a9} - {f2749281-e736-468b-aa91-58684cd31f79} - - {bfa12151-2192-476d-9647-fe895c6671c1} - {a7e5a47e-4aca-4cba-a08a-83cd9faf5c0b} - - {235f3575-34da-48d5-b677-3e6fbc47def5} - {7255c3f7-4e2c-4465-b0e3-daf2adf7a087} @@ -59,29 +47,11 @@ {bffea33b-5c54-48ba-abe8-cdf22efd1468} - - {d4faddea-080d-4a16-84d7-dac2c1951a06} - - - {8698641d-f4c9-4f2c-8b9e-52338c854edf} - - - {8af4a910-a30a-4410-b85d-e36e9455a799} - - - {c11c748b-1946-411b-8f2d-f100d711d8e3} - Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -94,20 +64,8 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -120,12 +78,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Glacier2/sessionControl/msbuild/server/server.vcxproj b/cpp/test/Glacier2/sessionControl/msbuild/server/server.vcxproj index c5537a7ca51..6892ed35a7d 100644 --- a/cpp/test/Glacier2/sessionControl/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/sessionControl/msbuild/server/server.vcxproj @@ -156,26 +156,6 @@ - - true - true - true - true - true - true - true - ..\..\Session.ice - - - true - true - true - true - true - true - true - ..\..\Session.ice - true true @@ -196,26 +176,6 @@ true ..\..\Session.ice - - true - true - true - true - true - true - true - ..\..\Session.ice - - - true - true - true - true - true - true - true - ..\..\Session.ice - true true @@ -242,26 +202,6 @@ - - true - true - true - true - true - true - true - ..\..\Session.ice - - - true - true - true - true - true - true - true - ..\..\Session.ice - true true @@ -282,26 +222,6 @@ true ..\..\Session.ice - - true - true - true - true - true - true - true - ..\..\Session.ice - - - true - true - true - true - true - true - true - ..\..\Session.ice - true true diff --git a/cpp/test/Glacier2/sessionControl/msbuild/server/server.vcxproj.filters b/cpp/test/Glacier2/sessionControl/msbuild/server/server.vcxproj.filters index ef8041e907c..f394aa2d86b 100644 --- a/cpp/test/Glacier2/sessionControl/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Glacier2/sessionControl/msbuild/server/server.vcxproj.filters @@ -1,12 +1,6 @@  - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -19,12 +13,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - Source Files @@ -46,27 +34,15 @@ {666ef08a-27d2-4cf6-b002-f59585030860} - - {a54827e9-3d9d-446d-a043-b2ec7bb8bbfc} - {ef6e1028-c3c2-4960-ab9c-6dcab10068dd} - - {c401e7ff-7b46-4f1a-b93c-6292d4f977fb} - {5a67af03-075c-4155-ae50-177c18d0bf1c} - - {82565fa4-e010-4a11-8ffe-556d8c07c98c} - {696b7fac-ce50-4b2f-baa7-c575c45ad40b} - - {01241109-c271-4bdf-addb-77f92cda8fb4} - {8d8a3b1e-cba4-4647-bce2-10ce963076a6} @@ -91,26 +67,8 @@ {ac34995d-ef25-4a81-ab5f-8414c72d5c05} - - {1fe874dd-da99-4489-a5d7-803dedd67912} - - - {4a9ae7e1-45e2-4b15-baed-e20f0e965889} - - - {81e05cbd-38ce-426c-bd9d-e069668f52a0} - - - {3e6cd288-91fd-4ac0-8ea0-9c4ddf8340c5} - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - Header Files diff --git a/cpp/test/Glacier2/sessionHelper/msbuild/client/client.vcxproj b/cpp/test/Glacier2/sessionHelper/msbuild/client/client.vcxproj index 9ef13f1d0bf..2819f611b7b 100644 --- a/cpp/test/Glacier2/sessionHelper/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/sessionHelper/msbuild/client/client.vcxproj @@ -38,26 +38,6 @@ - - true - true - true - true - true - true - true - ..\..\Callback.ice - - - true - true - true - true - true - true - true - ..\..\Callback.ice - true true @@ -78,26 +58,6 @@ true ..\..\Callback.ice - - true - true - true - true - true - true - true - ..\..\Callback.ice - - - true - true - true - true - true - true - true - ..\..\Callback.ice - true true @@ -123,26 +83,6 @@ - - true - true - true - true - true - true - true - ..\..\Callback.ice - - - true - true - true - true - true - true - true - ..\..\Callback.ice - true true @@ -163,26 +103,6 @@ true ..\..\Callback.ice - - true - true - true - true - true - true - true - ..\..\Callback.ice - - - true - true - true - true - true - true - true - ..\..\Callback.ice - true true diff --git a/cpp/test/Glacier2/sessionHelper/msbuild/client/client.vcxproj.filters b/cpp/test/Glacier2/sessionHelper/msbuild/client/client.vcxproj.filters index e8aeb3b7b56..994045f9609 100644 --- a/cpp/test/Glacier2/sessionHelper/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Glacier2/sessionHelper/msbuild/client/client.vcxproj.filters @@ -14,27 +14,15 @@ {88bd7ae4-6c8f-44dc-931a-ba357d00b12f} - - {8f989f90-694e-4fa1-bf6c-3bf5fd271428} - {8fc9f9d6-650f-497a-afd2-1a8d6e024ebc} - - {b66a1974-9417-412d-a2af-5b170bfe1d82} - {50dd5049-f2ea-467a-bba2-d0d9c8d59279} - - {055389ac-0ac8-4f0d-b8fb-c0812c773bb3} - {1f525397-1eb1-4c02-bc95-f222f3c8540f} - - {1a869942-bfa4-49e7-b3fc-bacf830f4a90} - {cc80a20c-a151-47f2-8938-42c2ca6cd442} @@ -59,29 +47,11 @@ {01fdf776-1917-46c8-bd0a-5f836deeb0fd} - - {2848c29f-1ac7-4488-af2b-0dde6a110b29} - - - {215a0913-787e-4310-82fe-d33b84b61d82} - - - {df2011e3-2bcf-4597-8312-bbfee3924ef2} - - - {e19e13c7-f8e7-45a9-8716-c21069970ab2} - Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -94,20 +64,8 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -120,12 +78,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Glacier2/sessionHelper/msbuild/server/server.vcxproj b/cpp/test/Glacier2/sessionHelper/msbuild/server/server.vcxproj index 1a33d806197..e356df60738 100644 --- a/cpp/test/Glacier2/sessionHelper/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/sessionHelper/msbuild/server/server.vcxproj @@ -155,26 +155,6 @@ - - true - true - true - true - true - true - true - ..\..\Callback.ice - - - true - true - true - true - true - true - true - ..\..\Callback.ice - true true @@ -195,26 +175,6 @@ true ..\..\Callback.ice - - true - true - true - true - true - true - true - ..\..\Callback.ice - - - true - true - true - true - true - true - true - ..\..\Callback.ice - true true @@ -240,26 +200,6 @@ - - true - true - true - true - true - true - true - ..\..\Callback.ice - - - true - true - true - true - true - true - true - ..\..\Callback.ice - true true @@ -280,26 +220,6 @@ true ..\..\Callback.ice - - true - true - true - true - true - true - true - ..\..\Callback.ice - - - true - true - true - true - true - true - true - ..\..\Callback.ice - true true diff --git a/cpp/test/Glacier2/sessionHelper/msbuild/server/server.vcxproj.filters b/cpp/test/Glacier2/sessionHelper/msbuild/server/server.vcxproj.filters index 27a3784a1fa..7b02f7ed039 100644 --- a/cpp/test/Glacier2/sessionHelper/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Glacier2/sessionHelper/msbuild/server/server.vcxproj.filters @@ -14,27 +14,15 @@ {893a9720-546f-447b-840c-676c4c25407d} - - {9e822431-f253-4588-88d5-fbeea4017928} - {ae45d567-212a-438e-b97f-6fa4cef9cb82} - - {9ea797ca-88bd-4b4d-afd9-e507a346c950} - {9791cfde-3e93-48d1-840d-0d313ebd4079} - - {e2a6d33e-5eaa-4d0e-963f-72b8c30d7f3e} - {add40582-ecb6-4f16-9588-97c9e5931602} - - {57720470-5ab5-450f-9c3a-1f8962685464} - {a341f046-db86-4534-b0e9-83a598b8afad} @@ -59,29 +47,11 @@ {84bd3212-268b-4f34-a192-665b0554940a} - - {f35081e8-8bf4-4794-89b2-82a6420d68cc} - - - {3dbd5f85-1c6d-49b1-8cd8-2319c4275f1b} - - - {5651fca8-a6d0-485d-a6b0-67f51b1ac266} - - - {fc438b99-77ba-4c1a-95a4-07c67f17ea70} - Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -94,20 +64,8 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -120,12 +78,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Glacier2/staticFiltering/msbuild/client/client.vcxproj b/cpp/test/Glacier2/staticFiltering/msbuild/client/client.vcxproj index e4b66cbe7b4..5c239cc63a1 100644 --- a/cpp/test/Glacier2/staticFiltering/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/staticFiltering/msbuild/client/client.vcxproj @@ -39,26 +39,6 @@ - - true - true - true - true - true - true - true - ..\..\Backend.ice - - - true - true - true - true - true - true - true - ..\..\Backend.ice - true true @@ -79,26 +59,6 @@ true ..\..\Backend.ice - - true - true - true - true - true - true - true - ..\..\Backend.ice - - - true - true - true - true - true - true - true - ..\..\Backend.ice - true true @@ -124,26 +84,6 @@ - - true - true - true - true - true - true - true - ..\..\Backend.ice - - - true - true - true - true - true - true - true - ..\..\Backend.ice - true true @@ -164,26 +104,6 @@ true ..\..\Backend.ice - - true - true - true - true - true - true - true - ..\..\Backend.ice - - - true - true - true - true - true - true - true - ..\..\Backend.ice - true true diff --git a/cpp/test/Glacier2/staticFiltering/msbuild/client/client.vcxproj.filters b/cpp/test/Glacier2/staticFiltering/msbuild/client/client.vcxproj.filters index bbe63ef9c11..095c7f345dd 100644 --- a/cpp/test/Glacier2/staticFiltering/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Glacier2/staticFiltering/msbuild/client/client.vcxproj.filters @@ -14,27 +14,15 @@ {252adcc7-7d12-458a-a3ac-f30c3a3a64dc} - - {4dc4b4ae-08e9-4295-86f3-cd05316df403} - {0a5c7672-ab77-4ada-aac6-8f2d27bf1f1c} - - {689cdc97-e190-45bd-b0e7-99ad20112928} - {8f20d10b-bed9-4621-8a0b-8d16809a9d1c} - - {b87ed1f5-191c-42a0-bf30-d399c46e6652} - {229ead42-8c29-4cdb-a5e4-7c5bb8518b9b} - - {42ee8d7b-114f-4f2a-b4a1-730704d0cb06} - {4456a305-c7ef-4af6-a9ab-d3a22fab75db} @@ -59,29 +47,11 @@ {dc565122-b0c2-4ec1-97b1-1e4beb56d8a2} - - {e2f25079-36cf-4397-8ca5-747362ddf68f} - - - {511ebeb8-71d8-4b33-b971-1e7e7cb9ac6d} - - - {f22f0ef8-4d5f-4f9c-9234-27791c8b14c5} - - - {66e5c532-0b52-4c81-b13d-47baf13a5d94} - Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -94,23 +64,11 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - Source Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Glacier2/staticFiltering/msbuild/server/server.vcxproj b/cpp/test/Glacier2/staticFiltering/msbuild/server/server.vcxproj index 542c1206736..446bd665d6f 100644 --- a/cpp/test/Glacier2/staticFiltering/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/staticFiltering/msbuild/server/server.vcxproj @@ -156,26 +156,6 @@ - - true - true - true - true - true - true - true - ..\..\Backend.ice - - - true - true - true - true - true - true - true - ..\..\Backend.ice - true true @@ -196,26 +176,6 @@ true ..\..\Backend.ice - - true - true - true - true - true - true - true - ..\..\Backend.ice - - - true - true - true - true - true - true - true - ..\..\Backend.ice - true true @@ -242,26 +202,6 @@ - - true - true - true - true - true - true - true - ..\..\Backend.ice - - - true - true - true - true - true - true - true - ..\..\Backend.ice - true true @@ -282,26 +222,6 @@ true ..\..\Backend.ice - - true - true - true - true - true - true - true - ..\..\Backend.ice - - - true - true - true - true - true - true - true - ..\..\Backend.ice - true true diff --git a/cpp/test/Glacier2/staticFiltering/msbuild/server/server.vcxproj.filters b/cpp/test/Glacier2/staticFiltering/msbuild/server/server.vcxproj.filters index 47325fc9144..3b526156973 100644 --- a/cpp/test/Glacier2/staticFiltering/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Glacier2/staticFiltering/msbuild/server/server.vcxproj.filters @@ -14,27 +14,15 @@ {e42bb76b-61bb-4de1-a180-52f726f5025e} - - {0c8a0fc4-63f5-43c5-8568-29c22a0b08f8} - {0b5da08b-9a5a-4680-b718-61dfe0682b5c} - - {a630150a-0580-457b-98ae-4c7341b28b64} - {d8efe6d0-49f0-4d68-93da-b6740261a232} - - {9fbf8d43-4ed7-445e-8a8f-49f81667b6f2} - {75c097d1-1e79-4d50-938d-ccce39669afe} - - {6f41db58-6a6d-4fb3-8937-4df936df8a9c} - {b3c97e3c-0bb6-4a89-ab9d-eaae7036a9f0} @@ -59,29 +47,11 @@ {6057165c-726d-4764-be59-fa7778271c4b} - - {a3a1ecc7-35cb-4f92-99ee-629f8819326c} - - - {3a5b33a7-0b47-419c-9802-0d469c573f4a} - - - {9bdd6657-8d6c-4232-bba2-467fb6aec9da} - - - {e4b23f8d-03e1-4315-9c84-c91ef2f29208} - Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -94,23 +64,11 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - Source Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - Header Files diff --git a/cpp/test/Ice/acm/msbuild/client/client.vcxproj b/cpp/test/Ice/acm/msbuild/client/client.vcxproj index c1746bb6d66..e8ec92c8c85 100644 --- a/cpp/test/Ice/acm/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/acm/msbuild/client/client.vcxproj @@ -119,26 +119,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -159,26 +139,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -201,26 +161,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -241,26 +181,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/acm/msbuild/client/client.vcxproj.filters b/cpp/test/Ice/acm/msbuild/client/client.vcxproj.filters index 8b3d8235f6e..42577cba2ae 100644 --- a/cpp/test/Ice/acm/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Ice/acm/msbuild/client/client.vcxproj.filters @@ -14,27 +14,15 @@ {79f1a930-eba9-4433-b456-23b043e25686} - - {5320fe87-21d3-4919-8fcb-7fc36dd76c0a} - {dfc4773c-1b39-4930-b227-2c0020552355} - - {a2d04bed-9209-45a1-9ff8-0da33b1fbddd} - {339228a0-d9f1-4c19-8480-93220e85cfee} - - {51df1588-304b-42ef-bb38-56306cd490c0} - {fb3a3c45-d72d-4380-9eff-0eb4618e3a8b} - - {4ad4b8cb-b3f7-4877-8a60-f8da005f1539} - {7817f391-37c8-4123-a22a-a5536361888d} @@ -59,18 +47,6 @@ {75b0e61d-c5fd-421b-b12d-42f921853a9a} - - {6822dc0b-190c-4874-a9be-100a4bcb7fc8} - - - {c81e3f06-e839-4252-91ad-fb947ea547cf} - - - {45471866-f324-4959-8a3d-d5c794f13120} - - - {4934c470-48b5-4bf6-bf06-6424e131d2c5} - @@ -79,12 +55,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -97,20 +67,8 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/acm/msbuild/server/server.vcxproj b/cpp/test/Ice/acm/msbuild/server/server.vcxproj index 05a1b9101a5..7cd6f60573d 100644 --- a/cpp/test/Ice/acm/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/acm/msbuild/server/server.vcxproj @@ -162,26 +162,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -202,26 +182,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -245,26 +205,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -285,26 +225,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/acm/msbuild/server/server.vcxproj.filters b/cpp/test/Ice/acm/msbuild/server/server.vcxproj.filters index 58973109ad6..865f3a8c598 100644 --- a/cpp/test/Ice/acm/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Ice/acm/msbuild/server/server.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {8f93f1cc-29b8-4532-b366-014416068b16} - - {6fc7df5c-d952-4fcf-baeb-d0e7b34db57d} - {579631a6-1b9d-4176-93e5-128195951279} - - {315f723a-b170-47ec-b884-832df84da3b9} - {1f3aa8cc-e0a1-43b7-a9e8-91b66cde3489} - - {65a76e5c-b66a-4199-a2fb-a04fefac3501} - {9647e436-c1bf-4d03-8ea2-81dda793bebc} - - {bc94783f-33fa-42b8-885d-b38e2bc430a5} - {66b4caaa-2068-4f37-8d9f-65e204b9bc79} @@ -91,29 +67,11 @@ {85414859-a745-4f20-9e92-07c043bc4b8d} - - {54d298f0-734c-40e2-9ff1-546b2477064c} - - - {3fb649b5-8139-4fbf-9b08-4c657e7bbc12} - - - {c91ff58d-41e5-4548-a596-e1e4a7005258} - - - {639c25dc-0e84-4afb-bf2f-59f775502693} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/client/client.vcxproj b/cpp/test/Ice/adapterDeactivation/msbuild/client/client.vcxproj index 3aee899d497..d15039ec36c 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/adapterDeactivation/msbuild/client/client.vcxproj @@ -122,26 +122,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -162,26 +142,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -204,26 +164,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -244,26 +184,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/client/client.vcxproj.filters b/cpp/test/Ice/adapterDeactivation/msbuild/client/client.vcxproj.filters index 2919ca5cf41..4d2a42f9326 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Ice/adapterDeactivation/msbuild/client/client.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {96efcedc-f5bc-4f4a-a00b-b10a892ff54b} - - {5d732714-3364-4bb2-a7a8-a44c7585c2ca} - {12ee2257-2421-4960-9e08-c5b75884f5a5} - - {18a0cbe3-4e2e-496b-85a5-c0ac8c4dfc35} - {5e1edddb-9a1e-477a-a011-46e9e86ff311} - - {c667bc91-f196-482c-8345-0f029e70bc5e} - {d7f2a4f5-f532-456c-a68d-a6bdc2fc2fce} - - {f3fbcb45-ec0c-4eee-b440-022e34750eb0} - {886a250e-5767-4a94-8f30-cd3cc5600828} @@ -91,26 +67,8 @@ {1b5dae94-7b4c-4a84-98e8-5774b4e4de02} - - {a235b35e-bd37-43e0-bae1-7854c3b63927} - - - {6df4cff9-c402-4fc0-bfa5-878250e7a686} - - - {76fdefc9-c514-49ca-b759-58d51f6e667e} - - - {98f08148-367c-42a3-a83e-b87ae5986e82} - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.vcxproj index cca8c07cd2d..d180b006530 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.vcxproj @@ -164,26 +164,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -204,26 +184,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -248,26 +208,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -288,26 +228,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.vcxproj.filters b/cpp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.vcxproj.filters index f93a90241a7..9960da4a75f 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.vcxproj.filters +++ b/cpp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.vcxproj.filters @@ -14,27 +14,15 @@ {23ca0f0a-c667-45c5-88ed-9a6cf3a7bce9} - - {673af659-fe2b-4b7d-93b3-771984168603} - {c2b0b1a0-23ff-48a1-9f37-040f996ab840} - - {a29f2ae0-0d5c-4828-9684-79d60a2bfd17} - {4067d2ef-335f-4609-a13d-721979acc56c} - - {90d3d0b9-e75e-42af-8c66-6f83f8293366} - {c8fd1b90-23fe-4852-b175-a6f2ad5f1746} - - {77fecf0f-b551-422d-b9a4-0ac1666bd104} - {5c9937e8-3e96-4564-afed-61326911a728} @@ -59,18 +47,6 @@ {0c76f885-d502-4984-8a2d-4841823fbe04} - - {9c3837e3-0e81-48c0-a154-c41ccd8c2a05} - - - {3c345d0a-8e92-4f7f-b874-ccf7841faa4f} - - - {2f20fecc-87ce-44f7-8f3e-a4d016038eb8} - - - {db94c07d-7a85-4e1e-8189-27ac0cac234f} - @@ -85,12 +61,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -103,12 +73,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -117,12 +81,6 @@ Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -135,12 +93,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/server/server.vcxproj b/cpp/test/Ice/adapterDeactivation/msbuild/server/server.vcxproj index 295d31039ee..47442a9a9eb 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/adapterDeactivation/msbuild/server/server.vcxproj @@ -163,26 +163,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -203,26 +183,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -247,26 +207,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -287,26 +227,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/server/server.vcxproj.filters b/cpp/test/Ice/adapterDeactivation/msbuild/server/server.vcxproj.filters index 9b3b18cf381..1fe796a98fd 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Ice/adapterDeactivation/msbuild/server/server.vcxproj.filters @@ -10,12 +10,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -28,12 +22,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -42,12 +30,6 @@ Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -60,12 +42,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - @@ -81,27 +57,15 @@ {091c3191-20cb-4719-ab66-bd24cfcd15de} - - {6a1b9e57-f145-485d-9467-e83898782c44} - {6679d53e-04b6-403e-ad64-99133eeb58c1} - - {def25961-2e1f-4800-8155-d557c572e783} - {0bda4dd3-98c7-4747-b44d-81728723852c} - - {167d7279-ff74-40c5-b1f9-66527a1bb84e} - {8ade7bbf-271b-4fa4-ab59-70d03ea3701f} - - {f5867451-0f01-4ada-9d64-7ff4f4311f29} - {f9bd954d-fbbc-4ca4-8d6b-330e15ebe480} @@ -126,18 +90,6 @@ {3cd793c7-4258-413a-a16e-58cf745ae7f9} - - {46c3a3ab-e911-46e6-a724-9e65c8e3c70b} - - - {5fbd50c3-fd13-46c1-95a6-6b5a5bbaf451} - - - {24d4b2bc-15a8-4261-bd87-d6c52a2fec10} - - - {557a9fb1-ab26-47dc-8751-f679fc59ea79} - diff --git a/cpp/test/Ice/admin/msbuild/client/client.vcxproj b/cpp/test/Ice/admin/msbuild/client/client.vcxproj index 70b3e096d40..efbed7f9c21 100644 --- a/cpp/test/Ice/admin/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/admin/msbuild/client/client.vcxproj @@ -162,26 +162,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -202,26 +182,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -245,26 +205,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -285,26 +225,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/admin/msbuild/client/client.vcxproj.filters b/cpp/test/Ice/admin/msbuild/client/client.vcxproj.filters index 14545bd2daa..1d0940ad675 100644 --- a/cpp/test/Ice/admin/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Ice/admin/msbuild/client/client.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {1b6311d3-1842-4cb4-8648-9195a21b3f8b} - - {521c0b4b-29e7-4f3d-b4e2-b5136224c663} - {4d1dcdbb-36f6-448b-b9d1-38ddbc05bbf9} - - {b942ebbd-5edd-4412-a33d-a118a34bd76c} - {194f4944-4b61-47da-b2b4-3156b08b2f84} - - {ba2d9142-380c-41e4-99c9-0b637897fc3c} - {31dfe850-f0ca-47f5-b9bb-21237921c6f7} - - {bfaf1229-f2c4-4924-b17d-fdd289ff240c} - {95c09ce1-7f6f-4d47-b3a1-4cac5068f77c} @@ -91,29 +67,11 @@ {6e54424d-6533-4473-b946-82bb92fb8587} - - {f16d1246-cc5b-4c68-ab27-f51b5a5401a3} - - - {6ba13383-2344-453d-a64b-7bed2f548c4a} - - - {b50ee17a-2417-4d3f-805d-1f1a8c57fc2d} - - - {8604ea21-b5b4-4bcf-aafc-88158917f112} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/admin/msbuild/server/server.vcxproj b/cpp/test/Ice/admin/msbuild/server/server.vcxproj index 25b93c259b1..afd02b0c461 100644 --- a/cpp/test/Ice/admin/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/admin/msbuild/server/server.vcxproj @@ -162,26 +162,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -202,26 +182,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -245,26 +205,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -285,26 +225,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/admin/msbuild/server/server.vcxproj.filters b/cpp/test/Ice/admin/msbuild/server/server.vcxproj.filters index e438fb464b8..7de6886ce34 100644 --- a/cpp/test/Ice/admin/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Ice/admin/msbuild/server/server.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {5ab60e3b-6734-494d-b663-df8058fa0399} - - {e0eab42f-4dd1-4389-bc48-30cc73c60399} - {947a27bf-093f-48de-b49c-08c5fa21d6f9} - - {5768de62-0ca4-40e5-ad23-36ff3bad1f6a} - {aa400bbb-6421-483f-83c8-83bdda1ae74f} - - {3efdc672-aeb1-455f-811e-7dcd0af798a2} - {54fbf58f-c7c2-48c8-bb48-c2eff5d1bd3e} - - {5a8174c7-58b6-4d31-a337-f50946502d00} - {8a1bee22-50b7-47d7-939e-42e6bc79aaef} @@ -91,29 +67,11 @@ {55d920a7-98f0-436c-be18-508095df54ec} - - {87f53762-b35a-4596-bcfe-eb768a2bb414} - - - {b2cc456b-94e5-46b3-9fcc-dad661197a54} - - - {17c7a410-8153-4237-8d83-467ba2bdd03c} - - - {db7e30b1-9a76-411f-9366-d71feb2ad309} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/ami/msbuild/client/client.vcxproj b/cpp/test/Ice/ami/msbuild/client/client.vcxproj index 84c4a6c1a50..da00539cc06 100644 --- a/cpp/test/Ice/ami/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/ami/msbuild/client/client.vcxproj @@ -122,26 +122,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -162,26 +142,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -204,26 +164,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -244,26 +184,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/ami/msbuild/client/client.vcxproj.filters b/cpp/test/Ice/ami/msbuild/client/client.vcxproj.filters index e361c5b7c8c..2b2b7e4427c 100644 --- a/cpp/test/Ice/ami/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Ice/ami/msbuild/client/client.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {d55109e4-eccb-4008-af82-b3f93f4158cf} - - {b7323d5b-1c9f-4138-9921-29a3f844faa5} - {a3fea772-57ac-480f-b655-f1d3f4e52889} - - {68f4b3b6-9b26-4a55-aae1-c2048dbb591e} - {0b6a0269-1d65-4883-852e-9a6b79b9acf8} - - {f63945d4-9a7c-4256-a025-2425cfae1d48} - {b2387025-2c71-4918-bd4a-34b8606b77ee} - - {c0fee20b-8b61-4849-9434-3b4a5be5dc9c} - {8f50abf8-26ca-4593-982f-57179f9f5605} @@ -91,26 +67,8 @@ {6bdd3429-57ff-48cd-aa39-8d7bc4ecdbd4} - - {f191dd9d-f1a7-4962-a672-1d0980d4de1f} - - - {9e0888b0-778c-4b80-9d3e-380b143ac22b} - - - {67ff753c-cbe3-4acb-a85a-90cdd17993e1} - - - {e47179c9-90e4-4035-9115-74470a28028e} - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/ami/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/ami/msbuild/collocated/collocated.vcxproj index de9f85902d5..4dc113e9bfa 100644 --- a/cpp/test/Ice/ami/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/ami/msbuild/collocated/collocated.vcxproj @@ -163,26 +163,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -203,26 +183,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -246,26 +206,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -286,26 +226,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/ami/msbuild/collocated/collocated.vcxproj.filters b/cpp/test/Ice/ami/msbuild/collocated/collocated.vcxproj.filters index ba1d3c8d5ee..f7eb994ad69 100644 --- a/cpp/test/Ice/ami/msbuild/collocated/collocated.vcxproj.filters +++ b/cpp/test/Ice/ami/msbuild/collocated/collocated.vcxproj.filters @@ -10,12 +10,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -28,12 +22,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -49,27 +37,15 @@ {26b2fa0c-1ead-4052-8ad6-3a360562ce45} - - {3851a3b4-bf67-498a-a5ee-eed5dabc9ba4} - {8b94c7bd-1cc2-4ea4-a4da-b67bd2f8d477} - - {010a615e-6eba-48bf-949d-c5cbd28942a7} - {c16ba92d-cf5c-43b6-92cc-e6f025ecd6c1} - - {70ce4e94-ad81-435b-a37f-5ae1bc0571d8} - {fcab0cff-37e0-401e-9f32-7aea905e0b6f} - - {fc883084-dea0-4945-bfb1-8da638456f1e} - {356d04ed-f025-445b-a259-a97aed33b2fa} @@ -94,29 +70,11 @@ {e5df4245-3b99-423c-a3f9-b416852612d3} - - {bc94b910-1c48-4b33-b55c-57b576056d16} - - - {4d33f565-2a52-4073-aa34-8abf38bf449c} - - - {fcb02d5f-d620-4f48-875f-6f8a12d2944f} - - - {f3817a9d-1697-43e3-a3a6-a04853d68e3f} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -129,12 +87,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/ami/msbuild/server/server.vcxproj b/cpp/test/Ice/ami/msbuild/server/server.vcxproj index db86b6f6bb8..fe3009114a6 100644 --- a/cpp/test/Ice/ami/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/ami/msbuild/server/server.vcxproj @@ -162,26 +162,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -202,26 +182,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -245,26 +205,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -285,26 +225,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/ami/msbuild/server/server.vcxproj.filters b/cpp/test/Ice/ami/msbuild/server/server.vcxproj.filters index 1161ffa7c14..10b66889fcd 100644 --- a/cpp/test/Ice/ami/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Ice/ami/msbuild/server/server.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {65502bc6-bc4a-42aa-9552-708d2aaa0eca} - - {06c83a25-539f-439b-a4f5-bbd25865c8a9} - {dd61a5dd-1c84-4c11-8bb0-cb3d1dfa6865} - - {6f000db2-f571-4fec-b95d-086ec2d82f4f} - {fdc8ee40-6d73-4031-a04a-b7757b5aff7b} - - {82ee890b-0940-412d-9167-0c2463829221} - {6538d8cb-7af1-4983-a304-4bcfb4170eda} - - {da281f29-eccb-499e-96e7-0f8a0935f111} - {f6189184-7f7c-402d-acd7-3dbb087a6936} @@ -91,29 +67,11 @@ {faa25879-ea82-48b9-a39b-93ccde73124d} - - {5f0f75b7-2bce-401d-98f6-e67e3a2d13bc} - - - {69452995-f703-4734-b9bd-98237716db84} - - - {522760b4-6cda-4e9a-a68d-e7f6b61a204f} - - - {60146be0-493e-40a5-97cd-48cf09d2d5a7} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/background/msbuild/client/client.vcxproj.filters b/cpp/test/Ice/background/msbuild/client/client.vcxproj.filters index d5f1901bd7e..bb80cd2f19f 100644 --- a/cpp/test/Ice/background/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Ice/background/msbuild/client/client.vcxproj.filters @@ -22,27 +22,15 @@ {1d4655c5-af85-482b-adf5-428d55c507ef} - - {8ceeecff-ffa6-48e3-bac9-5a12e6cddce5} - {ad9ca352-63ed-4558-819e-96a339c1776b} - - {e682d395-7c9c-4977-a6ba-38d05123c291} - {1c31e835-f4b9-423a-b8f8-b59103c0e42f} - - {bef8d123-cd70-493f-97f0-b2a6967139bf} - {8714bc91-2c99-4e2f-963c-52b7dd8e69fe} - - {179c622c-ea12-49d0-9ea0-bf52f41ca89f} - {f2c73dfc-410a-4948-a5ca-f7ec9cc8fa6b} @@ -67,18 +55,6 @@ {1de5e31e-030c-4479-8c5d-b87999e24470} - - {73380dc8-a394-493a-bf9d-f728388ef2f8} - - - {7d2ef8ed-2bea-41ec-9c65-c507f9d7ee2e} - - - {655d484d-bf1c-43d6-9ab9-a6d985591b39} - - - {f6b4cb45-0ca4-427d-9253-2a5fe6d44604} - diff --git a/cpp/test/Ice/background/msbuild/server/server.vcxproj.filters b/cpp/test/Ice/background/msbuild/server/server.vcxproj.filters index 49d2fda55cf..dc871078115 100644 --- a/cpp/test/Ice/background/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Ice/background/msbuild/server/server.vcxproj.filters @@ -22,27 +22,15 @@ {f9f17a9b-fa99-49fe-a1df-c6bb1f02c26e} - - {77e12886-4ebb-4cf5-93cb-2365968707e1} - {a3680ce8-9595-4d06-88e5-c1e704545eeb} - - {0a267269-8a20-4a49-9997-fd85398a3b39} - {338eb60c-577b-48f6-b588-41b6afb72659} - - {d36d1997-a03c-4557-9119-dd14d90207f0} - {170d87c1-c8d5-4544-808b-7f98d3d0d54a} - - {9f0d12f3-7911-4508-9659-b899bbb3b57d} - {52d4a9ae-5cbb-42f7-b34d-ed05922a800c} @@ -67,18 +55,6 @@ {f19705e4-f825-4e7f-a89d-6a5b7a0b7be1} - - {b8492d39-a49b-4d83-bbff-415a5cdd453b} - - - {b0769d87-0ed9-46ac-b8b1-709ace759294} - - - {63da9652-fee3-4965-b6df-71404c6f1d6c} - - - {7294dfba-54ef-44ba-99e0-e573c10dee75} - diff --git a/cpp/test/Ice/background/msbuild/testtransport/testtransport.vcxproj b/cpp/test/Ice/background/msbuild/testtransport/testtransport.vcxproj index 13369bfef75..5ae501a62a3 100644 --- a/cpp/test/Ice/background/msbuild/testtransport/testtransport.vcxproj +++ b/cpp/test/Ice/background/msbuild/testtransport/testtransport.vcxproj @@ -175,26 +175,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -215,26 +195,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -264,26 +224,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -304,26 +244,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/background/msbuild/testtransport/testtransport.vcxproj.filters b/cpp/test/Ice/background/msbuild/testtransport/testtransport.vcxproj.filters index 8872615831e..796a533cfdc 100644 --- a/cpp/test/Ice/background/msbuild/testtransport/testtransport.vcxproj.filters +++ b/cpp/test/Ice/background/msbuild/testtransport/testtransport.vcxproj.filters @@ -14,27 +14,15 @@ {a25fd397-73f5-444a-a479-37c436833445} - - {6a127ab7-a692-476b-b597-ee36ae17c605} - {c5b24cd8-6f22-475e-b065-216b0c1d1b9f} - - {cd293f3e-2b6f-4623-8921-98b36eee15f0} - {17bdd2ab-ea16-4d84-a1f2-63e9b37e0ee1} - - {f90a44e3-e452-4819-81e8-10d9682df990} - {0a263cd9-02a2-4c7c-b856-cf9d5edf9145} - - {6d0200f0-f8b3-441e-a4d4-d41815c4da9c} - {985cfe83-c23e-4bd2-bb2f-0d1baf127a76} @@ -59,18 +47,6 @@ {9a902f68-8050-495e-924f-6e9886d8e85d} - - {8fe9cbb5-a6a8-440e-b655-70044ba73376} - - - {8d352518-5e24-468a-bef4-e55b6e0a1dba} - - - {a72236ec-8e54-45f5-9918-d630f856ad5e} - - - {4d53b22e-a74f-4cba-9869-864afd3522a2} - @@ -94,12 +70,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -112,12 +82,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -141,12 +105,6 @@ Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -159,12 +117,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/binding/msbuild/client/client.vcxproj b/cpp/test/Ice/binding/msbuild/client/client.vcxproj index 006c9ae9f3a..c3a2627d7eb 100644 --- a/cpp/test/Ice/binding/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/binding/msbuild/client/client.vcxproj @@ -122,26 +122,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -162,26 +142,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -204,26 +164,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -244,26 +184,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/binding/msbuild/client/client.vcxproj.filters b/cpp/test/Ice/binding/msbuild/client/client.vcxproj.filters index eacfe34f4bd..c648721ea0b 100644 --- a/cpp/test/Ice/binding/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Ice/binding/msbuild/client/client.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {011d138f-ec63-4383-8a3e-82a9bd127112} - - {30cb6fca-676f-4a7d-a514-856938ae42b5} - {84f9192b-0b53-4981-b9d0-4e94a3c8e922} - - {4ac41d73-082e-4b58-857b-4e439e7e0230} - {fa5608ea-7fab-46d1-8839-523d29f573ec} - - {580bb6ff-adc4-4a38-8cb7-a9499ac718f2} - {62d49e96-6e95-4831-9bca-5c76ee72d421} - - {c492ed11-b1ae-417f-9664-ae7a32f12696} - {f827a6ae-98b0-46ac-8bfb-5f406dfe4da3} @@ -91,26 +67,8 @@ {d96d6629-8302-427c-b8fe-f286e2045b03} - - {6123f527-e7da-43d5-a3c1-e0581e4d9e91} - - - {85ff7146-9c1f-445d-910b-9daab551162f} - - - {65c3b47e-de5f-42f2-8abd-27d6974812e9} - - - {c3c9810e-ab01-4876-abe6-0fd7fd13a1bf} - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/binding/msbuild/server/server.vcxproj b/cpp/test/Ice/binding/msbuild/server/server.vcxproj index 79991d565cf..0bbddd6964e 100644 --- a/cpp/test/Ice/binding/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/binding/msbuild/server/server.vcxproj @@ -162,26 +162,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -202,26 +182,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -245,26 +205,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -285,26 +225,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/binding/msbuild/server/server.vcxproj.filters b/cpp/test/Ice/binding/msbuild/server/server.vcxproj.filters index ff954718cf0..368f58b9856 100644 --- a/cpp/test/Ice/binding/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Ice/binding/msbuild/server/server.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {28471409-d34b-4769-b69b-59eb4aae9a87} - - {1e1731d0-3f08-4474-936b-18fc578543dd} - {291be927-e355-4491-8082-40a0dbeabdc3} - - {414c7796-ba4a-43b2-9481-87d353f26e06} - {37a398af-d44e-4cd0-b246-d4539bc16361} - - {8432926b-3ba4-4d2f-92fc-0d25de8285cb} - {4c2a2c19-1747-45d6-a090-27c45efb2fa5} - - {9e9a91e4-4a6c-43d1-b2b0-f70478efb2af} - {66b80c5a-68fb-48bb-98f6-45015d010356} @@ -91,29 +67,11 @@ {e2fb5f39-30ae-4bcc-b1cf-c8140ff46ada} - - {98616d87-d042-40fd-bb73-eb7769d57be9} - - - {846fc660-5597-4834-973b-ad1328322425} - - - {6bcdbb1c-addf-4a73-9e3e-aaa98210e110} - - - {749047a3-94a5-4e45-93e1-4f1c877af561} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/custom/msbuild/client/client.vcxproj b/cpp/test/Ice/custom/msbuild/client/client.vcxproj index d0112b22230..4b0efc27902 100644 --- a/cpp/test/Ice/custom/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/custom/msbuild/client/client.vcxproj @@ -165,46 +165,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Wstring.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Wstring.ice - true true @@ -245,46 +205,6 @@ true ..\..\Wstring.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Wstring.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Wstring.ice - true true @@ -329,46 +249,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Wstring.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Wstring.ice - true true @@ -409,46 +289,6 @@ true ..\..\Wstring.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Wstring.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Wstring.ice - true true diff --git a/cpp/test/Ice/custom/msbuild/client/client.vcxproj.filters b/cpp/test/Ice/custom/msbuild/client/client.vcxproj.filters index a649d688834..48e9ba500eb 100644 --- a/cpp/test/Ice/custom/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Ice/custom/msbuild/client/client.vcxproj.filters @@ -13,18 +13,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -49,18 +37,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -76,27 +52,15 @@ {89e38e96-2ed9-4e3e-9b89-7956812fd959} - - {a1eda187-dc6e-4c64-b4d5-d1eef14cc670} - {c4d94722-9530-48ee-bcb3-0534549fc0ad} - - {9ed8ef4f-913b-44d2-8caa-e974e1fcf7c9} - {9833a68a-90d8-4da4-ac68-ed534856064d} - - {46c4360a-5305-4987-be77-4d7f41bde082} - {bfc61166-f2f6-46a6-9029-95a6f3430122} - - {a01746d8-843c-4411-9716-32519deca97c} - {afc8f10b-3a32-43f7-b166-b039062aad79} @@ -121,18 +85,6 @@ {0de2184c-d833-4fed-b0a3-b6060254bcf4} - - {d099dace-02ec-43ff-9512-f3cd4b325779} - - - {3bd88573-c182-4ec9-8a4b-815b0370b076} - - - {5c220e92-2df0-4f7a-abcd-10edab6ba729} - - - {4839ebb1-27ac-48e8-9f89-5e2944b66832} - @@ -141,18 +93,6 @@ Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -177,18 +117,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/custom/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/custom/msbuild/collocated/collocated.vcxproj index ee4428a9e5e..b81c4101bcd 100644 --- a/cpp/test/Ice/custom/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/custom/msbuild/collocated/collocated.vcxproj @@ -166,46 +166,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Wstring.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Wstring.ice - true true @@ -246,46 +206,6 @@ true ..\..\Wstring.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Wstring.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Wstring.ice - true true @@ -332,46 +252,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Wstring.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Wstring.ice - true true @@ -412,46 +292,6 @@ true ..\..\Wstring.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Wstring.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Wstring.ice - true true diff --git a/cpp/test/Ice/custom/msbuild/collocated/collocated.vcxproj.filters b/cpp/test/Ice/custom/msbuild/collocated/collocated.vcxproj.filters index 43504fde076..8a884766c7f 100644 --- a/cpp/test/Ice/custom/msbuild/collocated/collocated.vcxproj.filters +++ b/cpp/test/Ice/custom/msbuild/collocated/collocated.vcxproj.filters @@ -7,18 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -43,18 +31,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - Source Files @@ -82,27 +58,15 @@ {8995a838-bfc7-40a8-bad1-4aedfd24393f} - - {be7d62c6-96cd-4d5f-a6a2-3dde33e65e75} - {6a2c5c6b-5616-4efe-a563-4971658c753a} - - {43eea43c-1fea-4c1d-aae0-b54ee4a59aa2} - {5d7731b1-9a53-4de3-b9b2-3568e9406176} - - {50c552bf-5b68-414c-bdca-7a72fb41d4ac} - {20c6d47c-16ab-4eb6-92bb-4c3666ab3951} - - {40d17514-5098-4ed7-9bc3-a90645e59191} - {8980efd4-75c0-4231-97b1-048c2d949f86} @@ -127,32 +91,8 @@ {4a84c1bc-85f2-4de5-aa84-50504256370d} - - {17bfe2c9-739e-4a76-9ead-8c1c160937ae} - - - {f6cdb0fb-ab2a-482b-a88a-cf69aed51965} - - - {b53a75ad-eada-44c0-ad39-25eb2ea496e0} - - - {29455be0-30b0-4714-b7d3-a30f85908ffa} - - - Header Files\x64\Cpp11-Debug - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -177,18 +117,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - Header Files diff --git a/cpp/test/Ice/custom/msbuild/server/server.vcxproj b/cpp/test/Ice/custom/msbuild/server/server.vcxproj index 970dddcc5d3..e332cd2292d 100644 --- a/cpp/test/Ice/custom/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/custom/msbuild/server/server.vcxproj @@ -165,46 +165,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Wstring.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Wstring.ice - true true @@ -245,46 +205,6 @@ true ..\..\Wstring.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Wstring.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Wstring.ice - true true @@ -331,46 +251,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Wstring.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Wstring.ice - true true @@ -411,46 +291,6 @@ true ..\..\Wstring.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Wstring.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Wstring.ice - true true diff --git a/cpp/test/Ice/custom/msbuild/server/server.vcxproj.filters b/cpp/test/Ice/custom/msbuild/server/server.vcxproj.filters index f8ec1a32ba5..88b771dfe7e 100644 --- a/cpp/test/Ice/custom/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Ice/custom/msbuild/server/server.vcxproj.filters @@ -7,18 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -43,18 +31,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - Source Files @@ -79,27 +55,15 @@ {ae4a2fcf-e968-4112-afe7-644da731364e} - - {426bfa81-f09b-4038-b3fc-790fa457aa60} - {13d3f7cf-fdc3-4c38-85a5-0f2a2dcc2dab} - - {d697d023-8be8-4461-8180-f07858cf9a03} - {28705561-e7ce-4859-853c-76152bd86d7d} - - {ca93c5e5-75ee-4fd1-b947-d5c13cdc11c1} - {1d6b23ff-ae30-44c3-8e1f-9a3c9e8fbdf1} - - {12c399ef-c8da-405a-9e42-2922f9d0db89} - {99d12303-12b6-4420-8844-89493c2e08e3} @@ -124,35 +88,11 @@ {ba525aa7-1228-4a59-b83e-6b322aed3dd7} - - {2202dde7-2887-42c5-ac19-1f9fbdd547be} - - - {32e6a070-517e-4fea-bb3b-a9512c64a3c1} - - - {defa0bf7-c648-4eda-9299-17e85fe47c53} - - - {3a0281f4-0e3f-4f86-8ffc-0f644f64f2fa} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -177,18 +117,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - Header Files diff --git a/cpp/test/Ice/custom/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/custom/msbuild/serveramd/serveramd.vcxproj index c079d3079b8..7937ebe4f52 100644 --- a/cpp/test/Ice/custom/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/custom/msbuild/serveramd/serveramd.vcxproj @@ -161,46 +161,6 @@ - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\WstringAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\WstringAMD.ice - true true @@ -241,46 +201,6 @@ true ..\..\WstringAMD.ice - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\WstringAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\WstringAMD.ice - true true @@ -327,46 +247,6 @@ - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\WstringAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\WstringAMD.ice - true true @@ -407,46 +287,6 @@ true ..\..\WstringAMD.ice - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\WstringAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\WstringAMD.ice - true true diff --git a/cpp/test/Ice/custom/msbuild/serveramd/serveramd.vcxproj.filters b/cpp/test/Ice/custom/msbuild/serveramd/serveramd.vcxproj.filters index 18bfe1b0930..40db83892e3 100644 --- a/cpp/test/Ice/custom/msbuild/serveramd/serveramd.vcxproj.filters +++ b/cpp/test/Ice/custom/msbuild/serveramd/serveramd.vcxproj.filters @@ -7,18 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -43,18 +31,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - Source Files @@ -79,27 +55,15 @@ {a7d82ea7-f223-43c9-8699-2ef0599cc607} - - {e35ade6f-9adb-440e-9b68-31029d5156dc} - {736ad4c1-0db0-4aa7-b540-6cf8ae74237f} - - {5871be63-3109-4e92-9f23-4b094d57aee9} - {0b50609a-94a6-4e40-a9cc-c7c1c5e8d8ff} - - {1bc4b9f0-6ce5-4c49-aced-9ecce1dff867} - {370fe038-ee5b-4e9c-a387-a76756eec5ac} - - {71f85701-f6a5-4010-a775-82903a19967d} - {30ee9642-01c5-4737-8e74-f1cbbd230d2b} @@ -124,35 +88,11 @@ {5b94b7c8-71e6-4053-b23f-ae592a77c279} - - {ef865e0a-3e8f-46e6-9b81-86375b2aa14c} - - - {929a14e7-bf28-4ffe-99e4-92174d69e1c5} - - - {2e53373b-29ee-40cf-b213-a3e951008245} - - - {df8a18db-5e81-4cdc-8df6-3ffbc1d119e7} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -177,18 +117,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - Header Files diff --git a/cpp/test/Ice/defaultServant/msbuild/client.vcxproj b/cpp/test/Ice/defaultServant/msbuild/client.vcxproj index 6f56abc0a23..3a1ef793d5b 100644 --- a/cpp/test/Ice/defaultServant/msbuild/client.vcxproj +++ b/cpp/test/Ice/defaultServant/msbuild/client.vcxproj @@ -160,26 +160,6 @@ - - true - true - true - true - true - true - true - ..\Test.ice - - - true - true - true - true - true - true - true - ..\Test.ice - true true @@ -200,26 +180,6 @@ true ..\Test.ice - - true - true - true - true - true - true - true - ..\Test.ice - - - true - true - true - true - true - true - true - ..\Test.ice - true true @@ -245,26 +205,6 @@ - - true - true - true - true - true - true - true - ..\Test.ice - - - true - true - true - true - true - true - true - ..\Test.ice - true true @@ -285,26 +225,6 @@ true ..\Test.ice - - true - true - true - true - true - true - true - ..\Test.ice - - - true - true - true - true - true - true - true - ..\Test.ice - true true diff --git a/cpp/test/Ice/defaultServant/msbuild/client.vcxproj.filters b/cpp/test/Ice/defaultServant/msbuild/client.vcxproj.filters index a299b812718..e6a09a8ec54 100644 --- a/cpp/test/Ice/defaultServant/msbuild/client.vcxproj.filters +++ b/cpp/test/Ice/defaultServant/msbuild/client.vcxproj.filters @@ -10,12 +10,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -28,12 +22,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -49,27 +37,15 @@ {7625eab6-49bc-4b3e-85bd-adc11280946c} - - {f4f4c61b-7542-4da2-ac1e-bcee1392b99f} - {8f415f4f-46c7-4de8-a126-18fca623f54a} - - {1e7d8792-05ba-4d96-819e-06d39c148e27} - {978bcffc-345a-45fe-b1f9-47d246197289} - - {3214eed7-24b8-43b6-bbdc-9e4e77b81f9a} - {cf24f072-d946-456a-8892-fe726bd47008} - - {e9224bfe-cad5-49dc-bf76-09d93cde8e56} - {b2ff09dd-0788-4ea0-a006-ecffb0b8c551} @@ -94,26 +70,8 @@ {4e48d0d4-9242-4524-8841-5961af553ce2} - - {9342f2ec-0bf4-49ff-94a2-b5ef4f4c5b46} - - - {74caa1bb-e04d-426b-b620-ee5993f67bc4} - - - {b6323b75-6053-4ecb-bf57-6096d3bfef8d} - - - {6b67d5f3-661d-4984-bc64-5040970dea45} - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/defaultValue/msbuild/client.vcxproj b/cpp/test/Ice/defaultValue/msbuild/client.vcxproj index c401b350792..0996b621e98 100644 --- a/cpp/test/Ice/defaultValue/msbuild/client.vcxproj +++ b/cpp/test/Ice/defaultValue/msbuild/client.vcxproj @@ -159,26 +159,6 @@ - - true - true - true - true - true - true - true - ..\Test.ice - - - true - true - true - true - true - true - true - ..\Test.ice - true true @@ -199,26 +179,6 @@ true ..\Test.ice - - true - true - true - true - true - true - true - ..\Test.ice - - - true - true - true - true - true - true - true - ..\Test.ice - true true @@ -244,26 +204,6 @@ - - true - true - true - true - true - true - true - ..\Test.ice - - - true - true - true - true - true - true - true - ..\Test.ice - true true @@ -284,26 +224,6 @@ true ..\Test.ice - - true - true - true - true - true - true - true - ..\Test.ice - - - true - true - true - true - true - true - true - ..\Test.ice - true true diff --git a/cpp/test/Ice/defaultValue/msbuild/client.vcxproj.filters b/cpp/test/Ice/defaultValue/msbuild/client.vcxproj.filters index 49f66a3532d..17e9886fe8c 100644 --- a/cpp/test/Ice/defaultValue/msbuild/client.vcxproj.filters +++ b/cpp/test/Ice/defaultValue/msbuild/client.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {e8321f1c-c91b-4db3-ae46-89f31e1cdc38} - - {4aee0fea-31a6-46a0-b234-d43fd08cbb0f} - {3d2409b3-b9f5-4bd6-b3d7-1de804677a7d} - - {33a27922-32cb-46ce-848e-3f1ce666b1f4} - {d19afcff-48ed-45e8-8023-8fff1a46bca7} - - {6188d04e-6b5d-402e-9915-dc17b35e8d5d} - {936acff8-bfd0-4646-a4c1-c2ff67f4bbf7} - - {b45f525c-86d9-4809-81b9-d0260b68e3fd} - {be1837bf-c3e8-421a-a1b1-b9ae75a023f4} @@ -91,26 +67,8 @@ {a0d60cfd-ece4-47be-bae0-b2b2d747b7e6} - - {1b6ff900-dc14-43ba-8392-104a82aeded1} - - - {957cfbed-7115-4ee8-8f28-2949ed2d6fe5} - - - {47ed3dc5-9f3f-4dd5-a0ac-f5dca4a83c19} - - - {9d692a88-3b50-4cae-af12-23f10474dde5} - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/dispatcher/msbuild/client/client.vcxproj b/cpp/test/Ice/dispatcher/msbuild/client/client.vcxproj index 45cfe88e5c7..ea871edb66a 100644 --- a/cpp/test/Ice/dispatcher/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/dispatcher/msbuild/client/client.vcxproj @@ -163,26 +163,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -203,26 +183,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -246,26 +206,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -286,26 +226,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/dispatcher/msbuild/client/client.vcxproj.filters b/cpp/test/Ice/dispatcher/msbuild/client/client.vcxproj.filters index 459c7a705ab..81f79804bbc 100644 --- a/cpp/test/Ice/dispatcher/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Ice/dispatcher/msbuild/client/client.vcxproj.filters @@ -10,12 +10,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -28,12 +22,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -49,27 +37,15 @@ {9f454c5a-c96a-4c87-bea7-f33b4f8d2c86} - - {a6ee91f9-127e-47d8-936c-2b84bce8314f} - {7185b435-f1f8-4d65-bc86-2930f96faf9c} - - {d1e8d3c3-dc3b-4b99-b621-52a522aa6551} - {e0293e38-3b33-4a46-8460-6171c9a83d0f} - - {94b5e53e-c246-42ef-8634-5b3df7f900da} - {71bd269b-739c-40a2-b6e1-e41cf45bec05} - - {d72e6802-5e40-4218-8ebc-3385ef355781} - {2ea154ca-3837-4d6e-aa49-d5fcb1158440} @@ -94,29 +70,11 @@ {b0059172-c4a1-42ec-98a7-6edc769c9ed8} - - {28ffc489-d8ee-4000-b1c5-32b8230cb7fc} - - - {09303c82-58f3-47d0-8f58-41b017987a9b} - - - {fdf3cd88-b157-434f-8722-07e6a939ffa5} - - - {430d6001-a6a8-45b9-bb68-30d47aed255b} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -129,12 +87,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/dispatcher/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/dispatcher/msbuild/collocated/collocated.vcxproj index 9770c262322..564fb4841ae 100644 --- a/cpp/test/Ice/dispatcher/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/dispatcher/msbuild/collocated/collocated.vcxproj @@ -163,26 +163,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -203,26 +183,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -247,26 +207,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -287,26 +227,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/dispatcher/msbuild/collocated/collocated.vcxproj.filters b/cpp/test/Ice/dispatcher/msbuild/collocated/collocated.vcxproj.filters index a4513137e21..5e774c63f48 100644 --- a/cpp/test/Ice/dispatcher/msbuild/collocated/collocated.vcxproj.filters +++ b/cpp/test/Ice/dispatcher/msbuild/collocated/collocated.vcxproj.filters @@ -13,12 +13,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -31,12 +25,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -52,27 +40,15 @@ {093a2357-e211-4dcd-93d1-99e1d788cd42} - - {e3d18ee4-186a-4991-85bc-0ab8879fb85b} - {885ab2c2-9fa1-4a0c-bfd0-df96764df6bf} - - {1b4b215a-4b4a-454b-a5c8-2594b6533ff4} - {2ae84329-b1ea-480a-91d6-77cafe2b8412} - - {adbbc5b6-6ca3-4af8-bd3c-49cc7c21704a} - {742a5fae-91fd-486d-8674-e9f27766f666} - - {e7e1f091-fdfd-4c1e-b1be-82857cc54843} - {2f62796e-f8ba-4436-8433-49def0092f71} @@ -97,18 +73,6 @@ {b7422207-2891-4d7e-9618-da453ed33e53} - - {2060b884-dbc3-450c-920a-4f9d83730ebb} - - - {40e33161-0f07-443d-8f99-0aa071d99314} - - - {0fb0919f-3fe8-4f49-b486-da6d5ba712ae} - - - {c9e7ecd5-d192-495a-90f3-60564d1ca8b5} - @@ -117,12 +81,6 @@ Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -135,12 +93,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/dispatcher/msbuild/server/server.vcxproj b/cpp/test/Ice/dispatcher/msbuild/server/server.vcxproj index a350adac02e..55c70f1d35c 100644 --- a/cpp/test/Ice/dispatcher/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/dispatcher/msbuild/server/server.vcxproj @@ -162,26 +162,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -202,26 +182,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -246,26 +206,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -286,26 +226,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/dispatcher/msbuild/server/server.vcxproj.filters b/cpp/test/Ice/dispatcher/msbuild/server/server.vcxproj.filters index 03d40ed5578..c27d9873296 100644 --- a/cpp/test/Ice/dispatcher/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Ice/dispatcher/msbuild/server/server.vcxproj.filters @@ -10,12 +10,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -28,12 +22,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -49,27 +37,15 @@ {f087ba95-2f1a-4a5c-bfcc-bb51ed6ee2f2} - - {5f23262f-1e94-4692-b711-cb83de0269d4} - {29788b93-089e-4887-aa64-9bf4b3392896} - - {72ef4654-2bf5-4496-801e-a96d5b351d85} - {98afe211-747d-4c02-8c3d-6c898403dbe8} - - {a20462f0-f730-4fb1-8c51-3d665531f78f} - {5a8c0c83-5253-47de-ba1a-fb287c1a7126} - - {57a7fa92-8e4d-4b17-b7fc-0e53ec6da420} - {510749e2-b9d2-4a36-85df-32a33f3aeb94} @@ -94,18 +70,6 @@ {8f35a987-e85a-4448-80ab-7042c0f2b36b} - - {787f9d49-ab84-49f5-8344-699d824f103d} - - - {b58e953e-8e5f-4f8b-9913-05e6f4200de8} - - - {73b6af65-3cb9-4ac3-a650-43fd8a195d33} - - - {bde4b4da-476d-40ff-aac1-e3ef82a0e794} - @@ -114,12 +78,6 @@ Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -132,12 +90,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/echo/msbuild/server.vcxproj b/cpp/test/Ice/echo/msbuild/server.vcxproj index 507f84aeb77..5770537104c 100644 --- a/cpp/test/Ice/echo/msbuild/server.vcxproj +++ b/cpp/test/Ice/echo/msbuild/server.vcxproj @@ -162,26 +162,6 @@ - - true - true - true - true - true - true - true - ..\Test.ice - - - true - true - true - true - true - true - true - ..\Test.ice - true true @@ -202,26 +182,6 @@ true ..\Test.ice - - true - true - true - true - true - true - true - ..\Test.ice - - - true - true - true - true - true - true - true - ..\Test.ice - true true @@ -245,26 +205,6 @@ - - true - true - true - true - true - true - true - ..\Test.ice - - - true - true - true - true - true - true - true - ..\Test.ice - true true @@ -285,26 +225,6 @@ true ..\Test.ice - - true - true - true - true - true - true - true - ..\Test.ice - - - true - true - true - true - true - true - true - ..\Test.ice - true true diff --git a/cpp/test/Ice/echo/msbuild/server.vcxproj.filters b/cpp/test/Ice/echo/msbuild/server.vcxproj.filters index 499cbb85e05..2885abdd350 100644 --- a/cpp/test/Ice/echo/msbuild/server.vcxproj.filters +++ b/cpp/test/Ice/echo/msbuild/server.vcxproj.filters @@ -14,27 +14,15 @@ {acaf1bd9-ff60-4a2a-817c-6c12736e10c6} - - {e028a5e8-2326-4c00-8fd7-ef97904a9d56} - {6c414908-5a00-433f-ada1-ce6bf581aaa5} - - {90991005-8670-4ed7-95c7-a31c13c8235a} - {bbe9b512-3df1-45d7-a73b-e32ce780f0e1} - - {21ffbd0f-2322-40f5-8dd5-224b93eeeb00} - {40e10c83-22d6-4a9e-91e5-1b9cb155afa7} - - {e1a1a2a9-00f2-4a7c-93f0-3e58d7ebedae} - {6ff07790-9616-47cf-bae4-b1564488ebd3} @@ -59,18 +47,6 @@ {d96e9cfe-1a46-4551-802b-17389f2a5acc} - - {44cc9453-e7d7-42f7-a261-e33bf1221121} - - - {e51d6f42-e69e-4673-917e-df67f1627802} - - - {2807454e-ef9d-4e55-a5a1-6fe8548c01fa} - - - {3d618eaf-bffe-4b1e-97ec-d0df18aaccad} - @@ -79,12 +55,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -97,23 +67,11 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/enums/msbuild/client/client.vcxproj b/cpp/test/Ice/enums/msbuild/client/client.vcxproj index e2e7dd7aa74..d98e7c35113 100644 --- a/cpp/test/Ice/enums/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/enums/msbuild/client/client.vcxproj @@ -162,26 +162,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -202,26 +182,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -244,26 +204,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -284,26 +224,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/enums/msbuild/client/client.vcxproj.filters b/cpp/test/Ice/enums/msbuild/client/client.vcxproj.filters index fb143b7ed1d..511108e39d4 100644 --- a/cpp/test/Ice/enums/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Ice/enums/msbuild/client/client.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {7c99f847-02e0-495a-86f3-72976619760f} - - {c67d7ea3-6952-4230-8921-86c8db7622ce} - {28d4164e-b133-4668-a632-fbea3be9b455} - - {010ad9ed-375e-436f-880a-021942f7624d} - {6e8bb506-baa1-447b-a44b-d08e9321ca32} - - {59ac0107-4bdf-4a27-9df0-c5c3211c3861} - {8e412a8f-1fd2-4491-a7f9-82b290e38989} - - {dc352d97-a9b5-4cc9-8a5d-5a5e8955d679} - {8f0d2ecb-f588-4c21-b05c-86d8b8c583ca} @@ -91,26 +67,8 @@ {7fb7a4f1-f68d-4a70-9278-3cf482da287e} - - {9877df0f-e5c2-4474-ab7d-804ddd99dd41} - - - {2b0dd89a-4abc-47d8-a407-087a23902cd5} - - - {267e2153-230b-4a84-8452-1b40c115079b} - - - {0e443553-ebb6-47a8-aa4c-a82fdcc9ec6a} - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/enums/msbuild/server/server.vcxproj b/cpp/test/Ice/enums/msbuild/server/server.vcxproj index 1ca4794ad01..53d7e9fbbac 100644 --- a/cpp/test/Ice/enums/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/enums/msbuild/server/server.vcxproj @@ -161,26 +161,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -201,26 +181,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -244,26 +204,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -284,26 +224,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/enums/msbuild/server/server.vcxproj.filters b/cpp/test/Ice/enums/msbuild/server/server.vcxproj.filters index 8d6a7544bc4..1938efc6737 100644 --- a/cpp/test/Ice/enums/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Ice/enums/msbuild/server/server.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {a1b4bba4-668a-4f2b-8b97-4f2539344fe4} - - {815ee13b-7770-4fff-a7c5-bf54ac9692fe} - {67932bbd-6e77-4bc9-a244-3f7419de6c1b} - - {47b0f0ec-60ec-48c7-b8df-4569d5ac0e90} - {a5346066-d152-4744-b774-f322e6de8459} - - {17c9aa24-7168-468b-ae15-420fb717dbc8} - {bceb0de4-9588-43ff-96b1-55865fdf7878} - - {724e750c-ce89-4749-a00c-693018453fc5} - {ba66a383-efa8-44e7-814d-3763c6c01961} @@ -91,29 +67,11 @@ {588ff47d-d280-4048-8bf6-90f6d3766b7e} - - {7b0c5281-774f-472d-bef5-1b832035012c} - - - {a4e7cc1a-82fd-4de2-9dac-57476a6aa791} - - - {0d247e08-19be-4fa4-acbd-8fead541d32d} - - - {2b652cc3-c257-406e-8801-31b7bfa15613} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/exceptions/msbuild/client/client.vcxproj b/cpp/test/Ice/exceptions/msbuild/client/client.vcxproj index e7d0079869a..aca76599bbb 100644 --- a/cpp/test/Ice/exceptions/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/client/client.vcxproj @@ -123,26 +123,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -163,26 +143,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -205,26 +165,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -245,26 +185,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/exceptions/msbuild/client/client.vcxproj.filters b/cpp/test/Ice/exceptions/msbuild/client/client.vcxproj.filters index 42b2d27439a..d33f1ca48f8 100644 --- a/cpp/test/Ice/exceptions/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Ice/exceptions/msbuild/client/client.vcxproj.filters @@ -10,12 +10,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -28,12 +22,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -49,27 +37,15 @@ {ecf2ff6c-22a3-46fc-8f9f-60a076b91e8a} - - {a9c498bc-6193-408b-842e-c5a8a55e9222} - {ee5152f4-f836-4e8e-9319-0dd6298c6e99} - - {17c361c3-8ba4-4270-9825-a20c21c42186} - {b836b66d-abcb-481d-bc61-7ae6db203b1e} - - {55bf0530-b4a1-4d41-a4bb-f1069206a2b6} - {f200fa29-63cd-4abd-af52-8ede6455b721} - - {99202d1c-db9d-4c3a-a6cf-70e34994dba1} - {ec742bca-69aa-465e-9023-4934a294c728} @@ -94,26 +70,8 @@ {67d28317-93df-4f15-a675-876aad468072} - - {11555442-0af8-4ea9-aa7c-274d1d00aa9b} - - - {3ab660f1-0c8a-4481-9c01-260f7f0aa16c} - - - {b3916d8e-4a06-4706-add6-6cc917e7d791} - - - {1e93639a-c91e-476d-8798-ed0271fc12ae} - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/exceptions/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/exceptions/msbuild/collocated/collocated.vcxproj index 1bf29901009..667920c1d08 100644 --- a/cpp/test/Ice/exceptions/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/collocated/collocated.vcxproj @@ -163,26 +163,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -203,26 +183,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -246,26 +206,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -286,26 +226,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/exceptions/msbuild/collocated/collocated.vcxproj.filters b/cpp/test/Ice/exceptions/msbuild/collocated/collocated.vcxproj.filters index 93bbb59cffd..a85c59537b6 100644 --- a/cpp/test/Ice/exceptions/msbuild/collocated/collocated.vcxproj.filters +++ b/cpp/test/Ice/exceptions/msbuild/collocated/collocated.vcxproj.filters @@ -13,12 +13,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -31,12 +25,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -52,27 +40,15 @@ {88093f21-51e4-4a0b-a5b9-45901ceaf1c5} - - {750ff549-ff2a-4015-872e-234ab3946fc9} - {050e033a-3106-444a-adc0-f148cfe0ad2c} - - {bc0e9aee-ae40-456c-bd14-9ee1f62d65ad} - {938fb9af-bc3c-44bd-8b91-7e0149553aa2} - - {6cd499b5-24f1-493f-b7db-ff4f0b49c55c} - {ea45542a-a232-4172-b2ba-69ac015c6387} - - {55f55c1a-e96b-445b-8a13-e3666240f4c6} - {c42a765c-d6a0-41d9-bda3-f1ce6bb1a3c9} @@ -97,29 +73,11 @@ {ed89cf68-766b-4719-b0d7-327a6135ed8b} - - {cf9bfa6f-c634-430b-a74c-c0425c56872e} - - - {db665118-12be-4c21-8538-79f640601f88} - - - {f70a6f2e-db5d-4b10-8edf-a27d0c6b16d8} - - - {df5af41d-095c-4098-8f2f-4fa714dce6ab} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -132,12 +90,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/exceptions/msbuild/server/server.vcxproj b/cpp/test/Ice/exceptions/msbuild/server/server.vcxproj index c5b99ca2857..179afc3e326 100644 --- a/cpp/test/Ice/exceptions/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/server/server.vcxproj @@ -162,26 +162,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -202,26 +182,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -245,26 +205,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -285,26 +225,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/exceptions/msbuild/server/server.vcxproj.filters b/cpp/test/Ice/exceptions/msbuild/server/server.vcxproj.filters index 4842b5b0344..b379f0e6a29 100644 --- a/cpp/test/Ice/exceptions/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Ice/exceptions/msbuild/server/server.vcxproj.filters @@ -6,12 +6,6 @@ - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -24,12 +18,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -45,27 +33,15 @@ {ff997fc1-6582-412c-8439-0b1bc51ddb56} - - {6a8739c9-cf0a-49e5-933d-d36a1704033b} - {f4026076-c11d-4ea8-8af6-3ef9067ae509} - - {5bf68a27-0993-43fb-b485-346ce1cd8cac} - {86575bdb-560f-4dc0-8f88-34b671beab65} - - {2797fabe-ba44-4d2c-b389-c603ff90e84c} - {22d8d346-26e8-4735-a9f3-95ac1ead3c40} - - {fbd0c7e7-5c67-464e-bfc7-d95c5e9fcead} - {a0115b51-ab10-4e95-8e3a-54ade55641b1} @@ -90,27 +66,9 @@ {5f91d1d2-f4db-4dee-b79a-8bf1bf071e90} - - {eef44824-ed36-4512-a650-443b09079f1d} - - - {bc30bfeb-bbcd-4dbb-b95c-3dddc2ac6a02} - - - {aef9093e-c9d3-4d17-84da-84ca20c3922c} - - - {5e158636-505d-40f8-b05b-6dd95377e083} - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/exceptions/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/exceptions/msbuild/serveramd/serveramd.vcxproj index d442c460517..c3dae8cd36a 100644 --- a/cpp/test/Ice/exceptions/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/serveramd/serveramd.vcxproj @@ -167,26 +167,6 @@ - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - true true @@ -207,26 +187,6 @@ true ..\..\TestAMD.ice - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - true true @@ -250,26 +210,6 @@ - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - true true @@ -290,26 +230,6 @@ true ..\..\TestAMD.ice - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - true true diff --git a/cpp/test/Ice/exceptions/msbuild/serveramd/serveramd.vcxproj.filters b/cpp/test/Ice/exceptions/msbuild/serveramd/serveramd.vcxproj.filters index c86ea983c63..22b6a18054e 100644 --- a/cpp/test/Ice/exceptions/msbuild/serveramd/serveramd.vcxproj.filters +++ b/cpp/test/Ice/exceptions/msbuild/serveramd/serveramd.vcxproj.filters @@ -10,12 +10,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -28,23 +22,11 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -57,12 +39,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - @@ -78,27 +54,15 @@ {ae3e6cad-0a5c-481e-951f-24059fa9034b} - - {9df84066-a896-4ad4-91b7-527c2436266c} - {c2b5c20d-c96f-4f16-b3f8-717fe0fefe03} - - {90d7c434-c89c-4fda-b158-fe5d49992997} - {50e224ac-2e80-472e-b3f4-58db2c0eec8b} - - {06e5920b-23a0-4546-a2dd-f5a0d46d532e} - {c4562478-9f09-4c24-8b99-dede3451fdf4} - - {b3cae7f8-be4d-46fe-855d-cfc86932e8e2} - {a812c1b4-1905-423a-8dcd-195ce94ed310} @@ -123,18 +87,6 @@ {a310c5fd-b6ef-43c7-873c-540a889179a4} - - {129ba7cc-551a-4875-a1d5-387fa16c534a} - - - {3e0535c4-8002-48ba-98a7-f3f00d321dcb} - - - {fcdaa20e-0a06-4677-b747-c213fc27d9af} - - - {ece5453c-83ce-425e-b08d-ce595bc6943c} - diff --git a/cpp/test/Ice/facets/msbuild/client/client.vcxproj b/cpp/test/Ice/facets/msbuild/client/client.vcxproj index a2b3edd0bb7..626341b1bfb 100644 --- a/cpp/test/Ice/facets/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/facets/msbuild/client/client.vcxproj @@ -122,26 +122,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -162,26 +142,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -204,26 +164,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -244,26 +184,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/facets/msbuild/client/client.vcxproj.filters b/cpp/test/Ice/facets/msbuild/client/client.vcxproj.filters index f72d3fc5b74..b81fc4de106 100644 --- a/cpp/test/Ice/facets/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Ice/facets/msbuild/client/client.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {08cc2525-bca3-41de-a670-20c85230f95c} - - {ee435e35-08e8-4b0f-b1d1-559e90b8ef26} - {c7d00593-6f4d-4bbf-94bc-fd0641cb4bf4} - - {5bbab821-011a-4c65-afb3-03c9221754e2} - {d9f853ef-3ade-4a37-8fc2-98230ddeb9f5} - - {d82a645b-df54-4e55-bb56-7bc4ad18788e} - {9364b0a5-da01-4d8d-ab69-a2a2b36c295a} - - {ffde64b4-cec5-435a-9b5e-6a5809d38b3e} - {9a5fee85-4122-4b19-94fa-af3e294f752e} @@ -91,26 +67,8 @@ {8716f13e-9fdd-4283-8ea9-e3d056cfc793} - - {868a2db5-cb7b-4ae2-915f-6a27e9670191} - - - {2486df8e-c2f9-4d92-87a5-94fc3f2d8103} - - - {70a962b8-59ed-45ea-a669-ac6bd1539b69} - - - {5fb7a740-010d-4e97-9846-e7f6383d4213} - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/facets/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/facets/msbuild/collocated/collocated.vcxproj index ae074589dff..1e94efaf86d 100644 --- a/cpp/test/Ice/facets/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/facets/msbuild/collocated/collocated.vcxproj @@ -162,26 +162,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -202,26 +182,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -245,26 +205,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -285,26 +225,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/facets/msbuild/collocated/collocated.vcxproj.filters b/cpp/test/Ice/facets/msbuild/collocated/collocated.vcxproj.filters index f1b2d7b6b55..e81a5a74827 100644 --- a/cpp/test/Ice/facets/msbuild/collocated/collocated.vcxproj.filters +++ b/cpp/test/Ice/facets/msbuild/collocated/collocated.vcxproj.filters @@ -10,12 +10,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -28,12 +22,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -49,27 +37,15 @@ {8a2d3aed-9fdf-4d4c-997d-f464203b9ce3} - - {62a83682-0c15-43f9-93ff-e5f91b52cb2f} - {ba4ce40c-3da0-47f5-b226-8aeef3b08f7b} - - {66069e18-6515-49b7-9e27-4159a99b6497} - {1abe3773-7e69-434f-87ae-72d238f00410} - - {c0cac6fa-ac7a-4750-b524-9f7600105e45} - {211cd304-7fc9-4653-914a-695dfa4488bf} - - {b823350a-4e1e-4d84-a933-7062c72e4951} - {f613bc2a-c761-447d-aefd-577b850a96b4} @@ -94,29 +70,11 @@ {53c59a39-d123-478b-909f-fc7508935b14} - - {03ba683f-0efc-4344-90c6-e1c339a24fe1} - - - {8002142d-837d-4006-b169-b6fa73965c9d} - - - {41e66975-7421-40fa-a68f-56bff2aa8963} - - - {254c624c-881c-41fa-a2a5-60c77b0847b7} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -129,12 +87,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/facets/msbuild/server/server.vcxproj b/cpp/test/Ice/facets/msbuild/server/server.vcxproj index 3e7393780c2..fd6e998360c 100644 --- a/cpp/test/Ice/facets/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/facets/msbuild/server/server.vcxproj @@ -161,26 +161,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -201,26 +181,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -244,26 +204,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -284,26 +224,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/facets/msbuild/server/server.vcxproj.filters b/cpp/test/Ice/facets/msbuild/server/server.vcxproj.filters index 6241486ea7d..52c57b4b04e 100644 --- a/cpp/test/Ice/facets/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Ice/facets/msbuild/server/server.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {0e25e2f9-d495-49a8-b696-4df7b829a57f} - - {df310a03-41cb-459c-a821-652c449d1b3c} - {5fc7b338-fd07-4783-8d0e-a443cb691ed6} - - {c08530d3-086e-4734-9770-0977849ab8da} - {467f2f6d-bc09-47e7-95b9-95496ce7617f} - - {7e4c8e93-64ca-491a-8451-142374f01469} - {c7292950-1fe7-4f33-bb30-524c092c6702} - - {a42f7302-b553-49dc-8484-830a2a25ef7e} - {254b6b1e-a9f1-4894-ba40-3dea8022c5a0} @@ -91,29 +67,11 @@ {5103a3e9-c496-4db3-99b7-0205b500dad8} - - {0282281a-37e1-49c6-a031-b3391e952e19} - - - {d8915b76-e61a-41a9-b7d5-026b53d0fb37} - - - {23eab0c3-ccf6-4a2a-a164-61499ed298a3} - - - {dfbf7c15-8b34-40c7-8a6d-f7e3da6582ec} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/faultTolerance/msbuild/client/client.vcxproj b/cpp/test/Ice/faultTolerance/msbuild/client/client.vcxproj index 086711c3285..7978e339799 100644 --- a/cpp/test/Ice/faultTolerance/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/faultTolerance/msbuild/client/client.vcxproj @@ -122,26 +122,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -162,26 +142,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -204,26 +164,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -244,26 +184,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/faultTolerance/msbuild/client/client.vcxproj.filters b/cpp/test/Ice/faultTolerance/msbuild/client/client.vcxproj.filters index 6408ffe869a..3d1d60f10d1 100644 --- a/cpp/test/Ice/faultTolerance/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Ice/faultTolerance/msbuild/client/client.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {9c5b92ee-565f-4d40-a01d-a172e12fbe61} - - {d3ce2062-fa9d-4784-b008-4429df219dc6} - {e79f3884-d7f9-45a0-a5b7-fbbad4bf85f5} - - {1856dd27-5065-4ee7-9c40-420ad1f4e350} - {600bc5b5-a248-4c93-b4c6-3c74b00fe5ef} - - {c35f5f60-b67a-4a28-b3f2-a5987b8474c7} - {bb3ae4f4-3063-406c-9f7c-f32d90b5e079} - - {b87e19f9-6f4c-484d-b5cb-0166db62225c} - {50d0e31b-df31-4b31-8d06-638d0ad91062} @@ -91,26 +67,8 @@ {e7b3d5e9-9b00-4384-99f1-13e2e1a68499} - - {9b02153c-ca63-49e6-9376-5fa536631fdc} - - - {fabc0823-6e96-4ff2-9128-e4d8dabab8ea} - - - {5aa68fca-064b-4766-87b0-2e684827e171} - - - {84f5a850-1439-40fe-b774-054b9604260e} - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/faultTolerance/msbuild/server/server.vcxproj b/cpp/test/Ice/faultTolerance/msbuild/server/server.vcxproj index 18017fa4b6f..81e6c598922 100644 --- a/cpp/test/Ice/faultTolerance/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/faultTolerance/msbuild/server/server.vcxproj @@ -161,26 +161,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -201,26 +181,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -244,26 +204,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -284,26 +224,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/faultTolerance/msbuild/server/server.vcxproj.filters b/cpp/test/Ice/faultTolerance/msbuild/server/server.vcxproj.filters index beb3984e5e1..e656c2c3356 100644 --- a/cpp/test/Ice/faultTolerance/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Ice/faultTolerance/msbuild/server/server.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {9fe3e539-8a1a-41f8-88b0-17e71559a660} - - {9b5cf71b-6cf7-4f26-8351-d5e103593431} - {dc6ce963-e695-40d5-a413-56f811b1f889} - - {6657de0f-fe86-4e55-aed0-ab95cf3bd04d} - {400bf17c-3a8c-4f47-aa95-30216b1fce43} - - {3c30d2b6-0cbc-4996-a748-546ecfa037e9} - {b97c2a15-3405-4f6b-b584-a6ed53d50d0c} - - {13a3480e-1aed-4d22-825e-a1ae83150367} - {d2729316-35fc-468b-8fe6-93d1e8f1e4d7} @@ -91,29 +67,11 @@ {e22f612c-ac0f-4594-9108-6e4b1a455037} - - {d1ad4057-e8e2-4fde-b699-78bf750204f6} - - - {956b32ae-e2b4-45ab-9f7f-5223722dcdb6} - - - {6afe4b98-ba7e-4d11-82b6-b68e1a75f2d9} - - - {955b4f05-cb93-4110-b19f-de82602551d9} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/hash/msbuild/client.vcxproj b/cpp/test/Ice/hash/msbuild/client.vcxproj index ba79cfba8d1..a0125611da5 100644 --- a/cpp/test/Ice/hash/msbuild/client.vcxproj +++ b/cpp/test/Ice/hash/msbuild/client.vcxproj @@ -158,26 +158,6 @@ - - true - true - true - true - true - true - true - ..\Test.ice - - - true - true - true - true - true - true - true - ..\Test.ice - true true @@ -198,26 +178,6 @@ true ..\Test.ice - - true - true - true - true - true - true - true - ..\Test.ice - - - true - true - true - true - true - true - true - ..\Test.ice - true true @@ -243,26 +203,6 @@ - - true - true - true - true - true - true - true - ..\Test.ice - - - true - true - true - true - true - true - true - ..\Test.ice - true true @@ -283,26 +223,6 @@ true ..\Test.ice - - true - true - true - true - true - true - true - ..\Test.ice - - - true - true - true - true - true - true - true - ..\Test.ice - true true diff --git a/cpp/test/Ice/hash/msbuild/client.vcxproj.filters b/cpp/test/Ice/hash/msbuild/client.vcxproj.filters index 1c590a1be2d..a2a4d984c65 100644 --- a/cpp/test/Ice/hash/msbuild/client.vcxproj.filters +++ b/cpp/test/Ice/hash/msbuild/client.vcxproj.filters @@ -14,27 +14,15 @@ {651f4a14-31a1-4ea3-b6e9-7bd8c9abcc63} - - {848eab64-0fb8-444a-bddf-55b17978a73d} - {c8b8560a-c420-49f3-b667-5ce498ed98a0} - - {bf0d2bda-0ffe-47a4-ad9c-b224c1dc1d07} - {69c9f78c-11b5-4e64-a3ab-3a38eee8b606} - - {162d8aff-6d43-410f-a61d-aaa16f7d21ee} - {79f7ba67-3a82-4030-96f3-09d97ba6bab6} - - {0d1cf171-425f-43f6-9f55-4820bd0b0acc} - {f5cab1b4-f271-4d84-b20a-bc23535aa138} @@ -59,29 +47,11 @@ {05d7676f-58b9-406b-8e56-425642d478be} - - {542ec1a1-f338-4b0a-85e6-bae0d0d9c129} - - - {94dd8f68-f9df-4c31-aa08-c620e64e6ee4} - - - {adde67e7-cf14-4f91-a63e-fd1c40d7fb26} - - - {d98b3f8c-b282-49d8-9c4c-022969fee722} - Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -94,20 +64,8 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -120,12 +78,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/hold/msbuild/client/client.vcxproj b/cpp/test/Ice/hold/msbuild/client/client.vcxproj index dbd677b9b64..1310cb7ec9b 100644 --- a/cpp/test/Ice/hold/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/hold/msbuild/client/client.vcxproj @@ -122,26 +122,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -162,26 +142,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -204,26 +164,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -244,26 +184,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/hold/msbuild/client/client.vcxproj.filters b/cpp/test/Ice/hold/msbuild/client/client.vcxproj.filters index b54c2d62feb..a047826e45f 100644 --- a/cpp/test/Ice/hold/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Ice/hold/msbuild/client/client.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {8d38f102-6b4c-448d-839d-185495d0e3bd} - - {26d91d56-e008-4403-93e7-e9465c98439f} - {3e86bce1-fa22-4f96-b672-b07003468d0e} - - {9d441f4c-79bc-489d-9b4b-75ca4fdb78ce} - {c235cbb6-57cb-4dd4-b021-bd36a1942a87} - - {6f732504-6958-4d61-a660-ec8296d4c27e} - {321bc80f-7301-445c-97ad-78ca3f9ea900} - - {ea90eae1-2f57-43fa-bf16-bcc5ca21cba0} - {4869fb88-525a-478e-895c-3a05ea1dd7aa} @@ -91,26 +67,8 @@ {92b7a075-e1d6-4291-a7b9-21ce60ffd906} - - {2dc57348-e664-4039-8762-4f0f23ffbb37} - - - {3ca2c584-1bf1-4b98-99f9-82464dc5599c} - - - {721dcc05-e7fe-43d5-9b38-a891c8fcb2ae} - - - {4b9640b8-c127-4fa5-8eb8-865f546424e8} - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/hold/msbuild/server/server.vcxproj b/cpp/test/Ice/hold/msbuild/server/server.vcxproj index e6108303072..cfaa849f305 100644 --- a/cpp/test/Ice/hold/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/hold/msbuild/server/server.vcxproj @@ -161,26 +161,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -201,26 +181,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -244,26 +204,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -284,26 +224,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/hold/msbuild/server/server.vcxproj.filters b/cpp/test/Ice/hold/msbuild/server/server.vcxproj.filters index 839c345ce45..1c1e247716a 100644 --- a/cpp/test/Ice/hold/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Ice/hold/msbuild/server/server.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {7953726d-34c1-4d05-ab13-1cb422865ebb} - - {d5d51447-b71e-4df2-8823-d0a5d37cf4d5} - {5f18c3bb-aac4-4096-89c0-bdcf7f4fa53a} - - {fa0b0f09-fce4-4a82-b75e-35e4fc1dc044} - {85620d01-0d6e-4876-a84c-363cce846724} - - {1438f0a1-8b32-41fd-9eea-20a4841bac4f} - {7b323fd6-e5ef-49f7-adf7-1ce26326c114} - - {47ac58bb-a85d-4210-a8c5-7a921300813a} - {19df1ea8-07bb-48d6-b8d8-c5a02f59be8e} @@ -91,29 +67,11 @@ {b80f81a9-15ec-4d46-84da-1a458af5a77b} - - {3d3c15e2-1165-488f-a92f-fec59237c906} - - - {73425b4c-459d-4dff-8053-41f191ef6158} - - - {fe5bfeab-0fc1-4ebf-b155-61495f49747d} - - - {96c118e4-fb68-4c34-b242-d6f01c29f153} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/impl/msbuild/server/server.vcxproj b/cpp/test/Ice/impl/msbuild/server/server.vcxproj index 0973864740b..0ebbd6f0489 100644 --- a/cpp/test/Ice/impl/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/impl/msbuild/server/server.vcxproj @@ -187,15 +187,6 @@ true true - - true - true - true - true - true - true - true - true true @@ -205,15 +196,6 @@ true true - - true - true - true - true - true - true - true - true true @@ -223,15 +205,6 @@ true true - - true - true - true - true - true - true - true - true true @@ -241,42 +214,9 @@ true true - - true - true - true - true - true - true - true - - - - - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -297,26 +237,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -339,26 +259,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -379,26 +279,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/impl/msbuild/server/server.vcxproj.filters b/cpp/test/Ice/impl/msbuild/server/server.vcxproj.filters index 4cb3f56b537..8f444f103aa 100644 --- a/cpp/test/Ice/impl/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Ice/impl/msbuild/server/server.vcxproj.filters @@ -1,12 +1,6 @@  - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -19,47 +13,23 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - Source Files Source Files\Win32\Debug - - Source Files\Win32\Cpp11-Debug - Source Files\Win32\Release - - Source Files\Win32\Cpp11-Release - Source Files\x64\Debug Source Files\x64\Release - - Source Files\x64\Cpp11-Debug - - - Source Files\x64\Cpp11-Release - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -72,30 +42,12 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - - - Header Files\Win32\Cpp11-Debug - - - Header Files\Win32\Cpp11-Release - Header Files\Win32\Release Header Files\x64\Debug - - Header Files\x64\Cpp11-Release - - - Header Files\x64\Cpp11-Debug - Header Files\x64\Release @@ -107,30 +59,18 @@ {2b868f16-746c-43e5-9310-5b4b7cdeb23e} - - {482cf041-3666-4e7e-98e8-44a5eef70a2a} - {1e5d8cda-a2fa-448b-b852-e4b91168ebff} {cad44905-8920-4cb0-b1c5-f6ee801a0552} - - {c4fcf312-7683-4745-ae5b-87bb7990763f} - {7824e660-6410-414e-843e-28cad50d47d4} - - {9cf0bd9e-9f10-4125-808c-428249b3015b} - {36fc15c0-76c9-4d1c-a2cb-9dfda822f2e5} - - {214f88b0-3e4c-4e57-a50a-5624a3f8d657} - {12eefb1d-838f-42bb-bc6f-9679578b1d99} @@ -155,18 +95,6 @@ {9b6ab9f4-fe68-48f2-b5d7-8f489903489e} - - {d5e2e0ed-45d9-4d31-9000-a75f3af4897e} - - - {2dd8a47a-27d3-4bc4-af3b-c1c2a1be905d} - - - {8a363aa9-b753-4f65-b3a2-3f07f512a782} - - - {c3586b24-d1e3-4b7c-b6c6-3c06b90e114c} - {b23c6fc8-9b70-4d7e-99c5-ed6bb7860c6e} ice diff --git a/cpp/test/Ice/impl/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/impl/msbuild/serveramd/serveramd.vcxproj index a3dc3db637e..ab8a2f0ea34 100644 --- a/cpp/test/Ice/impl/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/impl/msbuild/serveramd/serveramd.vcxproj @@ -178,26 +178,6 @@ - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - true true @@ -217,15 +197,6 @@ true true - - true - true - true - true - true - true - true - true true @@ -245,35 +216,6 @@ true true - - true - true - true - true - true - true - true - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - true true @@ -293,15 +235,6 @@ true true - - true - true - true - true - true - true - true - true true @@ -321,36 +254,6 @@ true true - - true - true - true - true - true - true - true - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - true true @@ -372,27 +275,6 @@ ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - true true @@ -404,7 +286,6 @@ ..\..\TestAMD.ice - true true @@ -416,7 +297,6 @@ ..\..\TestAMD.ice - diff --git a/cpp/test/Ice/impl/msbuild/serveramd/serveramd.vcxproj.filters b/cpp/test/Ice/impl/msbuild/serveramd/serveramd.vcxproj.filters index 510aed1d38d..416c1fdd28e 100644 --- a/cpp/test/Ice/impl/msbuild/serveramd/serveramd.vcxproj.filters +++ b/cpp/test/Ice/impl/msbuild/serveramd/serveramd.vcxproj.filters @@ -1,36 +1,18 @@  - - Source Files\Win32\Cpp11-Debug - Source Files\Win32\Release - - Source Files\Win32\Cpp11-Release - Source Files\x64\Debug - - Source Files\x64\Cpp11-Debug - Source Files\Win32\Debug Source Files\x64\Release - - Source Files\x64\Cpp11-Release - - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -43,36 +25,15 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - Header Files\x64\Debug - - Header Files\x64\Cpp11-Debug - Header Files\x64\Release - - Header Files\x64\Cpp11-Release - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -85,18 +46,9 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - Header Files\Win32\Release - - Header Files\Win32\Cpp11-Debug - @@ -105,30 +57,18 @@ {2b868f16-746c-43e5-9310-5b4b7cdeb23e} - - {482cf041-3666-4e7e-98e8-44a5eef70a2a} - {1e5d8cda-a2fa-448b-b852-e4b91168ebff} {cad44905-8920-4cb0-b1c5-f6ee801a0552} - - {c4fcf312-7683-4745-ae5b-87bb7990763f} - {7824e660-6410-414e-843e-28cad50d47d4} - - {9cf0bd9e-9f10-4125-808c-428249b3015b} - {36fc15c0-76c9-4d1c-a2cb-9dfda822f2e5} - - {214f88b0-3e4c-4e57-a50a-5624a3f8d657} - {12eefb1d-838f-42bb-bc6f-9679578b1d99} @@ -153,18 +93,6 @@ {9b6ab9f4-fe68-48f2-b5d7-8f489903489e} - - {d5e2e0ed-45d9-4d31-9000-a75f3af4897e} - - - {2dd8a47a-27d3-4bc4-af3b-c1c2a1be905d} - - - {8a363aa9-b753-4f65-b3a2-3f07f512a782} - - - {c3586b24-d1e3-4b7c-b6c6-3c06b90e114c} - {b23c6fc8-9b70-4d7e-99c5-ed6bb7860c6e} ice diff --git a/cpp/test/Ice/info/msbuild/client/client.vcxproj b/cpp/test/Ice/info/msbuild/client/client.vcxproj index 3a2ff23140a..55ed42e7b03 100644 --- a/cpp/test/Ice/info/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/info/msbuild/client/client.vcxproj @@ -163,26 +163,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -203,26 +183,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -246,26 +206,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -286,26 +226,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/info/msbuild/client/client.vcxproj.filters b/cpp/test/Ice/info/msbuild/client/client.vcxproj.filters index 01f9cc8ecec..674f2989db6 100644 --- a/cpp/test/Ice/info/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Ice/info/msbuild/client/client.vcxproj.filters @@ -10,12 +10,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -28,12 +22,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -49,27 +37,15 @@ {a248f671-9033-4a89-84d8-f2fe817e84ea} - - {43293465-c043-4ddd-9057-27c957bcfa0e} - {e7b44697-2c1a-4ecb-baff-0d6e130d32fe} - - {38232389-cb61-448b-9302-57ee5045265c} - {5ddfa011-9809-4d85-a2cd-8c8dacdf0aef} - - {918a5fa0-dad7-4ab6-8895-2c212d28f759} - {2c469a40-9d2d-4342-a5df-ba4087c13252} - - {4f47412e-7214-42e6-9aa3-4420fd35b581} - {21ed03cd-c25f-48e0-bf32-b5cc525f578f} @@ -94,29 +70,11 @@ {7f0d43c5-52b0-4062-af98-381b28a92e89} - - {af001503-3d81-472b-ac97-65b3c917a5f0} - - - {64ccbd89-feff-4ed1-ba50-ba2d0fd7042b} - - - {8eef8fba-83ba-48c8-a15e-0f3bd7fbf698} - - - {a61ae4ac-cb4c-47cb-83bc-e8ef2b89939d} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -129,12 +87,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/info/msbuild/server/server.vcxproj b/cpp/test/Ice/info/msbuild/server/server.vcxproj index 7fdf75e076f..b26d9b06e2a 100644 --- a/cpp/test/Ice/info/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/info/msbuild/server/server.vcxproj @@ -161,26 +161,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -201,26 +181,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -244,26 +204,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -284,26 +224,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/info/msbuild/server/server.vcxproj.filters b/cpp/test/Ice/info/msbuild/server/server.vcxproj.filters index 40359760500..4f75ba74d12 100644 --- a/cpp/test/Ice/info/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Ice/info/msbuild/server/server.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {45c67dbd-2c03-4825-a93d-6571198f7e24} - - {7053a221-868e-47bc-b1a5-7ea53b626775} - {1ce799f7-cae6-40eb-98f6-23ca986e42c0} - - {1f108ce7-2e97-4909-8085-c04ce70c60a4} - {65b9f275-2dee-4d86-b19d-03c9819492f0} - - {6e9f2448-7fcb-4dc7-bca5-4189f3492f4f} - {17443f6a-d70c-4a43-a17b-03508b485f87} - - {1877ed0f-d78e-4a15-ab20-64a088938d85} - {cbdb67a5-9497-4396-89c3-f70a0af66bd5} @@ -91,29 +67,11 @@ {6d574568-642b-4446-b4ae-283e9a1d4128} - - {301f525d-88a3-4e3c-8be0-274d08e14067} - - - {a929c8d1-c246-4429-ac1e-aacb7a0b5fe6} - - - {1434ec07-67c6-4334-99d4-528d512c51ab} - - - {1aa14978-46bb-40db-9366-baca519b116e} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/inheritance/msbuild/client/client.vcxproj b/cpp/test/Ice/inheritance/msbuild/client/client.vcxproj index 4fc28a5e208..2b260dda626 100644 --- a/cpp/test/Ice/inheritance/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/inheritance/msbuild/client/client.vcxproj @@ -162,26 +162,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -202,26 +182,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -244,26 +204,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -284,26 +224,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/inheritance/msbuild/client/client.vcxproj.filters b/cpp/test/Ice/inheritance/msbuild/client/client.vcxproj.filters index 97eff8bf72b..938c34616f6 100644 --- a/cpp/test/Ice/inheritance/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Ice/inheritance/msbuild/client/client.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {20a8aea1-4eaf-49ad-a6bf-6685ec2fc749} - - {f9261613-07c7-49b7-8377-981aa7930f0c} - {096901ff-ae37-4d99-9e99-73df932cc7ab} - - {cfae68d2-97a2-493f-a5d6-c5e78698cd3f} - {8fa5657c-c496-4ae1-aa19-b05640766b90} - - {4501c683-e1a0-47fb-acdf-1f882b07d3f4} - {9fe72565-b7a0-4196-9a81-e5344a76fb06} - - {0c0007e7-1456-4750-88ae-05b4d420b36c} - {d06ec4bc-3174-44e6-a4af-a47998d0c268} @@ -91,26 +67,8 @@ {22d3462b-dbc4-4b22-8502-2227f3ed6522} - - {db167a61-775c-45ce-9cb0-5c6a83fe9129} - - - {bcdfe69f-9fe3-4616-9655-4c86241af445} - - - {bdec475a-85c8-4e50-bc56-6963d6a1ea2b} - - - {45618a37-b813-424a-8b3d-0dd028e6b62c} - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/inheritance/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/inheritance/msbuild/collocated/collocated.vcxproj index c8c5976790c..62edd3f9199 100644 --- a/cpp/test/Ice/inheritance/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/inheritance/msbuild/collocated/collocated.vcxproj @@ -162,26 +162,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -202,26 +182,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -245,26 +205,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -285,26 +225,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/inheritance/msbuild/collocated/collocated.vcxproj.filters b/cpp/test/Ice/inheritance/msbuild/collocated/collocated.vcxproj.filters index 85a71631dc4..52fc608da6a 100644 --- a/cpp/test/Ice/inheritance/msbuild/collocated/collocated.vcxproj.filters +++ b/cpp/test/Ice/inheritance/msbuild/collocated/collocated.vcxproj.filters @@ -10,12 +10,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -28,12 +22,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -49,27 +37,15 @@ {a2f867b6-fd02-4a7b-b259-ad4f2255e792} - - {c34d754c-1c24-4f6e-a043-ad66024b8f50} - {cd911709-90cc-4f2e-a531-4a6f77ae0913} - - {e469f084-928f-45dd-bf54-a9dc30e88429} - {e849ed13-beca-40d9-b864-e9162441a954} - - {0bbc316c-bf74-4cb4-951e-caeb8b78cbe7} - {f9dc5606-6777-42c1-9c0c-0a059019a6c0} - - {7ef9b2d6-5ad3-4d25-a38b-f70b77446c21} - {ee99121e-1dc2-4b6c-98fa-909f05bbb555} @@ -94,29 +70,11 @@ {f6d82ccf-24ca-4d53-9916-966d893d24dc} - - {7fb80488-b9d5-45be-9b0f-0d1a8b88d65b} - - - {e7fff3e9-874d-4414-98ac-d02091878832} - - - {83e54404-2513-496d-8ad3-6fd0dfc58cc5} - - - {66b1784d-1344-469a-865d-991b3a799336} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -129,12 +87,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/inheritance/msbuild/server/server.vcxproj.filters b/cpp/test/Ice/inheritance/msbuild/server/server.vcxproj.filters index 104afd6c308..ca6f8bb07b2 100644 --- a/cpp/test/Ice/inheritance/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Ice/inheritance/msbuild/server/server.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {9b51156c-7464-4520-ad35-c91243fab30f} - - {09d0353d-7ddd-4b04-b034-69e5035158b3} - {0c58b1bb-8892-45bc-8669-18261bc20db0} - - {62499f1f-1e3e-492c-804c-6782af58f916} - {53411f0b-574f-49d6-a726-87ec63e358ec} - - {56bd9948-0dd1-4e71-ad63-e7ddd0b6776e} - {ef85abfa-bdb9-4141-9d69-acdd720a3c02} - - {0f7adac7-8543-46a8-939f-ca0dbd115463} - {73040e49-a31a-499b-9e44-c7f02b280bac} @@ -91,18 +67,6 @@ {0658d905-b915-4d7d-a312-551082655286} - - {f1a79bb4-61fb-4a27-9dcd-01b02dd37d14} - - - {43f5003c-0b18-4014-9487-2003a7003c6a} - - - {bd4d5076-813f-4410-9a4a-44d709450e3a} - - - {315ca74d-1c61-4043-ac89-c9831e4dea8e} - @@ -141,4 +105,4 @@ Slice Files - \ No newline at end of file + diff --git a/cpp/test/Ice/interceptor/msbuild/interceptortest/interceptortest.vcxproj b/cpp/test/Ice/interceptor/msbuild/interceptortest/interceptortest.vcxproj index f01c50d3427..48dacc973a5 100644 --- a/cpp/test/Ice/interceptor/msbuild/interceptortest/interceptortest.vcxproj +++ b/cpp/test/Ice/interceptor/msbuild/interceptortest/interceptortest.vcxproj @@ -168,26 +168,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -208,26 +188,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -250,26 +210,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -290,26 +230,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/interceptor/msbuild/interceptortest/interceptortest.vcxproj.filters b/cpp/test/Ice/interceptor/msbuild/interceptortest/interceptortest.vcxproj.filters index cd4931f809b..22c0dd62570 100644 --- a/cpp/test/Ice/interceptor/msbuild/interceptortest/interceptortest.vcxproj.filters +++ b/cpp/test/Ice/interceptor/msbuild/interceptortest/interceptortest.vcxproj.filters @@ -14,27 +14,15 @@ {738c4504-6c0e-457d-b6e0-c3c79edeb2d3} - - {184b3579-fe53-4e35-b86f-a2eeeb242a58} - {23ddff3c-ea2d-4fd7-8d05-415abd2d2446} - - {2cb6b9a0-9d28-47ce-8e7d-8285e1419c4d} - {0ed3c230-d73d-46d0-8462-21bd33e8a6e3} - - {b23e436c-5d78-487e-84db-e7dbdd751c33} - {0c14e236-2b29-4c20-93e4-413599ee9fc5} - - {00c63187-250d-4a22-8b46-e9216e21d4a5} - {37e75848-547d-46e7-933c-a7dac5cbdf5b} @@ -59,26 +47,8 @@ {8ac30fb8-f974-498c-91e1-04fd3b8869f7} - - {31af4388-5f25-4b8f-82aa-edfd0aedd5a4} - - - {026c5f5a-fe9c-4466-a3b4-f4e83cf646d7} - - - {b2b0b655-b026-4fb0-b9a5-dc52b609662c} - - - {f82c7590-cf06-4830-800c-e6e9491e4b23} - - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -91,20 +61,8 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -117,12 +75,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/invoke/msbuild/client/client.vcxproj b/cpp/test/Ice/invoke/msbuild/client/client.vcxproj index d8315b67a41..dcc44f072f6 100644 --- a/cpp/test/Ice/invoke/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/invoke/msbuild/client/client.vcxproj @@ -162,26 +162,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -202,26 +182,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -244,26 +204,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -284,26 +224,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/invoke/msbuild/client/client.vcxproj.filters b/cpp/test/Ice/invoke/msbuild/client/client.vcxproj.filters index 19a607fa9c1..32894cec4a5 100644 --- a/cpp/test/Ice/invoke/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Ice/invoke/msbuild/client/client.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {58e5bd18-7bd8-4fd5-bbca-6d7d013efa5b} - - {5b30100c-e1a1-43e7-87c4-5fe917a53ebc} - {a467bf0c-62c2-42d5-b0dd-ddedc81cfeef} - - {7b1d9565-fdbb-4b92-b83b-2be861583e47} - {05fdb80f-3209-4eb0-bc5c-30a0db0a43a1} - - {abfb4748-703d-4590-88f5-d20b2457bdaa} - {682045e1-db27-40fb-9a13-6d87ef363865} - - {926a3bec-4bcb-4a52-83df-e63531d066e3} - {8dac3f94-e6be-4f26-8c7b-9671dce958ba} @@ -91,26 +67,8 @@ {dcfd4b53-a7bf-43a3-aec3-1c7cc9833a9e} - - {53875197-a2f8-4fac-b36f-ad3fdde8bb52} - - - {e3f4316a-1d48-4850-bddc-22070f0e0933} - - - {7507dec0-c1e2-49f4-8822-ccc35e9acfda} - - - {146eb924-8549-48bc-bec8-18ae9bb60d0f} - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/invoke/msbuild/server/server.vcxproj b/cpp/test/Ice/invoke/msbuild/server/server.vcxproj index 73b5d19e829..518ecb12897 100644 --- a/cpp/test/Ice/invoke/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/invoke/msbuild/server/server.vcxproj @@ -161,26 +161,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -201,26 +181,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -244,26 +204,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -284,26 +224,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/invoke/msbuild/server/server.vcxproj.filters b/cpp/test/Ice/invoke/msbuild/server/server.vcxproj.filters index 72d866a1f73..469eb8fb874 100644 --- a/cpp/test/Ice/invoke/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Ice/invoke/msbuild/server/server.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {647e6c4a-70ff-488c-b04e-acf692434b31} - - {9e121541-e45a-423c-91c2-97bbf7369d78} - {5812d44b-3e21-450a-a94c-c7ec058fb707} - - {0ba864f1-2ae1-46dd-825b-582709738fbb} - {5dd16b3a-013c-4de1-b6de-df3d65ecbcb9} - - {4d7b7de5-c5f9-4c93-ae76-47fdee6d6d71} - {8175e4ec-f10e-45d3-b243-e44a6761168c} - - {d5129f8d-08e1-4951-a24a-ffbf5990678f} - {4d996812-4080-42be-9623-31c2488ac0a9} @@ -91,29 +67,11 @@ {82d585c3-c721-46c7-865f-4ab298b732ec} - - {e786d93a-207a-48d4-844a-352655a4f855} - - - {bb2df51c-67d2-4e68-b439-01385ce5034f} - - - {8f165221-d642-42be-a6dc-884004e8491e} - - - {12110e71-5b23-42a2-bd0b-fd95685e393f} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/library/msbuild/alltests/alltests.vcxproj b/cpp/test/Ice/library/msbuild/alltests/alltests.vcxproj index b44aebad70d..ec18b8fad2b 100644 --- a/cpp/test/Ice/library/msbuild/alltests/alltests.vcxproj +++ b/cpp/test/Ice/library/msbuild/alltests/alltests.vcxproj @@ -2,22 +2,6 @@ - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -46,41 +30,21 @@ true $(DefaultPlatformToolset) - - DynamicLibrary - true - $(DefaultPlatformToolset) - DynamicLibrary false $(DefaultPlatformToolset) - - DynamicLibrary - false - $(DefaultPlatformToolset) - DynamicLibrary true $(DefaultPlatformToolset) - - DynamicLibrary - true - $(DefaultPlatformToolset) - DynamicLibrary false $(DefaultPlatformToolset) - - DynamicLibrary - false - $(DefaultPlatformToolset) - @@ -89,34 +53,18 @@ - - - - - - - - - - - - - - - - @@ -128,14 +76,6 @@ ..\..\msbuild\consumer\$(Platform)\$(Configuration);..\..\msbuild\gencode\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - - ..\..\msbuild\gencode\$(Platform)\$(Configuration);%(AdditionalIncludeDirectories) - - - ..\..\msbuild\consumer\$(Platform)\$(Configuration);..\..\msbuild\gencode\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - ..\..\msbuild\gencode\$(Platform)\$(Configuration);%(AdditionalIncludeDirectories) @@ -144,14 +84,6 @@ ..\..\msbuild\consumer\$(Platform)\$(Configuration);..\..\msbuild\gencode\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - - ..\..\msbuild\gencode\$(Platform)\$(Configuration);%(AdditionalIncludeDirectories) - - - ..\..\msbuild\consumer\$(Platform)\$(Configuration);..\..\msbuild\gencode\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - ..\..\msbuild\gencode\$(Platform)\$(Configuration);%(AdditionalIncludeDirectories) @@ -160,14 +92,6 @@ ..\..\msbuild\consumer\$(Platform)\$(Configuration);..\..\msbuild\gencode\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - - ..\..\msbuild\gencode\$(Platform)\$(Configuration);%(AdditionalIncludeDirectories) - - - ..\..\msbuild\consumer\$(Platform)\$(Configuration);..\..\msbuild\gencode\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - ..\..\msbuild\gencode\$(Platform)\$(Configuration);%(AdditionalIncludeDirectories) @@ -176,14 +100,6 @@ ..\..\msbuild\consumer\$(Platform)\$(Configuration);..\..\msbuild\gencode\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - - ..\..\msbuild\gencode\$(Platform)\$(Configuration);%(AdditionalIncludeDirectories) - - - ..\..\msbuild\consumer\$(Platform)\$(Configuration);..\..\msbuild\gencode\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - diff --git a/cpp/test/Ice/library/msbuild/gencode/gencode.vcxproj.filters b/cpp/test/Ice/library/msbuild/gencode/gencode.vcxproj.filters index 529cf68a635..d4cea9756f1 100644 --- a/cpp/test/Ice/library/msbuild/gencode/gencode.vcxproj.filters +++ b/cpp/test/Ice/library/msbuild/gencode/gencode.vcxproj.filters @@ -14,27 +14,15 @@ {588f377a-ccd8-4bcf-b0b5-553fae10cf8e} - - {092cb079-d312-4a87-92cc-1af853a509ae} - {08b13aba-df48-4ffa-ac43-7c6125af7f17} - - {64f3eba0-5d62-4212-a36d-151d76182345} - {48304773-4b2e-49a5-b409-eb08eb34e153} - - {f5a3bcb4-07ac-47bc-b1f1-c2aa0d5b079d} - {2a3c5ab8-7dff-400f-8572-bd2f10ca4bcb} - - {44af8f72-3abb-426d-bdb0-5c68006c1d60} - {90dda4ef-7c8b-469b-8e27-4c8100ec4a20} @@ -59,18 +47,6 @@ {ba0a0e38-fc4d-447f-a517-002e47ed7019} - - {2ef96c2c-d9ea-4e90-9170-ba02f6187107} - - - {cf729630-d56d-49de-af02-eaac1a4c8437} - - - {714c33cf-bc69-4ed1-85fe-bdd644d53692} - - - {ffaee417-1fd2-48f5-9c30-12cb395ae94b} - diff --git a/cpp/test/Ice/location/msbuild/client/client.vcxproj b/cpp/test/Ice/location/msbuild/client/client.vcxproj index 69bdd8901a9..9541d188155 100644 --- a/cpp/test/Ice/location/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/location/msbuild/client/client.vcxproj @@ -162,26 +162,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -202,26 +182,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -244,26 +204,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -284,26 +224,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/location/msbuild/client/client.vcxproj.filters b/cpp/test/Ice/location/msbuild/client/client.vcxproj.filters index 184a167129c..922a554573f 100644 --- a/cpp/test/Ice/location/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Ice/location/msbuild/client/client.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {387fab0a-c41b-429a-bdc2-ee7079c76021} - - {4f8a7708-7d8a-474a-961b-18850caca965} - {4f844305-94b9-42b7-a6ae-4677651bfa6d} - - {47b70d1e-a811-44f8-a12f-09cddd4f40a3} - {3308707e-9aa1-46a4-854a-55c20b470830} - - {cb254427-e55c-4775-9942-292f817f4dfd} - {a49f1eb9-45d0-4198-8d45-576fe5dccb55} - - {66d28f1d-0b98-4d5c-97bc-99d186ccd7df} - {cec7b8a0-015d-4e1e-b57e-cb3b829cd1cf} @@ -91,26 +67,8 @@ {7ceeb11a-2a22-47e7-abbf-a3ddb64ec2db} - - {e83d5d0b-08f7-4842-8c13-ceba08d58ba3} - - - {61553c7b-6e36-4139-b0bb-3ca08431bffe} - - - {ed13deed-69be-4fbd-9d40-739aa5dba075} - - - {093e6698-ffe5-4c78-8d8c-e0cad7f149a4} - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/location/msbuild/server/server.vcxproj b/cpp/test/Ice/location/msbuild/server/server.vcxproj index e22ffa6ac8d..7b00b02a86c 100644 --- a/cpp/test/Ice/location/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/location/msbuild/server/server.vcxproj @@ -162,26 +162,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -202,26 +182,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -246,26 +206,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -286,26 +226,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/location/msbuild/server/server.vcxproj.filters b/cpp/test/Ice/location/msbuild/server/server.vcxproj.filters index 7e103820305..1ef47368561 100644 --- a/cpp/test/Ice/location/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Ice/location/msbuild/server/server.vcxproj.filters @@ -10,12 +10,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -28,12 +22,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -49,27 +37,15 @@ {2729146a-f872-42a5-8886-4019ddfc68cb} - - {6e7e5a6f-8917-478b-bb8c-cd85b8ed0693} - {1e742af1-f53b-4c26-9182-70df5740b235} - - {26d6d7df-34a7-4548-8672-fef59f0fdbb4} - {0c3bf724-55e1-45fb-a7c2-0c5b2a125c16} - - {8f90ee66-37a0-4a4f-8d21-38ff6285f6ef} - {233110e1-6625-4406-a50b-4c65423d6c54} - - {a36236e6-2aa5-4e95-860e-f535505bba94} - {79bcfe68-59a9-44ee-9c3f-6b8567614f54} @@ -94,18 +70,6 @@ {e376ea75-f06b-47a1-b456-497bd20bb801} - - {f56c0aff-313a-43c7-99f7-c954ac8121ed} - - - {fe5f1c9a-8409-4294-af73-9d287e2f5b2d} - - - {2e345b0f-2d03-4fb6-bb72-5b9d9e8f02c9} - - - {9e31c49d-7d97-401d-927b-65906f0e916f} - @@ -114,12 +78,6 @@ Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -132,12 +90,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/metrics/msbuild/client/client.vcxproj b/cpp/test/Ice/metrics/msbuild/client/client.vcxproj index c154e3a2749..ed9404e5f5a 100644 --- a/cpp/test/Ice/metrics/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/client/client.vcxproj @@ -162,26 +162,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -202,26 +182,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -245,26 +205,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -285,26 +225,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/metrics/msbuild/client/client.vcxproj.filters b/cpp/test/Ice/metrics/msbuild/client/client.vcxproj.filters index 877aa83c92d..3c240f82212 100644 --- a/cpp/test/Ice/metrics/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Ice/metrics/msbuild/client/client.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {9f1d0ceb-1d25-45d9-909f-5a83bc07613f} - - {a7be3a2c-525f-4cda-b023-481850ba4006} - {3564236c-49e7-429e-ae71-41f57996809b} - - {aeb752c2-006c-4819-bfe5-b569c0c3f321} - {15fe40e1-aadc-44d1-b205-96e1c251dec1} - - {3ca3599c-8471-4f0d-bcb0-4bbb3c82d6d4} - {3227a6db-9071-4d08-856e-592792798c5d} - - {01692837-1480-4cd9-9003-fbba0f119dd7} - {a9190c2f-1b13-4dc1-b9b5-fa16a40547cb} @@ -91,29 +67,11 @@ {1663b8fa-16d2-49f5-9a4e-e6d00f9e9cd3} - - {4252e295-d5d1-4b62-8e64-aa020a738916} - - - {0af4a818-c377-4d4a-88ab-07cd8bd65284} - - - {bde77beb-7c1f-4a95-9db0-41f5f9b93441} - - - {09cfa8f3-9323-4ab5-bd7c-c88ba6280b61} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/metrics/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/metrics/msbuild/collocated/collocated.vcxproj index f1d0c219e0b..41c00beca46 100644 --- a/cpp/test/Ice/metrics/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/collocated/collocated.vcxproj @@ -162,26 +162,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -202,26 +182,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -246,26 +206,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -286,26 +226,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/metrics/msbuild/collocated/collocated.vcxproj.filters b/cpp/test/Ice/metrics/msbuild/collocated/collocated.vcxproj.filters index 6d0e0ee5093..c0ff38e764f 100644 --- a/cpp/test/Ice/metrics/msbuild/collocated/collocated.vcxproj.filters +++ b/cpp/test/Ice/metrics/msbuild/collocated/collocated.vcxproj.filters @@ -10,12 +10,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -28,12 +22,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -49,27 +37,15 @@ {b4cc9d54-456f-4f86-93c7-86afd2024ceb} - - {19d18ee1-44fa-4342-b84e-584d8a5399cc} - {36bd9eb4-bbe6-45b6-96c6-5dcb098fe8b9} - - {c08f1046-b0d7-429a-aac8-39ed1acd8b6b} - {e5be95bd-29c0-434d-83e6-3dfe1c2e0e77} - - {9b25265f-02bb-4ab4-892e-4d4f2c4ccddc} - {2b7a1531-d253-42d0-aa53-10834b81d4de} - - {b0a1f31f-11ae-4439-8efc-b4e467023121} - {a0333ef5-c8a4-472d-bc74-bf8badbe75ff} @@ -94,18 +70,6 @@ {58e7fe8d-8860-4357-aeae-19c4c1fd071e} - - {28619841-13ba-4026-b5db-f073defc04fb} - - - {fd7e24e0-4608-42cd-9649-e5b68bae62d6} - - - {560fd5f5-1651-4956-a30e-47d50011cbfe} - - - {1d72c226-8b4f-4105-85c3-a2aca34ffea0} - @@ -114,12 +78,6 @@ Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -132,12 +90,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/metrics/msbuild/server/server.vcxproj b/cpp/test/Ice/metrics/msbuild/server/server.vcxproj index 6a06971495e..9db16643b41 100644 --- a/cpp/test/Ice/metrics/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/server/server.vcxproj @@ -161,26 +161,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -201,26 +181,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -244,26 +204,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -284,26 +224,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/metrics/msbuild/server/server.vcxproj.filters b/cpp/test/Ice/metrics/msbuild/server/server.vcxproj.filters index d97e4f426c7..d7aa846184c 100644 --- a/cpp/test/Ice/metrics/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Ice/metrics/msbuild/server/server.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {a28f38f6-1a1b-4fb6-885e-cce11deaf5b1} - - {cd298370-78e1-4c77-ade8-b9bf3952cdbd} - {c7f3cac5-8be3-479f-aedc-d556a8893901} - - {91b943ce-893d-4979-a1a1-a1907652562f} - {1e62f631-e548-42bb-9153-dc3133c46725} - - {6cf847d1-cbdb-4d08-a641-6fab435bb050} - {8d7666a7-ae09-4bce-94ef-f889a6b87905} - - {9bf90208-6c5f-40f8-bd81-4575468c09f1} - {20dceb81-fd2e-4c0e-85a8-67828842ef49} @@ -91,29 +67,11 @@ {939ff07b-b74a-491b-beef-f30dff69c4e1} - - {e66f9c44-56fd-4d00-b1c9-f712b1f2ad22} - - - {e1df33dc-cf9d-4cbb-8187-b30539e6f73a} - - - {58e9d5e5-52c8-421f-8d23-566217a261ed} - - - {46de625d-87a5-4d23-b7ec-9b97c5342c63} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/metrics/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/metrics/msbuild/serveramd/serveramd.vcxproj index f1b6ddf30d6..ce4b3ca63c0 100644 --- a/cpp/test/Ice/metrics/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/serveramd/serveramd.vcxproj @@ -158,26 +158,6 @@ - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - true true @@ -198,26 +178,6 @@ true ..\..\TestAMD.ice - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - true true @@ -241,26 +201,6 @@ - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - true true @@ -281,26 +221,6 @@ true ..\..\TestAMD.ice - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - true true diff --git a/cpp/test/Ice/metrics/msbuild/serveramd/serveramd.vcxproj.filters b/cpp/test/Ice/metrics/msbuild/serveramd/serveramd.vcxproj.filters index 57b75bde164..4fb6eb5f785 100644 --- a/cpp/test/Ice/metrics/msbuild/serveramd/serveramd.vcxproj.filters +++ b/cpp/test/Ice/metrics/msbuild/serveramd/serveramd.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {521ba062-643e-483c-920d-0b0941073213} - - {fc4c3790-7e88-487a-bdc6-e56c7ce53006} - {400906ee-9039-4008-9a4f-8f49123c2768} - - {5017e9f8-ec9a-447c-b6f3-1447e79c1f5c} - {d725d369-8025-4a8c-86eb-01847c28e7cf} - - {c2d50696-34ce-4f7a-aee4-aa860e697518} - {cfbf0b20-4c34-4131-a2e4-a1cc4ed37c70} - - {d9762488-f1d7-4545-bffc-5e5fd4125726} - {998f599e-e66e-43be-9bf9-fe7a8e77a62a} @@ -91,29 +67,11 @@ {b645b952-6085-45c5-b73b-1353d0896a9e} - - {98ff173b-26ed-45bd-87d8-a9887b162e5b} - - - {e589a6fd-5963-4b1c-b087-d88aee2f2bb5} - - - {84c481ad-5a26-4b71-9aa4-ea93ed3f45be} - - - {7ed6da88-bbb9-49a8-8eee-cfcf30243ec9} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/networkProxy/msbuild/client/client.vcxproj b/cpp/test/Ice/networkProxy/msbuild/client/client.vcxproj index 478bb6ab0f2..9f2f8f56d9b 100644 --- a/cpp/test/Ice/networkProxy/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/networkProxy/msbuild/client/client.vcxproj @@ -39,26 +39,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -79,26 +59,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -124,26 +84,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -164,26 +104,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/networkProxy/msbuild/client/client.vcxproj.filters b/cpp/test/Ice/networkProxy/msbuild/client/client.vcxproj.filters index 5cd580f44ba..28232783815 100644 --- a/cpp/test/Ice/networkProxy/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Ice/networkProxy/msbuild/client/client.vcxproj.filters @@ -14,27 +14,15 @@ {07ce5191-3f25-4ce0-8de3-73d2d8de9b0d} - - {085ff80b-1c6d-4a87-9a70-ac81d0e608a1} - {f908ccb7-5769-4894-a39e-c505a815b778} - - {2eb757ba-4d31-4e8b-9ab4-bd8dad81a2a4} - {1b9fe643-6778-4738-855d-6bb1d09550a1} - - {e70825b0-0b38-4ff8-bbb7-f669433c71a2} - {7c31811c-b9ed-46ac-b5ef-f2bb0253e3ea} - - {d56535ad-8af0-4a8e-8e25-29b9dc3cec71} - {5772d930-3453-46c2-af1c-9dc86f64cf92} @@ -59,18 +47,6 @@ {43e86e69-fe5d-426f-91b6-edf579f1c551} - - {3ed8bfbc-affc-4bbd-93bd-f397900ac7d4} - - - {6d0a8fae-a26e-48e2-a419-ef7c460d97fb} - - - {7caca6f2-ce37-4f90-88cf-d7a6e0b2e850} - - - {a7e3e2ae-b0b5-4689-ad83-1e63b107d5ce} - @@ -79,12 +55,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -97,20 +67,8 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/networkProxy/msbuild/server/server.vcxproj b/cpp/test/Ice/networkProxy/msbuild/server/server.vcxproj index 78249076e5b..022b42bce50 100644 --- a/cpp/test/Ice/networkProxy/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/networkProxy/msbuild/server/server.vcxproj @@ -41,26 +41,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -81,26 +61,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -123,26 +83,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -163,26 +103,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/networkProxy/msbuild/server/server.vcxproj.filters b/cpp/test/Ice/networkProxy/msbuild/server/server.vcxproj.filters index 87386a3ac8f..254938d4aa8 100644 --- a/cpp/test/Ice/networkProxy/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Ice/networkProxy/msbuild/server/server.vcxproj.filters @@ -14,27 +14,15 @@ {1cf26298-6416-47a7-a78b-2a292ce6cb3c} - - {e406bb89-e95f-4381-a88c-7e24a0fd67e2} - {802cae51-c926-4528-a4ac-f3e5cc83aa46} - - {4d07e716-a023-4b32-9311-99da1e3c4b1d} - {dda7974f-5994-4593-accd-53f030cfbdd7} - - {8f77c988-6d36-4a17-9b9f-c7cf510223dc} - {3bb3743e-2434-4fb8-928e-d0eb2af6acd6} - - {262514da-e5ef-4389-b586-0b8c8b3b124a} - {5eaa9651-9c53-4c81-9566-c61566c66c87} @@ -59,29 +47,11 @@ {4e6fb5e4-e533-4234-ac39-8d0697f3d678} - - {594a2bba-9eff-45f6-a30d-1e2abee09b88} - - - {15cb407a-02c1-425b-8117-91575a166f8b} - - - {78e56143-6892-452c-a70a-a689876a5198} - - - {f172a929-9a18-4855-9bc8-79e9988bbc6a} - Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -94,20 +64,8 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -120,12 +78,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/objects/msbuild/client/client.vcxproj b/cpp/test/Ice/objects/msbuild/client/client.vcxproj index d999411ab96..60961c33db2 100644 --- a/cpp/test/Ice/objects/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/objects/msbuild/client/client.vcxproj @@ -202,86 +202,6 @@ - - true - true - true - true - true - true - true - ..\..\Derived.ice - - - true - true - true - true - true - true - true - ..\..\DerivedEx.ice - - - true - true - true - true - true - true - true - ..\..\Forward.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Derived.ice - - - true - true - true - true - true - true - true - ..\..\DerivedEx.ice - - - true - true - true - true - true - true - true - ..\..\Forward.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -362,86 +282,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Derived.ice - - - true - true - true - true - true - true - true - ..\..\DerivedEx.ice - - - true - true - true - true - true - true - true - ..\..\Forward.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Derived.ice - - - true - true - true - true - true - true - true - ..\..\DerivedEx.ice - - - true - true - true - true - true - true - true - ..\..\Forward.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -525,86 +365,6 @@ - - true - true - true - true - true - true - true - ..\..\Derived.ice - - - true - true - true - true - true - true - true - ..\..\DerivedEx.ice - - - true - true - true - true - true - true - true - ..\..\Forward.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Derived.ice - - - true - true - true - true - true - true - true - ..\..\DerivedEx.ice - - - true - true - true - true - true - true - true - ..\..\Forward.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -685,86 +445,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Derived.ice - - - true - true - true - true - true - true - true - ..\..\DerivedEx.ice - - - true - true - true - true - true - true - true - ..\..\Forward.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Derived.ice - - - true - true - true - true - true - true - true - ..\..\DerivedEx.ice - - - true - true - true - true - true - true - true - ..\..\Forward.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/objects/msbuild/client/client.vcxproj.filters b/cpp/test/Ice/objects/msbuild/client/client.vcxproj.filters index 6324d2645df..a281d8a6c70 100644 --- a/cpp/test/Ice/objects/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Ice/objects/msbuild/client/client.vcxproj.filters @@ -10,12 +10,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -28,24 +22,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Source Files\x64\Cpp11-Debug - - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -70,30 +46,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Source Files\Win32\Cpp11-Debug - - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Release - - - Source Files\x64\Cpp11-Release - Source Files\Win32\Debug @@ -121,27 +73,15 @@ {1e3eec4f-b790-4b18-9c8c-726e55bad4a1} - - {9f4c2b0f-1651-456b-9c97-7749484d4ead} - {07607044-d59f-4e72-8fea-07e2648b93bd} - - {19b97529-e32d-4ec9-8db3-d11e4ad9fdd5} - {703c0a81-c856-4be9-9348-ebd9efb05d82} - - {6a9cc256-ec21-417b-9e5f-6cd7d5e1e604} - {0ed49f16-f4e2-43a7-a267-fd2344474aec} - - {c11f640f-3aea-4ccc-91eb-9d0270b9a38a} - {9eabbb3a-ea9b-4099-a8e8-13948ded1ee7} @@ -166,29 +106,11 @@ {f90d29c2-0034-4d7b-b2a8-4aa9af71a4a4} - - {c55272d7-5ad4-4584-b046-2bc6de48d8cf} - - - {9b4e0cd1-9317-4aa9-9fb0-28b92d4e9182} - - - {0a1f15ac-90c6-409c-a1c0-40140972f338} - - - {c5a7caba-f5ac-481e-8a32-27afdfcacd47} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -201,24 +123,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - - - Header Files\x64\Cpp11-Debug - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -243,30 +147,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - - - Header Files\Win32\Cpp11-Debug - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Release - - - Header Files\x64\Cpp11-Release - Header Files\Win32\Debug diff --git a/cpp/test/Ice/objects/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/objects/msbuild/collocated/collocated.vcxproj index da69663d795..cf57e0c6ece 100644 --- a/cpp/test/Ice/objects/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/objects/msbuild/collocated/collocated.vcxproj @@ -195,86 +195,6 @@ - - true - true - true - true - true - true - true - ..\..\Derived.ice - - - true - true - true - true - true - true - true - ..\..\DerivedEx.ice - - - true - true - true - true - true - true - true - ..\..\Forward.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Derived.ice - - - true - true - true - true - true - true - true - ..\..\DerivedEx.ice - - - true - true - true - true - true - true - true - ..\..\Forward.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -355,86 +275,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Derived.ice - - - true - true - true - true - true - true - true - ..\..\DerivedEx.ice - - - true - true - true - true - true - true - true - ..\..\Forward.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Derived.ice - - - true - true - true - true - true - true - true - ..\..\DerivedEx.ice - - - true - true - true - true - true - true - true - ..\..\Forward.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -518,86 +358,6 @@ - - true - true - true - true - true - true - true - ..\..\Derived.ice - - - true - true - true - true - true - true - true - ..\..\DerivedEx.ice - - - true - true - true - true - true - true - true - ..\..\Forward.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Derived.ice - - - true - true - true - true - true - true - true - ..\..\DerivedEx.ice - - - true - true - true - true - true - true - true - ..\..\Forward.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -678,86 +438,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Derived.ice - - - true - true - true - true - true - true - true - ..\..\DerivedEx.ice - - - true - true - true - true - true - true - true - ..\..\Forward.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Derived.ice - - - true - true - true - true - true - true - true - ..\..\DerivedEx.ice - - - true - true - true - true - true - true - true - ..\..\Forward.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/objects/msbuild/collocated/collocated.vcxproj.filters b/cpp/test/Ice/objects/msbuild/collocated/collocated.vcxproj.filters index 07aaa1171a2..d0ef05fb0b2 100644 --- a/cpp/test/Ice/objects/msbuild/collocated/collocated.vcxproj.filters +++ b/cpp/test/Ice/objects/msbuild/collocated/collocated.vcxproj.filters @@ -13,24 +13,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\x64\Cpp11-Debug - - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -67,36 +49,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\x64\Cpp11-Release - - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Source Files\Win32\Cpp11-Debug - - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Release - - - Source Files\x64\Cpp11-Release - Source Files\Win32\Debug @@ -124,27 +76,15 @@ {7385ed7c-ac22-4758-818c-9a88cac0f405} - - {c347e1d6-bbb8-4c75-85a7-07c4a6a2ae20} - {e629759e-6235-4ba9-9808-cfd555c96547} - - {e36e15f3-b5a7-4657-9788-68b7efaaf8ee} - {d9e7207c-c39c-48c8-ba57-d8fce41b86fd} - - {8f52c785-a1ce-473a-a29f-a46e7ce3ca89} - {e34442bf-a017-4fe2-80da-7ccb091c4c7b} - - {bfcfa2f0-8f17-489d-be45-cb655999f12d} - {28c11e93-48a3-409a-b36f-66f551420a67} @@ -169,41 +109,11 @@ {248dcf4a-c5b8-4612-b039-b7c52c9514b7} - - {dad02125-ce98-4049-8e03-b787061bff16} - - - {fb3fa49b-b9a7-4fd3-a543-d5c01d64cfef} - - - {62d20b2e-9eeb-4141-9efc-a74e30d8b086} - - - {860b53d4-f7fe-43fb-8c55-6693024b0112} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\x64\Cpp11-Debug - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -240,36 +150,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\x64\Cpp11-Release - - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - - - Header Files\Win32\Cpp11-Debug - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Release - - - Header Files\x64\Cpp11-Release - Header Files\Win32\Debug diff --git a/cpp/test/Ice/objects/msbuild/server/server.vcxproj b/cpp/test/Ice/objects/msbuild/server/server.vcxproj index 4c0cf71d83d..12f1494941c 100644 --- a/cpp/test/Ice/objects/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/objects/msbuild/server/server.vcxproj @@ -194,86 +194,6 @@ - - true - true - true - true - true - true - true - ..\..\Derived.ice - - - true - true - true - true - true - true - true - ..\..\DerivedEx.ice - - - true - true - true - true - true - true - true - ..\..\Forward.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Derived.ice - - - true - true - true - true - true - true - true - ..\..\DerivedEx.ice - - - true - true - true - true - true - true - true - ..\..\Forward.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -354,86 +274,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Derived.ice - - - true - true - true - true - true - true - true - ..\..\DerivedEx.ice - - - true - true - true - true - true - true - true - ..\..\Forward.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Derived.ice - - - true - true - true - true - true - true - true - ..\..\DerivedEx.ice - - - true - true - true - true - true - true - true - ..\..\Forward.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -517,86 +357,6 @@ - - true - true - true - true - true - true - true - ..\..\Derived.ice - - - true - true - true - true - true - true - true - ..\..\DerivedEx.ice - - - true - true - true - true - true - true - true - ..\..\Forward.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Derived.ice - - - true - true - true - true - true - true - true - ..\..\DerivedEx.ice - - - true - true - true - true - true - true - true - ..\..\Forward.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -677,86 +437,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Derived.ice - - - true - true - true - true - true - true - true - ..\..\DerivedEx.ice - - - true - true - true - true - true - true - true - ..\..\Forward.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Derived.ice - - - true - true - true - true - true - true - true - ..\..\DerivedEx.ice - - - true - true - true - true - true - true - true - ..\..\Forward.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/objects/msbuild/server/server.vcxproj.filters b/cpp/test/Ice/objects/msbuild/server/server.vcxproj.filters index 58603f07cde..6cc5b81d318 100644 --- a/cpp/test/Ice/objects/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Ice/objects/msbuild/server/server.vcxproj.filters @@ -14,27 +14,15 @@ {fb5364fd-e243-4389-a206-c93137b50e2b} - - {ad4f0724-8f7c-492c-8d52-40357783f629} - {c18177c5-df93-4b1e-b1fc-72d348a9afab} - - {1e78503d-ce68-4562-b61e-0775e09a697e} - {a3018f15-5016-45b7-bc26-deeefdac0464} - - {56eff0df-9560-4c84-b971-5a730c3075a2} - {41dce87a-5564-466c-b652-153a018989f1} - - {f3707a6c-109d-4072-95bc-c139328664bf} - {f15e9e5a-aac1-4dac-888b-34bffad3a9fd} @@ -59,18 +47,6 @@ {b6f0b056-ede4-43d8-938f-a45ebb32c675} - - {a5ed41ad-c37c-4f8d-a640-e980f3b94208} - - - {6e2b2f15-a143-4cec-8928-d30b8676598d} - - - {d55f970e-9b18-43d8-93cb-ff7f4d44d5be} - - - {e9ff1f7e-0615-4688-953b-bd0cd73575fa} - @@ -82,24 +58,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\x64\Cpp11-Debug - - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -136,36 +94,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\x64\Cpp11-Release - - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Source Files\Win32\Cpp11-Debug - - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Release - - - Source Files\x64\Cpp11-Release - Source Files\Win32\Debug @@ -183,24 +111,6 @@ Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\x64\Cpp11-Debug - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -237,36 +147,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\x64\Cpp11-Release - - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - - - Header Files\Win32\Cpp11-Debug - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Release - - - Header Files\x64\Cpp11-Release - Header Files\Win32\Debug diff --git a/cpp/test/Ice/operations/msbuild/client/client.vcxproj b/cpp/test/Ice/operations/msbuild/client/client.vcxproj index 7485ca7f469..5ad3af055d8 100644 --- a/cpp/test/Ice/operations/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/operations/msbuild/client/client.vcxproj @@ -168,26 +168,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -208,26 +188,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -250,26 +210,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -290,26 +230,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/operations/msbuild/client/client.vcxproj.filters b/cpp/test/Ice/operations/msbuild/client/client.vcxproj.filters index 50fc18c8e2b..e20b1d18cbf 100644 --- a/cpp/test/Ice/operations/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Ice/operations/msbuild/client/client.vcxproj.filters @@ -25,12 +25,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -43,12 +37,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -64,27 +52,15 @@ {a73767b6-aacc-4fc6-b05a-82467de086ad} - - {2169552a-6e52-49c0-9e2e-4a1ee0fa915b} - {bff43d98-ea44-4264-b7ac-6f9edba637d4} - - {1d6571cc-2a9d-4c4a-ab0f-d060df3d4f5e} - {1d8f772d-7ebd-40a1-bbb3-488cafe138d9} - - {27add602-5fa9-42ce-9819-9922aad0ade3} - {4cf18090-2784-439b-b91d-4d18508778b2} - - {af6cbdd3-217a-480e-8e05-75e4f225aaf8} - {f36d15fc-be83-4b24-bebd-6476e2139ab5} @@ -109,26 +85,8 @@ {0ecb0fa1-9dbe-4701-99b8-abef8e3df89c} - - {515c7960-e3d8-4d61-9b41-02777dfc2197} - - - {ea866deb-464e-4572-9b5b-14f869aeedab} - - - {2d63e6bc-0d3c-4785-a07a-b6b6a00f949e} - - - {5e708e2a-333d-49ac-b4da-94d528eb4ea4} - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -141,12 +99,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/operations/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/operations/msbuild/collocated/collocated.vcxproj index 600853e3cc8..ac880c12743 100644 --- a/cpp/test/Ice/operations/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/operations/msbuild/collocated/collocated.vcxproj @@ -176,26 +176,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -216,26 +196,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -259,26 +219,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -299,26 +239,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/operations/msbuild/collocated/collocated.vcxproj.filters b/cpp/test/Ice/operations/msbuild/collocated/collocated.vcxproj.filters index a8cfaa340c3..3ff4d1fce09 100644 --- a/cpp/test/Ice/operations/msbuild/collocated/collocated.vcxproj.filters +++ b/cpp/test/Ice/operations/msbuild/collocated/collocated.vcxproj.filters @@ -28,12 +28,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -46,12 +40,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -67,27 +55,15 @@ {bd024832-35f4-4585-b8ef-f61905abffa0} - - {d0a3b9f0-2b5d-44a6-a785-9ac65abfef7b} - {e6752b43-376d-4fff-b567-51de26818891} - - {124dbcda-e4d4-4f65-ad15-3159aab639d3} - {d768a56f-014a-48d3-9d46-7819ac7471fe} - - {b8545cc8-b2a4-4c9a-b2ee-d4b726f4066c} - {3f98e0ce-69a5-472d-a4f4-42bd9c9ea776} - - {383f324b-cae7-48fd-910c-979c37f31376} - {93cc73ee-7119-4cf2-b81c-ddd0ac8a631c} @@ -112,29 +88,11 @@ {221a7676-7a2d-47eb-882f-044fe98f31d5} - - {dd23cf0d-fdd2-4548-9b29-b2eb9076c3e2} - - - {ead0c934-d260-40ce-9d05-dce7182a86c8} - - - {256ea024-2faa-401d-b803-68c992067541} - - - {acee10b9-9d01-4445-8eca-9baa872ecdb1} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -147,12 +105,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/operations/msbuild/server/server.vcxproj b/cpp/test/Ice/operations/msbuild/server/server.vcxproj index fa814669858..216feed60ec 100644 --- a/cpp/test/Ice/operations/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/operations/msbuild/server/server.vcxproj @@ -169,26 +169,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -209,26 +189,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -252,26 +212,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -292,26 +232,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/operations/msbuild/server/server.vcxproj.filters b/cpp/test/Ice/operations/msbuild/server/server.vcxproj.filters index 2b030acbb28..3985d5e666a 100644 --- a/cpp/test/Ice/operations/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Ice/operations/msbuild/server/server.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {759bc4ca-28b1-4edb-be6f-9e0aa9fc9591} - - {76ba3424-75c4-4081-b287-4d67ed500b50} - {d41a7991-3b60-4df6-8e92-f7f3dae62b62} - - {6615010b-d891-447a-9b1e-0f47224e4704} - {b12929ce-8b50-4056-8533-e6087fd20c70} - - {da7f6ecb-6705-4c9f-a421-372f591b82ec} - {1c2b8ea3-0207-4233-88db-25979dc06167} - - {25e570ed-b3db-4e9f-86c4-84e267f5c62b} - {53b2b65b-d9af-41f9-9d4b-90c189cb2452} @@ -91,29 +67,11 @@ {35b3ce8d-f989-40d3-9872-c8159e49a3fe} - - {92ca2d6c-76d8-4282-a797-110c8918ab10} - - - {7b9801fd-404e-41a2-8944-55bdcf44772b} - - - {a9cef5a9-43fa-4c2b-82b6-a0700312d25b} - - - {881fe500-1235-4723-a459-821314bc4cda} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/operations/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/operations/msbuild/serveramd/serveramd.vcxproj index f9e648ba3eb..91fb212bc56 100644 --- a/cpp/test/Ice/operations/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/operations/msbuild/serveramd/serveramd.vcxproj @@ -166,26 +166,6 @@ - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - true true @@ -206,26 +186,6 @@ true ..\..\TestAMD.ice - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - true true @@ -249,26 +209,6 @@ - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - true true @@ -289,26 +229,6 @@ true ..\..\TestAMD.ice - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - true true diff --git a/cpp/test/Ice/operations/msbuild/serveramd/serveramd.vcxproj.filters b/cpp/test/Ice/operations/msbuild/serveramd/serveramd.vcxproj.filters index 40b35737f2a..ed14abfa698 100644 --- a/cpp/test/Ice/operations/msbuild/serveramd/serveramd.vcxproj.filters +++ b/cpp/test/Ice/operations/msbuild/serveramd/serveramd.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {fdc8875b-000e-472b-900f-c157b6dc6035} - - {e55528f0-e924-4b5d-a87c-37d9c1f44412} - {c5b6d43a-6963-4d11-95da-e4f2a1eb68f1} - - {fa745818-04ea-420c-86f7-dfc79898e913} - {388a612b-c3fa-4bdf-8048-2d00e2b7e240} - - {c724060b-1bc0-4e08-aede-83d8591926da} - {56bca4ba-91be-44d0-9b92-b3b79db0dcdd} - - {ddaa2c5e-9044-420b-aa03-dec8a4e56202} - {7abe6ec3-ed12-4624-87bc-ad587c9ab3d6} @@ -91,29 +67,11 @@ {70fee8b2-b51c-4329-8500-c7495c056e36} - - {81000607-26b0-493f-9c83-df8356985b7d} - - - {bc51c886-8495-44e4-ad17-9c4c9d601975} - - - {75714fe3-4122-42b1-ba7a-51fd77c7aeb4} - - - {76d10be0-05b7-4947-88c3-66e6a5cb62d6} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/optional/msbuild/client/client.vcxproj b/cpp/test/Ice/optional/msbuild/client/client.vcxproj index 25c2640c072..4bbc4dc444a 100644 --- a/cpp/test/Ice/optional/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/optional/msbuild/client/client.vcxproj @@ -167,26 +167,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -207,26 +187,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -249,26 +209,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -289,26 +229,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/optional/msbuild/client/client.vcxproj.filters b/cpp/test/Ice/optional/msbuild/client/client.vcxproj.filters index d5e90706a48..ae962a5dd19 100644 --- a/cpp/test/Ice/optional/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Ice/optional/msbuild/client/client.vcxproj.filters @@ -10,12 +10,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -28,12 +22,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -49,27 +37,15 @@ {0349729d-fe46-4b5e-bcc7-dabf0b3d4961} - - {2d89c62e-9498-4dcd-8290-dcfeb27df528} - {0a630c40-dfab-49cf-a89a-e2bfba4afcff} - - {32fd4a24-9ae6-4cc1-9869-627b4f646a17} - {44cb4eb9-cb2a-4caa-a01c-09d10b731ba3} - - {a87b886e-605f-4cbd-8447-ac45b3fbe265} - {021218b6-040d-4a88-b352-e9b57b8e3f89} - - {2f09b97e-608d-4c69-8ca0-43457cd09e30} - {ecfbecde-9f32-4c54-a2bc-047ab51fb377} @@ -94,26 +70,8 @@ {edae816e-af9b-4747-bf8c-5ef878b0a0bc} - - {487c1c43-67bc-480a-87e3-24e5408a7682} - - - {915ddc2f-4a83-49f4-bc0f-45839c53fbcf} - - - {8edb2d01-9e87-4797-93da-5f1ac86d3c86} - - - {fae79228-101f-443b-9fd8-a12f47d48246} - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/optional/msbuild/server/server.vcxproj b/cpp/test/Ice/optional/msbuild/server/server.vcxproj index c64c773afac..cffb2bc2a9f 100644 --- a/cpp/test/Ice/optional/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/optional/msbuild/server/server.vcxproj @@ -165,26 +165,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -205,26 +185,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -248,26 +208,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -288,26 +228,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/optional/msbuild/server/server.vcxproj.filters b/cpp/test/Ice/optional/msbuild/server/server.vcxproj.filters index 3a4334bcf0f..93c884b3f7f 100644 --- a/cpp/test/Ice/optional/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Ice/optional/msbuild/server/server.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {1958013b-6b0a-471b-9088-9327876d78fd} - - {0042e4dc-be56-43ed-9bd1-b81bb5278960} - {3b09ba82-ad3e-405f-bed7-d37992cd69d1} - - {0bbe49e1-2cfd-42dd-aed0-a1c2cfdc8684} - {6eb6fccd-bfd5-494b-b196-6df004132ef1} - - {c5189e5e-67d6-4463-8a60-9c453526b84f} - {3c3c2eb6-6f2c-4f1a-8715-a04afb9f3c31} - - {6e9d6447-4e8f-4e63-91bc-13ed736d85d8} - {f9a10fa4-486d-49f5-9325-fab3cb4301dc} @@ -91,29 +67,11 @@ {0795383f-a567-464f-90f7-862eedc5e9f1} - - {c585f260-86ce-4d97-9eb6-82a3f4b079cd} - - - {27764317-e7fe-45a9-b1f6-a4efe856bbba} - - - {24b9522f-d554-47fc-970f-ba1c57cbaba8} - - - {3072651e-527b-415b-a704-afaaa0795f18} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/optional/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/optional/msbuild/serveramd/serveramd.vcxproj index 1c0780813a4..2e546c00559 100644 --- a/cpp/test/Ice/optional/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/optional/msbuild/serveramd/serveramd.vcxproj @@ -162,26 +162,6 @@ - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - true true @@ -202,26 +182,6 @@ true ..\..\TestAMD.ice - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - true true @@ -245,26 +205,6 @@ - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - true true @@ -285,26 +225,6 @@ true ..\..\TestAMD.ice - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - true true diff --git a/cpp/test/Ice/optional/msbuild/serveramd/serveramd.vcxproj.filters b/cpp/test/Ice/optional/msbuild/serveramd/serveramd.vcxproj.filters index 00c79333837..3556bd6303d 100644 --- a/cpp/test/Ice/optional/msbuild/serveramd/serveramd.vcxproj.filters +++ b/cpp/test/Ice/optional/msbuild/serveramd/serveramd.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {ba0a0ea4-5c0b-453e-826c-c384d7120555} - - {263a7dbd-fab9-49cb-bf37-e1a9684faeb1} - {0341735d-de1d-456c-8164-d17b47b811a9} - - {2bc9f6b0-66af-4e8c-8577-2bbfcb62bcda} - {d03f2c31-7a9a-4bdc-b3b7-3b6480c44dfc} - - {e8a9c47a-d3ef-41b7-8654-df6e43a24a6c} - {fdedbe1a-6b7d-4114-88e2-921b5d4837b7} - - {0e0f5150-9026-417a-8bd8-8141396412fa} - {6b6a45e3-5bf3-49ed-b70d-4dd806af717d} @@ -91,29 +67,11 @@ {957d4f0d-982d-478f-b39c-d93277be6f23} - - {bba3f375-601c-4811-8f38-dbfe6146e6a5} - - - {c26e2e0a-bb72-4976-8915-c8a0ebeeaa45} - - - {09aa0113-e717-4b9f-8835-93f8a520eb3e} - - - {cde90be6-0d61-4bb0-8444-834b7d8468de} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/proxy/msbuild/client/client.vcxproj b/cpp/test/Ice/proxy/msbuild/client/client.vcxproj index 9c34dcec479..05f98537b90 100644 --- a/cpp/test/Ice/proxy/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/client/client.vcxproj @@ -122,26 +122,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -162,26 +142,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -204,26 +164,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -244,26 +184,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/proxy/msbuild/client/client.vcxproj.filters b/cpp/test/Ice/proxy/msbuild/client/client.vcxproj.filters index d3bc9907aaa..01bf6de6230 100644 --- a/cpp/test/Ice/proxy/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Ice/proxy/msbuild/client/client.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {54573de8-7268-44f9-9375-1dce4fb7100c} - - {943afcac-20b8-4ad5-aa98-9f1431706f8c} - {40861e7c-3893-4355-a13d-f5307a9f86d7} - - {8944216d-17aa-4991-a13e-c879666c6c08} - {ac914959-fbeb-437b-91cc-c7fce2029091} - - {7214cdf4-2aef-4a43-9438-18808e86b21e} - {68c686fc-0d15-46a8-ad13-6a4ca8da5452} - - {9eeedfe8-5c94-46de-97b9-117f2c2527ca} - {074d90cd-b008-4ec9-961c-5f400c7716a9} @@ -91,26 +67,8 @@ {8edcdb9b-ab76-4f29-8969-923d5c2947c7} - - {e2e2bf5b-7fad-43fe-9a70-eddcc6a3e20a} - - - {94755add-d28c-4547-9ea6-1880e50601d7} - - - {dd65d923-5139-4a50-90b3-23ad20640332} - - - {2479c71f-a4b8-4abe-ae85-0ab6b37786fe} - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/proxy/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/proxy/msbuild/collocated/collocated.vcxproj index bac57fe4f08..79fc56c75fc 100644 --- a/cpp/test/Ice/proxy/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/collocated/collocated.vcxproj @@ -162,26 +162,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -202,26 +182,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -245,26 +205,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -285,26 +225,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/proxy/msbuild/collocated/collocated.vcxproj.filters b/cpp/test/Ice/proxy/msbuild/collocated/collocated.vcxproj.filters index 089a811102b..b2a06a81d20 100644 --- a/cpp/test/Ice/proxy/msbuild/collocated/collocated.vcxproj.filters +++ b/cpp/test/Ice/proxy/msbuild/collocated/collocated.vcxproj.filters @@ -10,12 +10,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -28,12 +22,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -49,27 +37,15 @@ {b5705cfb-5462-43a1-bd39-be7c197d27c0} - - {4374c370-cc8e-4693-99e2-7a74c68aa07c} - {c6aa5058-652e-4c61-af39-0cab54693e37} - - {0930d1a0-b3f4-43a1-b6f3-69eb597ea620} - {031d455a-634b-4626-9c2c-6b8fabea4a9b} - - {8f8c804e-72ba-476f-8bda-620815d2450a} - {4120e2e4-9686-45dc-8f05-762169b314ac} - - {d920b50a-00a3-441a-8744-f6026b04ef2d} - {b55f687e-b063-4cb8-8ba3-c2ac749dc933} @@ -94,29 +70,11 @@ {d1765ec9-be3d-41f3-8bed-0a24e0b9a19b} - - {6bdcd27f-bea6-48a4-b87d-a0be38f196f3} - - - {51cb9da9-858d-48a4-994c-30c29291d348} - - - {c13d3f98-a109-4fb2-88b2-e6480156457b} - - - {d73421bd-6875-4ab8-9e10-ce5ca7f27fd5} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -129,12 +87,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/proxy/msbuild/server/server.vcxproj b/cpp/test/Ice/proxy/msbuild/server/server.vcxproj index 40939b28e52..c59532c80a2 100644 --- a/cpp/test/Ice/proxy/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/server/server.vcxproj @@ -161,26 +161,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -201,26 +181,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -244,26 +204,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -284,26 +224,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/proxy/msbuild/server/server.vcxproj.filters b/cpp/test/Ice/proxy/msbuild/server/server.vcxproj.filters index 953095c620b..fa773da0802 100644 --- a/cpp/test/Ice/proxy/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Ice/proxy/msbuild/server/server.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {f762f943-cc45-4202-84f0-7b0d46f2d787} - - {0c04452d-b801-4223-b28b-4853fc9ce13b} - {256ac64f-b3e8-43ef-b79c-df80e9ef5e41} - - {4e5048c6-3ff3-4cfc-a3b0-da254dcc0f1e} - {a3c96fb1-a2ae-44c1-b2ed-c8ee068383c0} - - {ff8ecfd0-786b-4fee-a4a4-02135ec403b9} - {9fea78f3-de2f-4e9c-8d17-cc746b79582f} - - {6e83ee4a-eb7a-4452-bdc7-4c80e6043e64} - {0227e90c-bbd9-48ab-9a32-7229752254a6} @@ -91,29 +67,11 @@ {c13b32f6-d015-48f0-be69-3fcb074b0c91} - - {6671864d-ce9c-4537-8786-f01a6d8dced7} - - - {4e7c2ee7-6ca2-4c9d-a0a0-d34e27e3c1e5} - - - {2ed76a97-2e7a-4bcc-ac76-a5185a867a77} - - - {0c212393-24c5-4e0d-8fb3-d55157664458} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/proxy/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/proxy/msbuild/serveramd/serveramd.vcxproj index bdfe1355bf5..dddffcac371 100644 --- a/cpp/test/Ice/proxy/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/serveramd/serveramd.vcxproj @@ -158,26 +158,6 @@ - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - true true @@ -198,26 +178,6 @@ true ..\..\TestAMD.ice - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - true true @@ -241,26 +201,6 @@ - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - true true @@ -281,26 +221,6 @@ true ..\..\TestAMD.ice - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - true true diff --git a/cpp/test/Ice/proxy/msbuild/serveramd/serveramd.vcxproj.filters b/cpp/test/Ice/proxy/msbuild/serveramd/serveramd.vcxproj.filters index a4391a6576e..339b793f509 100644 --- a/cpp/test/Ice/proxy/msbuild/serveramd/serveramd.vcxproj.filters +++ b/cpp/test/Ice/proxy/msbuild/serveramd/serveramd.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {6df7bef0-7f0f-4c58-a888-b411203224ba} - - {581a0bfc-6613-481c-8e2e-260d1ae6ee4e} - {e65a36dc-524c-42fc-b0e6-357075b87ced} - - {aabc2135-091e-48da-a862-673bb5621275} - {3dcd8937-42b2-4faa-92fa-91aad3eb85c6} - - {6763877a-7851-4ae4-984e-3c6caecbb09f} - {785e116e-4598-41b4-944b-ce8fde5d60c6} - - {c0910ed5-25e0-4183-bcf0-4ed1636a4a8b} - {3f02ef38-fa31-48ee-84bd-7067e22ad006} @@ -91,29 +67,11 @@ {d0f544de-14ec-4ea7-8da2-08334564330b} - - {e32e6edb-1e6a-4d7e-bfe6-754fd808598b} - - - {75b7324c-667a-4f04-a555-a810abddbbba} - - - {1383c6b1-319e-41a0-bc61-b1fc17b5b826} - - - {ae3be3cd-a137-4a70-aa38-d625e9cbb2e8} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/retry/msbuild/client/client.vcxproj b/cpp/test/Ice/retry/msbuild/client/client.vcxproj index d734d3e4dc7..4fb39a75859 100644 --- a/cpp/test/Ice/retry/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/retry/msbuild/client/client.vcxproj @@ -163,26 +163,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -203,26 +183,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -246,26 +206,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -286,26 +226,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/retry/msbuild/client/client.vcxproj.filters b/cpp/test/Ice/retry/msbuild/client/client.vcxproj.filters index d5acb35eb37..985c19b0b74 100644 --- a/cpp/test/Ice/retry/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Ice/retry/msbuild/client/client.vcxproj.filters @@ -10,12 +10,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -28,12 +22,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -49,27 +37,15 @@ {ee3f9834-3263-42d2-bddc-41231f0bce55} - - {25300fbf-48c5-4e85-ad48-6486c35afa29} - {a2b60b99-7686-4954-9efa-564f0bbb0355} - - {770586d7-964f-4233-9cac-1e1d313953f8} - {29477bc7-3e6b-4172-a229-b78e9e190925} - - {d2c8aca0-4a4d-481a-ae48-c8cca4610939} - {0c6c5194-f444-41ef-9356-8a9eddfd1399} - - {8d9cdf25-8874-4b2b-8a3d-2d594c900b72} - {20f4302a-eec2-4e15-bb3d-3b6184df0199} @@ -94,29 +70,11 @@ {3b4162db-a86b-437d-ae53-2a6fccd0091f} - - {684599ff-b23c-4b90-9bf5-92f84ba0a2cd} - - - {9bc8ba2f-3278-4a95-9ba6-d9ec02f63fd8} - - - {c6941854-0654-462d-830a-b0100ee582a2} - - - {8a82fa6b-449c-4b59-914a-785073f31e13} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -129,12 +87,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/retry/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/retry/msbuild/collocated/collocated.vcxproj index 4743e7ce5aa..334b3605785 100644 --- a/cpp/test/Ice/retry/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/retry/msbuild/collocated/collocated.vcxproj @@ -163,26 +163,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -203,26 +183,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -247,26 +207,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -287,26 +227,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/retry/msbuild/collocated/collocated.vcxproj.filters b/cpp/test/Ice/retry/msbuild/collocated/collocated.vcxproj.filters index 4b57ec32a31..f8ea400a272 100644 --- a/cpp/test/Ice/retry/msbuild/collocated/collocated.vcxproj.filters +++ b/cpp/test/Ice/retry/msbuild/collocated/collocated.vcxproj.filters @@ -13,12 +13,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -31,12 +25,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -52,27 +40,15 @@ {93d8f2b5-1c2f-4415-89d6-ac01afec169d} - - {e7abb63a-d764-4400-bc72-33a215ff518c} - {a573271f-c850-4b1d-bf76-103c62998d3a} - - {78684f59-d792-462d-81fd-6758bacb590a} - {aeecbf65-14ae-48b7-b7ee-1422f3e4fc8f} - - {b451a7af-41b6-40be-880b-d0ebcaee2c9e} - {9854b865-7617-46ae-a00e-3fe26a805220} - - {6da5db22-5539-478c-8f54-ded9562c1882} - {87444007-fbf7-47bf-8e48-8589a6cbf329} @@ -97,18 +73,6 @@ {5258d75f-1244-4ed5-b603-f029254b1524} - - {0c4d05bc-1ef4-48df-9a19-a6313b15938c} - - - {c7a4d7fe-240a-4cc6-a6a4-e8850a0b31fa} - - - {355ce0ec-0be1-4833-b14c-4ad4c5fde0b4} - - - {084b97fd-65ee-460e-812f-4aaf696c19a3} - @@ -117,12 +81,6 @@ Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -135,12 +93,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/retry/msbuild/server/server.vcxproj b/cpp/test/Ice/retry/msbuild/server/server.vcxproj index dadb8986c63..c2ecd156f2f 100644 --- a/cpp/test/Ice/retry/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/retry/msbuild/server/server.vcxproj @@ -162,26 +162,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -202,26 +182,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -247,26 +207,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -287,26 +227,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/retry/msbuild/server/server.vcxproj.filters b/cpp/test/Ice/retry/msbuild/server/server.vcxproj.filters index c8dd4d3330e..6fbf33ed6ab 100644 --- a/cpp/test/Ice/retry/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Ice/retry/msbuild/server/server.vcxproj.filters @@ -10,12 +10,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -28,12 +22,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -49,27 +37,15 @@ {7d00e604-6c82-44e8-80e9-591f0ea14ba9} - - {8e42ba20-9c18-47a8-9416-f877b571de60} - {db503615-3a6e-4481-8d1a-b01ac09eb228} - - {34b6f82b-60e8-4505-9ace-8dad07988a96} - {f554c516-811f-4c5c-b4f2-59814d159366} - - {7010030a-c466-4a24-8db6-9f0c291e8940} - {135ac086-60dd-4ebc-a647-02a616871ef2} - - {98bc0ce2-24e6-4c92-8018-45f666d4ddda} - {acf48d5b-fd16-479c-b56b-15010c0551be} @@ -94,18 +70,6 @@ {4f359268-1b5d-42be-9970-5036534bad84} - - {a29d7ae8-18e4-4427-98dc-e24c8f27b858} - - - {54093967-65b1-42df-aba5-55c962cefd60} - - - {b8f1d6dc-8e50-426d-8c7a-710bf2a854fd} - - - {8fbc6d1a-c4b7-426b-bac6-17f89a108a69} - @@ -117,12 +81,6 @@ Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -135,12 +93,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/scope/msbuild/client/client.vcxproj b/cpp/test/Ice/scope/msbuild/client/client.vcxproj index 6e59cd559b3..51c9e5737b1 100644 --- a/cpp/test/Ice/scope/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/scope/msbuild/client/client.vcxproj @@ -162,26 +162,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -202,26 +182,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -244,26 +204,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -284,26 +224,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/scope/msbuild/client/client.vcxproj.filters b/cpp/test/Ice/scope/msbuild/client/client.vcxproj.filters index 5f4eec38e35..2c620899715 100644 --- a/cpp/test/Ice/scope/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Ice/scope/msbuild/client/client.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {a73767b6-aacc-4fc6-b05a-82467de086ad} - - {2169552a-6e52-49c0-9e2e-4a1ee0fa915b} - {bff43d98-ea44-4264-b7ac-6f9edba637d4} - - {1d6571cc-2a9d-4c4a-ab0f-d060df3d4f5e} - {1d8f772d-7ebd-40a1-bbb3-488cafe138d9} - - {27add602-5fa9-42ce-9819-9922aad0ade3} - {4cf18090-2784-439b-b91d-4d18508778b2} - - {af6cbdd3-217a-480e-8e05-75e4f225aaf8} - {f36d15fc-be83-4b24-bebd-6476e2139ab5} @@ -91,26 +67,8 @@ {0ecb0fa1-9dbe-4701-99b8-abef8e3df89c} - - {515c7960-e3d8-4d61-9b41-02777dfc2197} - - - {ea866deb-464e-4572-9b5b-14f869aeedab} - - - {2d63e6bc-0d3c-4785-a07a-b6b6a00f949e} - - - {5e708e2a-333d-49ac-b4da-94d528eb4ea4} - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/scope/msbuild/server/server.vcxproj b/cpp/test/Ice/scope/msbuild/server/server.vcxproj index 23a8ef205be..e7a93735c7b 100644 --- a/cpp/test/Ice/scope/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/scope/msbuild/server/server.vcxproj @@ -168,26 +168,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -208,26 +188,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -251,26 +211,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -291,26 +231,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/scope/msbuild/server/server.vcxproj.filters b/cpp/test/Ice/scope/msbuild/server/server.vcxproj.filters index df946a793da..d0921910700 100644 --- a/cpp/test/Ice/scope/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Ice/scope/msbuild/server/server.vcxproj.filters @@ -4,12 +4,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -22,12 +16,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -43,27 +31,15 @@ {759bc4ca-28b1-4edb-be6f-9e0aa9fc9591} - - {76ba3424-75c4-4081-b287-4d67ed500b50} - {d41a7991-3b60-4df6-8e92-f7f3dae62b62} - - {6615010b-d891-447a-9b1e-0f47224e4704} - {b12929ce-8b50-4056-8533-e6087fd20c70} - - {da7f6ecb-6705-4c9f-a421-372f591b82ec} - {1c2b8ea3-0207-4233-88db-25979dc06167} - - {25e570ed-b3db-4e9f-86c4-84e267f5c62b} - {53b2b65b-d9af-41f9-9d4b-90c189cb2452} @@ -88,29 +64,11 @@ {35b3ce8d-f989-40d3-9872-c8159e49a3fe} - - {92ca2d6c-76d8-4282-a797-110c8918ab10} - - - {7b9801fd-404e-41a2-8944-55bdcf44772b} - - - {a9cef5a9-43fa-4c2b-82b6-a0700312d25b} - - - {881fe500-1235-4723-a459-821314bc4cda} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/servantLocator/msbuild/client/client.vcxproj b/cpp/test/Ice/servantLocator/msbuild/client/client.vcxproj index 404f4e19d52..7d30a9e9718 100644 --- a/cpp/test/Ice/servantLocator/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/servantLocator/msbuild/client/client.vcxproj @@ -122,26 +122,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -162,26 +142,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -204,26 +164,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -244,26 +184,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/servantLocator/msbuild/client/client.vcxproj.filters b/cpp/test/Ice/servantLocator/msbuild/client/client.vcxproj.filters index ff9cac4ed55..b073dd07d1f 100644 --- a/cpp/test/Ice/servantLocator/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Ice/servantLocator/msbuild/client/client.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {bec736b0-9d70-42d9-a32c-83b3dfb7400d} - - {ebe45a39-d7d7-4424-aa7f-e2a9f9d74f44} - {92511af6-c362-4776-ace8-50160bed4f14} - - {cd4dc961-f111-4559-a499-b181ba948aa4} - {846e744f-bdc7-448a-900c-d85580d4870b} - - {c4c6ffa0-2966-401c-8bf1-a10e3271b867} - {44bc35dd-d6bf-4d29-9cb1-5d95f8ff5371} - - {efe057e6-337c-4bbf-b0f7-22c6243f6cc0} - {b866b50c-a309-4c61-a915-124063fb3c90} @@ -91,26 +67,8 @@ {fbf2283a-e6d6-4b12-96fb-9fc93362737c} - - {8a19cda3-d3b3-4678-aecb-282037919af9} - - - {e2e8504d-fd33-408d-9d4b-2a829d74c72d} - - - {f0f4815e-14ea-4c2b-a8f9-9fc5fe4c4e08} - - - {3631c90b-e251-43dd-9a56-084bc0ccab7d} - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/servantLocator/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/servantLocator/msbuild/collocated/collocated.vcxproj index de8f2f00c19..b388533786b 100644 --- a/cpp/test/Ice/servantLocator/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/servantLocator/msbuild/collocated/collocated.vcxproj @@ -163,26 +163,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -203,26 +183,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -247,26 +207,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -287,26 +227,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/servantLocator/msbuild/collocated/collocated.vcxproj.filters b/cpp/test/Ice/servantLocator/msbuild/collocated/collocated.vcxproj.filters index af66a26cfe4..39df53dc610 100644 --- a/cpp/test/Ice/servantLocator/msbuild/collocated/collocated.vcxproj.filters +++ b/cpp/test/Ice/servantLocator/msbuild/collocated/collocated.vcxproj.filters @@ -13,12 +13,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -31,12 +25,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -52,27 +40,15 @@ {114e8458-7fb1-4e16-ac99-e166a4c48461} - - {8d0b4569-0831-474c-85bc-2ef2786fc09b} - {d22a2c53-32c3-4324-890f-0d813f4efe5e} - - {ea71c2f2-66cb-48c5-a1c2-af76c6bf69f3} - {aab87d05-c4c4-4daf-a3f9-91db64178a06} - - {15a82d8f-92c4-4cbc-aa91-cd77b58e312c} - {48b45b45-f6b2-4695-9b52-2ba0a36712b5} - - {0152f5fb-429b-447e-b9d4-53d78e911b85} - {2d492751-92b3-4da2-af62-02acc155ef97} @@ -97,18 +73,6 @@ {e8794e3d-8812-4ed5-b613-4db8f0de9b17} - - {18d48adb-11cd-4dde-9f07-932c278c979f} - - - {13b6285d-3d84-457a-936c-83d7d80aedbb} - - - {074edc2f-2f34-4969-87df-07240dffbe68} - - - {2cd6252d-7194-4d90-949f-4c18af949512} - @@ -117,12 +81,6 @@ Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -135,12 +93,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/servantLocator/msbuild/server/server.vcxproj b/cpp/test/Ice/servantLocator/msbuild/server/server.vcxproj index e72b9a28865..542a9393fbe 100644 --- a/cpp/test/Ice/servantLocator/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/servantLocator/msbuild/server/server.vcxproj @@ -162,26 +162,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -202,26 +182,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -246,26 +206,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -286,26 +226,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/servantLocator/msbuild/server/server.vcxproj.filters b/cpp/test/Ice/servantLocator/msbuild/server/server.vcxproj.filters index f0c41bec271..d4388e05b97 100644 --- a/cpp/test/Ice/servantLocator/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Ice/servantLocator/msbuild/server/server.vcxproj.filters @@ -10,12 +10,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -28,12 +22,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -49,27 +37,15 @@ {abdb3c27-ff68-4ebc-ae82-c37da176bb3d} - - {a1726a5f-fdfc-4076-98e8-8cd3e1286aca} - {7e1c3735-ecfc-4c4c-810f-879183b292a9} - - {fbd4e61d-279c-40d4-b636-06e323c83c3c} - {5942087d-2686-4e81-bf09-d867313bd12a} - - {0b9c6b5e-3509-43a4-9a06-58ed386813e2} - {851ca66e-6585-415a-8900-c2248c9c5553} - - {d2b5ec72-d0ab-48be-91e7-d9657fc644ca} - {6cc8c494-a77a-4ae7-b9d0-90642452d084} @@ -94,18 +70,6 @@ {28f05d67-7e54-4934-8867-623591cb4016} - - {21dd2dc7-1bb8-4c70-9788-2ae880971ba1} - - - {799dca28-f268-4b20-95f0-feac43fabb3f} - - - {9804e8e9-9738-4422-8dbd-3d6ab8a6b468} - - - {f360d5c4-cfb4-41e8-b938-0507a6569a14} - @@ -114,12 +78,6 @@ Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -132,12 +90,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/servantLocator/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/servantLocator/msbuild/serveramd/serveramd.vcxproj index b392fef03f0..a84f588a7a1 100644 --- a/cpp/test/Ice/servantLocator/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/servantLocator/msbuild/serveramd/serveramd.vcxproj @@ -167,26 +167,6 @@ - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - true true @@ -207,26 +187,6 @@ true ..\..\TestAMD.ice - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - true true @@ -251,26 +211,6 @@ - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - true true @@ -291,26 +231,6 @@ true ..\..\TestAMD.ice - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - true true diff --git a/cpp/test/Ice/servantLocator/msbuild/serveramd/serveramd.vcxproj.filters b/cpp/test/Ice/servantLocator/msbuild/serveramd/serveramd.vcxproj.filters index a94f8fce22f..6fd3d644cec 100644 --- a/cpp/test/Ice/servantLocator/msbuild/serveramd/serveramd.vcxproj.filters +++ b/cpp/test/Ice/servantLocator/msbuild/serveramd/serveramd.vcxproj.filters @@ -10,12 +10,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -28,12 +22,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -49,27 +37,15 @@ {84dd8a81-cd8d-43fc-9254-0ee1ecf55d63} - - {f9f73807-26af-4ae4-8a6b-526e3377df09} - {5abd11d3-5443-481b-9418-884f2d5d5793} - - {4965d413-32c2-4dd3-b4f9-4eed2579c967} - {db14aee9-a541-4855-afa6-ecdfb7e89435} - - {c7cb3f8e-4864-4200-8fe3-53854fb23451} - {5d13915c-7323-41da-a672-6c008c6c69d8} - - {e3b9f110-dc4c-49ab-9bc2-58c2b106139e} - {b8ccd913-d4a0-4b6b-a758-6cc4064ab353} @@ -94,18 +70,6 @@ {ae1119de-b83a-4388-8f2c-081c3d3ba16e} - - {4172db62-0a2d-4031-9f16-5e87aab78958} - - - {a4b2b59f-e141-40e1-b8a1-182929e18702} - - - {dfe19338-c5bc-4e02-aaf6-b7f10c002da6} - - - {a54729d0-e1d3-40e2-9b89-568222e3a153} - @@ -114,12 +78,6 @@ Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -132,12 +90,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/services/msbuild/client.vcxproj b/cpp/test/Ice/services/msbuild/client.vcxproj index dcb25c55d62..35b446b3077 100644 --- a/cpp/test/Ice/services/msbuild/client.vcxproj +++ b/cpp/test/Ice/services/msbuild/client.vcxproj @@ -167,26 +167,6 @@ - - true - true - true - true - true - true - true - ..\Test.ice - - - true - true - true - true - true - true - true - ..\Test.ice - true true @@ -207,26 +187,6 @@ true ..\Test.ice - - true - true - true - true - true - true - true - ..\Test.ice - - - true - true - true - true - true - true - true - ..\Test.ice - true true @@ -252,26 +212,6 @@ - - true - true - true - true - true - true - true - ..\Test.ice - - - true - true - true - true - true - true - true - ..\Test.ice - true true @@ -292,26 +232,6 @@ true ..\Test.ice - - true - true - true - true - true - true - true - ..\Test.ice - - - true - true - true - true - true - true - true - ..\Test.ice - true true diff --git a/cpp/test/Ice/services/msbuild/client.vcxproj.filters b/cpp/test/Ice/services/msbuild/client.vcxproj.filters index d711768c4a1..89e6b1c48e0 100644 --- a/cpp/test/Ice/services/msbuild/client.vcxproj.filters +++ b/cpp/test/Ice/services/msbuild/client.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {ccce578e-fabf-4419-9a0c-5b0f0607c898} - - {ab238f86-fa96-4791-a4c4-30785e08fa3e} - {79efcdc0-cf86-4d29-b8dc-6190c75546bc} - - {7c6a9f6b-fd9d-4e71-b81a-e11aadc6b3dd} - {35b4ea4c-eb2b-4799-beb3-038cbc29eccb} - - {325c009d-7752-4bd2-a8a7-9c86cd02f6c3} - {ab3805bb-61bc-4faa-9b14-ee9d7182433f} - - {368741a9-f456-4b27-9f4c-5d3f5623bf19} - {253cad1c-e761-4c65-b434-33c27681881b} @@ -91,26 +67,8 @@ {716b37db-d4aa-4343-9a38-b4fdc26634b9} - - {673e4ef7-35a7-45f3-8105-e314e7600556} - - - {29fb7a6f-76ca-4d19-a491-fcdb55c0557e} - - - {d6be2bdb-4af9-4260-bcd7-e3d9b12ff392} - - - {d727643c-e113-4003-8fb4-3931c142119c} - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/slicing/exceptions/msbuild/client/client.vcxproj b/cpp/test/Ice/slicing/exceptions/msbuild/client/client.vcxproj index 36e71083718..12fb8376eb4 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/slicing/exceptions/msbuild/client/client.vcxproj @@ -125,46 +125,6 @@ - - true - true - true - true - true - true - true - ..\..\ClientPrivate.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\ClientPrivate.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -205,46 +165,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\ClientPrivate.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\ClientPrivate.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -287,46 +207,6 @@ - - true - true - true - true - true - true - true - ..\..\ClientPrivate.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\ClientPrivate.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -367,46 +247,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\ClientPrivate.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\ClientPrivate.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/slicing/exceptions/msbuild/client/client.vcxproj.filters b/cpp/test/Ice/slicing/exceptions/msbuild/client/client.vcxproj.filters index 0f64e1fced5..b6444c6edb5 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Ice/slicing/exceptions/msbuild/client/client.vcxproj.filters @@ -7,18 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -43,18 +31,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -70,27 +46,15 @@ {be651520-c426-4580-8bd5-d7323c4ac188} - - {dcf79ed5-a298-4f22-92a2-0c849e76739f} - {cc032aa5-533c-41e4-ad22-6023a23ca8eb} - - {4017847e-f8b6-4a81-9fcd-cc315de9dfda} - {98e4f105-d3e4-4daa-8ee1-7c164158f79e} - - {11c8c6fc-e921-44d6-83e0-146687f037de} - {1c15940e-272d-4f04-8ab4-4cbf1d5266cc} - - {d556752c-6973-494d-8d4d-936677beff35} - {858ebe23-341f-4a5f-a590-b161680aa865} @@ -115,32 +79,8 @@ {cd316006-4037-42e2-a66a-90dde3552618} - - {bdee4fbc-df21-4831-bb4b-d2055f7fbb05} - - - {f5728b3a-2400-4d5c-98e8-0ffe09bec720} - - - {dc4c0e42-11d7-4e4d-8a5d-bc3466cc22e3} - - - {5c9d3add-6b1d-404e-81ef-7883e6687779} - - - Header Files\x64\Cpp11-Debug - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -165,18 +105,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/slicing/exceptions/msbuild/server/server.vcxproj b/cpp/test/Ice/slicing/exceptions/msbuild/server/server.vcxproj index 5fd75ea2d0a..ac3f6ee881f 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/slicing/exceptions/msbuild/server/server.vcxproj @@ -164,46 +164,6 @@ - - true - true - true - true - true - true - true - ..\..\ServerPrivate.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\ServerPrivate.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -244,46 +204,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\ServerPrivate.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\ServerPrivate.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -327,46 +247,6 @@ - - true - true - true - true - true - true - true - ..\..\ServerPrivate.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\ServerPrivate.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -407,46 +287,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\ServerPrivate.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\ServerPrivate.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/slicing/exceptions/msbuild/server/server.vcxproj.filters b/cpp/test/Ice/slicing/exceptions/msbuild/server/server.vcxproj.filters index 4350a56efda..a9399a6702f 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Ice/slicing/exceptions/msbuild/server/server.vcxproj.filters @@ -7,18 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -43,18 +31,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -70,27 +46,15 @@ {f36a3b6e-205e-4d47-9205-1b3c9856391f} - - {d8ec9788-a426-4fb6-b4dd-a36436c75ec9} - {a3cfe38d-1c04-4e44-a734-aac20cfdc230} - - {2fc0ea1b-c6a5-48a0-a523-129d099e5a25} - {96f84111-bb43-43a1-b6d3-7f293c40beb2} - - {593a1a56-d2b6-4ccc-b90c-82253282d4fc} - {9772429e-0690-4a68-8b80-34560a9c0b2f} - - {dddb6cd4-66e5-458d-9a94-f53ca3e4c4ab} - {423ba910-c60b-473d-a882-26a42abbffe7} @@ -115,35 +79,11 @@ {67044d02-5ecd-40f9-be38-d7cbfcbeba51} - - {42ad05a5-dbfb-46bc-bd35-bc5a86826549} - - - {b3c048b0-95e5-4ea5-b1f8-94b5f706237a} - - - {cdbdf9e7-a8cf-46b1-891b-3097aacd9f17} - - - {d5eba8e3-007b-4442-b046-b74ecc207f04} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -168,18 +108,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.vcxproj index edeef16a488..1a77b06744e 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.vcxproj @@ -160,46 +160,6 @@ - - true - true - true - true - true - true - true - ..\..\ServerPrivateAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\ServerPrivateAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - true true @@ -240,46 +200,6 @@ true ..\..\TestAMD.ice - - true - true - true - true - true - true - true - ..\..\ServerPrivateAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\ServerPrivateAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - true true @@ -323,46 +243,6 @@ - - true - true - true - true - true - true - true - ..\..\ServerPrivateAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\ServerPrivateAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - true true @@ -403,46 +283,6 @@ true ..\..\TestAMD.ice - - true - true - true - true - true - true - true - ..\..\ServerPrivateAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\ServerPrivateAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - true true diff --git a/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.vcxproj.filters b/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.vcxproj.filters index 56ec697a979..bc0612f8ad3 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.vcxproj.filters +++ b/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.vcxproj.filters @@ -7,18 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -43,18 +31,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -70,27 +46,15 @@ {823dd48e-69db-497b-824d-b9807e9c6605} - - {3fcd946a-7d21-4f6a-921e-733311ad4c9d} - {ef05b0a7-3e68-4eb1-98b8-e51393b1d437} - - {dcebb081-ae5b-47f0-8b2e-33ad97931d6b} - {43c826aa-d2ed-4860-bab3-6cb5c2ecf38d} - - {99336a58-7b8f-406e-9cb9-976efe02a91c} - {63da5fcd-9c10-4d3d-962e-57e21492c2dc} - - {e1077129-c009-4607-b2ba-b831ad1a4ff0} - {e9ef937f-6412-46ba-8649-da607cbdf36c} @@ -115,35 +79,11 @@ {17e5d8d9-90cc-423d-8c18-0d3c6c7b8216} - - {add669c2-662a-4aff-a028-5b337e78e4cd} - - - {d472b20d-52c2-43cf-832c-62cccea31678} - - - {7eee1301-94f6-41ae-b99d-e12b2c080def} - - - {caa08a68-4f97-4309-a680-66b484535dfe} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -168,18 +108,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/slicing/objects/msbuild/client/client.vcxproj b/cpp/test/Ice/slicing/objects/msbuild/client/client.vcxproj index 3d5480bf834..cf9527c11e6 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/slicing/objects/msbuild/client/client.vcxproj @@ -121,46 +121,6 @@ - - true - true - true - true - true - true - true - ..\..\ClientPrivate.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\ClientPrivate.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -201,46 +161,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\ClientPrivate.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\ClientPrivate.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -287,46 +207,6 @@ - - true - true - true - true - true - true - true - ..\..\ClientPrivate.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\ClientPrivate.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -367,46 +247,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\ClientPrivate.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\ClientPrivate.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/slicing/objects/msbuild/client/client.vcxproj.filters b/cpp/test/Ice/slicing/objects/msbuild/client/client.vcxproj.filters index f5f72e7a464..8557ce24758 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Ice/slicing/objects/msbuild/client/client.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,18 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -49,12 +31,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -63,30 +39,18 @@ {ca99f7ca-fe65-4a5f-89a4-ded02343a5ad} - - {dff279ff-c68c-4958-b25a-7c73b7bc0799} - {7a0200a5-bf09-4d44-96f7-fb736c60da4d} {02c5e997-b879-4924-aa10-4d9bef266c76} - - {3cdb7f00-2486-4809-ba4d-592c1d901bdf} - {237b3061-7868-4129-9225-d433ad7f6274} - - {495d728f-5be5-4ca3-9297-0dc063f006ac} - {565474c9-746a-4c39-96ea-a3cd4aa04460} - - {d248de5c-36c5-4980-805a-69720c184c3c} - {3e91add4-2f64-4de1-a687-b9b5f573716a} @@ -111,30 +75,12 @@ {42d1b6fd-5329-4dfd-9625-c7bca6abd6e2} - - {06811cbd-8cdd-4a7d-87db-9c28c73406f1} - - - {86fd2578-081a-4e3e-b1af-a3496a4d4494} - - - {d8aec885-a2b4-4c4f-82de-3ad1846ae5a1} - - - {5db18abf-f2ec-4197-be70-61de49c1aa35} - {0a2d3eae-2de1-4c46-8def-cf57e30e19e4} ice - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -147,18 +93,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -171,12 +105,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/slicing/objects/msbuild/server/server.vcxproj b/cpp/test/Ice/slicing/objects/msbuild/server/server.vcxproj index 2a0b9e19171..45db17fe739 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/slicing/objects/msbuild/server/server.vcxproj @@ -164,46 +164,6 @@ - - true - true - true - true - true - true - true - ..\..\ServerPrivate.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\ServerPrivate.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -244,46 +204,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\ServerPrivate.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\ServerPrivate.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -327,46 +247,6 @@ - - true - true - true - true - true - true - true - ..\..\ServerPrivate.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\ServerPrivate.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -407,46 +287,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\ServerPrivate.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\ServerPrivate.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/slicing/objects/msbuild/server/server.vcxproj.filters b/cpp/test/Ice/slicing/objects/msbuild/server/server.vcxproj.filters index 7554241365e..8b01eb75de0 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Ice/slicing/objects/msbuild/server/server.vcxproj.filters @@ -7,18 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -43,18 +31,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -70,27 +46,15 @@ {ec28ee65-a211-49a4-8d0f-3060313e606a} - - {021e9038-5d3e-43ee-8571-5d41a4f5817a} - {43db7e82-060c-487a-a8d0-5a710f9323db} - - {b9870389-d3f6-42b2-9a27-d6e397725272} - {8bca4c9e-9d4f-4476-adf3-059d53415286} - - {9bed60c9-cb3e-4240-9e59-425df7e39ffe} - {d69f7385-9018-433c-b622-f870c0470105} - - {2c9e37bf-17e2-4ef2-8a00-a321e4ec4669} - {5e8a87ef-5b61-46ae-8af2-bb09e73d5f11} @@ -115,35 +79,11 @@ {21960ba5-a3e4-4b30-8b78-271dada37b41} - - {819e835d-f44e-4a39-b067-4a47f66fefcd} - - - {017569e3-97eb-4f60-ac78-2bc9c68c9342} - - - {52226f6c-cad9-472c-9eff-b28d55865fe5} - - - {f0586db6-a7f8-43f8-9c72-0439a0d7da2f} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -168,18 +108,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.vcxproj index 58f7e3a590d..96bd5095212 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.vcxproj @@ -160,46 +160,6 @@ - - true - true - true - true - true - true - true - ..\..\ServerPrivateAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\ServerPrivateAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - true true @@ -240,46 +200,6 @@ true ..\..\TestAMD.ice - - true - true - true - true - true - true - true - ..\..\ServerPrivateAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\ServerPrivateAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - true true @@ -323,46 +243,6 @@ - - true - true - true - true - true - true - true - ..\..\ServerPrivateAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\ServerPrivateAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - true true @@ -403,46 +283,6 @@ true ..\..\TestAMD.ice - - true - true - true - true - true - true - true - ..\..\ServerPrivateAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - - - true - true - true - true - true - true - true - ..\..\ServerPrivateAMD.ice - - - true - true - true - true - true - true - true - ..\..\TestAMD.ice - true true diff --git a/cpp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.vcxproj.filters b/cpp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.vcxproj.filters index c6170037a9d..812e1309438 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.vcxproj.filters +++ b/cpp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.vcxproj.filters @@ -7,18 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -43,18 +31,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -70,27 +46,15 @@ {4b31fa0a-4cb5-4587-b02b-31b84d9a3390} - - {6bea520a-bb00-4278-9f33-9e7a040cab04} - {3e729a87-cfc7-47a1-85ea-3b7ac291563d} - - {ee8317e5-63b3-4996-81c6-162dc33c6f70} - {806b95d2-5316-48b4-9a02-b8a7d7ca32a5} - - {f71e93c8-ff0f-4e5c-9df1-0cf76d3caf96} - {d6a084b4-396c-4cca-a30c-1b079377ebcf} - - {68e8347a-098b-43bf-8251-85d12aa4de2f} - {3bf8a717-eb05-4524-9420-fc0664a04625} @@ -115,35 +79,11 @@ {02122984-061f-4f23-9ff3-0fa1e93df177} - - {83dd6fe2-9705-4da8-be18-2b79759ff880} - - - {586b9503-44cb-4ccf-b902-91c208bd4f1c} - - - {e94d8c9e-fb33-4aed-815f-ec180fbe0418} - - - {493ce7ac-089f-4443-aa94-96e57af42ceb} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -168,18 +108,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/stream/msbuild/client.vcxproj b/cpp/test/Ice/stream/msbuild/client.vcxproj index d9e8eb7c341..94eedb6fb63 100644 --- a/cpp/test/Ice/stream/msbuild/client.vcxproj +++ b/cpp/test/Ice/stream/msbuild/client.vcxproj @@ -142,26 +142,6 @@ - - true - true - true - true - true - true - true - ..\Test.ice - - - true - true - true - true - true - true - true - ..\Test.ice - true true @@ -182,26 +162,6 @@ true ..\Test.ice - - true - true - true - true - true - true - true - ..\Test.ice - - - true - true - true - true - true - true - true - ..\Test.ice - true true @@ -227,26 +187,6 @@ - - true - true - true - true - true - true - true - ..\Test.ice - - - true - true - true - true - true - true - true - ..\Test.ice - true true @@ -267,26 +207,6 @@ true ..\Test.ice - - true - true - true - true - true - true - true - ..\Test.ice - - - true - true - true - true - true - true - true - ..\Test.ice - true true diff --git a/cpp/test/Ice/stream/msbuild/client.vcxproj.filters b/cpp/test/Ice/stream/msbuild/client.vcxproj.filters index 781213f5bb1..3fc449b8d70 100644 --- a/cpp/test/Ice/stream/msbuild/client.vcxproj.filters +++ b/cpp/test/Ice/stream/msbuild/client.vcxproj.filters @@ -4,12 +4,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -22,12 +16,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -43,27 +31,15 @@ {0b3ae5d5-8088-4f00-a782-9cd575c1556d} - - {49473093-b205-4f54-8b3f-36d16873dcd1} - {7edee64f-6552-49f4-b857-292a86987983} - - {6456ac34-60ac-40fb-94ec-299b907ca0d7} - {e986c8b5-8b06-4889-ae6c-fc57acb589a4} - - {02776162-a296-4d57-b8b2-60de2ed3d938} - {b2ca7c8b-266b-4308-b743-637bde961f2a} - - {0d7afd73-306c-493e-a412-a77a20b4be34} - {4e383a3b-aa5e-4d61-b011-fe4b319d17c6} @@ -88,26 +64,8 @@ {d7e56621-24e7-4861-b8af-0b1c5f1bffa8} - - {50ad6161-bd08-46ad-8df7-49ed3a7aa0f1} - - - {96518ee8-8943-47fa-907c-6f12f5bf1229} - - - {c2ebe856-a146-4b21-8ce6-6f569b786278} - - - {54212b5a-9b53-46c7-b4ec-e9d309ee465a} - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -120,12 +78,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/stringConverter/msbuild/client/client.vcxproj b/cpp/test/Ice/stringConverter/msbuild/client/client.vcxproj index ea290f00ef0..df9f0f6bbee 100644 --- a/cpp/test/Ice/stringConverter/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/stringConverter/msbuild/client/client.vcxproj @@ -121,26 +121,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -161,26 +141,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -203,26 +163,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -243,26 +183,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/stringConverter/msbuild/client/client.vcxproj.filters b/cpp/test/Ice/stringConverter/msbuild/client/client.vcxproj.filters index dddacb66c56..5d1546588c7 100644 --- a/cpp/test/Ice/stringConverter/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Ice/stringConverter/msbuild/client/client.vcxproj.filters @@ -14,27 +14,15 @@ {dfe246a0-2447-43a3-9984-0e7278da82e7} - - {f3cb2e50-ffb7-4cf4-86f6-31383b20c4d9} - {2b88f78a-75ab-4006-8b7d-8d1edee23987} - - {27531fcb-0167-4b37-8455-efd737c1da3f} - {f7e26cce-71d7-48a3-b54c-6fe9e616d15e} - - {9bb1d1b6-153c-4162-9328-dcd7f9afdd9a} - {4b05cb2c-b6b0-4dd1-9a23-94b2b4ae2dab} - - {27558449-9a6b-46a7-9239-5a8f2e9f4180} - {904d2038-620e-4903-913e-45506f81e10f} @@ -59,29 +47,11 @@ {b65931c5-0b55-479a-82d2-f4df81660963} - - {9a87c929-3823-4e67-954d-fe47a0147a5a} - - - {3b07b78c-299a-4f0d-aaf6-852e4d9fd9e1} - - - {a48e5736-f8ab-4845-93c8-7a7529aa41fe} - - - {12161029-5fc3-453f-80a6-493b6cfc30dc} - Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -94,20 +64,8 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -120,12 +78,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/stringConverter/msbuild/server/server.vcxproj b/cpp/test/Ice/stringConverter/msbuild/server/server.vcxproj index 70d5a1794e6..1217c0d089a 100644 --- a/cpp/test/Ice/stringConverter/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/stringConverter/msbuild/server/server.vcxproj @@ -161,26 +161,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -201,26 +181,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -243,26 +203,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -283,26 +223,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/stringConverter/msbuild/server/server.vcxproj.filters b/cpp/test/Ice/stringConverter/msbuild/server/server.vcxproj.filters index 56a3a1881b5..a0bfa06a5a6 100644 --- a/cpp/test/Ice/stringConverter/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Ice/stringConverter/msbuild/server/server.vcxproj.filters @@ -14,27 +14,15 @@ {ba325bf9-bf66-4898-995e-013abfa8e906} - - {c737a579-b089-4ca9-b359-ae3ee7792fa0} - {fe3f9513-3f2c-4c22-b8f1-a74add0e85cb} - - {589586e5-24e9-4ed9-a37b-f39f60d8297d} - {66b720a5-a40f-46b8-a29c-869048d0662b} - - {2b8b1f7f-4981-4d21-b5d4-a72277aa7e69} - {b7923a64-66ea-4fbf-9895-bb5be3fc6fe2} - - {b40cb531-05f8-4f28-8511-b39b5b8cf24c} - {a8961d7a-4347-42ab-8609-44892024ea2e} @@ -59,29 +47,11 @@ {ae732f4c-f345-4853-868b-df529c51f026} - - {0f5ee90e-8ba6-4dc0-b83d-65652062eaa7} - - - {3b26053e-bb7d-4ec6-946b-df22ef822918} - - - {136b9b15-593c-4049-8164-a0c94781160c} - - - {e486366a-b6eb-45f5-b1e2-66e1447fdd80} - Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -94,20 +64,8 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -120,12 +78,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/threadPoolPriority/msbuild/client/client.vcxproj b/cpp/test/Ice/threadPoolPriority/msbuild/client/client.vcxproj index 895fb0460c0..ca53fc61428 100644 --- a/cpp/test/Ice/threadPoolPriority/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/threadPoolPriority/msbuild/client/client.vcxproj @@ -122,26 +122,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -162,26 +142,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -204,26 +164,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -244,26 +184,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/threadPoolPriority/msbuild/client/client.vcxproj.filters b/cpp/test/Ice/threadPoolPriority/msbuild/client/client.vcxproj.filters index ccd1b1df74e..89d5d743f15 100644 --- a/cpp/test/Ice/threadPoolPriority/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Ice/threadPoolPriority/msbuild/client/client.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {f0e2e4af-adab-4ec1-b12a-46b7248e0440} - - {cadcb3b9-4d41-463f-bc87-057ac2687a47} - {0a705f90-2617-449a-8fb9-6e99061a8240} - - {b22acb84-9203-4ffd-9264-6c0825b633bf} - {00edf5cc-cd02-4692-af42-b4d59da1599a} - - {1589a42e-90bf-49b2-b810-d9f3f9f9903e} - {21666844-c2d8-44c4-8f75-6d32e5fbaf13} - - {a6ebe333-4341-4a3b-8516-6b283273eca6} - {c1da7918-60b5-411c-bd29-9be8adcea574} @@ -91,26 +67,8 @@ {8492a272-dd2c-469e-b89e-8ab913c86433} - - {a3c6887a-c95d-4397-9f78-ae89396ecb3c} - - - {514419f1-c633-400c-910c-a1d5b0882ae8} - - - {b3f10e64-aa2e-46ca-a346-94965eb9157e} - - - {b6bbe2ba-f6cd-4d7b-a7f7-65f0863e1e68} - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/threadPoolPriority/msbuild/server/server.vcxproj b/cpp/test/Ice/threadPoolPriority/msbuild/server/server.vcxproj index f3283c2789e..21dcddce7a8 100644 --- a/cpp/test/Ice/threadPoolPriority/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/threadPoolPriority/msbuild/server/server.vcxproj @@ -161,26 +161,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -201,26 +181,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -244,26 +204,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -284,26 +224,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/threadPoolPriority/msbuild/server/server.vcxproj.filters b/cpp/test/Ice/threadPoolPriority/msbuild/server/server.vcxproj.filters index 35114a8d2a4..698cf3e1116 100644 --- a/cpp/test/Ice/threadPoolPriority/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Ice/threadPoolPriority/msbuild/server/server.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {06b9058c-84d5-44cb-a213-f2f01df19393} - - {1657fe1b-aec4-4b74-b314-49fcd5b0fe0a} - {894d09e0-6c63-4185-adf0-c2ccfe158fc8} - - {31b7a5bc-eb2f-4c06-9d83-9ba313d8580b} - {c661035e-2086-4484-8100-7984f0cf2dcb} - - {2b03efd9-6b83-4049-a265-c329be14b07e} - {0039aef7-99ae-4d95-895f-fdcc6b8e4afb} - - {636cc801-09d5-4339-a097-1d5570fa349d} - {4cda29d1-8bd2-4520-a678-1780da8d0981} @@ -91,29 +67,11 @@ {2153eb51-0d9e-4af8-be4d-c1c125808e1b} - - {f2d8d7d0-0ad9-473c-bed4-4a10ca339d86} - - - {8b7fa26c-867b-4362-9b18-82ee3e6f0528} - - - {45f9b0e8-4573-42c8-9007-9161e963ebc2} - - - {1b12c720-74d1-4d89-a6f9-e3ac7e9c20ff} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/threadPoolPriority/msbuild/servercustom/servercustom.vcxproj b/cpp/test/Ice/threadPoolPriority/msbuild/servercustom/servercustom.vcxproj index fb32a2eda82..a30afd1b423 100644 --- a/cpp/test/Ice/threadPoolPriority/msbuild/servercustom/servercustom.vcxproj +++ b/cpp/test/Ice/threadPoolPriority/msbuild/servercustom/servercustom.vcxproj @@ -161,26 +161,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -201,26 +181,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -244,26 +204,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -284,26 +224,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/threadPoolPriority/msbuild/servercustom/servercustom.vcxproj.filters b/cpp/test/Ice/threadPoolPriority/msbuild/servercustom/servercustom.vcxproj.filters index 1156926de60..334443c5780 100644 --- a/cpp/test/Ice/threadPoolPriority/msbuild/servercustom/servercustom.vcxproj.filters +++ b/cpp/test/Ice/threadPoolPriority/msbuild/servercustom/servercustom.vcxproj.filters @@ -14,27 +14,15 @@ {92eafb42-f339-4685-9026-09fafe48b67b} - - {2c05953f-a731-46b6-b54b-0767c1da50ea} - {81602f52-64ab-4bbf-9d05-73590ad97fd4} - - {d8ebb77c-a294-4dce-af28-da074c8b56bf} - {811a809e-7cc8-4214-a560-7a11f9b77ea7} - - {577d2a83-92fa-4d53-be30-bd0fa863a2a9} - {3645eb7a-549e-4a40-9a4f-0f5e6d10542e} - - {e6d79fe6-fbc1-4495-8da8-a7899061623b} - {ceaf9f49-8364-47d6-8fd4-2de468585b1e} @@ -59,18 +47,6 @@ {6c9766d9-7fee-438a-ab90-fc984c2bd5f8} - - {491eef77-b2d6-4b8b-aa41-5c5842296e60} - - - {b3b1de92-b5e0-402b-8256-01cf5fff4a9e} - - - {50bf8c4c-e805-4f93-9ff7-20b8f893886d} - - - {0bf63a7e-fe4e-48c2-990b-c87dc7ef1443} - @@ -79,12 +55,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -97,23 +67,11 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/timeout/msbuild/client/client.vcxproj b/cpp/test/Ice/timeout/msbuild/client/client.vcxproj index d5e69490876..c79d1b53408 100644 --- a/cpp/test/Ice/timeout/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/timeout/msbuild/client/client.vcxproj @@ -163,26 +163,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -203,26 +183,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -246,26 +206,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -286,26 +226,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/timeout/msbuild/client/client.vcxproj.filters b/cpp/test/Ice/timeout/msbuild/client/client.vcxproj.filters index 7b3e6e75dd2..a2ad54c2748 100644 --- a/cpp/test/Ice/timeout/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Ice/timeout/msbuild/client/client.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - Source Files @@ -49,27 +37,15 @@ {2254f6d7-1d20-431a-bdee-d32020c4787d} - - {ad5d7f50-0912-4821-86df-4206781b94b1} - {461950e7-c6ec-4eac-96e1-464a6c3f0d5c} - - {5469aeb8-4824-4033-b472-3e3824f9ee13} - {3674a694-410e-4796-90f5-4104abc76ab0} - - {8bd7c44b-5212-4995-b22e-c06c96e18ef2} - {dbbcb667-f7e2-439d-9b4f-def7054b1c93} - - {0a430bf0-8b9e-496e-880e-fa260a65a0a5} - {242e12e8-b645-491b-bd8f-8b7a64683648} @@ -94,26 +70,8 @@ {c8cce593-5dbb-4b44-be2f-bab32ff79a26} - - {20ceb9ec-004a-4643-8596-269e0403560f} - - - {9fb4c399-b6d1-46ed-9628-7843e57f55b5} - - - {08a9dc36-c3e4-4cd9-95cd-e6d2d5eb5553} - - - {18d11ff9-deb8-482f-8b51-cf7a6ed1710b} - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - Header Files diff --git a/cpp/test/Ice/timeout/msbuild/server/server.vcxproj b/cpp/test/Ice/timeout/msbuild/server/server.vcxproj index ac99452670a..0997a9f9d4a 100644 --- a/cpp/test/Ice/timeout/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/timeout/msbuild/server/server.vcxproj @@ -161,26 +161,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -201,26 +181,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -244,26 +204,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -284,26 +224,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/timeout/msbuild/server/server.vcxproj.filters b/cpp/test/Ice/timeout/msbuild/server/server.vcxproj.filters index f4734fc0d8d..430758807cd 100644 --- a/cpp/test/Ice/timeout/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Ice/timeout/msbuild/server/server.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {cb2dffa3-b07e-4197-b453-0aee8ed9dc2f} - - {821af2fc-d86b-4172-a2b1-64dc01ee2733} - {03b671f6-15b5-4bfa-bca2-925449863c8a} - - {cd5df7dd-3a3d-465b-afab-47689821d2da} - {1c5d579d-9457-4d92-8ca8-bd502d965c8f} - - {bf593e11-3e1b-498d-aaab-a7bf26c2780c} - {78aa9818-ef24-4d1b-a4a0-7dc379908abd} - - {c057e354-3c00-4b26-91f2-74a7c4c72428} - {24b1d772-faf6-43f0-8332-990f71e479de} @@ -91,29 +67,11 @@ {b2671c8a-3e47-49ab-b394-337fb2b5741c} - - {08a043ee-627c-4649-9c74-48c29312bdeb} - - - {123c600e-109f-444c-bb6a-fd0491bccf98} - - - {bdfdfa44-1665-4092-903c-bf798c4be5ff} - - - {6bc03995-7b0c-44b0-98f4-07bc5e319f54} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/udp/msbuild/client/client.vcxproj b/cpp/test/Ice/udp/msbuild/client/client.vcxproj index 822a0f0a094..934e7bafceb 100644 --- a/cpp/test/Ice/udp/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/udp/msbuild/client/client.vcxproj @@ -122,26 +122,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -162,26 +142,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -204,26 +164,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -244,26 +184,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/udp/msbuild/client/client.vcxproj.filters b/cpp/test/Ice/udp/msbuild/client/client.vcxproj.filters index 86cf7921fa4..f6f49351413 100644 --- a/cpp/test/Ice/udp/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Ice/udp/msbuild/client/client.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {6d9f281e-4eb4-4f43-8798-0590f0259475} - - {1e898bce-aaf2-4404-9614-3e8b12546f5b} - {554c49ab-bdf2-483d-9189-f3ca3746e27e} - - {b35a7344-c7ea-429e-bb38-d65c6d228d50} - {a12c53dd-03e6-4398-b83e-98ef22b541d1} - - {89cfe966-b374-4623-9deb-ac4aef6915a8} - {bde00f8a-1467-4752-b5fe-f47008303c0d} - - {266161ec-caef-4814-8326-151062112e81} - {b23cc8e2-c48c-4490-a341-147028cc59ec} @@ -91,26 +67,8 @@ {be2d567a-9f8e-4cf8-88d3-de7685867e45} - - {c3e158cb-cbf1-463f-a6a9-1c3273ecbcb6} - - - {7e51b527-058e-401f-83f7-ce723801f5d1} - - - {1eea8c23-8d54-4353-8aad-bef91099dea0} - - - {ba6657ca-8740-4224-96ea-02a6f83af53d} - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Ice/udp/msbuild/server/server.vcxproj b/cpp/test/Ice/udp/msbuild/server/server.vcxproj index 74ce045b579..2a591913841 100644 --- a/cpp/test/Ice/udp/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/udp/msbuild/server/server.vcxproj @@ -161,26 +161,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -201,26 +181,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -244,26 +204,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -284,26 +224,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/Ice/udp/msbuild/server/server.vcxproj.filters b/cpp/test/Ice/udp/msbuild/server/server.vcxproj.filters index 290f90e9715..f2a6a3c9732 100644 --- a/cpp/test/Ice/udp/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Ice/udp/msbuild/server/server.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {5d4e2703-76e3-4fb5-916a-2fe35816546b} - - {202dbd2a-1edd-4e0d-bc88-e7d5d6d03d1b} - {4d4114f5-08d5-440d-83c8-9615ad0faf06} - - {fdc436ff-040c-45e0-80f4-7107f264d48b} - {ce973bd4-32aa-445e-9188-7a08238c7936} - - {b17ff702-dc6d-468e-b6b7-76d12f592e4f} - {da611152-f930-4426-bac1-446c2a751e8a} - - {73a85765-0458-405e-8bbc-037d709ade79} - {3f98184d-135c-4eab-b8f5-5bacad4f5ec1} @@ -91,29 +67,11 @@ {8748dd82-0bd8-45d2-9536-9abfeca441e9} - - {16a94479-7793-486e-8b6e-58376a8774d2} - - - {829bf15c-a94f-4cf2-b08a-7da22585b825} - - - {eb185f6f-e19e-4352-8ed5-84653b4c9bab} - - - {bbb1aaef-117e-4bc1-8e07-07bfd1d14ac8} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceBox/admin/msbuild/client/client.vcxproj b/cpp/test/IceBox/admin/msbuild/client/client.vcxproj index 61fa2a91a4d..b328a6487a0 100644 --- a/cpp/test/IceBox/admin/msbuild/client/client.vcxproj +++ b/cpp/test/IceBox/admin/msbuild/client/client.vcxproj @@ -159,26 +159,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -199,26 +179,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -244,26 +204,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -284,26 +224,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/IceBox/admin/msbuild/client/client.vcxproj.filters b/cpp/test/IceBox/admin/msbuild/client/client.vcxproj.filters index 00d1e7a14c3..43a2c6a8ae8 100644 --- a/cpp/test/IceBox/admin/msbuild/client/client.vcxproj.filters +++ b/cpp/test/IceBox/admin/msbuild/client/client.vcxproj.filters @@ -1,12 +1,6 @@  - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -19,12 +13,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - Source Files @@ -46,27 +34,15 @@ {53c31de6-c099-4e56-9fae-0dcd5b2a51a5} - - {4c47f8c9-e9f7-4732-9b12-a71364869ad4} - {5a058ab9-4a1b-45fd-9e45-da010b1bf1f0} - - {f527461a-011c-4f76-8dcd-957ea9e193d4} - {aaf3d46f-f263-4e8d-84fe-7293d16a06d9} - - {a56076c0-c5bb-4cb6-a657-2fe4c23dba5c} - {34dee498-9d11-417a-8e59-04a344de53c2} - - {fb0d3534-c2cb-40f0-84da-393468df4dd0} - {b7c0a2b6-aaa0-4d6e-99aa-c52972b6e7a5} @@ -91,26 +67,8 @@ {0a7b8a8b-1f42-4864-9d78-1a587f18db3f} - - {16cbb6e2-327c-4737-841a-d424e90f32ba} - - - {3b5bd756-957f-4b4b-870c-1102715e7c54} - - - {e1269181-a14f-4bd7-a744-2298007198f4} - - - {fd845ec9-ddfd-4f2d-bd13-1f17081a5f39} - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceBox/admin/msbuild/testservice/testservice.vcxproj b/cpp/test/IceBox/admin/msbuild/testservice/testservice.vcxproj index c7dcc00bbf3..4d95184a174 100644 --- a/cpp/test/IceBox/admin/msbuild/testservice/testservice.vcxproj +++ b/cpp/test/IceBox/admin/msbuild/testservice/testservice.vcxproj @@ -39,26 +39,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -79,26 +59,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -125,26 +85,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -165,26 +105,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/IceBox/admin/msbuild/testservice/testservice.vcxproj.filters b/cpp/test/IceBox/admin/msbuild/testservice/testservice.vcxproj.filters index 39e69cadde6..9459bab7860 100644 --- a/cpp/test/IceBox/admin/msbuild/testservice/testservice.vcxproj.filters +++ b/cpp/test/IceBox/admin/msbuild/testservice/testservice.vcxproj.filters @@ -14,27 +14,15 @@ {1e66f6b9-7281-4af8-b577-f294fbd735bb} - - {63ebc46b-d958-4b9f-8fe5-d59a3f716d01} - {914702a3-e846-497b-904a-81760b2f212f} - - {efd8e97f-87c2-4a17-8a37-78f253abbee9} - {d7e0a785-087b-48e8-9973-eb6adfe1f0a5} - - {93fca230-49bf-4d75-9be4-983de89fc59f} - {9f27e095-1b9f-45dd-8fc7-fc3be2729e94} - - {801f25f0-9d3f-4475-b300-cb0adcea11b0} - {7e7acae2-a3d5-4724-b90d-f485403544bc} @@ -59,18 +47,6 @@ {7cc72906-61b9-446d-874f-b3ab8401eafb} - - {e85e58be-c237-4462-8aa7-c73b5ea5963d} - - - {51b9f0e2-64ab-46ee-9160-301e26f27228} - - - {ca1bcb99-cfcb-4ae0-8dc7-a08e6c4d313d} - - - {9d27a38a-0fd7-48af-8fe7-139fd53a3e2e} - @@ -79,12 +55,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -97,20 +67,8 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - Header Files diff --git a/cpp/test/IceBox/configuration/msbuild/client/client.vcxproj b/cpp/test/IceBox/configuration/msbuild/client/client.vcxproj index cadd36677b8..4dc8b92234f 100644 --- a/cpp/test/IceBox/configuration/msbuild/client/client.vcxproj +++ b/cpp/test/IceBox/configuration/msbuild/client/client.vcxproj @@ -159,26 +159,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -199,26 +179,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -244,26 +204,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -284,26 +224,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/IceBox/configuration/msbuild/client/client.vcxproj.filters b/cpp/test/IceBox/configuration/msbuild/client/client.vcxproj.filters index c745b67e07c..58c42d0bdfa 100644 --- a/cpp/test/IceBox/configuration/msbuild/client/client.vcxproj.filters +++ b/cpp/test/IceBox/configuration/msbuild/client/client.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {b336fc05-e622-4694-b74c-7083d5b7d76c} - - {f7107939-d6ee-4d25-8b44-949720f3fce0} - {1507801d-92aa-4ae7-aa9a-d654352a62d2} - - {25669807-3279-4b35-b2ec-3b034207e421} - {b1d7fae7-58cb-44ea-8534-91be9f34906d} - - {c6b396cf-da73-4647-8bcb-d15e425da317} - {5015d2bf-cf5f-4f97-8cc0-d5cc1bd76f60} - - {6aaf21d5-3db5-418f-ba3e-484e39e5a73c} - {7e5b764c-bbd7-4784-a8cc-7a866e344c3c} @@ -91,26 +67,8 @@ {ae9b9291-ba3e-4029-bd3b-9b2bafee6586} - - {6b60f632-a006-47e3-b2cb-2044aa377924} - - - {2034a28c-6629-44d5-9bdc-4ce5abc88ea5} - - - {0ede1681-b37b-42ca-9465-d31f717b2faf} - - - {eaf1cc84-c428-4a08-a268-121c3a584d13} - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceBox/configuration/msbuild/testservice/testservice.vcxproj b/cpp/test/IceBox/configuration/msbuild/testservice/testservice.vcxproj index 4fafdd5792e..9217637278e 100644 --- a/cpp/test/IceBox/configuration/msbuild/testservice/testservice.vcxproj +++ b/cpp/test/IceBox/configuration/msbuild/testservice/testservice.vcxproj @@ -39,26 +39,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -79,26 +59,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -125,26 +85,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -165,26 +105,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/IceBox/configuration/msbuild/testservice/testservice.vcxproj.filters b/cpp/test/IceBox/configuration/msbuild/testservice/testservice.vcxproj.filters index 11954161cea..f7a9c80f1c6 100644 --- a/cpp/test/IceBox/configuration/msbuild/testservice/testservice.vcxproj.filters +++ b/cpp/test/IceBox/configuration/msbuild/testservice/testservice.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {08a0deb6-94a9-4eaa-8d35-07adacc447f2} - - {626915a6-83a0-46f0-9c45-052c9ee1d6ca} - {b6c2afc8-c974-4d1c-aeec-ce573d2761ab} - - {323b8cb6-b87d-4a68-82b3-f1ff91183808} - {1f152d53-0ee5-4d9b-86b7-caa067adfbd9} - - {08d40393-90a9-4c06-b59c-0f90eb7d3e42} - {8ebdea4e-22f1-45f5-b658-51834b5b1fd1} - - {4e087d44-095f-409f-9610-629956467123} - {f44c122b-9420-407c-b595-f76cdb8c5f10} @@ -91,29 +67,11 @@ {2ed00b71-5ac1-47d2-82d0-74550007922f} - - {15c90af3-b298-49a5-b4c4-c669c32c862a} - - - {f988f20c-9d78-49db-af0e-6d0e1900f60d} - - - {f05541ab-adaf-4487-ac48-c26eb976838f} - - - {2ae59ad2-846c-4c7e-952b-5cea2d567035} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceBridge/simple/msbuild/client/client.vcxproj b/cpp/test/IceBridge/simple/msbuild/client/client.vcxproj index bff5d1df737..3faff50e10d 100644 --- a/cpp/test/IceBridge/simple/msbuild/client/client.vcxproj +++ b/cpp/test/IceBridge/simple/msbuild/client/client.vcxproj @@ -119,26 +119,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -159,26 +139,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -207,26 +167,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -247,26 +187,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/IceBridge/simple/msbuild/client/client.vcxproj.filters b/cpp/test/IceBridge/simple/msbuild/client/client.vcxproj.filters index 353db89e457..b0742151a88 100644 --- a/cpp/test/IceBridge/simple/msbuild/client/client.vcxproj.filters +++ b/cpp/test/IceBridge/simple/msbuild/client/client.vcxproj.filters @@ -53,30 +53,6 @@ {83db95da-e222-4945-b1b0-3528c7076575} - - {5604c87c-0d45-42dc-b39e-92779e07c213} - - - {a3b409bd-c189-49ac-90d9-30d54889ccbe} - - - {19fe4dc0-f97c-4ed1-a2ee-07b75af4a07d} - - - {de2d9762-7242-4ef6-932d-d83ffc70a91a} - - - {afd8eb74-79c4-439f-90f1-b40831e14473} - - - {797eb1f1-afd8-48ef-b3b8-e25bdce4b2db} - - - {08f5ae4a-68f8-4468-acbb-cea38ca2ebd1} - - - {8adb48fc-4cfc-4328-a264-4a776a7d901c} - @@ -85,12 +61,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -103,23 +73,11 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -132,12 +90,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceBridge/simple/msbuild/server/server.vcxproj b/cpp/test/IceBridge/simple/msbuild/server/server.vcxproj index a5a2bf29349..38bde64d651 100644 --- a/cpp/test/IceBridge/simple/msbuild/server/server.vcxproj +++ b/cpp/test/IceBridge/simple/msbuild/server/server.vcxproj @@ -159,26 +159,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -199,26 +179,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -241,26 +201,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -281,26 +221,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/IceBridge/simple/msbuild/server/server.vcxproj.filters b/cpp/test/IceBridge/simple/msbuild/server/server.vcxproj.filters index 2a4d6ae19da..12ae72105a2 100644 --- a/cpp/test/IceBridge/simple/msbuild/server/server.vcxproj.filters +++ b/cpp/test/IceBridge/simple/msbuild/server/server.vcxproj.filters @@ -53,38 +53,8 @@ {03c34b36-1e74-4cd4-be6c-5c126cdef74b} - - {84de1e76-2f26-458d-a3d2-154d761813e0} - - - {601e7bca-8dd9-4fe1-a095-3cd5f3e8abf4} - - - {e622b64e-87a0-44b5-95f3-d3dbe6659e2c} - - - {bf55a053-f099-4889-9bcb-f68dbfdd48fb} - - - {9e1f6dd1-933e-47d8-87c2-97f0e0926cbf} - - - {af5b2ff9-d224-465a-9c06-1c0576c5a9bf} - - - {220b14c4-7373-469f-b8ee-a44082c910b2} - - - {b9f950c7-4b1c-42c8-96f2-2880bb5f3d52} - - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -97,12 +67,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - Source Files @@ -111,12 +75,6 @@ - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -129,12 +87,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceDiscovery/simple/msbuild/client/client.vcxproj b/cpp/test/IceDiscovery/simple/msbuild/client/client.vcxproj index a6841cfb0d0..534d3c9ea83 100644 --- a/cpp/test/IceDiscovery/simple/msbuild/client/client.vcxproj +++ b/cpp/test/IceDiscovery/simple/msbuild/client/client.vcxproj @@ -146,26 +146,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -186,26 +166,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -228,26 +188,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -268,26 +208,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/IceDiscovery/simple/msbuild/client/client.vcxproj.filters b/cpp/test/IceDiscovery/simple/msbuild/client/client.vcxproj.filters index 5a4f14cf8b7..92f39bca749 100644 --- a/cpp/test/IceDiscovery/simple/msbuild/client/client.vcxproj.filters +++ b/cpp/test/IceDiscovery/simple/msbuild/client/client.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {86fb8757-513b-441b-96da-99f4036d63bb} - - {4b8f9bee-662a-4077-89c8-cbd1d0bfb7f7} - {015c9bfa-ba0a-4bba-a70d-511d096abc27} - - {c54aec91-3c37-4cb9-b2ce-d8c4a31313ed} - {e6d0c1dd-e23e-4c85-8b66-c9f05ef8f4bb} - - {06346800-bb8f-42be-8e56-38801b553202} - {b962dc85-ef5a-4dd3-8ee3-21ef877684cd} - - {2f8bdfb0-afec-4cf0-b668-b661789aec11} - {90a25195-5c7c-4593-90c0-cf0c482a9eee} @@ -91,26 +67,8 @@ {02a28ec8-91cb-4bea-8dd7-e377dcd3c0c4} - - {7531ed28-6fa0-4b0c-9f4f-ef70f70930f3} - - - {6b6e5fe7-b16a-4aca-b850-133df395b060} - - - {96a842f7-57c7-47a7-a94c-f9b3f292e13c} - - - {1a27b87c-38cc-4438-b80c-98fedab29e20} - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceDiscovery/simple/msbuild/server/server.vcxproj b/cpp/test/IceDiscovery/simple/msbuild/server/server.vcxproj index b784cdfd6b4..974367b3613 100644 --- a/cpp/test/IceDiscovery/simple/msbuild/server/server.vcxproj +++ b/cpp/test/IceDiscovery/simple/msbuild/server/server.vcxproj @@ -169,26 +169,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -209,26 +189,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -252,26 +212,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -292,26 +232,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/IceDiscovery/simple/msbuild/server/server.vcxproj.filters b/cpp/test/IceDiscovery/simple/msbuild/server/server.vcxproj.filters index a9dbaf44387..69d136edc6f 100644 --- a/cpp/test/IceDiscovery/simple/msbuild/server/server.vcxproj.filters +++ b/cpp/test/IceDiscovery/simple/msbuild/server/server.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {c1754fdb-f20c-43d1-b220-faed7fc9d4a6} - - {51a8e580-181d-413c-ae4b-425b6dab4227} - {756baf99-1898-464c-942b-281a97945d01} - - {4a1875f8-9762-4d23-8709-0048e398af03} - {3eb3c17a-f9d7-4dbe-baf3-dca98a02bbd8} - - {81af40ce-8865-4f3f-b789-94788578033e} - {e247b0af-8626-46f9-977a-0d01d969a8a0} - - {446f82c5-b5a2-4f3f-95bf-553062516c5f} - {e464d1cd-eed3-4f60-ad9f-b7938830257c} @@ -91,29 +67,11 @@ {971c4799-e4b4-4900-b6f4-79212cdadc5b} - - {81de7858-b2b9-470b-a0df-5e75f81b5a99} - - - {9b5dc311-23e5-4b30-8e69-91075d45d685} - - - {9b8f1004-04d9-4731-90d3-27331627a9fd} - - - {27f3c270-fd00-4139-8a85-403ce3b677da} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceGrid/activation/msbuild/client/client.vcxproj b/cpp/test/IceGrid/activation/msbuild/client/client.vcxproj index abb24fef42e..031c4370bf1 100644 --- a/cpp/test/IceGrid/activation/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/activation/msbuild/client/client.vcxproj @@ -120,26 +120,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -160,26 +140,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -202,26 +162,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -242,26 +182,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/IceGrid/activation/msbuild/client/client.vcxproj.filters b/cpp/test/IceGrid/activation/msbuild/client/client.vcxproj.filters index 548cfdfca98..82dc49c07ba 100644 --- a/cpp/test/IceGrid/activation/msbuild/client/client.vcxproj.filters +++ b/cpp/test/IceGrid/activation/msbuild/client/client.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {5b403135-205d-4ffe-94b3-51f598f22b7d} - - {5cf9fc8d-0e65-477a-aad9-522eb0223bdc} - {519c7795-1382-47f5-bb06-d4e66ef483e8} - - {8fcfa9b2-574e-4ed3-a906-3c087eef88da} - {c5477a5a-0ef9-4737-b0dd-19d3e8ba864a} - - {6d68cfcf-0ccf-4f34-a054-c44d9dd5280a} - {6add6a54-8481-49ae-9eaa-7588d1aadeff} - - {da5b34e6-238c-4598-b2e7-c8245c9061d0} - {35b85ebf-0379-4754-8187-8aceae5f6cc2} @@ -91,26 +67,8 @@ {29624057-2772-42fc-9e09-927307a4d633} - - {04170ee4-03b0-462d-9dc8-5de4d92db8d6} - - - {6c62b1c0-873c-454d-aaf7-ff3de5186244} - - - {9cae7b8e-61ca-43f0-ad01-faad574af30e} - - - {06c5ebd0-0a5f-4359-8bab-64dda248ae2d} - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceGrid/activation/msbuild/server/server.vcxproj b/cpp/test/IceGrid/activation/msbuild/server/server.vcxproj index 69d5d31a658..f84f71e25da 100644 --- a/cpp/test/IceGrid/activation/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/activation/msbuild/server/server.vcxproj @@ -160,26 +160,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -200,26 +180,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -243,26 +203,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -283,26 +223,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/IceGrid/activation/msbuild/server/server.vcxproj.filters b/cpp/test/IceGrid/activation/msbuild/server/server.vcxproj.filters index 8a37b5309c5..32fbd513233 100644 --- a/cpp/test/IceGrid/activation/msbuild/server/server.vcxproj.filters +++ b/cpp/test/IceGrid/activation/msbuild/server/server.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {62af88dc-9802-49c5-9955-bc86d2860232} - - {a9cc6dbb-e523-4b4a-b2a4-29ca1214dc8f} - {4c1fa22f-f9d9-4a34-8b6d-b382e7e612dd} - - {2e22e556-4ac4-4a5f-9bf2-50a6a3ce7c4d} - {5b24e103-23ff-4570-84a9-2cd38d20a731} - - {8feaf490-98c8-4bd7-8a5e-d7b1cd21f89e} - {0a4cab6c-3f56-4fc1-9f3a-4d7d74581553} - - {8ee3290c-b72d-4fb6-9216-4df8fdba9681} - {98b80e8b-1ee9-40f6-aa28-42de8c183ceb} @@ -91,29 +67,11 @@ {935946d6-1200-46db-8546-93140fc5f5fa} - - {0de0f5c1-ee74-4056-b21d-18d6f266cc81} - - - {b3906d6e-f435-4ed8-ab24-ec7607c2ea9f} - - - {0197ffdb-9012-43e6-b3e6-e8eca54e94bd} - - - {d1b03ffc-8667-44b8-9ebe-77d2b73d455e} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceGrid/allocation/msbuild/client/client.vcxproj b/cpp/test/IceGrid/allocation/msbuild/client/client.vcxproj index ffb37cce9e8..7ae07206701 100644 --- a/cpp/test/IceGrid/allocation/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/allocation/msbuild/client/client.vcxproj @@ -120,26 +120,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -160,26 +140,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -202,26 +162,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -242,26 +182,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/IceGrid/allocation/msbuild/client/client.vcxproj.filters b/cpp/test/IceGrid/allocation/msbuild/client/client.vcxproj.filters index 7b5b033b6a4..b484379ba78 100644 --- a/cpp/test/IceGrid/allocation/msbuild/client/client.vcxproj.filters +++ b/cpp/test/IceGrid/allocation/msbuild/client/client.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {bcd70c6c-ecb0-45a2-8056-7cd37ddee249} - - {085e9ef2-fd28-466e-a34b-74081a020e1a} - {c806d9b0-618c-4daf-928f-bb08af368c4c} - - {37cb6b66-5351-41dc-ba4d-5f64ebee99f2} - {d473a96b-05b1-45eb-af51-f02f63f4c448} - - {80479970-6a82-417a-8fb7-035972ae2b16} - {7a99bb18-f3b9-4b2d-bd76-468b327d79e9} - - {29404b2e-7368-40f5-86a5-0471d77f426f} - {148240a6-f74e-45c2-9ac0-873e576ea00d} @@ -91,26 +67,8 @@ {e485433a-5f91-4431-9f05-10b8524f3179} - - {08a6f508-2b94-41f2-a5b3-0d1eaeab5e35} - - - {4af01307-1c17-49b0-b237-05bd768f3151} - - - {15d6e534-8e23-44e0-92f8-0077c035f428} - - - {4fdd9015-74b9-474f-ab62-735e6bb51d8c} - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceGrid/allocation/msbuild/server/server.vcxproj b/cpp/test/IceGrid/allocation/msbuild/server/server.vcxproj index 43a5d80c189..7a7d31833a6 100644 --- a/cpp/test/IceGrid/allocation/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/allocation/msbuild/server/server.vcxproj @@ -160,26 +160,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -200,26 +180,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -243,26 +203,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -283,26 +223,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/IceGrid/allocation/msbuild/server/server.vcxproj.filters b/cpp/test/IceGrid/allocation/msbuild/server/server.vcxproj.filters index bf5a9f40e2a..943d0d28eda 100644 --- a/cpp/test/IceGrid/allocation/msbuild/server/server.vcxproj.filters +++ b/cpp/test/IceGrid/allocation/msbuild/server/server.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {30f8b76a-834d-4ea2-a393-300b24e8c81c} - - {e5d5fd13-fcac-4cab-ac27-fd67ff68dbcc} - {ade66564-0aa4-4905-bc1e-b6c348e56d84} - - {a01f8872-fecc-4610-a78c-d2c167532e55} - {342cd629-6d29-406c-9a31-1a20e83dc4b6} - - {354fd863-780b-4053-a2f1-cac7950a3834} - {582d905b-1064-4c7d-8e16-77abf7609d8a} - - {01b0a9d3-4894-41b9-b567-1b45d5b6d19b} - {a3fc9ea4-ca98-4b58-a272-14b6b70a995d} @@ -91,29 +67,11 @@ {c89e1d27-7010-47e1-9c22-2f172e1293ef} - - {211a5498-a482-41a4-a80e-723ff5efa20b} - - - {6b825506-0905-4009-aa03-0189a5c7ee18} - - - {c0526fed-bbe9-4728-a465-6272ffe3fd77} - - - {f9d9a41b-a031-4a83-9c53-3754a80d79ec} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceGrid/deployer/msbuild/client/client.vcxproj b/cpp/test/IceGrid/deployer/msbuild/client/client.vcxproj index 67e6ebe5d26..0a7556223e0 100644 --- a/cpp/test/IceGrid/deployer/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/deployer/msbuild/client/client.vcxproj @@ -120,26 +120,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -160,26 +140,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -202,26 +162,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -242,26 +182,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/IceGrid/deployer/msbuild/client/client.vcxproj.filters b/cpp/test/IceGrid/deployer/msbuild/client/client.vcxproj.filters index 262188f5603..b427e37dda3 100644 --- a/cpp/test/IceGrid/deployer/msbuild/client/client.vcxproj.filters +++ b/cpp/test/IceGrid/deployer/msbuild/client/client.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {721c19c4-c7c8-49ef-a7ec-aaba3b6b6355} - - {a489d92b-ff4f-4cdb-a278-ed2541369c7e} - {13c335bf-7998-488e-82d6-baeaa726e106} - - {a025a2d8-fd1f-40de-8cba-9e591d271045} - {088a0292-9a50-468d-80b8-7b33f5fe7a87} - - {eed6bfa1-e582-4633-b9c7-b391b7a8bc3b} - {998988e3-8a14-49e0-ab9a-4a59f78a5a3e} - - {d9052c33-82e2-4199-aaed-ef412aaa790d} - {c20d284e-5a92-4970-996c-7c2eae8a7c3b} @@ -91,26 +67,8 @@ {89f8e0c5-9ad3-4888-bf67-19e8e89ee4fc} - - {62afa606-8078-4241-be05-5999f776f446} - - - {1504e3f2-5075-4b49-8580-b9cb01ca4c1f} - - - {a13eb8b5-8c5e-4aa9-b417-76a9331ce82f} - - - {9cbff0d5-02dd-49fe-8cbe-d65b526a6186} - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceGrid/deployer/msbuild/server/server.vcxproj b/cpp/test/IceGrid/deployer/msbuild/server/server.vcxproj index 77af65e8ada..1cf7c7a6f9b 100644 --- a/cpp/test/IceGrid/deployer/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/deployer/msbuild/server/server.vcxproj @@ -160,26 +160,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -200,26 +180,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -243,26 +203,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -283,26 +223,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/IceGrid/deployer/msbuild/server/server.vcxproj.filters b/cpp/test/IceGrid/deployer/msbuild/server/server.vcxproj.filters index 4a74bcd701c..420cba41a99 100644 --- a/cpp/test/IceGrid/deployer/msbuild/server/server.vcxproj.filters +++ b/cpp/test/IceGrid/deployer/msbuild/server/server.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {d8f05bda-2553-492b-a80f-74e8fd72976f} - - {11a6f17d-4aab-4a95-933e-1779e29eb9f7} - {2f1478b1-5763-4db1-810c-1ad2e7674bab} - - {5539662f-08e6-415c-9bc6-3f281f2469bb} - {e56eab2c-2f08-4b67-9b70-07d52c5ceba0} - - {3ba992c3-e086-43be-a1fe-91a1c0741f41} - {2bffdd88-6a47-45dc-bf14-bd95195dcbfc} - - {c586bc28-6304-4ede-8a66-e7352a23ef54} - {da454820-6a25-4a55-a259-03d6f875a049} @@ -91,29 +67,11 @@ {6da61901-4655-4510-806d-b71091fc2637} - - {11257da2-fa16-48e3-81a1-bb41687dce9f} - - - {13883971-7140-47ba-a39e-6c1e3057e2d1} - - - {f0dd3a0b-74c9-4419-a668-a14e3bda3001} - - - {32921acf-213d-4d7d-9b4f-e973d577f3cd} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceGrid/deployer/msbuild/testservice/testservice.vcxproj b/cpp/test/IceGrid/deployer/msbuild/testservice/testservice.vcxproj index be6c1a46c33..bff43195b9e 100644 --- a/cpp/test/IceGrid/deployer/msbuild/testservice/testservice.vcxproj +++ b/cpp/test/IceGrid/deployer/msbuild/testservice/testservice.vcxproj @@ -184,26 +184,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -224,26 +204,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -267,26 +227,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -307,26 +247,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/IceGrid/deployer/msbuild/testservice/testservice.vcxproj.filters b/cpp/test/IceGrid/deployer/msbuild/testservice/testservice.vcxproj.filters index 53f4e8e020a..f1d37109a9a 100644 --- a/cpp/test/IceGrid/deployer/msbuild/testservice/testservice.vcxproj.filters +++ b/cpp/test/IceGrid/deployer/msbuild/testservice/testservice.vcxproj.filters @@ -14,27 +14,15 @@ {2dc10c6d-8f2d-4a4c-9d90-cf3a30659d96} - - {49cc21c4-71ae-4205-ba56-86b50981967f} - {91da28b9-7116-4f58-9512-a8f78654e83e} - - {36f3c662-6bc0-494d-850a-bc55e82b29f4} - {e68546da-52a7-4597-935f-48c54ef96953} - - {c3225922-434e-4c37-b269-5e1f8ba9057c} - {0ee99cb0-3e15-40af-bcab-dfcc5d7bb4ee} - - {4b53daa0-ad9d-49a8-99d5-522fbc3874c5} - {d7b57cac-58e1-42af-896d-d789bc5a4a08} @@ -59,18 +47,6 @@ {206f7b1f-19c3-4c3e-b843-9e6ab40a197e} - - {3681e36b-24ad-47c9-b0af-9e48083fd5dc} - - - {bf08e17c-3f8e-4f67-8bbc-6e4fd58c79f5} - - - {d70bc5c5-187a-4443-91fc-304555c42ae0} - - - {c68f0ee8-ad27-480c-bd4d-46e4cf903c95} - @@ -79,12 +55,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -97,23 +67,11 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceGrid/distribution/msbuild/client/client.vcxproj b/cpp/test/IceGrid/distribution/msbuild/client/client.vcxproj index 81801e62e0a..b8beb2b1b73 100644 --- a/cpp/test/IceGrid/distribution/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/distribution/msbuild/client/client.vcxproj @@ -120,26 +120,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -160,26 +140,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -202,26 +162,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -242,26 +182,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/IceGrid/distribution/msbuild/client/client.vcxproj.filters b/cpp/test/IceGrid/distribution/msbuild/client/client.vcxproj.filters index ec895771f10..67a58432d54 100644 --- a/cpp/test/IceGrid/distribution/msbuild/client/client.vcxproj.filters +++ b/cpp/test/IceGrid/distribution/msbuild/client/client.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {b0c6d481-e295-412d-ab5d-e77d4e0239c1} - - {7a939a79-7044-4da3-8089-6ad014d7df11} - {7afc95df-a2cf-4992-a2e8-e574e678dd00} - - {7369b844-8333-4dd4-be5b-54b392c95804} - {3db9237f-43da-4e7b-91e6-fca122d2eaa8} - - {4b088de8-7c80-46ae-8caf-90833c5c194b} - {f005857f-8f03-4ede-bc86-1cfcc98acbce} - - {a107f57a-91e8-48b6-bb10-520074ae2a47} - {2216c67b-27c6-4c7e-8bc0-51f6cdc9b1c0} @@ -91,26 +67,8 @@ {f02d91fc-59bb-452d-87e9-b6f20ac64a84} - - {47c8bdf0-aa47-4350-b24f-b75bd43e84e8} - - - {b7f04836-f33d-4085-84cf-10a6728c80fb} - - - {b685497f-5dda-4866-abab-aa1e913ae9bb} - - - {4a079582-c420-41d5-86ab-cf35fef86293} - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceGrid/distribution/msbuild/server/server.vcxproj b/cpp/test/IceGrid/distribution/msbuild/server/server.vcxproj index 462c06235e6..a46f8b5ba29 100644 --- a/cpp/test/IceGrid/distribution/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/distribution/msbuild/server/server.vcxproj @@ -160,26 +160,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -200,26 +180,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -243,26 +203,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -283,26 +223,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/IceGrid/distribution/msbuild/server/server.vcxproj.filters b/cpp/test/IceGrid/distribution/msbuild/server/server.vcxproj.filters index 0c3c78224ef..d6be5582f37 100644 --- a/cpp/test/IceGrid/distribution/msbuild/server/server.vcxproj.filters +++ b/cpp/test/IceGrid/distribution/msbuild/server/server.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {3074b3c3-68b0-4699-a0a6-32fd96ed05ca} - - {a378b026-caac-43eb-bc33-c695163b0ee9} - {1d935fd7-2e87-45a9-a220-b96134b7dc40} - - {e7e260d3-cca1-436f-b143-1a6410c6cd7a} - {95c0c4f1-5e9c-4cdb-b788-df86e237c3c4} - - {0b2d273a-0d81-4b7b-9e58-69605f2d4bb4} - {4fcc6ea4-70f2-4ea6-863e-f0776b02741a} - - {d17a27cf-a349-4e0c-9f5c-1e1949514498} - {f85eab1b-13d6-4678-8121-67b982793dce} @@ -91,29 +67,11 @@ {4fccb7ad-b255-4d93-9473-5cedbaa238d6} - - {39771b60-5385-42a0-83e1-624286f8e1ab} - - - {85af3060-7792-4818-8d65-b4f973a2bbf8} - - - {da3beafe-1a9f-4667-858a-9189d3010132} - - - {99b19e01-6c5a-41cc-ab29-2e28bd751b22} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceGrid/noRestartUpdate/msbuild/client/client.vcxproj b/cpp/test/IceGrid/noRestartUpdate/msbuild/client/client.vcxproj index 3a0e7d67aa2..9fd62438655 100644 --- a/cpp/test/IceGrid/noRestartUpdate/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/noRestartUpdate/msbuild/client/client.vcxproj @@ -120,26 +120,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -160,26 +140,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -202,26 +162,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -242,26 +182,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/IceGrid/noRestartUpdate/msbuild/client/client.vcxproj.filters b/cpp/test/IceGrid/noRestartUpdate/msbuild/client/client.vcxproj.filters index 8859c2eafaf..d7cef804571 100644 --- a/cpp/test/IceGrid/noRestartUpdate/msbuild/client/client.vcxproj.filters +++ b/cpp/test/IceGrid/noRestartUpdate/msbuild/client/client.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {256f3b4b-fcc9-420e-8d1d-4db16b3a4faf} - - {d960fdc8-780c-4d9c-81fa-9c3f1c1eb3e3} - {b3d831d5-94f7-465a-8a48-8666acfb0958} - - {2cf1fa60-e607-4e22-adb2-2de653425b1d} - {3e56b18d-b679-4b62-8cce-21dc845f53f3} - - {3d829eca-e685-411a-9b02-18a82ef90745} - {98d108fc-4551-4e72-bf08-bb2d1cf619a4} - - {b1df3cc2-af81-40ac-92bd-764078fec40d} - {d645d2c2-1dc7-4dde-98fb-c404583d0a6e} @@ -91,26 +67,8 @@ {65e7687e-d007-4f22-a370-779cc0e90f66} - - {183376e7-fe88-4a95-93a2-9d664e89ccf6} - - - {47c78e18-3291-40aa-8f4f-3bf1f93a49d2} - - - {b9700d1b-6f6f-41b5-8583-330bf8b4f52f} - - - {06b84f15-e798-49b5-842a-602387926036} - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceGrid/noRestartUpdate/msbuild/server/server.vcxproj b/cpp/test/IceGrid/noRestartUpdate/msbuild/server/server.vcxproj index bd82a8fb818..a3b14142e53 100644 --- a/cpp/test/IceGrid/noRestartUpdate/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/noRestartUpdate/msbuild/server/server.vcxproj @@ -160,26 +160,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -200,26 +180,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -243,26 +203,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -283,26 +223,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/IceGrid/noRestartUpdate/msbuild/server/server.vcxproj.filters b/cpp/test/IceGrid/noRestartUpdate/msbuild/server/server.vcxproj.filters index 2d553960c9b..edf26e7f5b6 100644 --- a/cpp/test/IceGrid/noRestartUpdate/msbuild/server/server.vcxproj.filters +++ b/cpp/test/IceGrid/noRestartUpdate/msbuild/server/server.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {19b6fbcd-85a6-461f-bffd-1224fc39c150} - - {9f5ecd59-596f-4b9e-bd6d-e3594c253272} - {7b701484-3629-4bb2-b3f4-3b1b77f34c28} - - {0b856ef0-d6a3-4f47-a666-1744fb1eadc6} - {5c08de1b-2d9f-4153-95de-fb360bbba572} - - {e607af3e-cdcb-48f8-a12e-e11ccd9599a8} - {a9f433fc-051d-4a3a-8349-9ec7f41c7653} - - {119afbd4-15a0-4b26-9915-3f660494f662} - {66bdc204-3c39-4520-b64b-b1919167d069} @@ -91,29 +67,11 @@ {e2763dbd-13bc-4231-8bdd-6f7cbdc5e1b7} - - {2f42ad78-ef27-480e-a935-334abeab4569} - - - {0845ab40-f45d-434d-8a71-5ddb58aae20a} - - - {6cacba4d-e5c4-421e-bbb0-d66babd42e76} - - - {c0721a8e-eacb-4466-bacc-ac1c530cf187} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/testservice.vcxproj b/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/testservice.vcxproj index 2664db12da5..9c5658eff56 100644 --- a/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/testservice.vcxproj +++ b/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/testservice.vcxproj @@ -184,26 +184,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -224,26 +204,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -267,26 +227,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -307,26 +247,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/testservice.vcxproj.filters b/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/testservice.vcxproj.filters index 3bcbccff748..eb4d8a85bd4 100644 --- a/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/testservice.vcxproj.filters +++ b/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/testservice.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {43ba4ae5-72e7-4cf5-88b4-d347f9e29fe3} - - {974c4e60-40ec-476e-916c-d9687d7393cf} - {ef2e5300-1f1a-461b-803f-da0aca5db963} - - {ce57d46f-aa7a-4f77-b8e5-74db7124f230} - {c585713e-8528-4ff5-8d2d-7fd038f97ce1} - - {86f40fb2-e1ba-4be8-bcc5-409dd3230da6} - {67fc816a-871d-4989-9cb7-237d4c7c104f} - - {47ece6dd-6485-471d-b911-5c89452450ec} - {22a3265d-6c1e-4c29-8d0e-c4e4c96dca98} @@ -91,29 +67,11 @@ {910121aa-b266-4051-a14e-ed6e55c8d018} - - {5f41519a-a42a-4860-a4fb-4b36a7100ef4} - - - {f89dabf3-57d0-4943-b8c5-4c6e2b30051a} - - - {b77bb033-45c4-4e75-b55d-eed9fddc6ad7} - - - {d5e28d21-ac51-403c-becb-7019dd31c02c} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceGrid/replicaGroup/msbuild/client/client.vcxproj b/cpp/test/IceGrid/replicaGroup/msbuild/client/client.vcxproj index 1587464abf5..7869f45a969 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/replicaGroup/msbuild/client/client.vcxproj @@ -120,26 +120,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -160,26 +140,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -202,26 +162,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -242,26 +182,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/IceGrid/replicaGroup/msbuild/client/client.vcxproj.filters b/cpp/test/IceGrid/replicaGroup/msbuild/client/client.vcxproj.filters index 0c5c5fb02ce..c6a31c0d1b6 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/client/client.vcxproj.filters +++ b/cpp/test/IceGrid/replicaGroup/msbuild/client/client.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {32a05f44-8d3f-4859-8553-5a96a50e73ee} - - {4868645f-74bc-47a6-b831-d992b6d18fb7} - {6a91877e-35d4-4dd8-9865-22715e9a89ff} - - {1523e0e0-5969-435f-b683-87ee6c3f5996} - {736ced77-98b3-4eb5-a04d-acb8bc59049c} - - {59072368-8a54-4c7c-8e9c-073ebd01c785} - {a6b2b0e4-a7da-4178-b266-2140c57e4952} - - {05b6b7e9-7417-486a-93ff-94aa09206268} - {941310fa-636e-4b3e-b1e3-0fc217681a18} @@ -91,26 +67,8 @@ {e909f89c-8da4-45ce-968f-f991c4ca683d} - - {2896b35a-e19d-4c6d-a3ac-0a3eb882f4a6} - - - {cd55a3b5-912f-4f10-958f-02bba802799f} - - - {4552556e-63c3-49e4-bf60-026f9ae35b89} - - - {33f1e4bc-d2c7-462e-bba0-80b0e2698639} - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceGrid/replicaGroup/msbuild/server/server.vcxproj b/cpp/test/IceGrid/replicaGroup/msbuild/server/server.vcxproj index 89f0b0444bc..0d00dd070e3 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/replicaGroup/msbuild/server/server.vcxproj @@ -160,26 +160,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -200,26 +180,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -243,26 +203,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -283,26 +223,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/IceGrid/replicaGroup/msbuild/server/server.vcxproj.filters b/cpp/test/IceGrid/replicaGroup/msbuild/server/server.vcxproj.filters index 49d15708ff1..dc7aabc6f44 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/server/server.vcxproj.filters +++ b/cpp/test/IceGrid/replicaGroup/msbuild/server/server.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {f348abc5-dfee-4441-96b0-fc6cbf918bcf} - - {d8477222-1cfb-4b28-8cd3-b94718093a1f} - {04b4e7a6-3d7f-4c95-b480-a0d75cd38ef3} - - {d574b0f0-0e1d-4a18-b2ab-a0241e1bcf32} - {41f38003-bc13-4c34-b783-20ee402512b6} - - {9d2e9686-14c3-4994-8bca-2b8cd0cb2e2a} - {45b04ebc-e183-4453-a7e3-3388c8d47dd0} - - {feaac1d3-f1b4-4974-b84c-79ad4f5ca1cf} - {8a7ffbf2-c4c1-49d4-bdf0-2d52160a639b} @@ -91,29 +67,11 @@ {f683062e-7041-46f4-97b9-7ca1286c1f4c} - - {c3fb20c4-7612-407c-859a-dcd6a32ba3e0} - - - {0d69a15c-a7ad-4d81-83f7-4ca963e5450c} - - - {69462fa5-e1c7-4efa-b098-a93a1cfe1a6d} - - - {c5ff6acd-3980-4f66-9fe0-7ffaeb55b1df} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceGrid/replicaGroup/msbuild/testservice/testservice.vcxproj b/cpp/test/IceGrid/replicaGroup/msbuild/testservice/testservice.vcxproj index 41c30303ca6..437c4528116 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/testservice/testservice.vcxproj +++ b/cpp/test/IceGrid/replicaGroup/msbuild/testservice/testservice.vcxproj @@ -184,26 +184,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -224,26 +204,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -267,26 +227,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -307,26 +247,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/IceGrid/replicaGroup/msbuild/testservice/testservice.vcxproj.filters b/cpp/test/IceGrid/replicaGroup/msbuild/testservice/testservice.vcxproj.filters index 80b00274f44..25a13c9a9a0 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/testservice/testservice.vcxproj.filters +++ b/cpp/test/IceGrid/replicaGroup/msbuild/testservice/testservice.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {b236a555-0a33-4b88-a932-1271f9393cce} - - {d2791846-1eaa-4cd4-8535-177d25c98ccc} - {a4bd264e-6c51-44dd-8d38-aa002e35be75} - - {ede04947-72d6-4550-9584-b3524212a851} - {feac2eda-5cda-4c7b-b92e-624de7d09782} - - {407248e4-96e7-4d50-9d01-beeac75bef09} - {6a581093-61f0-4852-85d1-e00bb7dc937b} - - {1777b46c-78c3-40f5-bec2-5b67e8ba38da} - {32fba3e2-9cba-4134-9212-a33fa0482757} @@ -91,29 +67,11 @@ {772c9a1e-4212-45d4-b07b-ee65c3ebffc6} - - {4dc1cfa1-f5e7-4277-99f2-b6d46cd134d6} - - - {e7215495-53d9-4b1b-9c5f-77503c767358} - - - {438088f0-ddd4-4b3b-8b8c-75457f552e0d} - - - {4ebbf98a-b99b-4a11-a40c-dd6b1c4e1d6e} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceGrid/replication/msbuild/client/client.vcxproj b/cpp/test/IceGrid/replication/msbuild/client/client.vcxproj index a8a57771cb1..5b9410560bc 100644 --- a/cpp/test/IceGrid/replication/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/replication/msbuild/client/client.vcxproj @@ -120,26 +120,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -160,26 +140,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -202,26 +162,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -242,26 +182,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/IceGrid/replication/msbuild/client/client.vcxproj.filters b/cpp/test/IceGrid/replication/msbuild/client/client.vcxproj.filters index 4890a99d442..1ef3d936023 100644 --- a/cpp/test/IceGrid/replication/msbuild/client/client.vcxproj.filters +++ b/cpp/test/IceGrid/replication/msbuild/client/client.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {c87ed1f9-5151-43bd-bdfa-b47e36fb8ecc} - - {391d5664-c27e-454f-b742-50865acf5232} - {a8dfec3c-9925-400c-b89d-4102f5be36b1} - - {9a17ce97-6aee-49ed-a7d5-f10d76932acb} - {3632a4be-77ca-4523-879a-a4812934e914} - - {24a8f2de-9000-4f1b-9157-52026e05ddf7} - {47c115f3-8eb8-45e0-b36a-46cd076fd825} - - {a9385a8b-a87a-4c01-ab8f-f435e13b6f3e} - {ecebfaf3-ff93-4570-8818-55995fe76e91} @@ -91,26 +67,8 @@ {90b9c503-03ea-4b92-b6d3-f1894cffa251} - - {5b466d14-e6f6-4cf5-89c7-3d5d0570e1eb} - - - {9d3bcf00-d463-497e-affc-30428419103e} - - - {c7d46e16-52f7-4991-b6ee-f8d29ede4c4c} - - - {718950bc-3d78-4c85-9c03-bab290637f16} - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceGrid/replication/msbuild/server/server.vcxproj b/cpp/test/IceGrid/replication/msbuild/server/server.vcxproj index 33d7e1dfbf6..de6f748bbb0 100644 --- a/cpp/test/IceGrid/replication/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/replication/msbuild/server/server.vcxproj @@ -160,26 +160,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -200,26 +180,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -243,26 +203,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -283,26 +223,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/IceGrid/replication/msbuild/server/server.vcxproj.filters b/cpp/test/IceGrid/replication/msbuild/server/server.vcxproj.filters index 0d103a2f28e..f550756766e 100644 --- a/cpp/test/IceGrid/replication/msbuild/server/server.vcxproj.filters +++ b/cpp/test/IceGrid/replication/msbuild/server/server.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {5e1bf312-389c-462a-9165-05c6804a0591} - - {e8d509e8-3c1d-42ca-b026-7c7097677cd5} - {16ebb1ff-09ea-4628-8388-4e56a54d98cc} - - {b2948c64-2122-4008-8c5e-4c59074384f5} - {adffe2fd-8341-467b-abec-20b46a248406} - - {b91f90f8-04b5-4bbc-b027-06493756ae5f} - {987dd6e4-ee7c-4be2-bab1-e29fd3d8c363} - - {2fcb9656-6cbf-443f-8e0d-9651dbfe2850} - {1684bced-2ee6-46f0-9a17-86b9c1c886f0} @@ -91,29 +67,11 @@ {4f894093-ed46-4a22-a31e-4a900a27d063} - - {aa369bf2-9a04-4317-9e42-2a4194d654e6} - - - {733abe6d-18eb-42e2-a207-6886b3483fbe} - - - {4a2fb8c2-9677-45f2-83a3-0c09921ef043} - - - {a0847899-ca2c-4820-b943-4e826319f6d7} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceGrid/session/msbuild/client/client.vcxproj b/cpp/test/IceGrid/session/msbuild/client/client.vcxproj index 9dfa14897b5..1b71a8f4a8a 100644 --- a/cpp/test/IceGrid/session/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/session/msbuild/client/client.vcxproj @@ -120,26 +120,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -160,26 +140,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -202,26 +162,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -242,26 +182,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/IceGrid/session/msbuild/client/client.vcxproj.filters b/cpp/test/IceGrid/session/msbuild/client/client.vcxproj.filters index 10c252b9c44..e34b06ba4a3 100644 --- a/cpp/test/IceGrid/session/msbuild/client/client.vcxproj.filters +++ b/cpp/test/IceGrid/session/msbuild/client/client.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {5360d821-5c2f-4111-a0e5-e5eb63057043} - - {e8e875e6-487d-47ee-b207-e7ba301323ca} - {c4120f39-c655-44d3-8a51-11731319efcc} - - {ac69609d-f8f3-44e1-ab83-b196b9d58c8d} - {33fd13a1-2bd4-4830-a41e-faffa61bde80} - - {f9b37083-b61a-4071-9e19-2eb9d5d14a64} - {9ad06cd4-e366-4056-8938-1ef74ea12611} - - {ef49512a-c80d-4b72-9459-c8322602fa40} - {fc1e990f-7a9b-4360-aebb-4b74b2655063} @@ -91,26 +67,8 @@ {04389040-0ed7-4155-b373-af0cea3cb329} - - {59c07189-91a2-4dfa-978a-d4de8a1e7d08} - - - {19ce573a-6f12-448a-9991-f5b7c1e07216} - - - {569b6137-4b25-4072-a978-5aef3e262b9f} - - - {458eec1b-3676-4de4-9c11-f79d685ed000} - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceGrid/session/msbuild/server/server.vcxproj b/cpp/test/IceGrid/session/msbuild/server/server.vcxproj index 424df25c69d..00f6092e7c3 100644 --- a/cpp/test/IceGrid/session/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/session/msbuild/server/server.vcxproj @@ -37,7 +37,7 @@ - {35.0.7D1-34B8-450C-AE23-FCF994DE4879} + {00000035-0000-0000-0000-000000000000} @@ -159,26 +159,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -199,26 +179,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -241,26 +201,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -281,26 +221,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/IceGrid/session/msbuild/server/server.vcxproj.filters b/cpp/test/IceGrid/session/msbuild/server/server.vcxproj.filters index d4e57f5d756..b0f4b723df6 100644 --- a/cpp/test/IceGrid/session/msbuild/server/server.vcxproj.filters +++ b/cpp/test/IceGrid/session/msbuild/server/server.vcxproj.filters @@ -4,12 +4,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -22,12 +16,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -43,27 +31,15 @@ {ba14bc9d-04e7-4157-b706-ef69abeaebb2} - - {949d1dce-88d5-4575-97d8-b43bff8f9bef} - {b883d21d-1554-41e6-8f56-55cf72b51a6a} - - {c5ae3eec-0f3f-4bd6-8d16-4c93577ce157} - {d6d7c805-2efb-4f05-b11e-df54e5db7078} - - {32da3dc4-f006-4e4d-af69-9f060adbe242} - {e0ff5975-e2aa-4fc6-9115-a6cdf1936ae4} - - {a9acb484-ead6-4cb3-907c-2d372dac2886} - {f67e0833-206e-46d6-a17f-201cb0cad81f} @@ -88,26 +64,8 @@ {f3be1bed-c4b0-408f-a391-ba3b78080ca0} - - {ff5a81b3-05d2-423b-aab3-9a90a4d57611} - - - {4cf86235-1aeb-430d-91d4-65448fac50be} - - - {2b23307f-c07b-4d6e-b749-6b74e42e45ef} - - - {87179e2f-119f-4546-ad01-fa2e58434916} - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -120,12 +78,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceGrid/session/msbuild/verifier/verifier.vcxproj b/cpp/test/IceGrid/session/msbuild/verifier/verifier.vcxproj index 0a4cf730f04..d627b1a6aff 100644 --- a/cpp/test/IceGrid/session/msbuild/verifier/verifier.vcxproj +++ b/cpp/test/IceGrid/session/msbuild/verifier/verifier.vcxproj @@ -159,26 +159,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -199,26 +179,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -241,26 +201,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -281,26 +221,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/IceGrid/session/msbuild/verifier/verifier.vcxproj.filters b/cpp/test/IceGrid/session/msbuild/verifier/verifier.vcxproj.filters index 9f3d7b5be83..53542ddd14b 100644 --- a/cpp/test/IceGrid/session/msbuild/verifier/verifier.vcxproj.filters +++ b/cpp/test/IceGrid/session/msbuild/verifier/verifier.vcxproj.filters @@ -14,27 +14,15 @@ {35e81b7a-f8db-4b06-9d7d-23742c81f385} - - {3a1d737f-84da-40db-b7ba-957c581b63ea} - {ac6e8069-fa1b-40ca-991c-c180713cd5f6} - - {31154651-8d81-42cd-b6a0-0dc7c80e8a63} - {6ec0541f-b282-431e-a675-29a60c587a2d} - - {e476ef87-b451-4eed-811e-dc10f983087b} - {017d3f55-9594-4819-abcf-74f20a4dd82f} - - {ac26a8f8-6bfc-4967-a003-1a3b1b134af2} - {3b9b9788-888b-4746-a28a-1cbd97fdee2c} @@ -59,29 +47,11 @@ {da759e6b-b473-4c7b-bb94-d1225dd3d293} - - {906dcee6-c431-4a53-8fd2-da2cb4f30818} - - - {cae4f121-50e1-45fa-94da-49c19d520aae} - - - {59880b54-90a1-4008-b6eb-8968bbd7d6a6} - - - {a8755732-6038-4193-8cc7-57880df751be} - Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -94,20 +64,8 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -120,12 +78,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceGrid/simple/msbuild/client/client.vcxproj b/cpp/test/IceGrid/simple/msbuild/client/client.vcxproj index 479b92f111c..0c9586c4c89 100644 --- a/cpp/test/IceGrid/simple/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/simple/msbuild/client/client.vcxproj @@ -168,26 +168,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -208,26 +188,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -250,26 +210,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -290,26 +230,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/IceGrid/simple/msbuild/client/client.vcxproj.filters b/cpp/test/IceGrid/simple/msbuild/client/client.vcxproj.filters index c4e42725737..43ecbb277fd 100644 --- a/cpp/test/IceGrid/simple/msbuild/client/client.vcxproj.filters +++ b/cpp/test/IceGrid/simple/msbuild/client/client.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {346b5126-487e-4584-ab35-aec8cff11975} - - {b6d58471-9ee5-45f6-8287-127d62d90b5c} - {58f228fc-c1a1-4471-9f23-9d0883f176aa} - - {f723bba2-a4d3-4737-ac2a-8708ed9141db} - {047a4fdb-acdf-43a7-a4df-76a147651a08} - - {6f6a5f54-d82b-4fd0-b2aa-c2d17cfa86b7} - {87e2de62-426f-4877-88e4-0d165b4f57b7} - - {371dd196-0bd2-4ae9-9241-38d8f4405056} - {4d6e5bfd-74db-42b1-a7bc-2515fe7364df} @@ -91,26 +67,8 @@ {4425b22b-ba3a-426e-b7d5-16d11bf15aa6} - - {5da3b794-dff9-431d-9695-942c32024943} - - - {c2fbf9d0-20ef-4af1-ac69-a4bb3c3cb389} - - - {52f2fb41-86ee-45a0-aa08-bc29178c533c} - - - {79abaeff-8997-468c-9b4c-4134eb861065} - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceGrid/simple/msbuild/server/server.vcxproj b/cpp/test/IceGrid/simple/msbuild/server/server.vcxproj index 4c9eedfe61e..418f04b2c9a 100644 --- a/cpp/test/IceGrid/simple/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/simple/msbuild/server/server.vcxproj @@ -160,26 +160,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -200,26 +180,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -243,26 +203,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -283,26 +223,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/IceGrid/simple/msbuild/server/server.vcxproj.filters b/cpp/test/IceGrid/simple/msbuild/server/server.vcxproj.filters index ebe10782b9c..e8bb2abffc2 100644 --- a/cpp/test/IceGrid/simple/msbuild/server/server.vcxproj.filters +++ b/cpp/test/IceGrid/simple/msbuild/server/server.vcxproj.filters @@ -14,27 +14,15 @@ {f773aecb-d2d2-45f9-a906-1ccb2aa3eedc} - - {7a9aad07-f931-46b7-a9ac-9b93398a1d44} - {1b3b5ad4-0914-4ab4-abe9-8de3958103c4} - - {66f0d39c-13c3-4552-acbc-16b7174b5bf9} - {b7cef6ac-cb0a-4d82-b025-bf4f1b989e8d} - - {2d802dc5-07e3-4371-92ac-83122adbfd45} - {98024722-013e-4d65-80e9-61b7bea43f17} - - {694047c1-da08-4b86-9941-d6f64351d860} - {97c3ddaa-3807-4715-b298-e2d7a8da9005} @@ -59,29 +47,11 @@ {59c24850-232e-4285-a7a0-a80be79cd5eb} - - {bd94faf8-ee06-436f-8cdd-0ddcdc675708} - - - {319bc1b6-1c71-47ca-a4c6-9514e38975de} - - - {267d2467-bbda-45f2-b7e0-8ee8c4397ec8} - - - {d82a0bdb-deea-4e13-9fb4-5fddcd9e0d78} - Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -94,23 +64,11 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - Source Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - Header Files diff --git a/cpp/test/IceGrid/update/msbuild/client/client.vcxproj b/cpp/test/IceGrid/update/msbuild/client/client.vcxproj index 7c8d48046cf..64fca79a55d 100644 --- a/cpp/test/IceGrid/update/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/update/msbuild/client/client.vcxproj @@ -144,26 +144,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -184,26 +164,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -226,26 +186,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -266,26 +206,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/IceGrid/update/msbuild/client/client.vcxproj.filters b/cpp/test/IceGrid/update/msbuild/client/client.vcxproj.filters index aa86bf5e5ba..f9558989c47 100644 --- a/cpp/test/IceGrid/update/msbuild/client/client.vcxproj.filters +++ b/cpp/test/IceGrid/update/msbuild/client/client.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {bb3fe9d6-43b9-487c-bae0-c373ebd3d8b9} - - {9e03f7e7-9ed8-46c7-82d4-38e2d10db102} - {d4bf7621-8609-4f29-bd71-6ec13015f66f} - - {6f0c67a2-8324-4330-a35f-9697cb64b369} - {af58e42b-6ff0-4243-9c89-fb4cb53c669b} - - {cbd24ffd-3f30-4310-a8b9-c09a3c1d30be} - {baed9d55-ac9b-4285-8268-7497f44e3fd5} - - {64f3c0ab-7af8-45fa-be8a-a6a4138dfdc6} - {328f7d4f-9bf4-41fb-8bcf-81d45ab65f48} @@ -91,26 +67,8 @@ {208e7472-2858-4afa-8cb3-1a44c4b61ab5} - - {d8fb4507-85da-48e9-906c-210e412c5994} - - - {54a2ec46-8872-43e2-b923-63d35d4b98d2} - - - {60d4a875-086e-4fea-bed6-69737504c5fd} - - - {814bad99-c67f-49ba-b4be-1ebd1cf09c76} - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceGrid/update/msbuild/server/server.vcxproj b/cpp/test/IceGrid/update/msbuild/server/server.vcxproj index 2de64e6ed2d..8a8dad02511 100644 --- a/cpp/test/IceGrid/update/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/update/msbuild/server/server.vcxproj @@ -160,26 +160,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -200,26 +180,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -243,26 +203,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -283,26 +223,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/IceGrid/update/msbuild/server/server.vcxproj.filters b/cpp/test/IceGrid/update/msbuild/server/server.vcxproj.filters index afd7ae4e854..1f74b6731d8 100644 --- a/cpp/test/IceGrid/update/msbuild/server/server.vcxproj.filters +++ b/cpp/test/IceGrid/update/msbuild/server/server.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {31300253-09ad-4d00-bd43-fd52b79e2368} - - {bd808c02-c435-4693-87d3-976980bf9d8f} - {5da7ccf8-58f7-4992-9495-0d6a95cec53e} - - {79f76b7f-2a15-4889-b78e-84d0e5063d2c} - {fa422680-070e-479c-a334-eab7d2eb91fd} - - {f6f0ecbf-fde5-4378-bf51-fd2324b4f4af} - {9a099eee-94fb-4521-8895-dac0f84e945d} - - {c6eb39ae-4ccc-482d-a6de-dc214cec33d8} - {ab6c013a-dc6e-47b3-ab90-174969509c51} @@ -91,29 +67,11 @@ {34878625-f866-4b6a-b823-7b439bd9f562} - - {75134ab3-2649-4cb7-8b85-1534c1eaf2ac} - - - {7eee46be-157f-4158-81e6-69fc3f204cad} - - - {26c402b1-b6a2-4ee6-93e1-72266cc07f29} - - - {78e9c7c0-7987-41e4-950a-8cdd213b2c15} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceSSL/configuration/msbuild/client/client.vcxproj b/cpp/test/IceSSL/configuration/msbuild/client/client.vcxproj index d2dd4c72edc..5138eccbadf 100644 --- a/cpp/test/IceSSL/configuration/msbuild/client/client.vcxproj +++ b/cpp/test/IceSSL/configuration/msbuild/client/client.vcxproj @@ -162,26 +162,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -202,26 +182,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -244,26 +204,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -284,26 +224,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/IceSSL/configuration/msbuild/client/client.vcxproj.filters b/cpp/test/IceSSL/configuration/msbuild/client/client.vcxproj.filters index d5bb204ff13..c18e57d332d 100644 --- a/cpp/test/IceSSL/configuration/msbuild/client/client.vcxproj.filters +++ b/cpp/test/IceSSL/configuration/msbuild/client/client.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {cff6ff58-cfc7-4ff9-8b6e-983c9eadeeea} - - {05fca7b1-4694-4d7b-9e96-8664b9eec0a3} - {b527d98a-2399-4c39-8963-1619d21e27cc} - - {73aff73a-c87e-4d36-b247-d537cc2fd804} - {9dce4a10-5e39-41c2-9125-d537fcaf0562} - - {c58a9746-f268-45f5-99d7-5fdb64a04407} - {7f2c40d1-5e97-4d10-9d0a-16905ab8ad76} - - {22596883-4550-49c4-a5e0-ed146a3e68a5} - {50206de0-b08c-445c-9e80-58c39cc5278f} @@ -91,26 +67,8 @@ {39ff1ead-1815-4af9-a2cd-457b6f0ed399} - - {8f5b4b04-166a-4057-8707-5c93822b5e02} - - - {9c340360-3907-426f-b200-8b0040d45fa3} - - - {4a70479b-9ee2-4d91-808b-14bb9b741b27} - - - {eab6f860-7cf3-4cee-8810-216df2924251} - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -123,12 +81,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceSSL/configuration/msbuild/server/server.vcxproj b/cpp/test/IceSSL/configuration/msbuild/server/server.vcxproj index 9d4ebc1f5b6..8ec1ea129b1 100644 --- a/cpp/test/IceSSL/configuration/msbuild/server/server.vcxproj +++ b/cpp/test/IceSSL/configuration/msbuild/server/server.vcxproj @@ -161,26 +161,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -201,26 +181,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -244,26 +204,6 @@ - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true @@ -284,26 +224,6 @@ true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - true true diff --git a/cpp/test/IceSSL/configuration/msbuild/server/server.vcxproj.filters b/cpp/test/IceSSL/configuration/msbuild/server/server.vcxproj.filters index 6296a567db7..1ea1bd777ac 100644 --- a/cpp/test/IceSSL/configuration/msbuild/server/server.vcxproj.filters +++ b/cpp/test/IceSSL/configuration/msbuild/server/server.vcxproj.filters @@ -7,12 +7,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -25,12 +19,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - @@ -46,27 +34,15 @@ {d25424dc-4b3f-4dec-a83a-54d4de89fefe} - - {625e8b26-8c7b-48e0-b61f-207f02235717} - {b2c4157f-5d2d-45fb-b193-c6d7da06190a} - - {4f5279cd-c658-4c6c-9ec3-a0152caf0ed5} - {b35ef6e1-7178-4b4e-a992-0ba588b047fd} - - {7b307652-09f7-45b2-885f-50ae92266efd} - {9caa42de-c763-47d9-9f4d-e3ae67b23a9d} - - {fcb3f373-d502-4e32-a1d5-ef5b918367c9} - {f31275fe-6cc1-47c6-bdfd-74984e2ea306} @@ -91,29 +67,11 @@ {f5e99acb-dae1-4563-8086-882077ef946f} - - {8cea6720-831d-44c3-a1e8-92451ae1ac45} - - - {82198e5b-4c69-4d86-b991-cd322047f1e1} - - - {883e8b6c-c487-4e4f-90f3-e37b7d095867} - - - {1cd2596f-cf38-4e5a-a94f-246cc35987df} - Header Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -126,12 +84,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceStorm/federation/msbuild/publisher/publisher.vcxproj b/cpp/test/IceStorm/federation/msbuild/publisher/publisher.vcxproj index 4d918c80ed8..bef7151570c 100644 --- a/cpp/test/IceStorm/federation/msbuild/publisher/publisher.vcxproj +++ b/cpp/test/IceStorm/federation/msbuild/publisher/publisher.vcxproj @@ -41,26 +41,6 @@ - - true - true - true - true - true - true - true - ..\..\Event.ice - - - true - true - true - true - true - true - true - ..\..\Event.ice - true true @@ -81,26 +61,6 @@ true ..\..\Event.ice - - true - true - true - true - true - true - true - ..\..\Event.ice - - - true - true - true - true - true - true - true - ..\..\Event.ice - true true @@ -123,26 +83,6 @@ - - true - true - true - true - true - true - true - ..\..\Event.ice - - - true - true - true - true - true - true - true - ..\..\Event.ice - true true @@ -163,26 +103,6 @@ true ..\..\Event.ice - - true - true - true - true - true - true - true - ..\..\Event.ice - - - true - true - true - true - true - true - true - ..\..\Event.ice - true true diff --git a/cpp/test/IceStorm/federation/msbuild/publisher/publisher.vcxproj.filters b/cpp/test/IceStorm/federation/msbuild/publisher/publisher.vcxproj.filters index 7de249df55a..8a0036d3249 100644 --- a/cpp/test/IceStorm/federation/msbuild/publisher/publisher.vcxproj.filters +++ b/cpp/test/IceStorm/federation/msbuild/publisher/publisher.vcxproj.filters @@ -14,27 +14,15 @@ {8de10a5b-39f2-4b0c-96c6-fa6a73eb71de} - - {364aea09-eeeb-4861-98a7-ceba329bec0d} - {7c8fe037-7e77-47fb-8c4a-775032d5fc6f} - - {187f7cb7-6ad5-4533-a90a-202a44cd979d} - {57dce9c4-fe6d-43bc-b7cd-700b1c609713} - - {1deac400-510c-4433-8d56-4d8827b286e5} - {b0f3f9a6-73e8-40eb-8a36-ee020e769274} - - {ec0c1668-65c7-4ca2-b4c1-e39d100ea850} - {a95ebd2f-43eb-456a-8a2f-e5c2ea6155bd} @@ -59,29 +47,11 @@ {6509031e-aa9a-46e6-bb21-1f8de5b41f3b} - - {386a63e9-71d1-4a88-b23a-6189a507572f} - - - {c8551de6-6cd1-4e81-98ae-a1e6f5963da2} - - - {86f82063-f250-4050-9913-79718629aa26} - - - {25779303-713c-4e77-a6d6-ab437173a2f8} - Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -94,20 +64,8 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -120,12 +78,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceStorm/federation/msbuild/subscriber/subscriber.vcxproj b/cpp/test/IceStorm/federation/msbuild/subscriber/subscriber.vcxproj index 00d6f39197a..94666bf4d5c 100644 --- a/cpp/test/IceStorm/federation/msbuild/subscriber/subscriber.vcxproj +++ b/cpp/test/IceStorm/federation/msbuild/subscriber/subscriber.vcxproj @@ -41,26 +41,6 @@ - - true - true - true - true - true - true - true - ..\..\Event.ice - - - true - true - true - true - true - true - true - ..\..\Event.ice - true true @@ -81,26 +61,6 @@ true ..\..\Event.ice - - true - true - true - true - true - true - true - ..\..\Event.ice - - - true - true - true - true - true - true - true - ..\..\Event.ice - true true @@ -123,26 +83,6 @@ - - true - true - true - true - true - true - true - ..\..\Event.ice - - - true - true - true - true - true - true - true - ..\..\Event.ice - true true @@ -163,26 +103,6 @@ true ..\..\Event.ice - - true - true - true - true - true - true - true - ..\..\Event.ice - - - true - true - true - true - true - true - true - ..\..\Event.ice - true true diff --git a/cpp/test/IceStorm/federation/msbuild/subscriber/subscriber.vcxproj.filters b/cpp/test/IceStorm/federation/msbuild/subscriber/subscriber.vcxproj.filters index 16459b5e3b4..24c592da15d 100644 --- a/cpp/test/IceStorm/federation/msbuild/subscriber/subscriber.vcxproj.filters +++ b/cpp/test/IceStorm/federation/msbuild/subscriber/subscriber.vcxproj.filters @@ -14,27 +14,15 @@ {6cad4908-44fd-4305-a802-4034eba37c3d} - - {39bdc1da-6cb2-439b-8126-98a621100491} - {a30d81e6-84e7-4a8f-954a-dcc8701204c6} - - {193de0c2-4d1f-4e24-a5f0-a8d7bec19766} - {e8d7f756-ce7c-4f5d-bc59-02a5092c340b} - - {689c43ac-55da-4130-ba2f-523deb79ae64} - {75cb960e-74aa-4316-9425-822350c700e6} - - {b4663e9b-e134-4563-84f5-742ea7f7167a} - {be6fca36-339f-420d-ac21-1596f7bf6494} @@ -59,26 +47,8 @@ {451975b7-3486-4de4-a89b-396fa1c2f570} - - {c6e00c1e-4f14-400f-9466-3b3c22cf1ba8} - - - {d083811a-5e97-4248-b664-90881a38370c} - - - {898ae8dc-7ad7-45e6-9afa-f7171ebf467a} - - - {583ae5e9-6400-4ace-b63c-2b2abc1fcc75} - - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -91,23 +61,11 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - Source Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -120,12 +78,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceStorm/federation2/msbuild/publisher/publisher.vcxproj b/cpp/test/IceStorm/federation2/msbuild/publisher/publisher.vcxproj index bdea674db99..0b3631fad86 100644 --- a/cpp/test/IceStorm/federation2/msbuild/publisher/publisher.vcxproj +++ b/cpp/test/IceStorm/federation2/msbuild/publisher/publisher.vcxproj @@ -41,26 +41,6 @@ - - true - true - true - true - true - true - true - ..\..\Event.ice - - - true - true - true - true - true - true - true - ..\..\Event.ice - true true @@ -81,26 +61,6 @@ true ..\..\Event.ice - - true - true - true - true - true - true - true - ..\..\Event.ice - - - true - true - true - true - true - true - true - ..\..\Event.ice - true true @@ -123,26 +83,6 @@ - - true - true - true - true - true - true - true - ..\..\Event.ice - - - true - true - true - true - true - true - true - ..\..\Event.ice - true true @@ -163,26 +103,6 @@ true ..\..\Event.ice - - true - true - true - true - true - true - true - ..\..\Event.ice - - - true - true - true - true - true - true - true - ..\..\Event.ice - true true diff --git a/cpp/test/IceStorm/federation2/msbuild/publisher/publisher.vcxproj.filters b/cpp/test/IceStorm/federation2/msbuild/publisher/publisher.vcxproj.filters index a3f2d744595..f47aa62f8bc 100644 --- a/cpp/test/IceStorm/federation2/msbuild/publisher/publisher.vcxproj.filters +++ b/cpp/test/IceStorm/federation2/msbuild/publisher/publisher.vcxproj.filters @@ -14,27 +14,15 @@ {f0cac2d0-3268-41ea-981c-c29df7d9299c} - - {1a2c32c1-2b93-4698-8af6-a035a758efba} - {0c1fa2b1-bb21-49c4-87c2-063fb3e325c9} - - {59a6fe1e-561f-43e9-b7c8-542342f17e21} - {ffc547e8-6061-4466-8aab-7eb4d9b2381d} - - {fa8df0b6-26bd-441d-aa47-ee6323541a4a} - {253a2892-acad-4b11-8c47-96aeb4e37f52} - - {6e88ca87-ae9a-4154-a977-be6dbbb4df74} - {0e0aa318-6aed-4011-b74d-294d728923f1} @@ -59,29 +47,11 @@ {cc16443e-b4c6-4115-9eb9-88e69f5ee8e3} - - {f3330b16-f727-4546-a540-9b98c2029511} - - - {d7ada0c2-9acd-4570-856e-2ced9b7a30e8} - - - {c8a43ada-2f40-4def-ac7d-c989496f6338} - - - {a84d53e8-45aa-4a98-828c-4bddcc2f79f3} - Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -94,20 +64,8 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -120,12 +78,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceStorm/federation2/msbuild/subscriber/subscriber.vcxproj b/cpp/test/IceStorm/federation2/msbuild/subscriber/subscriber.vcxproj index 0bdda84ba57..89209f2d8a3 100644 --- a/cpp/test/IceStorm/federation2/msbuild/subscriber/subscriber.vcxproj +++ b/cpp/test/IceStorm/federation2/msbuild/subscriber/subscriber.vcxproj @@ -41,26 +41,6 @@ - - true - true - true - true - true - true - true - ..\..\Event.ice - - - true - true - true - true - true - true - true - ..\..\Event.ice - true true @@ -81,26 +61,6 @@ true ..\..\Event.ice - - true - true - true - true - true - true - true - ..\..\Event.ice - - - true - true - true - true - true - true - true - ..\..\Event.ice - true true @@ -123,26 +83,6 @@ - - true - true - true - true - true - true - true - ..\..\Event.ice - - - true - true - true - true - true - true - true - ..\..\Event.ice - true true @@ -163,26 +103,6 @@ true ..\..\Event.ice - - true - true - true - true - true - true - true - ..\..\Event.ice - - - true - true - true - true - true - true - true - ..\..\Event.ice - true true diff --git a/cpp/test/IceStorm/federation2/msbuild/subscriber/subscriber.vcxproj.filters b/cpp/test/IceStorm/federation2/msbuild/subscriber/subscriber.vcxproj.filters index fd0795f1a5b..33a77bfc20b 100644 --- a/cpp/test/IceStorm/federation2/msbuild/subscriber/subscriber.vcxproj.filters +++ b/cpp/test/IceStorm/federation2/msbuild/subscriber/subscriber.vcxproj.filters @@ -14,27 +14,15 @@ {8f7c0e10-144e-4883-ae4d-7fb13c77af05} - - {8086167e-da5d-49d8-9d58-a90e1a1cd8b7} - {6a1eaa65-ea84-4145-9c78-9de56940f46d} - - {03f1d774-15fa-4cee-b603-f1d77200af65} - {1bdf03b3-d615-4999-a20c-91d267a94609} - - {9227b4c0-1c87-4b67-84e7-68b4f9390a0f} - {e061e60e-c892-4037-b8da-4cf6552ce1df} - - {028f9a63-ccc5-4c96-9fb2-291330ce3516} - {0fa32d1d-e4b3-460b-ba33-0077b44b41c5} @@ -59,29 +47,11 @@ {d246b008-c14d-48de-a8e9-62e397fc3b79} - - {acaae8ca-cde3-4e6f-9af9-f2be7241b916} - - - {a5a46d8f-6b8b-4b44-abfa-3fffd4785557} - - - {079bc9c3-b720-4df4-bdb7-46fa3ca2621f} - - - {9537ac4d-8b6b-41af-b6a3-f067354df0ea} - Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -94,20 +64,8 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -120,12 +78,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceStorm/rep1/msbuild/publisher/publisher.vcxproj b/cpp/test/IceStorm/rep1/msbuild/publisher/publisher.vcxproj index 03861180364..632e7cab213 100644 --- a/cpp/test/IceStorm/rep1/msbuild/publisher/publisher.vcxproj +++ b/cpp/test/IceStorm/rep1/msbuild/publisher/publisher.vcxproj @@ -38,26 +38,6 @@ - - true - true - true - true - true - true - true - ..\..\Single.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - true true @@ -78,26 +58,6 @@ true ..\..\Single.ice - - true - true - true - true - true - true - true - ..\..\Single.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - true true @@ -123,26 +83,6 @@ - - true - true - true - true - true - true - true - ..\..\Single.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - true true @@ -163,26 +103,6 @@ true ..\..\Single.ice - - true - true - true - true - true - true - true - ..\..\Single.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - true true diff --git a/cpp/test/IceStorm/rep1/msbuild/publisher/publisher.vcxproj.filters b/cpp/test/IceStorm/rep1/msbuild/publisher/publisher.vcxproj.filters index 7415123515f..c551bdaba14 100644 --- a/cpp/test/IceStorm/rep1/msbuild/publisher/publisher.vcxproj.filters +++ b/cpp/test/IceStorm/rep1/msbuild/publisher/publisher.vcxproj.filters @@ -14,27 +14,15 @@ {5e3e509d-7c85-47d8-8c96-56ef328e0b6c} - - {056169a6-2448-489e-8998-01154b1bf5bd} - {e848af66-a93e-4d5a-9252-278383d4daec} - - {66c4185b-4ded-4575-9f53-869fd17c3ae1} - {e2532ebb-ae5d-472a-8684-6cbf4a8cea82} - - {6e07d96c-9164-4144-aa43-4d3b0f51d5cf} - {3289c952-876f-4c60-8225-e88269209c9e} - - {3c6a1c5e-11f4-493a-a52c-6f52304b2373} - {7ccd28c5-d4d5-4ab3-b06c-d8af357f7c6a} @@ -59,29 +47,11 @@ {dc6dddf8-4540-4a00-acf8-dfe31339b9fc} - - {3b32a6df-0ccf-4d3e-9bca-23575011b80b} - - - {0b74d819-0120-460f-b133-4da7cc4f2604} - - - {8d5855ab-9174-4418-bc51-c1bba1e0fb71} - - - {b76f9801-8ca6-4b11-a54b-5e7426f76e8c} - Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -94,20 +64,8 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -120,12 +78,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceStorm/rep1/msbuild/sub/sub.vcxproj b/cpp/test/IceStorm/rep1/msbuild/sub/sub.vcxproj index 33b00d69ceb..4c797576efb 100644 --- a/cpp/test/IceStorm/rep1/msbuild/sub/sub.vcxproj +++ b/cpp/test/IceStorm/rep1/msbuild/sub/sub.vcxproj @@ -41,26 +41,6 @@ - - true - true - true - true - true - true - true - ..\..\Single.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - true true @@ -81,26 +61,6 @@ true ..\..\Single.ice - - true - true - true - true - true - true - true - ..\..\Single.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - true true @@ -123,26 +83,6 @@ - - true - true - true - true - true - true - true - ..\..\Single.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - true true @@ -163,26 +103,6 @@ true ..\..\Single.ice - - true - true - true - true - true - true - true - ..\..\Single.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - true true diff --git a/cpp/test/IceStorm/rep1/msbuild/sub/sub.vcxproj.filters b/cpp/test/IceStorm/rep1/msbuild/sub/sub.vcxproj.filters index b74627323e1..7537820da65 100644 --- a/cpp/test/IceStorm/rep1/msbuild/sub/sub.vcxproj.filters +++ b/cpp/test/IceStorm/rep1/msbuild/sub/sub.vcxproj.filters @@ -14,27 +14,15 @@ {4dbf6356-2de1-4e9f-a56d-6667c326c62e} - - {35e928a4-5665-4f1b-8da5-a39567342714} - {20d8e2eb-a904-4bce-90f1-657dcdf74fe2} - - {339562cc-4616-4d9c-bfe0-feebeca73691} - {d5a20464-b4ef-4004-86cb-cd6ca67a0860} - - {e0b95a1e-70ba-4806-a022-1db09596b4ef} - {6e7256f7-99fd-4adb-b048-c5fbbb44cf4c} - - {883379e4-1aa3-4d83-b466-d90c78c3bb8c} - {45c6bd5b-8304-4847-97d2-9f81fcc0c112} @@ -59,26 +47,8 @@ {11b1c0a1-ae41-4406-890f-2d9714806766} - - {11ddd459-1a66-464f-857d-26006b7bed99} - - - {d997c511-8dc9-4afd-b60b-b81ab2355aa3} - - - {41f144c9-3262-4db5-9bfc-a825ec1529b8} - - - {6f04a895-545d-49c3-a5ce-3689b24f09a7} - - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -91,23 +61,11 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - Source Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -120,12 +78,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceStorm/rep1/msbuild/subscriber/subscriber.vcxproj b/cpp/test/IceStorm/rep1/msbuild/subscriber/subscriber.vcxproj index 17d3e26446e..8c122ed97aa 100644 --- a/cpp/test/IceStorm/rep1/msbuild/subscriber/subscriber.vcxproj +++ b/cpp/test/IceStorm/rep1/msbuild/subscriber/subscriber.vcxproj @@ -38,26 +38,6 @@ - - true - true - true - true - true - true - true - ..\..\Single.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - true true @@ -78,26 +58,6 @@ true ..\..\Single.ice - - true - true - true - true - true - true - true - ..\..\Single.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - true true @@ -123,26 +83,6 @@ - - true - true - true - true - true - true - true - ..\..\Single.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - true true @@ -163,26 +103,6 @@ true ..\..\Single.ice - - true - true - true - true - true - true - true - ..\..\Single.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - true true diff --git a/cpp/test/IceStorm/rep1/msbuild/subscriber/subscriber.vcxproj.filters b/cpp/test/IceStorm/rep1/msbuild/subscriber/subscriber.vcxproj.filters index 0ebefc183e3..251d8b5da32 100644 --- a/cpp/test/IceStorm/rep1/msbuild/subscriber/subscriber.vcxproj.filters +++ b/cpp/test/IceStorm/rep1/msbuild/subscriber/subscriber.vcxproj.filters @@ -14,27 +14,15 @@ {bbb40dc1-510f-40d7-afc8-198ffc519ba5} - - {3046ece7-30dc-4ab4-a3ad-ba1f5b5521b4} - {2525a6bb-a426-48e5-8712-b9e4b0cb1186} - - {de82a11f-61aa-40d7-a6ff-254217305949} - {e2d7e0bd-6472-49f4-932d-51c06d80aa76} - - {9284536c-1fd6-44e1-b27a-6f47b805186d} - {862ee641-44d0-447e-8141-4c1da2313b59} - - {0227d9ca-1d51-4ea1-812d-856bd980ce65} - {9613d7d3-1c6b-4d93-8648-950d0e636eae} @@ -59,29 +47,11 @@ {5540ce37-2815-474e-ba48-a9bd11482bed} - - {5abe2893-4aa1-4bc2-967b-c0dee15b0bc3} - - - {a29e7c50-4f3a-4328-8fa6-c9da8a99ed05} - - - {cf08cdeb-a728-4df8-bdcc-3ffdf928f32e} - - - {49658f34-2321-4da5-ac8c-e60171cb95c5} - Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -94,20 +64,8 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -120,12 +78,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceStorm/repgrid/msbuild/client.vcxproj b/cpp/test/IceStorm/repgrid/msbuild/client.vcxproj index bfa63b5d436..d4f572deb6e 100644 --- a/cpp/test/IceStorm/repgrid/msbuild/client.vcxproj +++ b/cpp/test/IceStorm/repgrid/msbuild/client.vcxproj @@ -41,26 +41,6 @@ - - true - true - true - true - true - true - true - ..\Single.ice - - - true - true - true - true - true - true - true - ..\Single.ice - true true @@ -81,26 +61,6 @@ true ..\Single.ice - - true - true - true - true - true - true - true - ..\Single.ice - - - true - true - true - true - true - true - true - ..\Single.ice - true true @@ -123,26 +83,6 @@ - - true - true - true - true - true - true - true - ..\Single.ice - - - true - true - true - true - true - true - true - ..\Single.ice - true true @@ -163,26 +103,6 @@ true ..\Single.ice - - true - true - true - true - true - true - true - ..\Single.ice - - - true - true - true - true - true - true - true - ..\Single.ice - true true diff --git a/cpp/test/IceStorm/repgrid/msbuild/client.vcxproj.filters b/cpp/test/IceStorm/repgrid/msbuild/client.vcxproj.filters index c2bbccbeacb..906c841245a 100644 --- a/cpp/test/IceStorm/repgrid/msbuild/client.vcxproj.filters +++ b/cpp/test/IceStorm/repgrid/msbuild/client.vcxproj.filters @@ -14,27 +14,15 @@ {c66b918d-edc6-479d-919e-613ebd05b715} - - {8f78c318-364e-483b-81a8-1472fa10a10e} - {7ff33800-cf1d-4896-ae9f-00516933b04e} - - {c4935dcf-fb31-4c2a-ab37-9da04430010c} - {e5796045-0453-4426-8338-53435b6680fd} - - {adf26e55-4fea-4666-a44f-3cf75c98b83a} - {f2e946ea-2082-429e-8084-7605ff52d1c6} - - {2a49c8a4-7214-4792-80a8-8cd32358d5d8} - {7ef73d5b-0736-4816-8546-46f3d4391d60} @@ -59,26 +47,8 @@ {656bc893-efd5-4b2c-b5d7-5887d8b46540} - - {bcfeab97-cfa9-47bf-80a3-d3ea5b45653a} - - - {084bd514-26cb-4f86-89c1-e8d0706b482c} - - - {a3f0bb8a-5a5e-4043-a275-476b02868252} - - - {363be0d2-8bf8-41b9-b7ca-4e6d34e9d636} - - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -91,23 +61,11 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - Source Files - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -120,12 +78,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceStorm/repstress/msbuild/control/control.vcxproj b/cpp/test/IceStorm/repstress/msbuild/control/control.vcxproj index d10f77b3a57..f1bfa94ead6 100644 --- a/cpp/test/IceStorm/repstress/msbuild/control/control.vcxproj +++ b/cpp/test/IceStorm/repstress/msbuild/control/control.vcxproj @@ -38,46 +38,6 @@ - - true - true - true - true - true - true - true - ..\..\Controller.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - - - true - true - true - true - true - true - true - ..\..\Controller.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - true true @@ -118,46 +78,6 @@ true ..\..\Single.ice - - true - true - true - true - true - true - true - ..\..\Controller.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - - - true - true - true - true - true - true - true - ..\..\Controller.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - true true @@ -204,46 +124,6 @@ - - true - true - true - true - true - true - true - ..\..\Controller.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - - - true - true - true - true - true - true - true - ..\..\Controller.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - true true @@ -284,46 +164,6 @@ true ..\..\Single.ice - - true - true - true - true - true - true - true - ..\..\Controller.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - - - true - true - true - true - true - true - true - ..\..\Controller.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - true true diff --git a/cpp/test/IceStorm/repstress/msbuild/control/control.vcxproj.filters b/cpp/test/IceStorm/repstress/msbuild/control/control.vcxproj.filters index bc359fa8bfa..83e7f294cf7 100644 --- a/cpp/test/IceStorm/repstress/msbuild/control/control.vcxproj.filters +++ b/cpp/test/IceStorm/repstress/msbuild/control/control.vcxproj.filters @@ -14,27 +14,15 @@ {e767ab68-5006-4ce8-a534-07494cd07afa} - - {99a4dda5-df56-43f3-aa6f-83dac2f7d047} - {55724ef1-83a6-46f9-bab3-c16e38a2e9e5} - - {9f666216-5424-4ed3-8dc7-3bc341a7aef1} - {12bab72f-a3f2-417c-ba13-375634d46a1b} - - {85765f9d-6ad5-4a68-9329-1c9719cdbf42} - {592bc622-8ce1-4329-b118-c9216b924286} - - {55b681d9-11bc-42e3-8789-e31862c3b4a7} - {23b7e79a-e687-4859-b8d0-473d8a4517d0} @@ -59,29 +47,11 @@ {032554bc-a6e9-4334-a629-9a3423c5a925} - - {b9a8530a-0847-46d7-9156-b9d06851f2ad} - - - {cb3fe959-0469-4809-a9f6-4e0a9426af50} - - - {d37df17c-64e4-4a3a-be56-d6130e75c010} - - - {16c5fe13-f001-4eae-b147-db79cc85d29e} - Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -94,18 +64,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -118,20 +76,8 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -144,18 +90,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -168,12 +102,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceStorm/repstress/msbuild/publisher/publisher.vcxproj b/cpp/test/IceStorm/repstress/msbuild/publisher/publisher.vcxproj index 984e4d819a6..c30d99cb960 100644 --- a/cpp/test/IceStorm/repstress/msbuild/publisher/publisher.vcxproj +++ b/cpp/test/IceStorm/repstress/msbuild/publisher/publisher.vcxproj @@ -38,46 +38,6 @@ - - true - true - true - true - true - true - true - ..\..\Controller.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - - - true - true - true - true - true - true - true - ..\..\Controller.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - true true @@ -118,46 +78,6 @@ true ..\..\Single.ice - - true - true - true - true - true - true - true - ..\..\Controller.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - - - true - true - true - true - true - true - true - ..\..\Controller.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - true true @@ -204,46 +124,6 @@ - - true - true - true - true - true - true - true - ..\..\Controller.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - - - true - true - true - true - true - true - true - ..\..\Controller.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - true true @@ -284,46 +164,6 @@ true ..\..\Single.ice - - true - true - true - true - true - true - true - ..\..\Controller.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - - - true - true - true - true - true - true - true - ..\..\Controller.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - true true diff --git a/cpp/test/IceStorm/repstress/msbuild/publisher/publisher.vcxproj.filters b/cpp/test/IceStorm/repstress/msbuild/publisher/publisher.vcxproj.filters index aef8c46ecc3..fd41a2e3b3e 100644 --- a/cpp/test/IceStorm/repstress/msbuild/publisher/publisher.vcxproj.filters +++ b/cpp/test/IceStorm/repstress/msbuild/publisher/publisher.vcxproj.filters @@ -1,12 +1,6 @@  - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -19,18 +13,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -43,12 +25,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - Source Files @@ -67,27 +43,15 @@ {155021cb-6a65-4e31-be76-966ef2b8976d} - - {47e65dfb-c7ef-4d50-902e-dd3e1bb71e13} - {46e07f27-399f-4c71-8129-653c9152c13c} - - {8f991f5c-e34d-4ab6-8bd1-b7b168cf1759} - {c5d6c9cd-080e-4d20-9574-e5793429c900} - - {451e35c6-4ccf-46c4-8e0b-19dc7e74e344} - {543d30ff-8f82-4ae2-8c9c-a7a86140690b} - - {99f2a648-9933-4583-b8c3-4d516f0fdb72} - {48056b94-c77e-4511-9cc5-81f609efc837} @@ -112,26 +76,8 @@ {024ce1d1-9915-4337-a3c3-54334269c2a7} - - {fe34ded0-46a1-4b7a-bde7-34e5e931796e} - - - {aa093855-af59-46f1-bf02-21d5523f3ac7} - - - {79a9d01b-2964-4ad0-84f3-c5c50e6c8e7f} - - - {a2fbe9a6-d647-4003-b765-88ba627b0730} - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -144,18 +90,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -168,12 +102,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceStorm/repstress/msbuild/subscriber/subscriber.vcxproj b/cpp/test/IceStorm/repstress/msbuild/subscriber/subscriber.vcxproj index b035a497a25..c4b00fcfc42 100644 --- a/cpp/test/IceStorm/repstress/msbuild/subscriber/subscriber.vcxproj +++ b/cpp/test/IceStorm/repstress/msbuild/subscriber/subscriber.vcxproj @@ -38,46 +38,6 @@ - - true - true - true - true - true - true - true - ..\..\Controller.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - - - true - true - true - true - true - true - true - ..\..\Controller.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - true true @@ -118,46 +78,6 @@ true ..\..\Single.ice - - true - true - true - true - true - true - true - ..\..\Controller.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - - - true - true - true - true - true - true - true - ..\..\Controller.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - true true @@ -204,46 +124,6 @@ - - true - true - true - true - true - true - true - ..\..\Controller.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - - - true - true - true - true - true - true - true - ..\..\Controller.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - true true @@ -284,46 +164,6 @@ true ..\..\Single.ice - - true - true - true - true - true - true - true - ..\..\Controller.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - - - true - true - true - true - true - true - true - ..\..\Controller.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - true true diff --git a/cpp/test/IceStorm/repstress/msbuild/subscriber/subscriber.vcxproj.filters b/cpp/test/IceStorm/repstress/msbuild/subscriber/subscriber.vcxproj.filters index f5315cad8b9..14d9988e3f2 100644 --- a/cpp/test/IceStorm/repstress/msbuild/subscriber/subscriber.vcxproj.filters +++ b/cpp/test/IceStorm/repstress/msbuild/subscriber/subscriber.vcxproj.filters @@ -14,27 +14,15 @@ {28c6666d-b6f5-478f-9522-9c1db3775ecd} - - {1660888e-b903-4905-b346-bf2d954ecf9d} - {cab90859-a09c-4ecb-ba86-7e001a6a1833} - - {cee1ec3c-caf5-4642-bf50-f9151fa8284d} - {e03688c4-eacc-413a-872d-a346ac49e33b} - - {62f56bca-12ad-4813-9b91-103d3e01e26e} - {c2630957-519a-4738-9ecb-6aad24392273} - - {2ca8c7ec-74b4-4d17-be26-c53c85a8c10a} - {bbb060dd-f87d-4c25-ba77-1805a009a95e} @@ -59,29 +47,11 @@ {06db5969-5018-48e0-b4de-00473701a483} - - {cba2312f-153e-4686-8b43-e3a525704033} - - - {4f76d522-b770-433d-ab6b-7946cd23a35f} - - - {11800999-b746-4104-9a36-906195f9d314} - - - {041ac4bc-c638-4dba-b641-7b4c41adeb06} - Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -94,18 +64,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -118,20 +76,8 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -144,18 +90,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -168,12 +102,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceStorm/single/msbuild/publisher/publisher.vcxproj b/cpp/test/IceStorm/single/msbuild/publisher/publisher.vcxproj index 0b5a2249710..0916057177e 100644 --- a/cpp/test/IceStorm/single/msbuild/publisher/publisher.vcxproj +++ b/cpp/test/IceStorm/single/msbuild/publisher/publisher.vcxproj @@ -41,26 +41,6 @@ - - true - true - true - true - true - true - true - ..\..\Single.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - true true @@ -81,26 +61,6 @@ true ..\..\Single.ice - - true - true - true - true - true - true - true - ..\..\Single.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - true true @@ -123,26 +83,6 @@ - - true - true - true - true - true - true - true - ..\..\Single.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - true true @@ -163,26 +103,6 @@ true ..\..\Single.ice - - true - true - true - true - true - true - true - ..\..\Single.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - true true diff --git a/cpp/test/IceStorm/single/msbuild/publisher/publisher.vcxproj.filters b/cpp/test/IceStorm/single/msbuild/publisher/publisher.vcxproj.filters index e9a96e55e22..2a72b2c7305 100644 --- a/cpp/test/IceStorm/single/msbuild/publisher/publisher.vcxproj.filters +++ b/cpp/test/IceStorm/single/msbuild/publisher/publisher.vcxproj.filters @@ -7,30 +7,18 @@ {6234c348-cb38-44e9-9553-3e9957dcae60} - - {7dd37c79-a6aa-4603-a4dc-2d1ffc385c86} - {f54ac765-2ba1-40bc-92c2-5f8af6c4a3c7} {78655f2e-821f-4571-bf4a-9fd3b71282df} - - {0637a14a-5306-4bcd-9bd1-e7e6885841bf} - {4166fa0c-c23e-416d-893a-8ec7c47bf851} - - {c644a302-8c82-475e-acff-4cde265409eb} - {85735cfe-baf3-4479-81d5-48af32657cfe} - - {cf8f2f75-32ca-459c-9fa5-5ce88723c477} - {f44c013e-3a3e-4eb1-8b1c-5840dd0a2b21} @@ -55,18 +43,6 @@ {0cb7495e-0f13-49fd-8df2-bf5d92a6dc58} - - {c5064f88-fb8d-49a1-941a-91a7f549e4c1} - - - {8bf28297-6f03-48ea-b4d4-41592a37c5f3} - - - {4bb99e37-9fb7-42aa-9477-648caf9d7166} - - - {f6b871ae-f440-4332-a991-5d8c5c8a1abe} - {4934e99e-5e7c-4c2e-ba4e-2956e8632620} ice @@ -76,12 +52,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -94,20 +64,8 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -120,12 +78,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceStorm/single/msbuild/subscriber/subscriber.vcxproj b/cpp/test/IceStorm/single/msbuild/subscriber/subscriber.vcxproj index 53b7547f257..983a8632157 100644 --- a/cpp/test/IceStorm/single/msbuild/subscriber/subscriber.vcxproj +++ b/cpp/test/IceStorm/single/msbuild/subscriber/subscriber.vcxproj @@ -38,26 +38,6 @@ - - true - true - true - true - true - true - true - ..\..\Single.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - true true @@ -78,26 +58,6 @@ true ..\..\Single.ice - - true - true - true - true - true - true - true - ..\..\Single.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - true true @@ -123,26 +83,6 @@ - - true - true - true - true - true - true - true - ..\..\Single.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - true true @@ -163,26 +103,6 @@ true ..\..\Single.ice - - true - true - true - true - true - true - true - ..\..\Single.ice - - - true - true - true - true - true - true - true - ..\..\Single.ice - true true diff --git a/cpp/test/IceStorm/single/msbuild/subscriber/subscriber.vcxproj.filters b/cpp/test/IceStorm/single/msbuild/subscriber/subscriber.vcxproj.filters index 455696a7ae2..b85dcf5241c 100644 --- a/cpp/test/IceStorm/single/msbuild/subscriber/subscriber.vcxproj.filters +++ b/cpp/test/IceStorm/single/msbuild/subscriber/subscriber.vcxproj.filters @@ -7,30 +7,18 @@ {84f2732b-bb68-4739-a11e-be65b02b4726} - - {574727d3-bc96-40cc-8d1e-75c18225ef8e} - {fcb8e4e5-3b6a-4cfa-8796-0caac62cf915} {c4c67f2c-01ca-4d51-b0ae-6815971cde18} - - {9c5dd21d-dff1-455f-a2c7-b091c7a1d6a7} - {05faa7fa-91c1-418b-a01a-bd942dc12069} - - {05bbac07-79d1-4327-9933-76dda9f86bbc} - {3d417d8b-3f74-42c0-837a-aa11760597b5} - - {11724662-60d8-42b4-9afb-f762b4fee8a6} - {726d7f61-a7ef-4337-939a-17c9778dda2b} @@ -55,18 +43,6 @@ {0a72fa76-ab08-49fd-bb06-55df080ec255} - - {fcfddeb7-375d-4826-8bad-f4def9bbf039} - - - {ca6e0058-3b16-4729-bdc0-d5cf849ac4d4} - - - {79d7fd1c-745a-4021-b848-640646a8bea7} - - - {fc0c9e00-2424-46c9-99c3-c0c2c6d49b1a} - {86bf6217-de59-434d-a814-3c82187b85ce} ice @@ -76,12 +52,6 @@ Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -94,20 +64,8 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -120,12 +78,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceStorm/stress/msbuild/publisher/publisher.vcxproj b/cpp/test/IceStorm/stress/msbuild/publisher/publisher.vcxproj index 2c0c6a32145..47536aed117 100644 --- a/cpp/test/IceStorm/stress/msbuild/publisher/publisher.vcxproj +++ b/cpp/test/IceStorm/stress/msbuild/publisher/publisher.vcxproj @@ -38,26 +38,6 @@ - - true - true - true - true - true - true - true - ..\..\Event.ice - - - true - true - true - true - true - true - true - ..\..\Event.ice - true true @@ -78,26 +58,6 @@ true ..\..\Event.ice - - true - true - true - true - true - true - true - ..\..\Event.ice - - - true - true - true - true - true - true - true - ..\..\Event.ice - true true @@ -123,26 +83,6 @@ - - true - true - true - true - true - true - true - ..\..\Event.ice - - - true - true - true - true - true - true - true - ..\..\Event.ice - true true @@ -163,26 +103,6 @@ true ..\..\Event.ice - - true - true - true - true - true - true - true - ..\..\Event.ice - - - true - true - true - true - true - true - true - ..\..\Event.ice - true true diff --git a/cpp/test/IceStorm/stress/msbuild/publisher/publisher.vcxproj.filters b/cpp/test/IceStorm/stress/msbuild/publisher/publisher.vcxproj.filters index 1481673fb14..440c1a1a3ae 100644 --- a/cpp/test/IceStorm/stress/msbuild/publisher/publisher.vcxproj.filters +++ b/cpp/test/IceStorm/stress/msbuild/publisher/publisher.vcxproj.filters @@ -14,27 +14,15 @@ {e82326bf-921d-4430-997f-31c0eda3cf80} - - {e2dc5249-be63-4f8a-9d6f-078e572e31d1} - {e9794a38-c209-4328-ba67-55dc28cf6c34} - - {e8054442-8b84-4028-9b7a-5c8a01bc6d24} - {b56827e1-f586-489d-bf16-34f282b7d265} - - {f1566d2b-6d60-4779-a447-73c16933142a} - {82ed8ab8-7eda-47d3-a293-717a2f0db02e} - - {fb2d94a3-678c-4594-86b3-9dd2a63d9a8d} - {b5a6b908-3a02-49fb-800a-a198c5974168} @@ -59,29 +47,11 @@ {8a4c8f8e-52f5-425f-b9e3-643084de41e4} - - {15be49ee-f59c-4cfc-aeb0-d777af4ef370} - - - {2a616b81-cc23-44c1-bbd8-a59e756f6544} - - - {3fc181a7-b1b2-4cc4-b3ed-05693f1826d4} - - - {19a612c6-d3a2-47b4-a4d3-3d770bdafc8e} - Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -94,20 +64,8 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -120,12 +78,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/IceStorm/stress/msbuild/subscriber/subscriber.vcxproj b/cpp/test/IceStorm/stress/msbuild/subscriber/subscriber.vcxproj index 184d586d059..2e6906a385e 100644 --- a/cpp/test/IceStorm/stress/msbuild/subscriber/subscriber.vcxproj +++ b/cpp/test/IceStorm/stress/msbuild/subscriber/subscriber.vcxproj @@ -38,26 +38,6 @@ - - true - true - true - true - true - true - true - ..\..\Event.ice - - - true - true - true - true - true - true - true - ..\..\Event.ice - true true @@ -78,26 +58,6 @@ true ..\..\Event.ice - - true - true - true - true - true - true - true - ..\..\Event.ice - - - true - true - true - true - true - true - true - ..\..\Event.ice - true true @@ -123,26 +83,6 @@ - - true - true - true - true - true - true - true - ..\..\Event.ice - - - true - true - true - true - true - true - true - ..\..\Event.ice - true true @@ -163,26 +103,6 @@ true ..\..\Event.ice - - true - true - true - true - true - true - true - ..\..\Event.ice - - - true - true - true - true - true - true - true - ..\..\Event.ice - true true diff --git a/cpp/test/IceStorm/stress/msbuild/subscriber/subscriber.vcxproj.filters b/cpp/test/IceStorm/stress/msbuild/subscriber/subscriber.vcxproj.filters index dd4bf938f83..394cc119f58 100644 --- a/cpp/test/IceStorm/stress/msbuild/subscriber/subscriber.vcxproj.filters +++ b/cpp/test/IceStorm/stress/msbuild/subscriber/subscriber.vcxproj.filters @@ -14,27 +14,15 @@ {e5abf453-4378-4cd0-9b23-a1166ed24c15} - - {338296b8-22f7-4d31-b0fa-c541bf88f46d} - {760a0b6a-5cce-4bf8-b888-56ee340e8c63} - - {b5544029-82de-4359-8759-d768bb1f9880} - {d424a7d1-bc75-4940-993f-f5e44b97e9d6} - - {00e01f44-1505-45bb-b168-a330227566ca} - {fa1d28ab-e156-406e-9e1c-894c31f70366} - - {ae5d888a-c0dd-44b0-b150-5f385ad93e06} - {660060b5-a511-46e1-a5f0-6015862686de} @@ -59,29 +47,11 @@ {99f9abe1-29c4-47fb-8088-f6713dff55f6} - - {d7494bd5-d4dc-446d-9efb-e99c00c7b6ab} - - - {034f3270-49eb-4b45-80a6-167540a3b5f3} - - - {1a2ca472-52c7-453d-a7f7-a62946d29f19} - - - {7266333a-5c4b-4599-9cda-92cb5e7ba309} - Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -94,20 +64,8 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -120,12 +78,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Slice/escape/msbuild/client.vcxproj b/cpp/test/Slice/escape/msbuild/client.vcxproj index 4d0c51d515c..6cc14849048 100644 --- a/cpp/test/Slice/escape/msbuild/client.vcxproj +++ b/cpp/test/Slice/escape/msbuild/client.vcxproj @@ -158,46 +158,6 @@ - - true - true - true - true - true - true - true - ..\Clash.ice - - - true - true - true - true - true - true - true - ..\Key.ice - - - true - true - true - true - true - true - true - ..\Clash.ice - - - true - true - true - true - true - true - true - ..\Key.ice - true true @@ -238,46 +198,6 @@ true ..\Key.ice - - true - true - true - true - true - true - true - ..\Clash.ice - - - true - true - true - true - true - true - true - ..\Key.ice - - - true - true - true - true - true - true - true - ..\Clash.ice - - - true - true - true - true - true - true - true - ..\Key.ice - true true @@ -324,46 +244,6 @@ - - true - true - true - true - true - true - true - ..\Clash.ice - - - true - true - true - true - true - true - true - ..\Key.ice - - - true - true - true - true - true - true - true - ..\Clash.ice - - - true - true - true - true - true - true - true - ..\Key.ice - true true @@ -404,46 +284,6 @@ true ..\Key.ice - - true - true - true - true - true - true - true - ..\Clash.ice - - - true - true - true - true - true - true - true - ..\Key.ice - - - true - true - true - true - true - true - true - ..\Clash.ice - - - true - true - true - true - true - true - true - ..\Key.ice - true true diff --git a/cpp/test/Slice/escape/msbuild/client.vcxproj.filters b/cpp/test/Slice/escape/msbuild/client.vcxproj.filters index c8817033039..6ac70e215b1 100644 --- a/cpp/test/Slice/escape/msbuild/client.vcxproj.filters +++ b/cpp/test/Slice/escape/msbuild/client.vcxproj.filters @@ -14,27 +14,15 @@ {0f707e48-e326-4a2d-9855-f5031863faac} - - {e6a32dd6-065b-46c7-8e93-f6bf50ce0d2c} - {53f9ea67-ad73-4dc0-a342-a5287486963b} - - {78565ab5-c3c6-4c89-a38a-8302bbff8203} - {e26b44eb-68ab-46a5-a116-eab283879edc} - - {0efc9aa9-d8d5-4833-9db6-8a27764cd90e} - {46dda298-57a9-4b85-8100-a73c8a3134b9} - - {47b70b40-aebb-4711-8e23-3b85987a7914} - {a5a7d69c-3f96-4bc6-8a3b-08f82d4d62cb} @@ -59,29 +47,11 @@ {c54af285-020f-4370-ad94-8ab96f114888} - - {331018bf-1b68-47a7-8703-027261561a72} - - - {b69cc347-79af-4081-9096-cdd6e189551c} - - - {d593306e-a014-41be-8d29-8680a5d13703} - - - {f293ad77-e91d-431a-bf18-c0f3e42db640} - Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -94,18 +64,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -118,20 +76,8 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -144,18 +90,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -168,12 +102,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Slice/macros/msbuild/client.vcxproj b/cpp/test/Slice/macros/msbuild/client.vcxproj index 9f8e8a4dee6..0aabff4dfad 100644 --- a/cpp/test/Slice/macros/msbuild/client.vcxproj +++ b/cpp/test/Slice/macros/msbuild/client.vcxproj @@ -158,26 +158,6 @@ - - true - true - true - true - true - true - true - ..\Test.ice - - - true - true - true - true - true - true - true - ..\Test.ice - true true @@ -198,26 +178,6 @@ true ..\Test.ice - - true - true - true - true - true - true - true - ..\Test.ice - - - true - true - true - true - true - true - true - ..\Test.ice - true true @@ -243,26 +203,6 @@ - - true - true - true - true - true - true - true - ..\Test.ice - - - true - true - true - true - true - true - true - ..\Test.ice - true true @@ -283,26 +223,6 @@ true ..\Test.ice - - true - true - true - true - true - true - true - ..\Test.ice - - - true - true - true - true - true - true - true - ..\Test.ice - true true diff --git a/cpp/test/Slice/macros/msbuild/client.vcxproj.filters b/cpp/test/Slice/macros/msbuild/client.vcxproj.filters index baca97292c7..0307828e8fa 100644 --- a/cpp/test/Slice/macros/msbuild/client.vcxproj.filters +++ b/cpp/test/Slice/macros/msbuild/client.vcxproj.filters @@ -14,27 +14,15 @@ {67fbf500-4645-4449-8a36-5b9c915204c8} - - {d600f64f-7e2a-4fce-a50b-ab3798897611} - {080cd982-b1b6-4bfa-ade6-65e43d59cf68} - - {6a7c503f-ba41-4d09-8f75-ee444e02b549} - {cca297b2-951d-4a3a-9270-a562f1b01fe2} - - {83c6a495-2116-4046-b932-5f5d6ad2ea6a} - {99958866-ee2d-4ada-9881-297e6fee23b2} - - {ab380b45-c801-4592-ad84-2e6a4af26f09} - {944d8f5f-b084-4735-968d-2955ae4860cd} @@ -59,29 +47,11 @@ {0152f789-10fc-44e7-bf50-4bcb476bb5d9} - - {9eb710ff-de94-4955-bf5f-c28febf6c919} - - - {d476dbd7-d0aa-46ce-9199-f697e5ea3270} - - - {2069da9d-bfeb-4cac-8be6-27122568edc8} - - - {fe76bb86-6865-4d05-8f8c-82d77c22095d} - Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -94,20 +64,8 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -120,12 +78,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Slice/parser/msbuild/client.vcxproj b/cpp/test/Slice/parser/msbuild/client.vcxproj index a0e544286d3..21d1e5914e7 100644 --- a/cpp/test/Slice/parser/msbuild/client.vcxproj +++ b/cpp/test/Slice/parser/msbuild/client.vcxproj @@ -41,46 +41,6 @@ - - true - true - true - true - true - true - true - ..\CircularA.ice - - - true - true - true - true - true - true - true - ..\CircularB.ice - - - true - true - true - true - true - true - true - ..\CircularA.ice - - - true - true - true - true - true - true - true - ..\CircularB.ice - true true @@ -121,46 +81,6 @@ true ..\CircularB.ice - - true - true - true - true - true - true - true - ..\CircularA.ice - - - true - true - true - true - true - true - true - ..\CircularB.ice - - - true - true - true - true - true - true - true - ..\CircularA.ice - - - true - true - true - true - true - true - true - ..\CircularB.ice - true true @@ -203,46 +123,6 @@ - - true - true - true - true - true - true - true - ..\CircularA.ice - - - true - true - true - true - true - true - true - ..\CircularB.ice - - - true - true - true - true - true - true - true - ..\CircularA.ice - - - true - true - true - true - true - true - true - ..\CircularB.ice - true true @@ -283,46 +163,6 @@ true ..\CircularB.ice - - true - true - true - true - true - true - true - ..\CircularA.ice - - - true - true - true - true - true - true - true - ..\CircularB.ice - - - true - true - true - true - true - true - true - ..\CircularA.ice - - - true - true - true - true - true - true - true - ..\CircularB.ice - true true diff --git a/cpp/test/Slice/parser/msbuild/client.vcxproj.filters b/cpp/test/Slice/parser/msbuild/client.vcxproj.filters index f2b3661deef..61c982170e3 100644 --- a/cpp/test/Slice/parser/msbuild/client.vcxproj.filters +++ b/cpp/test/Slice/parser/msbuild/client.vcxproj.filters @@ -14,27 +14,15 @@ {04fb440d-c2a6-4b44-baa0-2b0624c7f549} - - {d4412de5-bc41-413c-8030-d084d515df1a} - {983997ba-d3f5-46ce-bf09-0b8f011c6a3b} - - {4297ab22-2de2-4c88-a9a9-cc3941624421} - {3113d2e0-080b-4358-ace0-7296c9609b8a} - - {0a76546e-4eed-4e8c-a5e8-e74a7197013e} - {9348edd3-ade8-4ff7-971d-a81c4eae064c} - - {b4842a98-1328-4310-b863-524d61a6bc23} - {d38f460c-8873-4f5e-95af-28c5811d8a6b} @@ -59,26 +47,8 @@ {01204b65-6dbc-4791-9162-19eb574f3e5d} - - {e95587fa-1bb4-4013-a419-1236fe21b270} - - - {f07d4ea6-a724-4159-9c33-f3b75dfdd1e2} - - - {f82303af-2f76-4e75-b7af-079a26455dfe} - - - {dd7a351d-3130-4734-90cb-8206f0f24286} - - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -91,18 +61,6 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -115,20 +73,8 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -141,18 +87,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -165,12 +99,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/cpp/test/Slice/structure/msbuild/client.vcxproj.filters b/cpp/test/Slice/structure/msbuild/client.vcxproj.filters index 36c53c3bc5c..e695bcfc551 100644 --- a/cpp/test/Slice/structure/msbuild/client.vcxproj.filters +++ b/cpp/test/Slice/structure/msbuild/client.vcxproj.filters @@ -14,27 +14,15 @@ {992746ef-3c71-4f6f-8b2e-18edeb6c541b} - - {ad13f393-8e1d-4361-b9cb-f74fa51cce6f} - {7960005d-190b-49ee-9767-70e6e7a65f48} - - {953ebf4b-d5d0-4f56-995b-07e72316dafa} - {0939114a-efdc-4938-9c11-55e9a32aeef2} - - {e60903b9-453a-4504-949c-e5173c98444e} - {ac324d21-f556-40c7-8fa7-419e62a6e666} - - {471c713b-cc63-4f23-98da-b95ca73b067b} - {1828c945-46af-43c3-9165-8d9a8a987485} @@ -59,29 +47,11 @@ {c3192da4-b2bf-4a93-b9d6-af4bf353a316} - - {d331ed2f-f87e-45d5-957f-84cbb0d980d2} - - - {4e3ac9e8-bc55-4a78-8ffd-a1678ab968f2} - - - {3654ae45-df2e-412a-9203-47e59f188f84} - - - {99e05557-b803-4f73-bd36-16ac6203c0c0} - Source Files - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -94,20 +64,8 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -120,12 +78,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - @@ -135,4 +87,4 @@ Slice Files - \ No newline at end of file + diff --git a/cpp/test/Slice/utf8BOM/msbuild/client.vcxproj b/cpp/test/Slice/utf8BOM/msbuild/client.vcxproj index 09567c0acf6..5946205044b 100644 --- a/cpp/test/Slice/utf8BOM/msbuild/client.vcxproj +++ b/cpp/test/Slice/utf8BOM/msbuild/client.vcxproj @@ -3,22 +3,6 @@ - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -160,26 +144,6 @@ - - true - true - true - true - true - true - true - ..\Test.ice - - - true - true - true - true - true - true - true - ..\Test.ice - true true @@ -200,26 +164,6 @@ true ..\Test.ice - - true - true - true - true - true - true - true - ..\Test.ice - - - true - true - true - true - true - true - true - ..\Test.ice - true true @@ -242,26 +186,6 @@ - - true - true - true - true - true - true - true - ..\Test.ice - - - true - true - true - true - true - true - true - ..\Test.ice - true true @@ -282,26 +206,6 @@ true ..\Test.ice - - true - true - true - true - true - true - true - ..\Test.ice - - - true - true - true - true - true - true - true - ..\Test.ice - true true diff --git a/cpp/test/Slice/utf8BOM/msbuild/client.vcxproj.filters b/cpp/test/Slice/utf8BOM/msbuild/client.vcxproj.filters index f80ac778f47..a119d254db6 100644 --- a/cpp/test/Slice/utf8BOM/msbuild/client.vcxproj.filters +++ b/cpp/test/Slice/utf8BOM/msbuild/client.vcxproj.filters @@ -7,30 +7,18 @@ {6f9e05e1-b2e9-4781-a42d-da1a8e204fbc} - - {881ed764-63f8-4767-8c8a-b38cc2cfb118} - {b380bc4a-74b6-41d4-8f5e-271ce07dd80d} {92170dc7-c988-4441-85b6-65a631d1fa7b} - - {b5d2bcc1-9cdf-41b2-bc66-f86ff801f538} - {8dc28eb7-3e0c-4a6f-9c55-c2c27330c213} - - {1f89336f-8aba-4a2e-88ab-98217fa44aa6} - {6997e64d-7bb2-455d-a056-e3ab884f3e8d} - - {842e37ef-37d9-4944-83f9-00a4bca69f46} - {c9ca7f95-310a-4b40-83ef-2eddd2fd3dca} @@ -55,30 +43,12 @@ {6a67d8f3-6d5b-4759-8741-6a95b3cef062} - - {be635e4d-0547-423e-be17-435d02181421} - - - {1630d590-0d5d-42a3-8285-0bceacd30f32} - - - {6b92ce5d-d78d-4cfd-bc17-812e55288b9c} - - - {c5f578c7-fe1c-47ac-9e7f-cff7eb92d3a8} - {9e15918b-2161-4b9a-9fea-0bb3ea0762ae} ice - - Source Files\x64\Cpp11-Debug - - - Source Files\Win32\Cpp11-Debug - Source Files\x64\Debug @@ -91,20 +61,8 @@ Source Files\Win32\Release - - Source Files\x64\Cpp11-Release - - - Source Files\Win32\Cpp11-Release - - - Header Files\x64\Cpp11-Debug - - - Header Files\Win32\Cpp11-Debug - Header Files\x64\Debug @@ -117,12 +75,6 @@ Header Files\Win32\Release - - Header Files\x64\Cpp11-Release - - - Header Files\Win32\Cpp11-Release - diff --git a/matlab/src/msbuild/ice/ice.vcxproj b/matlab/src/msbuild/ice/ice.vcxproj index 201469bf24f..8c075f9e3e4 100644 --- a/matlab/src/msbuild/ice/ice.vcxproj +++ b/matlab/src/msbuild/ice/ice.vcxproj @@ -28,7 +28,7 @@ v143 - + ..\..\..\lib\$(Platform)\$(Configuration)\ .mexw64 diff --git a/matlab/src/msbuild/icethunk/icethunk.vcxproj b/matlab/src/msbuild/icethunk/icethunk.vcxproj index ae72d5b1b81..a5ace8d990a 100644 --- a/matlab/src/msbuild/icethunk/icethunk.vcxproj +++ b/matlab/src/msbuild/icethunk/icethunk.vcxproj @@ -26,7 +26,7 @@ v143 - + ..\..\..\lib\$(Platform)\$(Configuration)\ .dll From 5fe8033476f1e8496f51e895a6be2fd91875fd60 Mon Sep 17 00:00:00 2001 From: Jose Date: Fri, 2 Feb 2024 11:08:34 +0100 Subject: [PATCH 06/17] VC++ projects cleanup --- cpp/test/Common/msbuild/testcommon.vcxproj | 124 ++------ .../application/msbuild/client/client.vcxproj | 146 ++------- .../application/msbuild/server/server.vcxproj | 146 ++------- .../attack/msbuild/client/client.vcxproj | 148 ++------- .../attack/msbuild/server/server.vcxproj | 150 ++------- .../msbuild/client/client.vcxproj | 146 ++------- .../msbuild/server/server.vcxproj | 158 ++-------- .../override/msbuild/client/client.vcxproj | 150 ++------- .../override/msbuild/server/server.vcxproj | 150 ++------- .../router/msbuild/client/client.vcxproj | 150 ++------- .../router/msbuild/server/server.vcxproj | 150 ++------- .../msbuild/client/client.vcxproj | 146 ++------- .../msbuild/server/server.vcxproj | 150 ++------- .../msbuild/client/client.vcxproj | 146 ++------- .../msbuild/server/server.vcxproj | 146 ++------- .../ssl/msbuild/client/client.vcxproj | 102 ++----- .../ssl/msbuild/server/server.vcxproj | 102 ++----- .../msbuild/client/client.vcxproj | 148 ++------- .../msbuild/server/server.vcxproj | 150 ++------- .../Ice/acm/msbuild/client/client.vcxproj | 148 ++------- .../Ice/acm/msbuild/server/server.vcxproj | 150 ++------- .../msbuild/client/client.vcxproj | 128 ++------ .../msbuild/collocated/collocated.vcxproj | 156 ++-------- .../msbuild/server/server.vcxproj | 154 ++-------- .../Ice/admin/msbuild/client/client.vcxproj | 150 ++------- .../Ice/admin/msbuild/server/server.vcxproj | 150 ++------- .../Ice/ami/msbuild/client/client.vcxproj | 128 ++------ .../ami/msbuild/collocated/collocated.vcxproj | 152 ++------- .../Ice/ami/msbuild/server/server.vcxproj | 150 ++------- .../background/msbuild/client/client.vcxproj | 118 ++----- .../background/msbuild/server/server.vcxproj | 120 ++------ .../testtransport/testtransport.vcxproj | 184 +++-------- .../Ice/binding/msbuild/client/client.vcxproj | 128 ++------ .../Ice/binding/msbuild/server/server.vcxproj | 150 ++------- .../Ice/custom/msbuild/client/client.vcxproj | 190 ++---------- .../msbuild/collocated/collocated.vcxproj | 198 ++---------- .../Ice/custom/msbuild/server/server.vcxproj | 196 ++---------- .../msbuild/serveramd/serveramd.vcxproj | 196 ++---------- .../Ice/defaultServant/msbuild/client.vcxproj | 150 ++------- .../Ice/defaultValue/msbuild/client.vcxproj | 148 ++------- .../dispatcher/msbuild/client/client.vcxproj | 152 ++------- .../msbuild/collocated/collocated.vcxproj | 156 ++-------- .../dispatcher/msbuild/server/server.vcxproj | 154 ++-------- cpp/test/Ice/echo/msbuild/server.vcxproj | 150 ++------- .../Ice/enums/msbuild/client/client.vcxproj | 148 ++------- .../Ice/enums/msbuild/server/server.vcxproj | 150 ++------- .../exceptions/msbuild/client/client.vcxproj | 130 ++------ .../msbuild/collocated/collocated.vcxproj | 154 ++-------- .../exceptions/msbuild/server/server.vcxproj | 152 ++------- .../msbuild/serveramd/serveramd.vcxproj | 156 ++-------- .../Ice/facets/msbuild/client/client.vcxproj | 128 ++------ .../msbuild/collocated/collocated.vcxproj | 152 ++------- .../Ice/facets/msbuild/server/server.vcxproj | 150 ++------- .../msbuild/client/client.vcxproj | 128 ++------ .../msbuild/server/server.vcxproj | 150 ++------- cpp/test/Ice/hash/msbuild/client.vcxproj | 146 ++------- .../Ice/hold/msbuild/client/client.vcxproj | 128 ++------ .../Ice/hold/msbuild/server/server.vcxproj | 150 ++------- .../Ice/impl/msbuild/server/server.vcxproj | 184 ++--------- .../impl/msbuild/serveramd/serveramd.vcxproj | 184 ++--------- .../Ice/info/msbuild/client/client.vcxproj | 152 ++------- .../Ice/info/msbuild/server/server.vcxproj | 150 ++------- .../inheritance/msbuild/client/client.vcxproj | 148 ++------- .../msbuild/collocated/collocated.vcxproj | 152 ++------- .../inheritance/msbuild/server/server.vcxproj | 230 ++------------ .../interceptor/msbuild/client/client.vcxproj | 130 ++------ .../interceptortest/interceptortest.vcxproj | 156 ++-------- .../Ice/invoke/msbuild/client/client.vcxproj | 148 ++------- .../Ice/invoke/msbuild/server/server.vcxproj | 150 ++------- .../library/msbuild/alltests/alltests.vcxproj | 44 +-- .../Ice/library/msbuild/client/client.vcxproj | 104 ++----- .../library/msbuild/consumer/consumer.vcxproj | 128 ++------ .../library/msbuild/gencode/gencode.vcxproj | 216 ++----------- .../location/msbuild/client/client.vcxproj | 148 ++------- .../location/msbuild/server/server.vcxproj | 154 ++-------- .../logger/msbuild/client1/client1.vcxproj | 102 ++----- .../logger/msbuild/client2/client2.vcxproj | 102 ++----- .../logger/msbuild/client3/client3.vcxproj | 102 ++----- .../logger/msbuild/client4/client4.vcxproj | 102 ++----- .../logger/msbuild/client5/client5.vcxproj | 102 ++----- .../Ice/metrics/msbuild/client/client.vcxproj | 150 ++------- .../msbuild/collocated/collocated.vcxproj | 154 ++-------- .../Ice/metrics/msbuild/server/server.vcxproj | 150 ++------- .../msbuild/serveramd/serveramd.vcxproj | 150 ++------- .../msbuild/client/client.vcxproj | 148 ++------- .../msbuild/server/server.vcxproj | 146 ++------- .../Ice/objects/msbuild/client/client.vcxproj | 288 +++--------------- .../msbuild/collocated/collocated.vcxproj | 278 ++--------------- .../Ice/objects/msbuild/server/server.vcxproj | 276 ++--------------- .../operations/msbuild/client/client.vcxproj | 160 ++-------- .../msbuild/collocated/collocated.vcxproj | 168 ++-------- .../operations/msbuild/server/server.vcxproj | 154 ++-------- .../msbuild/serveramd/serveramd.vcxproj | 154 ++-------- .../optional/msbuild/client/client.vcxproj | 154 ++-------- .../optional/msbuild/server/server.vcxproj | 154 ++-------- .../msbuild/serveramd/serveramd.vcxproj | 154 ++-------- .../Ice/plugin/msbuild/client/client.vcxproj | 82 ++--- .../msbuild/testplugin/testplugin.vcxproj | 102 ++----- .../Ice/properties/msbuild/client.vcxproj | 102 ++----- .../Ice/proxy/msbuild/client/client.vcxproj | 128 ++------ .../msbuild/collocated/collocated.vcxproj | 152 ++------- .../Ice/proxy/msbuild/server/server.vcxproj | 150 ++------- .../proxy/msbuild/serveramd/serveramd.vcxproj | 150 ++------- .../Ice/retry/msbuild/client/client.vcxproj | 152 ++------- .../msbuild/collocated/collocated.vcxproj | 156 ++-------- .../Ice/retry/msbuild/server/server.vcxproj | 156 ++-------- .../Ice/scope/msbuild/client/client.vcxproj | 148 ++------- .../Ice/scope/msbuild/server/server.vcxproj | 152 ++------- .../msbuild/client/client.vcxproj | 128 ++------ .../msbuild/collocated/collocated.vcxproj | 156 ++-------- .../msbuild/server/server.vcxproj | 154 ++-------- .../msbuild/serveramd/serveramd.vcxproj | 158 ++-------- cpp/test/Ice/services/msbuild/client.vcxproj | 152 ++------- .../exceptions/msbuild/client/client.vcxproj | 160 ++-------- .../exceptions/msbuild/server/server.vcxproj | 182 ++--------- .../msbuild/serveramd/serveramd.vcxproj | 182 ++--------- .../objects/msbuild/client/client.vcxproj | 160 ++-------- .../objects/msbuild/server/server.vcxproj | 182 ++--------- .../msbuild/serveramd/serveramd.vcxproj | 182 ++--------- cpp/test/Ice/stream/msbuild/client.vcxproj | 146 ++------- .../msbuild/client/client.vcxproj | 126 ++------ .../msbuild/server/server.vcxproj | 146 ++------- .../msbuild/client/client.vcxproj | 128 ++------ .../msbuild/server/server.vcxproj | 150 ++------- .../msbuild/servercustom/servercustom.vcxproj | 150 ++------- .../Ice/timeout/msbuild/client/client.vcxproj | 152 ++------- .../Ice/timeout/msbuild/server/server.vcxproj | 150 ++------- .../Ice/udp/msbuild/client/client.vcxproj | 128 ++------ .../Ice/udp/msbuild/server/server.vcxproj | 150 ++------- .../admin/msbuild/client/client.vcxproj | 148 ++------- .../msbuild/testservice/testservice.vcxproj | 162 ++-------- .../msbuild/client/client.vcxproj | 148 ++------- .../msbuild/testservice/testservice.vcxproj | 162 ++-------- .../simple/msbuild/client/client.vcxproj | 128 ++------ .../simple/msbuild/server/server.vcxproj | 148 ++------- .../simple/msbuild/client/client.vcxproj | 148 ++------- .../simple/msbuild/server/server.vcxproj | 162 ++-------- .../activation/msbuild/client/client.vcxproj | 128 ++------ .../activation/msbuild/server/server.vcxproj | 150 ++------- cpp/test/IceGrid/admin/msbuild/server.vcxproj | 102 ++----- .../allocation/msbuild/client/client.vcxproj | 128 ++------ .../allocation/msbuild/server/server.vcxproj | 150 ++------- .../msbuild/verifier/verifier.vcxproj | 102 ++----- .../deployer/msbuild/client/client.vcxproj | 128 ++------ .../deployer/msbuild/server/server.vcxproj | 150 ++------- .../msbuild/testservice/testservice.vcxproj | 162 ++-------- .../msbuild/client/client.vcxproj | 128 ++------ .../msbuild/server/server.vcxproj | 150 ++------- .../msbuild/client/client.vcxproj | 128 ++------ .../msbuild/server/server.vcxproj | 150 ++------- .../msbuild/testservice/testservice.vcxproj | 162 ++-------- .../msbuild/client/client.vcxproj | 128 ++------ .../registryplugin/registryplugin.vcxproj | 102 ++----- .../msbuild/server/server.vcxproj | 150 ++------- .../msbuild/testservice/testservice.vcxproj | 162 ++-------- .../replication/msbuild/client/client.vcxproj | 128 ++------ .../replication/msbuild/server/server.vcxproj | 150 ++------- .../session/msbuild/client/client.vcxproj | 128 ++------ .../session/msbuild/server/server.vcxproj | 146 ++------- .../session/msbuild/verifier/verifier.vcxproj | 146 ++------- .../simple/msbuild/client/client.vcxproj | 160 ++-------- .../simple/msbuild/server/server.vcxproj | 150 ++------- .../update/msbuild/client/client.vcxproj | 148 ++------- .../update/msbuild/server/server.vcxproj | 150 ++------- .../msbuild/client/client.vcxproj | 148 ++------- .../clientopenssl/clientopenssl.vcxproj | 258 +++------------- .../msbuild/server/server.vcxproj | 150 ++------- .../serveropenssl/serveropenssl.vcxproj | 259 +++------------- .../msbuild/publisher/publisher.vcxproj | 126 ++------ .../msbuild/subscriber/subscriber.vcxproj | 146 ++------- .../msbuild/publisher/publisher.vcxproj | 126 ++------ .../msbuild/subscriber/subscriber.vcxproj | 146 ++------- .../persistent/msbuild/client/client.vcxproj | 92 ++---- .../rep1/msbuild/publisher/publisher.vcxproj | 126 ++------ .../IceStorm/rep1/msbuild/sub/sub.vcxproj | 146 ++------- .../msbuild/subscriber/subscriber.vcxproj | 146 ++------- .../IceStorm/repgrid/msbuild/client.vcxproj | 126 ++------ .../repstress/msbuild/control/control.vcxproj | 180 ++--------- .../msbuild/publisher/publisher.vcxproj | 160 ++-------- .../msbuild/subscriber/subscriber.vcxproj | 180 ++--------- .../msbuild/publisher/publisher.vcxproj | 126 ++------ .../msbuild/subscriber/subscriber.vcxproj | 146 ++------- .../msbuild/publisher/publisher.vcxproj | 126 ++------ .../msbuild/subscriber/subscriber.vcxproj | 146 ++------- .../ctrlCHandler/msbuild/client.vcxproj | 102 ++----- .../IceUtil/inputUtil/msbuild/client.vcxproj | 102 ++----- .../IceUtil/priority/msbuild/client.vcxproj | 122 ++------ cpp/test/IceUtil/sha1/msbuild/client.vcxproj | 102 ++----- .../IceUtil/stacktrace/msbuild/client.vcxproj | 114 ++----- .../IceUtil/thread/msbuild/client.vcxproj | 146 +++------ cpp/test/IceUtil/time/msbuild/client.vcxproj | 102 ++----- cpp/test/IceUtil/timer/msbuild/client.vcxproj | 102 ++----- .../IceUtil/unicode/msbuild/client.vcxproj | 102 ++----- cpp/test/IceUtil/uuid/msbuild/client.vcxproj | 102 ++----- cpp/test/Slice/escape/msbuild/client.vcxproj | 180 ++--------- cpp/test/Slice/macros/msbuild/client.vcxproj | 146 ++------- cpp/test/Slice/parser/msbuild/client.vcxproj | 176 ++--------- .../Slice/structure/msbuild/client.vcxproj | 226 ++------------ cpp/test/Slice/utf8BOM/msbuild/client.vcxproj | 128 ++------ 199 files changed, 4873 insertions(+), 24474 deletions(-) diff --git a/cpp/test/Common/msbuild/testcommon.vcxproj b/cpp/test/Common/msbuild/testcommon.vcxproj index b4ca874dbb2..e84e09aaf83 100644 --- a/cpp/test/Common/msbuild/testcommon.vcxproj +++ b/cpp/test/Common/msbuild/testcommon.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -37,18 +21,18 @@ - + - + - + {C7223CC8-0AAA-470B-ACB3-12B9DE75525C} - + @@ -56,132 +40,76 @@ true $(DefaultPlatformToolset) - - DynamicLibrary - true - $(DefaultPlatformToolset) - DynamicLibrary false $(DefaultPlatformToolset) - - DynamicLibrary - false - $(DefaultPlatformToolset) - DynamicLibrary true $(DefaultPlatformToolset) - - DynamicLibrary - true - $(DefaultPlatformToolset) - DynamicLibrary false $(DefaultPlatformToolset) - - DynamicLibrary - false - $(DefaultPlatformToolset) - - - + + - - - - + - - - - + - - - - + - - - - + - - - - - - - - - + + + + + TEST_API_EXPORTS;%(PreprocessorDefinitions) - - - TEST_API_EXPORTS;%(PreprocessorDefinitions) - - TEST_API_EXPORTS;%(PreprocessorDefinitions) - - - TEST_API_EXPORTS;%(PreprocessorDefinitions) - - TEST_API_EXPORTS;%(PreprocessorDefinitions) - - - TEST_API_EXPORTS;%(PreprocessorDefinitions) - - TEST_API_EXPORTS;%(PreprocessorDefinitions) - - - TEST_API_EXPORTS;%(PreprocessorDefinitions) - - - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Glacier2/application/msbuild/client/client.vcxproj b/cpp/test/Glacier2/application/msbuild/client/client.vcxproj index b11e0d09c19..ef2932e73b1 100644 --- a/cpp/test/Glacier2/application/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/application/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -37,222 +21,138 @@ - + - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - + - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - + {24916CD9-F28F-436C-8F20-B22BE0555601} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Glacier2/application/msbuild/server/server.vcxproj b/cpp/test/Glacier2/application/msbuild/server/server.vcxproj index c6be90bc9fa..431d54f10fd 100644 --- a/cpp/test/Glacier2/application/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/application/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,220 +23,136 @@ {E17093DB-4940-4EB4-A7BB-6958A96475E2} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - + - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Glacier2/attack/msbuild/client/client.vcxproj b/cpp/test/Glacier2/attack/msbuild/client/client.vcxproj index dec823bcf2b..f1bb94acded 100644 --- a/cpp/test/Glacier2/attack/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/attack/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,221 +23,137 @@ {DE360450-9BF9-42FB-98FD-3D29C5CAF6DA} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - - + + - true - true true true true - true - true ..\..\Backend.ice - true - true true true true - true - true ..\..\Backend.ice - true - true true true true - true - true ..\..\Backend.ice - true - true true true true - true - true ..\..\Backend.ice - true - true true true true - true - true ..\..\Backend.ice - true - true true true true - true - true ..\..\Backend.ice - true - true true true true - true - true ..\..\Backend.ice - true - true true true true - true - true ..\..\Backend.ice - + - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Glacier2/attack/msbuild/server/server.vcxproj b/cpp/test/Glacier2/attack/msbuild/server/server.vcxproj index 8b06d42b5db..68fe077c196 100644 --- a/cpp/test/Glacier2/attack/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/attack/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,222 +23,138 @@ {D6C3E453-ED0B-41CA-84E6-7D07D8867A2D} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - - + + - true - true true true true - true - true ..\..\Backend.ice - true - true true true true - true - true ..\..\Backend.ice - true - true true true true - true - true ..\..\Backend.ice - true - true true true true - true - true ..\..\Backend.ice - + - + - true - true true true true - true - true ..\..\Backend.ice - true - true true true true - true - true ..\..\Backend.ice - true - true true true true - true - true ..\..\Backend.ice - true - true true true true - true - true ..\..\Backend.ice - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Glacier2/dynamicFiltering/msbuild/client/client.vcxproj b/cpp/test/Glacier2/dynamicFiltering/msbuild/client/client.vcxproj index 2af1509b1bb..f95609d1c57 100644 --- a/cpp/test/Glacier2/dynamicFiltering/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/dynamicFiltering/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,220 +23,136 @@ {14C78FC0-F80C-425F-A504-1DD264BCDD01} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Glacier2/dynamicFiltering/msbuild/server/server.vcxproj b/cpp/test/Glacier2/dynamicFiltering/msbuild/server/server.vcxproj index a0f8c7b7e90..4e170def6dc 100644 --- a/cpp/test/Glacier2/dynamicFiltering/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/dynamicFiltering/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,226 +23,142 @@ {814690FE-2C4F-4EF4-82CB-720BC4C8FF9B} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - - - - + + + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - - - + + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Glacier2/override/msbuild/client/client.vcxproj b/cpp/test/Glacier2/override/msbuild/client/client.vcxproj index f7b30bf0086..d92c100372a 100644 --- a/cpp/test/Glacier2/override/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/override/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -37,224 +21,140 @@ - + - - + + - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - + - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - + {3C394401-8E95-475B-8B35-B90A7CCAE578} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Glacier2/override/msbuild/server/server.vcxproj b/cpp/test/Glacier2/override/msbuild/server/server.vcxproj index 07afe9c4a70..595451464cc 100644 --- a/cpp/test/Glacier2/override/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/override/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,222 +23,138 @@ {E1510790-AF0B-4FFE-B6AA-B75119793AFC} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - - + + - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - + - + - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Glacier2/router/msbuild/client/client.vcxproj b/cpp/test/Glacier2/router/msbuild/client/client.vcxproj index 9c86cb381ef..67a86c836f4 100644 --- a/cpp/test/Glacier2/router/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/router/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -37,224 +21,140 @@ - + - - + + - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - + - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - + {7CB05069-58C9-4C7D-A6A6-DBFB1CE7C58C} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Glacier2/router/msbuild/server/server.vcxproj b/cpp/test/Glacier2/router/msbuild/server/server.vcxproj index b45c203e109..ff69f884298 100644 --- a/cpp/test/Glacier2/router/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/router/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,222 +23,138 @@ {3BD0D95D-8DC6-4A07-B4D9-72EC85C4C97A} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - - + + - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - + - + - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Glacier2/sessionControl/msbuild/client/client.vcxproj b/cpp/test/Glacier2/sessionControl/msbuild/client/client.vcxproj index 3f2a3b379ab..20a54fda004 100644 --- a/cpp/test/Glacier2/sessionControl/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/sessionControl/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -37,222 +21,138 @@ - + - true - true true true true - true - true ..\..\Session.ice - true - true true true true - true - true ..\..\Session.ice - true - true true true true - true - true ..\..\Session.ice - true - true true true true - true - true ..\..\Session.ice - + - true - true true true true - true - true ..\..\Session.ice - true - true true true true - true - true ..\..\Session.ice - true - true true true true - true - true ..\..\Session.ice - true - true true true true - true - true ..\..\Session.ice - + {8CCBFE0A-E0EE-40B7-A78A-C36B7615618A} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Glacier2/sessionControl/msbuild/server/server.vcxproj b/cpp/test/Glacier2/sessionControl/msbuild/server/server.vcxproj index 6892ed35a7d..ec4438dd5f1 100644 --- a/cpp/test/Glacier2/sessionControl/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/sessionControl/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,222 +23,138 @@ {40C0ABA8-A839-4988-AC60-04F649B44C54} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - - + + - true - true true true true - true - true ..\..\Session.ice - true - true true true true - true - true ..\..\Session.ice - true - true true true true - true - true ..\..\Session.ice - true - true true true true - true - true ..\..\Session.ice - + - + - true - true true true true - true - true ..\..\Session.ice - true - true true true true - true - true ..\..\Session.ice - true - true true true true - true - true ..\..\Session.ice - true - true true true true - true - true ..\..\Session.ice - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Glacier2/sessionHelper/msbuild/client/client.vcxproj b/cpp/test/Glacier2/sessionHelper/msbuild/client/client.vcxproj index 2819f611b7b..633e7b86950 100644 --- a/cpp/test/Glacier2/sessionHelper/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/sessionHelper/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -37,222 +21,138 @@ - + - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - + - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - + {BF42E24D-954E-47A6-8699-B2F764939757} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Glacier2/sessionHelper/msbuild/server/server.vcxproj b/cpp/test/Glacier2/sessionHelper/msbuild/server/server.vcxproj index e356df60738..99dc91027a2 100644 --- a/cpp/test/Glacier2/sessionHelper/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/sessionHelper/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,220 +23,136 @@ {D3978518-2640-48BE-9D42-F664742BCB45} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - + - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - true - true true true true - true - true ..\..\Callback.ice - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Glacier2/ssl/msbuild/client/client.vcxproj b/cpp/test/Glacier2/ssl/msbuild/client/client.vcxproj index c2954a15c2d..a852f6356b1 100644 --- a/cpp/test/Glacier2/ssl/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/ssl/msbuild/client/client.vcxproj @@ -1,23 +1,7 @@ - - - + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -36,131 +20,79 @@ - + - + {F0F9CA32-65BC-4F71-9901-E231FD485CDA} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + \ No newline at end of file diff --git a/cpp/test/Glacier2/ssl/msbuild/server/server.vcxproj b/cpp/test/Glacier2/ssl/msbuild/server/server.vcxproj index ac27139ed34..c78bbec0504 100644 --- a/cpp/test/Glacier2/ssl/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/ssl/msbuild/server/server.vcxproj @@ -1,23 +1,7 @@ - - - + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -38,129 +22,77 @@ {5579253D-24F6-4001-BF9E-D0D6DA3EF928} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + \ No newline at end of file diff --git a/cpp/test/Glacier2/staticFiltering/msbuild/client/client.vcxproj b/cpp/test/Glacier2/staticFiltering/msbuild/client/client.vcxproj index 5c239cc63a1..c7de5db9893 100644 --- a/cpp/test/Glacier2/staticFiltering/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/staticFiltering/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -37,223 +21,139 @@ - - + + - true - true true true true - true - true ..\..\Backend.ice - true - true true true true - true - true ..\..\Backend.ice - true - true true true true - true - true ..\..\Backend.ice - true - true true true true - true - true ..\..\Backend.ice - + - true - true true true true - true - true ..\..\Backend.ice - true - true true true true - true - true ..\..\Backend.ice - true - true true true true - true - true ..\..\Backend.ice - true - true true true true - true - true ..\..\Backend.ice - + {C02402BC-608E-4E46-B432-3C0C39E3B346} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Glacier2/staticFiltering/msbuild/server/server.vcxproj b/cpp/test/Glacier2/staticFiltering/msbuild/server/server.vcxproj index 446bd665d6f..bf49524d705 100644 --- a/cpp/test/Glacier2/staticFiltering/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/staticFiltering/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,222 +23,138 @@ {5ED6FC18-EAED-4833-8CE8-FA19F5CD713B} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - - + + - true - true true true true - true - true ..\..\Backend.ice - true - true true true true - true - true ..\..\Backend.ice - true - true true true true - true - true ..\..\Backend.ice - true - true true true true - true - true ..\..\Backend.ice - + - + - true - true true true true - true - true ..\..\Backend.ice - true - true true true true - true - true ..\..\Backend.ice - true - true true true true - true - true ..\..\Backend.ice - true - true true true true - true - true ..\..\Backend.ice - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/acm/msbuild/client/client.vcxproj b/cpp/test/Ice/acm/msbuild/client/client.vcxproj index e8ec92c8c85..bdc8ec2941a 100644 --- a/cpp/test/Ice/acm/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/acm/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {CD25A05C-228D-473F-A86F-6C2DD22085B4} - + @@ -47,199 +31,123 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - - - - + - - - - + - - - - + - - - - + - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/acm/msbuild/server/server.vcxproj b/cpp/test/Ice/acm/msbuild/server/server.vcxproj index 7cd6f60573d..0754ba7c9a6 100644 --- a/cpp/test/Ice/acm/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/acm/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {FC4AC0A5-84D5-461F-BE52-EA686F52773E} - + @@ -47,216 +31,132 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/client/client.vcxproj b/cpp/test/Ice/adapterDeactivation/msbuild/client/client.vcxproj index d15039ec36c..180c9925710 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/adapterDeactivation/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {715411FA-34B3-4ABF-8476-3C84F5EFFFE5} - + @@ -47,175 +31,111 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.vcxproj index d180b006530..51c323ed4f3 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {5D38E70A-98C1-4B1D-BC0D-01BC114078C5} - + @@ -47,219 +31,135 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - - - + + + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/server/server.vcxproj b/cpp/test/Ice/adapterDeactivation/msbuild/server/server.vcxproj index 47442a9a9eb..a2b392ca273 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/adapterDeactivation/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {9929ACAD-44DE-4699-BA2C-6EE8B665C6EB} - + @@ -47,218 +31,134 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - - + + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/admin/msbuild/client/client.vcxproj b/cpp/test/Ice/admin/msbuild/client/client.vcxproj index efbed7f9c21..855d427d787 100644 --- a/cpp/test/Ice/admin/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/admin/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {25132357-8775-4C8F-AF35-CEC5F6BB08E7} - + @@ -47,216 +31,132 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/admin/msbuild/server/server.vcxproj b/cpp/test/Ice/admin/msbuild/server/server.vcxproj index afd02b0c461..93d4f1beb22 100644 --- a/cpp/test/Ice/admin/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/admin/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {0A601498-AA62-4639-9319-BC1EA94EBE13} - + @@ -47,216 +31,132 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/ami/msbuild/client/client.vcxproj b/cpp/test/Ice/ami/msbuild/client/client.vcxproj index da00539cc06..0d24dabcd51 100644 --- a/cpp/test/Ice/ami/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/ami/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {24272AC4-1B9D-40C0-B432-485EEB642A38} - + @@ -47,175 +31,111 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/ami/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/ami/msbuild/collocated/collocated.vcxproj index 4dc113e9bfa..97df59bbe07 100644 --- a/cpp/test/Ice/ami/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/ami/msbuild/collocated/collocated.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {26E3EDCA-70EE-43EA-8FB1-0B7BD61DD3F2} - + @@ -47,217 +31,133 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - - + + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/ami/msbuild/server/server.vcxproj b/cpp/test/Ice/ami/msbuild/server/server.vcxproj index fe3009114a6..35adae429e9 100644 --- a/cpp/test/Ice/ami/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/ami/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {697273CB-CEAF-481E-A77B-56FDAE5B3D3A} - + @@ -47,216 +31,132 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/background/msbuild/client/client.vcxproj b/cpp/test/Ice/background/msbuild/client/client.vcxproj index 795ad5b594a..4b55245a5c6 100644 --- a/cpp/test/Ice/background/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/background/msbuild/client/client.vcxproj @@ -1,23 +1,7 @@ - - - + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -38,7 +22,7 @@ {F5827922-7493-4DB4-AA42-3DCFF59CCA0D} - + @@ -46,71 +30,39 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - + - - - - + - - - - + - - - - + - - - - + - + ..\..;..\..\msbuild\testtransport\$(Platform)\$(Configuration);..\..\..\..\..\src;%(AdditionalIncludeDirectories) @@ -119,14 +71,6 @@ ..\..\msbuild\testtransport\$(Platform)\$(Configuration);$(IceLibraryPath);%(AdditionalLibraryDirectories) - - - ..\..;..\..\msbuild\testtransport\$(Platform)\$(Configuration);..\..\..\..\..\src;%(AdditionalIncludeDirectories) - - - ..\..\msbuild\testtransport\$(Platform)\$(Configuration);$(IceLibraryPath);%(AdditionalLibraryDirectories) - - ..\..;..\..\msbuild\testtransport\$(Platform)\$(Configuration);..\..\..\..\..\src;%(AdditionalIncludeDirectories) @@ -143,22 +87,6 @@ ..\..\msbuild\testtransport\$(Platform)\$(Configuration);$(IceLibraryPath);%(AdditionalLibraryDirectories) - - - ..\..;..\..\msbuild\testtransport\$(Platform)\$(Configuration);..\..\..\..\..\src;%(AdditionalIncludeDirectories) - - - ..\..\msbuild\testtransport\$(Platform)\$(Configuration);$(IceLibraryPath);%(AdditionalLibraryDirectories) - - - - - ..\..;..\..\msbuild\testtransport\$(Platform)\$(Configuration);..\..\..\..\..\src;%(AdditionalIncludeDirectories) - - - ..\..\msbuild\testtransport\$(Platform)\$(Configuration);$(IceLibraryPath);%(AdditionalLibraryDirectories) - - ..\..;..\..\msbuild\testtransport\$(Platform)\$(Configuration);..\..\..\..\..\src;%(AdditionalIncludeDirectories) @@ -167,30 +95,22 @@ ..\..\msbuild\testtransport\$(Platform)\$(Configuration);$(IceLibraryPath);%(AdditionalLibraryDirectories) - - - ..\..;..\..\msbuild\testtransport\$(Platform)\$(Configuration);..\..\..\..\..\src;%(AdditionalIncludeDirectories) - - - ..\..\msbuild\testtransport\$(Platform)\$(Configuration);$(IceLibraryPath);%(AdditionalLibraryDirectories) - - - - + + - + - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + \ No newline at end of file diff --git a/cpp/test/Ice/background/msbuild/server/server.vcxproj b/cpp/test/Ice/background/msbuild/server/server.vcxproj index 1a68b80a31f..443cbd2881d 100644 --- a/cpp/test/Ice/background/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/background/msbuild/server/server.vcxproj @@ -1,23 +1,7 @@ - - - + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -38,7 +22,7 @@ {C1228BE2-FC54-4D44-94B1-964F62A569C3} - + @@ -46,71 +30,39 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - + - - - - + - - - - + - - - - + - - - - + - + ..\..;..\..\msbuild\testtransport\$(Platform)\$(Configuration);..\..\..\..\..\src;%(AdditionalIncludeDirectories) @@ -119,14 +71,6 @@ ..\..\msbuild\testtransport\$(Platform)\$(Configuration);$(IceLibraryPath);%(AdditionalLibraryDirectories) - - - ..\..;..\..\msbuild\testtransport\$(Platform)\$(Configuration);..\..\..\..\..\src;%(AdditionalIncludeDirectories) - - - ..\..\msbuild\testtransport\$(Platform)\$(Configuration);$(IceLibraryPath);%(AdditionalLibraryDirectories) - - ..\..;..\..\msbuild\testtransport\$(Platform)\$(Configuration);..\..\..\..\..\src;%(AdditionalIncludeDirectories) @@ -135,14 +79,6 @@ ..\..\msbuild\testtransport\$(Platform)\$(Configuration);$(IceLibraryPath);%(AdditionalLibraryDirectories) - - - ..\..;..\..\msbuild\testtransport\$(Platform)\$(Configuration);..\..\..\..\..\src;%(AdditionalIncludeDirectories) - - - ..\..\msbuild\testtransport\$(Platform)\$(Configuration);$(IceLibraryPath);%(AdditionalLibraryDirectories) - - ..\..;..\..\msbuild\testtransport\$(Platform)\$(Configuration);..\..\..\..\..\src;%(AdditionalIncludeDirectories) @@ -151,14 +87,6 @@ ..\..\msbuild\testtransport\$(Platform)\$(Configuration);$(IceLibraryPath);%(AdditionalLibraryDirectories) - - - ..\..;..\..\msbuild\testtransport\$(Platform)\$(Configuration);..\..\..\..\..\src;%(AdditionalIncludeDirectories) - - - ..\..\msbuild\testtransport\$(Platform)\$(Configuration);$(IceLibraryPath);%(AdditionalLibraryDirectories) - - ..\..;..\..\msbuild\testtransport\$(Platform)\$(Configuration);..\..\..\..\..\src;%(AdditionalIncludeDirectories) @@ -167,31 +95,23 @@ ..\..\msbuild\testtransport\$(Platform)\$(Configuration);$(IceLibraryPath);%(AdditionalLibraryDirectories) - - - ..\..;..\..\msbuild\testtransport\$(Platform)\$(Configuration);..\..\..\..\..\src;%(AdditionalIncludeDirectories) - - - ..\..\msbuild\testtransport\$(Platform)\$(Configuration);$(IceLibraryPath);%(AdditionalLibraryDirectories) - - - - + + - - + + - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + \ No newline at end of file diff --git a/cpp/test/Ice/background/msbuild/testtransport/testtransport.vcxproj b/cpp/test/Ice/background/msbuild/testtransport/testtransport.vcxproj index 5ae501a62a3..09b2c852e94 100644 --- a/cpp/test/Ice/background/msbuild/testtransport/testtransport.vcxproj +++ b/cpp/test/Ice/background/msbuild/testtransport/testtransport.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {01C495B5-93BE-424E-BB7C-5110A3952A75} - + @@ -47,235 +31,147 @@ true $(DefaultPlatformToolset) - - DynamicLibrary - true - $(DefaultPlatformToolset) - DynamicLibrary false $(DefaultPlatformToolset) - - DynamicLibrary - false - $(DefaultPlatformToolset) - DynamicLibrary true $(DefaultPlatformToolset) - - DynamicLibrary - true - $(DefaultPlatformToolset) - DynamicLibrary false $(DefaultPlatformToolset) - - DynamicLibrary - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - - - - - - - - - + + + + + ..\..;..\..\..\..\..\src;%(AdditionalIncludeDirectories) - - - ..\..;..\..\..\..\..\src;%(AdditionalIncludeDirectories) - - ..\..;..\..\..\..\..\src;%(AdditionalIncludeDirectories) - - - ..\..;..\..\..\..\..\src;%(AdditionalIncludeDirectories) - - ..\..;..\..\..\..\..\src;%(AdditionalIncludeDirectories) - - - ..\..;..\..\..\..\..\src;%(AdditionalIncludeDirectories) - - ..\..;..\..\..\..\..\src;%(AdditionalIncludeDirectories) - - - ..\..;..\..\..\..\..\src;%(AdditionalIncludeDirectories) - - - + - + - - - - - - - + + + + + + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - - - - - - - + + + + + + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/binding/msbuild/client/client.vcxproj b/cpp/test/Ice/binding/msbuild/client/client.vcxproj index c3a2627d7eb..8d8aa2c505e 100644 --- a/cpp/test/Ice/binding/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/binding/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {5BEA940C-1C98-486B-A530-C238D3A74E87} - + @@ -47,175 +31,111 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/binding/msbuild/server/server.vcxproj b/cpp/test/Ice/binding/msbuild/server/server.vcxproj index 0bbddd6964e..e4810000e6a 100644 --- a/cpp/test/Ice/binding/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/binding/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {3215FCAD-59F2-47F4-8DB5-AEA11B39991D} - + @@ -47,216 +31,132 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/custom/msbuild/client/client.vcxproj b/cpp/test/Ice/custom/msbuild/client/client.vcxproj index 4b0efc27902..beaafe49646 100644 --- a/cpp/test/Ice/custom/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/custom/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {B980C392-C4B2-4A3F-9AE2-5038FD607F74} - + @@ -47,77 +31,40 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - - - - ..\..;%(AdditionalIncludeDirectories) - - + ..\..;%(AdditionalIncludeDirectories) @@ -128,16 +75,6 @@ ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) @@ -148,199 +85,130 @@ ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - - + + - - - - + + + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Wstring.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Wstring.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Wstring.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Wstring.ice - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Wstring.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Wstring.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Wstring.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Wstring.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/custom/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/custom/msbuild/collocated/collocated.vcxproj index b81c4101bcd..69598fdf1d7 100644 --- a/cpp/test/Ice/custom/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/custom/msbuild/collocated/collocated.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {C2BA933C-9EBE-44CB-A85F-5B5ED6F82442} - + @@ -47,304 +31,188 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - - + + - - - - - - + + + + + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Wstring.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Wstring.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Wstring.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Wstring.ice - - - - + + + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Wstring.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Wstring.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Wstring.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Wstring.ice - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/custom/msbuild/server/server.vcxproj b/cpp/test/Ice/custom/msbuild/server/server.vcxproj index e332cd2292d..675198e3aa7 100644 --- a/cpp/test/Ice/custom/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/custom/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4} - + @@ -47,303 +31,187 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - - + + - - - - - + + + + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Wstring.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Wstring.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Wstring.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Wstring.ice - - - - + + + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Wstring.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Wstring.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Wstring.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Wstring.ice - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/custom/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/custom/msbuild/serveramd/serveramd.vcxproj index 7937ebe4f52..d229e924b49 100644 --- a/cpp/test/Ice/custom/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/custom/msbuild/serveramd/serveramd.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {ACFD09A4-49FE-45B5-A3CC-948968239C3E} - + @@ -47,303 +31,187 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - - - - - + + + + + - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\WstringAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\WstringAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\WstringAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\WstringAMD.ice - - - - + + + + - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\WstringAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\WstringAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\WstringAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\WstringAMD.ice - - + + - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/defaultServant/msbuild/client.vcxproj b/cpp/test/Ice/defaultServant/msbuild/client.vcxproj index 3a1ef793d5b..18248dbd9f5 100644 --- a/cpp/test/Ice/defaultServant/msbuild/client.vcxproj +++ b/cpp/test/Ice/defaultServant/msbuild/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {5105B294-6DAB-4604-8BD7-10C126EED1FE} - + @@ -47,216 +31,132 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..;%(AdditionalIncludeDirectories) - - - ..;%(AdditionalIncludeDirectories) - - ..;%(AdditionalIncludeDirectories) - - - ..;%(AdditionalIncludeDirectories) - - ..;%(AdditionalIncludeDirectories) - - - ..;%(AdditionalIncludeDirectories) - - ..;%(AdditionalIncludeDirectories) - - - ..;%(AdditionalIncludeDirectories) - - - + - - - + + + - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - + - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/defaultValue/msbuild/client.vcxproj b/cpp/test/Ice/defaultValue/msbuild/client.vcxproj index 0996b621e98..25088e8c966 100644 --- a/cpp/test/Ice/defaultValue/msbuild/client.vcxproj +++ b/cpp/test/Ice/defaultValue/msbuild/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {80FE3863-C289-4BDE-833C-256D5E54093A} - + @@ -47,215 +31,131 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - - + + - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - + - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/dispatcher/msbuild/client/client.vcxproj b/cpp/test/Ice/dispatcher/msbuild/client/client.vcxproj index ea871edb66a..9b1c2808c12 100644 --- a/cpp/test/Ice/dispatcher/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/dispatcher/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {BA3042D4-7E5B-461D-A31E-345753A8A726} - + @@ -47,217 +31,133 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - - + + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/dispatcher/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/dispatcher/msbuild/collocated/collocated.vcxproj index 564fb4841ae..dffc4d3c9a5 100644 --- a/cpp/test/Ice/dispatcher/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/dispatcher/msbuild/collocated/collocated.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {FBAC9C87-6A77-4663-9653-F0DFEFB00935} - + @@ -47,219 +31,135 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - - - + + + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/dispatcher/msbuild/server/server.vcxproj b/cpp/test/Ice/dispatcher/msbuild/server/server.vcxproj index 55c70f1d35c..60ebe61f670 100644 --- a/cpp/test/Ice/dispatcher/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/dispatcher/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {3E471DF3-EB57-4FC3-AF20-2CF548DBF5C1} - + @@ -47,218 +31,134 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - - + + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/echo/msbuild/server.vcxproj b/cpp/test/Ice/echo/msbuild/server.vcxproj index 5770537104c..62b7c511692 100644 --- a/cpp/test/Ice/echo/msbuild/server.vcxproj +++ b/cpp/test/Ice/echo/msbuild/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {5F22AF4C-5DFE-43E9-98E6-64187F174761} - + @@ -47,216 +31,132 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..;%(AdditionalIncludeDirectories) - - - ..;%(AdditionalIncludeDirectories) - - ..;%(AdditionalIncludeDirectories) - - - ..;%(AdditionalIncludeDirectories) - - ..;%(AdditionalIncludeDirectories) - - - ..;%(AdditionalIncludeDirectories) - - ..;%(AdditionalIncludeDirectories) - - - ..;%(AdditionalIncludeDirectories) - - - + - + - - + + - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - + - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/enums/msbuild/client/client.vcxproj b/cpp/test/Ice/enums/msbuild/client/client.vcxproj index d98e7c35113..548350a2d2a 100644 --- a/cpp/test/Ice/enums/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/enums/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {3BDD2378-5B4E-4021-846E-3225A04E85B1} - + @@ -47,215 +31,131 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/enums/msbuild/server/server.vcxproj b/cpp/test/Ice/enums/msbuild/server/server.vcxproj index 53d7e9fbbac..5ec1bed50dc 100644 --- a/cpp/test/Ice/enums/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/enums/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {0E5471E9-E208-4B77-B9D6-C4AD36CBB653} - + @@ -47,216 +31,132 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/exceptions/msbuild/client/client.vcxproj b/cpp/test/Ice/exceptions/msbuild/client/client.vcxproj index aca76599bbb..238a03a7299 100644 --- a/cpp/test/Ice/exceptions/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {6BF6F8F7-AF5F-4A4C-90C2-77473F6AFC2F} - + @@ -47,176 +31,112 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + - + - + - - - + + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/exceptions/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/exceptions/msbuild/collocated/collocated.vcxproj index 667920c1d08..c4419e819d7 100644 --- a/cpp/test/Ice/exceptions/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/collocated/collocated.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {3A38F35B-3A61-4490-955D-D1CAE61CB7FD} - + @@ -47,218 +31,134 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - - - + + + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/exceptions/msbuild/server/server.vcxproj b/cpp/test/Ice/exceptions/msbuild/server/server.vcxproj index 179afc3e326..2a67aaecfad 100644 --- a/cpp/test/Ice/exceptions/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {24550251-512C-4DC0-9B62-7DB6664DDCA8} - + @@ -47,217 +31,133 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - - + + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/exceptions/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/exceptions/msbuild/serveramd/serveramd.vcxproj index c3dae8cd36a..c2b42c33785 100644 --- a/cpp/test/Ice/exceptions/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/serveramd/serveramd.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {8D0B611C-F9C2-4B53-8497-7BD8036BD831} - + @@ -47,70 +31,38 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + @@ -118,154 +70,98 @@ ICE_AMD_TEST;%(PreprocessorDefinitions) - - - ..\..;%(AdditionalIncludeDirectories) - ICE_AMD_TEST;%(PreprocessorDefinitions) - - ..\..;%(AdditionalIncludeDirectories) ICE_AMD_TEST;%(PreprocessorDefinitions) - - - ..\..;%(AdditionalIncludeDirectories) - ICE_AMD_TEST;%(PreprocessorDefinitions) - - ..\..;%(AdditionalIncludeDirectories) ICE_AMD_TEST;%(PreprocessorDefinitions) - - - ..\..;%(AdditionalIncludeDirectories) - ICE_AMD_TEST;%(PreprocessorDefinitions) - - ..\..;%(AdditionalIncludeDirectories) ICE_AMD_TEST;%(PreprocessorDefinitions) - - - ..\..;%(AdditionalIncludeDirectories) - ICE_AMD_TEST;%(PreprocessorDefinitions) - - - + - - - + + + - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - + - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - + - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/facets/msbuild/client/client.vcxproj b/cpp/test/Ice/facets/msbuild/client/client.vcxproj index 626341b1bfb..bd298a36022 100644 --- a/cpp/test/Ice/facets/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/facets/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {386DD353-1314-407B-A394-476F4983461D} - + @@ -47,175 +31,111 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/facets/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/facets/msbuild/collocated/collocated.vcxproj index 1e94efaf86d..fc2089c1d35 100644 --- a/cpp/test/Ice/facets/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/facets/msbuild/collocated/collocated.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {420B2FB5-833E-449A-BF43-5A5538DAEEC4} - + @@ -47,217 +31,133 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - - + + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/facets/msbuild/server/server.vcxproj b/cpp/test/Ice/facets/msbuild/server/server.vcxproj index fd6e998360c..242440082f9 100644 --- a/cpp/test/Ice/facets/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/facets/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {46DDEC66-2287-47E2-BFE4-BDE53B5D40C5} - + @@ -47,216 +31,132 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/faultTolerance/msbuild/client/client.vcxproj b/cpp/test/Ice/faultTolerance/msbuild/client/client.vcxproj index 7978e339799..d59e56fdf20 100644 --- a/cpp/test/Ice/faultTolerance/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/faultTolerance/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {606D6061-3084-498A-988A-7F5B9FE8732D} - + @@ -47,175 +31,111 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/faultTolerance/msbuild/server/server.vcxproj b/cpp/test/Ice/faultTolerance/msbuild/server/server.vcxproj index 81e6c598922..af8be1cd9dc 100644 --- a/cpp/test/Ice/faultTolerance/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/faultTolerance/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {CC0C7076-D15B-42AB-AFD6-CE40472F6E84} - + @@ -47,216 +31,132 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/hash/msbuild/client.vcxproj b/cpp/test/Ice/hash/msbuild/client.vcxproj index a0125611da5..9af6527c2a4 100644 --- a/cpp/test/Ice/hash/msbuild/client.vcxproj +++ b/cpp/test/Ice/hash/msbuild/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {685612A9-F2AA-4ACA-8327-5D40E4731906} - + @@ -47,214 +31,130 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - + - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/hold/msbuild/client/client.vcxproj b/cpp/test/Ice/hold/msbuild/client/client.vcxproj index 1310cb7ec9b..c1565606983 100644 --- a/cpp/test/Ice/hold/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/hold/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {649ECCDB-5CA3-4371-B521-95CE8EF534BA} - + @@ -47,175 +31,111 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/hold/msbuild/server/server.vcxproj b/cpp/test/Ice/hold/msbuild/server/server.vcxproj index cfaa849f305..1c75e84bd1b 100644 --- a/cpp/test/Ice/hold/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/hold/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {10A9A668-8508-4971-AD56-15B50AB12829} - + @@ -47,216 +31,132 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/impl/msbuild/server/server.vcxproj b/cpp/test/Ice/impl/msbuild/server/server.vcxproj index 0ebbd6f0489..dd2839fc335 100644 --- a/cpp/test/Ice/impl/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/impl/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -41,7 +25,7 @@ --impl-c++98 --impl-c++11 - + @@ -49,70 +33,38 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + @@ -121,13 +73,6 @@ %(DisableSpecificWarnings);4100;4503 - - - ..\..;%(AdditionalIncludeDirectories) - STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions) - %(DisableSpecificWarnings);4100;4503 - - ..\..;%(AdditionalIncludeDirectories) @@ -135,13 +80,6 @@ %(DisableSpecificWarnings);4100;4503 - - - ..\..;%(AdditionalIncludeDirectories) - STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions) - %(DisableSpecificWarnings);4100;4503 - - ..\..;%(AdditionalIncludeDirectories) @@ -149,13 +87,6 @@ %(DisableSpecificWarnings);4100;4503 - - - ..\..;%(AdditionalIncludeDirectories) - STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions) - %(DisableSpecificWarnings);4100;4503 - - ..\..;%(AdditionalIncludeDirectories) @@ -163,145 +94,90 @@ %(DisableSpecificWarnings);4100;4503 - - - ..\..;%(AdditionalIncludeDirectories) - STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions) - %(DisableSpecificWarnings);4100;4503 - - - + - + - + - true true - true true - true true - true - + true - true - true true - true true - true - + true - true true - true - true true - true - + true - true true - true true - true - true - - - - + + + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + @@ -347,15 +223,15 @@ $(IceToolsPath)\slice2cpp.exe -I$(IceHome)\slice $(IceBuilderImpl) ..\..\Test.ic ..\..\Test.ice - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/impl/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/impl/msbuild/serveramd/serveramd.vcxproj index ab8a2f0ea34..2113ec32926 100644 --- a/cpp/test/Ice/impl/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/impl/msbuild/serveramd/serveramd.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -41,7 +25,7 @@ --impl-c++98 --impl-c++11 - + @@ -49,70 +33,38 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + @@ -121,13 +73,6 @@ %(DisableSpecificWarnings);4100;4503 - - - ..\..;%(AdditionalIncludeDirectories) - STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions) - %(DisableSpecificWarnings);4100;4503 - - ..\..;%(AdditionalIncludeDirectories) @@ -135,13 +80,6 @@ %(DisableSpecificWarnings);4100;4503 - - - ..\..;%(AdditionalIncludeDirectories) - STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions) - %(DisableSpecificWarnings);4100;4503 - - ..\..;%(AdditionalIncludeDirectories) @@ -149,13 +87,6 @@ %(DisableSpecificWarnings);4100;4503 - - - ..\..;%(AdditionalIncludeDirectories) - STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions) - %(DisableSpecificWarnings);4100;4503 - - ..\..;%(AdditionalIncludeDirectories) @@ -163,143 +94,88 @@ %(DisableSpecificWarnings);4100;4503 - - - ..\..;%(AdditionalIncludeDirectories) - STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions) - %(DisableSpecificWarnings);4100;4503 - - - + - + - + - true - true true true true - true - true ..\..\TestAMD.ice - true true - true true - true true - true - + - true - true true true true - true - true ..\..\TestAMD.ice true - true - true true - true true - true - + - true - true true true true - true - true ..\..\TestAMD.ice true - true true - true - true true - true - + - true - true true true true - true - true ..\..\TestAMD.ice true - true true - true true - true - true - + - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - + - true - true true true true - true - true ..\..\TestAMD.ice - + - true - true true true true - true - true ..\..\TestAMD.ice - + - + @@ -345,15 +221,15 @@ $(IceToolsPath)\slice2cpp.exe -I$(IceHome)\slice $(IceBuilderImpl) ..\..\TestAMD ..\..\TestAMD.ice - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/info/msbuild/client/client.vcxproj b/cpp/test/Ice/info/msbuild/client/client.vcxproj index 55ed42e7b03..fa1cc5f3df8 100644 --- a/cpp/test/Ice/info/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/info/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {3001AE1F-E8D1-4C33-8ED1-B7D676D3BC73} - + @@ -47,217 +31,133 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - - + + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/info/msbuild/server/server.vcxproj b/cpp/test/Ice/info/msbuild/server/server.vcxproj index b26d9b06e2a..2f6c351d739 100644 --- a/cpp/test/Ice/info/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/info/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {9145C992-2C7A-4D01-B957-F38373DF5829} - + @@ -47,216 +31,132 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/inheritance/msbuild/client/client.vcxproj b/cpp/test/Ice/inheritance/msbuild/client/client.vcxproj index 2b260dda626..f786860b4e0 100644 --- a/cpp/test/Ice/inheritance/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/inheritance/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {4ADE8581-F2FC-4350-BFAE-62FEFF254A11} - + @@ -47,215 +31,131 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/inheritance/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/inheritance/msbuild/collocated/collocated.vcxproj index 62edd3f9199..5cac72f55c6 100644 --- a/cpp/test/Ice/inheritance/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/inheritance/msbuild/collocated/collocated.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {1E199A0A-392A-45E3-9B33-D27ADD734F0D} - + @@ -47,217 +31,133 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - - + + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/inheritance/msbuild/server/server.vcxproj b/cpp/test/Ice/inheritance/msbuild/server/server.vcxproj index 0c1c8bb1082..6aa01cc6282 100644 --- a/cpp/test/Ice/inheritance/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/inheritance/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {C95B71C9-654C-4C6C-B956-F1A70F5CB5A3} - + @@ -47,296 +31,132 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/interceptor/msbuild/client/client.vcxproj b/cpp/test/Ice/interceptor/msbuild/client/client.vcxproj index d0f3ef753dd..61c3b52b27a 100644 --- a/cpp/test/Ice/interceptor/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/interceptor/msbuild/client/client.vcxproj @@ -1,23 +1,7 @@ - - - + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -38,7 +22,7 @@ {EF33CB6A-A655-4812-995B-4000D85FC8B6} - + @@ -46,71 +30,39 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - + - - - - + - - - - + - - - - + - - - - + - + ..\..;..\interceptortest\$(Platform)\$(Configuration)\;%(AdditionalIncludeDirectories) @@ -120,15 +72,6 @@ interceptortest$(IceSoVersion)d.lib - - - ..\interceptortest\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) - interceptortest$(IceSoVersion)++11d.lib - - - ..\..;..\interceptortest\$(Platform)\$(Configuration)\;%(AdditionalIncludeDirectories) - - ..\interceptortest\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) @@ -147,24 +90,6 @@ ..\..;..\interceptortest\$(Platform)\$(Configuration)\;%(AdditionalIncludeDirectories) - - - ..\interceptortest\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) - interceptortest$(IceSoVersion)++11.lib - - - ..\..;..\interceptortest\$(Platform)\$(Configuration)\;%(AdditionalIncludeDirectories) - - - - - ..\interceptortest\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) - interceptortest$(IceSoVersion)++11d.lib - - - ..\..;..\interceptortest\$(Platform)\$(Configuration)\;%(AdditionalIncludeDirectories) - - ..\interceptortest\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) @@ -174,35 +99,26 @@ ..\..;..\interceptortest\$(Platform)\$(Configuration)\;%(AdditionalIncludeDirectories) - - - ..\interceptortest\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) - interceptortest$(IceSoVersion)++11.lib - - - ..\..;..\interceptortest\$(Platform)\$(Configuration)\;%(AdditionalIncludeDirectories) - - - - - - + + + + - - - + + + - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + \ No newline at end of file diff --git a/cpp/test/Ice/interceptor/msbuild/interceptortest/interceptortest.vcxproj b/cpp/test/Ice/interceptor/msbuild/interceptortest/interceptortest.vcxproj index 48dacc973a5..bec84559a07 100644 --- a/cpp/test/Ice/interceptor/msbuild/interceptortest/interceptortest.vcxproj +++ b/cpp/test/Ice/interceptor/msbuild/interceptortest/interceptortest.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {3182D709-1DDE-495B-8CE9-D1A4DACED7DA} - + @@ -47,221 +31,133 @@ true $(DefaultPlatformToolset) - - DynamicLibrary - true - $(DefaultPlatformToolset) - DynamicLibrary false $(DefaultPlatformToolset) - - DynamicLibrary - false - $(DefaultPlatformToolset) - DynamicLibrary true $(DefaultPlatformToolset) - - DynamicLibrary - true - $(DefaultPlatformToolset) - DynamicLibrary false $(DefaultPlatformToolset) - - DynamicLibrary - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - - - - - - - - - + + + + + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/invoke/msbuild/client/client.vcxproj b/cpp/test/Ice/invoke/msbuild/client/client.vcxproj index dcc44f072f6..f5adbaa8d58 100644 --- a/cpp/test/Ice/invoke/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/invoke/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {311D5177-A40C-4527-BA81-A0D8C20AA121} - + @@ -47,215 +31,131 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/invoke/msbuild/server/server.vcxproj b/cpp/test/Ice/invoke/msbuild/server/server.vcxproj index 518ecb12897..1b1ebc38740 100644 --- a/cpp/test/Ice/invoke/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/invoke/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {74931348-C85B-4B59-BC91-154D1CF9A933} - + @@ -47,216 +31,132 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/library/msbuild/alltests/alltests.vcxproj b/cpp/test/Ice/library/msbuild/alltests/alltests.vcxproj index ec18b8fad2b..3112a988805 100644 --- a/cpp/test/Ice/library/msbuild/alltests/alltests.vcxproj +++ b/cpp/test/Ice/library/msbuild/alltests/alltests.vcxproj @@ -1,6 +1,6 @@ - - - + + + Debug @@ -22,7 +22,7 @@ {A9537443-BB6C-4324-B1B9-B9492CAE1CD5} - + @@ -45,33 +45,33 @@ false $(DefaultPlatformToolset) - - + + - + - + - + - + - + - - - - - + + + + + ..\..\msbuild\gencode\$(Platform)\$(Configuration);%(AdditionalIncludeDirectories) - + ..\..\msbuild\consumer\$(Platform)\$(Configuration);..\..\msbuild\gencode\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) @@ -101,17 +101,17 @@ - + - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + \ No newline at end of file diff --git a/cpp/test/Ice/library/msbuild/client/client.vcxproj b/cpp/test/Ice/library/msbuild/client/client.vcxproj index afdddc6c317..41fb9500368 100644 --- a/cpp/test/Ice/library/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/library/msbuild/client/client.vcxproj @@ -1,23 +1,7 @@ - - - + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -38,7 +22,7 @@ {28347243-F75F-4B28-89F9-7EA84478D9C9} - + @@ -46,78 +30,41 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - + - - - - + - - - - + - - - - + - - - - + - + - - - ..\..\msbuild\alltests\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - - + ..\..\msbuild\alltests\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) @@ -132,38 +79,23 @@ ..\..\msbuild\alltests\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - - ..\..\msbuild\alltests\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - - - - ..\..\msbuild\alltests\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - ..\..\msbuild\alltests\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - - ..\..\msbuild\alltests\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - - + - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + \ No newline at end of file diff --git a/cpp/test/Ice/library/msbuild/consumer/consumer.vcxproj b/cpp/test/Ice/library/msbuild/consumer/consumer.vcxproj index 2b4685e0be9..dc822bc8b3b 100644 --- a/cpp/test/Ice/library/msbuild/consumer/consumer.vcxproj +++ b/cpp/test/Ice/library/msbuild/consumer/consumer.vcxproj @@ -1,23 +1,7 @@ - - - + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -38,7 +22,7 @@ {73C0E333-6476-4B7E-A52D-AB5E9CA36906} - + @@ -46,92 +30,48 @@ true $(DefaultPlatformToolset) - - DynamicLibrary - true - $(DefaultPlatformToolset) - DynamicLibrary false $(DefaultPlatformToolset) - - DynamicLibrary - false - $(DefaultPlatformToolset) - DynamicLibrary true $(DefaultPlatformToolset) - - DynamicLibrary - true - $(DefaultPlatformToolset) - DynamicLibrary false $(DefaultPlatformToolset) - - DynamicLibrary - false - $(DefaultPlatformToolset) - - - + + - + - - - - + - - - - + - - - - + - - - - + - - - - - - - - - + + + + + ..\..\msbuild\gencode\$(Platform)\$(Configuration);%(AdditionalIncludeDirectories) - - - ..\..\msbuild\gencode\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - - - - ..\..\msbuild\gencode\$(Platform)\$(Configuration);%(AdditionalIncludeDirectories) - + ..\..\msbuild\gencode\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) @@ -144,14 +84,6 @@ ..\..\msbuild\gencode\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - - ..\..\msbuild\gencode\$(Platform)\$(Configuration);%(AdditionalIncludeDirectories) - - - ..\..\msbuild\gencode\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - ..\..\msbuild\gencode\$(Platform)\$(Configuration);%(AdditionalIncludeDirectories) @@ -160,14 +92,6 @@ ..\..\msbuild\gencode\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - - ..\..\msbuild\gencode\$(Platform)\$(Configuration);%(AdditionalIncludeDirectories) - - - ..\..\msbuild\gencode\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - ..\..\msbuild\gencode\$(Platform)\$(Configuration);%(AdditionalIncludeDirectories) @@ -176,26 +100,18 @@ ..\..\msbuild\gencode\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - - ..\..\msbuild\gencode\$(Platform)\$(Configuration);%(AdditionalIncludeDirectories) - - - ..\..\msbuild\gencode\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - - + - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + \ No newline at end of file diff --git a/cpp/test/Ice/library/msbuild/gencode/gencode.vcxproj b/cpp/test/Ice/library/msbuild/gencode/gencode.vcxproj index 6de05f14767..6cb8a1aeef7 100644 --- a/cpp/test/Ice/library/msbuild/gencode/gencode.vcxproj +++ b/cpp/test/Ice/library/msbuild/gencode/gencode.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {2454F754-3A55-4875-9D8E-57B63673C231} - + @@ -47,261 +31,113 @@ true $(DefaultPlatformToolset) - - DynamicLibrary - true - $(DefaultPlatformToolset) - DynamicLibrary false $(DefaultPlatformToolset) - - DynamicLibrary - false - $(DefaultPlatformToolset) - DynamicLibrary true $(DefaultPlatformToolset) - - DynamicLibrary - true - $(DefaultPlatformToolset) - DynamicLibrary false $(DefaultPlatformToolset) - - DynamicLibrary - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - + - - - - - - - - - - - - + + + + + - + - + - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - true - true true true true - true - true ..\..\Test.ice - true - true - true - true - true - true - true - ..\..\Test.ice - - - true true true - true true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true - ..\..\Test.ice - - - true - true - true - true - true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/location/msbuild/client/client.vcxproj b/cpp/test/Ice/location/msbuild/client/client.vcxproj index 9541d188155..3cd822a8d39 100644 --- a/cpp/test/Ice/location/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/location/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {FD9FB0E5-22D8-41B2-B6B9-272BA12516CC} - + @@ -47,215 +31,131 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/location/msbuild/server/server.vcxproj b/cpp/test/Ice/location/msbuild/server/server.vcxproj index 7b00b02a86c..378842946a4 100644 --- a/cpp/test/Ice/location/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/location/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {40D8363E-E617-4270-9A1F-7B69A3112F6B} - + @@ -47,218 +31,134 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - - + + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/logger/msbuild/client1/client1.vcxproj b/cpp/test/Ice/logger/msbuild/client1/client1.vcxproj index fb75c1026e6..7f479e58a3b 100644 --- a/cpp/test/Ice/logger/msbuild/client1/client1.vcxproj +++ b/cpp/test/Ice/logger/msbuild/client1/client1.vcxproj @@ -1,23 +1,7 @@ - - - + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -36,15 +20,15 @@ - + - + {2923D875-5496-4D0D-B19F-B55AF6EC25E8} - + @@ -52,117 +36,65 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + \ No newline at end of file diff --git a/cpp/test/Ice/logger/msbuild/client2/client2.vcxproj b/cpp/test/Ice/logger/msbuild/client2/client2.vcxproj index 3a182e012f6..2e52f044ffc 100644 --- a/cpp/test/Ice/logger/msbuild/client2/client2.vcxproj +++ b/cpp/test/Ice/logger/msbuild/client2/client2.vcxproj @@ -1,23 +1,7 @@ - - - + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -36,15 +20,15 @@ - + - + {BDA98D7E-A92B-4B18-89C0-5F5C5D52934D} - + @@ -52,117 +36,65 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + \ No newline at end of file diff --git a/cpp/test/Ice/logger/msbuild/client3/client3.vcxproj b/cpp/test/Ice/logger/msbuild/client3/client3.vcxproj index 1ca90aa58c7..845adad3d87 100644 --- a/cpp/test/Ice/logger/msbuild/client3/client3.vcxproj +++ b/cpp/test/Ice/logger/msbuild/client3/client3.vcxproj @@ -1,23 +1,7 @@ - - - + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -36,15 +20,15 @@ - + - + {11C94711-6AA5-4D42-8F1A-08421527376E} - + @@ -52,117 +36,65 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + \ No newline at end of file diff --git a/cpp/test/Ice/logger/msbuild/client4/client4.vcxproj b/cpp/test/Ice/logger/msbuild/client4/client4.vcxproj index 7b620fdbe87..2ed2ada97bc 100644 --- a/cpp/test/Ice/logger/msbuild/client4/client4.vcxproj +++ b/cpp/test/Ice/logger/msbuild/client4/client4.vcxproj @@ -1,23 +1,7 @@ - - - + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -36,15 +20,15 @@ - + - + {649FACD9-76C7-4184-A34C-269E7F302952} - + @@ -52,117 +36,65 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + \ No newline at end of file diff --git a/cpp/test/Ice/logger/msbuild/client5/client5.vcxproj b/cpp/test/Ice/logger/msbuild/client5/client5.vcxproj index 1b9650bb3dd..833551f6544 100644 --- a/cpp/test/Ice/logger/msbuild/client5/client5.vcxproj +++ b/cpp/test/Ice/logger/msbuild/client5/client5.vcxproj @@ -1,23 +1,7 @@ - - - + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -36,15 +20,15 @@ - + - + {A4E94959-FD6B-4280-B1B3-99E4829153C9} - + @@ -52,117 +36,65 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + \ No newline at end of file diff --git a/cpp/test/Ice/metrics/msbuild/client/client.vcxproj b/cpp/test/Ice/metrics/msbuild/client/client.vcxproj index ed9404e5f5a..9436bacf41a 100644 --- a/cpp/test/Ice/metrics/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {387716BD-A892-4D88-86CB-E64FF359271D} - + @@ -47,216 +31,132 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/metrics/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/metrics/msbuild/collocated/collocated.vcxproj index 41c00beca46..92d072a1e31 100644 --- a/cpp/test/Ice/metrics/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/collocated/collocated.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {CC584047-6A76-4E0B-AABE-1CDB4A735079} - + @@ -47,218 +31,134 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - - + + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/metrics/msbuild/server/server.vcxproj b/cpp/test/Ice/metrics/msbuild/server/server.vcxproj index 9db16643b41..03bf7758711 100644 --- a/cpp/test/Ice/metrics/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {BC79E960-2F72-4CC7-8C2F-A1C0E2EDD271} - + @@ -47,216 +31,132 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/metrics/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/metrics/msbuild/serveramd/serveramd.vcxproj index ce4b3ca63c0..acc47626d5a 100644 --- a/cpp/test/Ice/metrics/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/serveramd/serveramd.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {75A5B8DA-6110-4588-8B86-D9002E6FD028} - + @@ -47,216 +31,132 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - - + + - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - + - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - + - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/networkProxy/msbuild/client/client.vcxproj b/cpp/test/Ice/networkProxy/msbuild/client/client.vcxproj index 9f2f8f56d9b..5c6cc3fffc7 100644 --- a/cpp/test/Ice/networkProxy/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/networkProxy/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -37,101 +21,69 @@ - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + {9681E7B8-4D88-4AFF-8F96-784DDF5F5B76} - + @@ -139,123 +91,71 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..;%(AdditionalIncludeDirectories) - - - ..;%(AdditionalIncludeDirectories) - - ..;%(AdditionalIncludeDirectories) - - - ..;%(AdditionalIncludeDirectories) - - ..;%(AdditionalIncludeDirectories) - - - ..;%(AdditionalIncludeDirectories) - - ..;%(AdditionalIncludeDirectories) - - - ..;%(AdditionalIncludeDirectories) - - - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/networkProxy/msbuild/server/server.vcxproj b/cpp/test/Ice/networkProxy/msbuild/server/server.vcxproj index 022b42bce50..a1ff85075a1 100644 --- a/cpp/test/Ice/networkProxy/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/networkProxy/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -37,100 +21,68 @@ - + - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + {ED9139A9-82F5-435F-BA2D-FD55D46ADCCB} - + @@ -138,123 +90,71 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..;%(AdditionalIncludeDirectories) - - - ..;%(AdditionalIncludeDirectories) - - ..;%(AdditionalIncludeDirectories) - - - ..;%(AdditionalIncludeDirectories) - - ..;%(AdditionalIncludeDirectories) - - - ..;%(AdditionalIncludeDirectories) - - ..;%(AdditionalIncludeDirectories) - - - ..;%(AdditionalIncludeDirectories) - - - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/objects/msbuild/client/client.vcxproj b/cpp/test/Ice/objects/msbuild/client/client.vcxproj index 60961c33db2..0a94f8c027f 100644 --- a/cpp/test/Ice/objects/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/objects/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {10096783-388B-4B2A-806A-F0190AFB5096} - + @@ -47,85 +31,43 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + - - - - 8388608 - - - ..\..;%(AdditionalIncludeDirectories) - - - - - + + 8388608 @@ -134,18 +76,8 @@ - - - - 8388608 - - - ..\..;%(AdditionalIncludeDirectories) - - - - - + + 8388608 @@ -154,18 +86,8 @@ - - - - 8388608 - - - ..\..;%(AdditionalIncludeDirectories) - - - - - + + 8388608 @@ -174,18 +96,8 @@ - - - - 8388608 - - - ..\..;%(AdditionalIncludeDirectories) - - - - - + + 8388608 @@ -199,350 +111,222 @@ - - - + + + - true - true true true true - true - true ..\..\Derived.ice - true - true true true true - true - true ..\..\DerivedEx.ice - true - true - true - true true true true ..\..\Forward.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Derived.ice - true - true true true true - true - true ..\..\DerivedEx.ice - true - true - true - true true true true ..\..\Forward.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Derived.ice - true - true true true true - true - true ..\..\DerivedEx.ice - true - true - true - true true true true ..\..\Forward.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Derived.ice - true - true true true true - true - true ..\..\DerivedEx.ice - true - true - true - true true true true ..\..\Forward.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Derived.ice - true - true true true true - true - true ..\..\DerivedEx.ice - true - true - true - true true true true ..\..\Forward.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Derived.ice - true - true true true true - true - true ..\..\DerivedEx.ice - true - true - true - true true true true ..\..\Forward.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Derived.ice - true - true true true true - true - true ..\..\DerivedEx.ice - true - true - true - true true true true ..\..\Forward.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Derived.ice - true - true true true true - true - true ..\..\DerivedEx.ice - true - true - true - true true true true ..\..\Forward.ice - true - true true true true - true - true ..\..\Test.ice - - - - + + + + - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/objects/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/objects/msbuild/collocated/collocated.vcxproj index cf57e0c6ece..aaea74f8360 100644 --- a/cpp/test/Ice/objects/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/objects/msbuild/collocated/collocated.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {57E9C935-F8A6-4C1E-BDF4-0F0EB72CACC8} - + @@ -47,86 +31,45 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + generated;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - - - generated;%(AdditionalIncludeDirectories) - - + ..\..;%(AdditionalIncludeDirectories) @@ -135,16 +78,7 @@ generated;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - - - generated;%(AdditionalIncludeDirectories) - - + ..\..;%(AdditionalIncludeDirectories) @@ -153,16 +87,7 @@ generated;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - - - generated;%(AdditionalIncludeDirectories) - - + ..\..;%(AdditionalIncludeDirectories) @@ -171,16 +96,7 @@ generated;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - - - generated;%(AdditionalIncludeDirectories) - - + ..\..;%(AdditionalIncludeDirectories) @@ -191,351 +107,223 @@ - - - - + + + + - true - true true true true - true - true ..\..\Derived.ice - true - true true true true - true - true ..\..\DerivedEx.ice - true - true - true - true true true true ..\..\Forward.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Derived.ice - true - true true true true - true - true ..\..\DerivedEx.ice - true - true - true - true true true true ..\..\Forward.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Derived.ice - true - true true true true - true - true ..\..\DerivedEx.ice - true - true - true - true true true true ..\..\Forward.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Derived.ice - true - true true true true - true - true ..\..\DerivedEx.ice - true - true - true - true true true true ..\..\Forward.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Derived.ice - true - true true true true - true - true ..\..\DerivedEx.ice - true - true - true - true true true true ..\..\Forward.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Derived.ice - true - true true true true - true - true ..\..\DerivedEx.ice - true - true - true - true true true true ..\..\Forward.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Derived.ice - true - true true true true - true - true ..\..\DerivedEx.ice - true - true - true - true true true true ..\..\Forward.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Derived.ice - true - true true true true - true - true ..\..\DerivedEx.ice - true - true - true - true true true true ..\..\Forward.ice - true - true true true true - true - true ..\..\Test.ice - - - - + + + + - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/objects/msbuild/server/server.vcxproj b/cpp/test/Ice/objects/msbuild/server/server.vcxproj index 12f1494941c..69b8eca9166 100644 --- a/cpp/test/Ice/objects/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/objects/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {46204626-B8AC-4E09-88F2-0A68A5DEEF5A} - + @@ -47,86 +31,45 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + generated;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - - - generated;%(AdditionalIncludeDirectories) - - + ..\..;%(AdditionalIncludeDirectories) @@ -135,16 +78,7 @@ generated;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - - - generated;%(AdditionalIncludeDirectories) - - + ..\..;%(AdditionalIncludeDirectories) @@ -153,16 +87,7 @@ generated;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - - - generated;%(AdditionalIncludeDirectories) - - + ..\..;%(AdditionalIncludeDirectories) @@ -171,16 +96,7 @@ generated;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - - - generated;%(AdditionalIncludeDirectories) - - + ..\..;%(AdditionalIncludeDirectories) @@ -191,350 +107,222 @@ - - - + + + - true - true true true true - true - true ..\..\Derived.ice - true - true true true true - true - true ..\..\DerivedEx.ice - true - true - true - true true true true ..\..\Forward.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Derived.ice - true - true true true true - true - true ..\..\DerivedEx.ice - true - true - true - true true true true ..\..\Forward.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Derived.ice - true - true true true true - true - true ..\..\DerivedEx.ice - true - true - true - true true true true ..\..\Forward.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Derived.ice - true - true true true true - true - true ..\..\DerivedEx.ice - true - true - true - true true true true ..\..\Forward.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Derived.ice - true - true true true true - true - true ..\..\DerivedEx.ice - true - true - true - true true true true ..\..\Forward.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Derived.ice - true - true true true true - true - true ..\..\DerivedEx.ice - true - true - true - true true true true ..\..\Forward.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Derived.ice - true - true true true true - true - true ..\..\DerivedEx.ice - true - true - true - true true true true ..\..\Forward.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Derived.ice - true - true true true true - true - true ..\..\DerivedEx.ice - true - true - true - true true true true ..\..\Forward.ice - true - true true true true - true - true ..\..\Test.ice - - - - + + + + - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/operations/msbuild/client/client.vcxproj b/cpp/test/Ice/operations/msbuild/client/client.vcxproj index 5ad3af055d8..c4fada1e94f 100644 --- a/cpp/test/Ice/operations/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/operations/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {A364B7AB-7129-4891-A305-B2EEE2948EC4} - + @@ -47,77 +31,40 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - - - - 4503;%(DisableSpecificWarnings) - - + 4503;%(DisableSpecificWarnings) @@ -128,16 +75,6 @@ 4503;%(DisableSpecificWarnings) - - - 4503;%(DisableSpecificWarnings) - - - - - 4503;%(DisableSpecificWarnings) - - 4503;%(DisableSpecificWarnings) @@ -148,120 +85,83 @@ 4503;%(DisableSpecificWarnings) - - - 4503;%(DisableSpecificWarnings) - - - + - + - - - - - - - - + + + + + + + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/operations/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/operations/msbuild/collocated/collocated.vcxproj index ac880c12743..9ed485cc322 100644 --- a/cpp/test/Ice/operations/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/operations/msbuild/collocated/collocated.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {1C3367B8-CCFF-4409-8847-623DFD833DAD} - + @@ -47,70 +31,38 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + @@ -118,160 +70,104 @@ 4503;%(DisableSpecificWarnings) - - - ..\..;%(AdditionalIncludeDirectories) - 4503;%(DisableSpecificWarnings) - - ..\..;%(AdditionalIncludeDirectories) 4503;%(DisableSpecificWarnings) - - - ..\..;%(AdditionalIncludeDirectories) - 4503;%(DisableSpecificWarnings) - - ..\..;%(AdditionalIncludeDirectories) 4503;%(DisableSpecificWarnings) - - - ..\..;%(AdditionalIncludeDirectories) - 4503;%(DisableSpecificWarnings) - - ..\..;%(AdditionalIncludeDirectories) 4503;%(DisableSpecificWarnings) - - - ..\..;%(AdditionalIncludeDirectories) - 4503;%(DisableSpecificWarnings) - - - + - + - - - - - - - - - + + + + + + + + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/operations/msbuild/server/server.vcxproj b/cpp/test/Ice/operations/msbuild/server/server.vcxproj index 216feed60ec..2c0598ece4d 100644 --- a/cpp/test/Ice/operations/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/operations/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {27B7CAC4-9236-4139-88B8-3B9950D2DB2C} - + @@ -47,70 +31,38 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + @@ -118,153 +70,97 @@ 4503;%(DisableSpecificWarnings) - - - ..\..;%(AdditionalIncludeDirectories) - 4503;%(DisableSpecificWarnings) - - ..\..;%(AdditionalIncludeDirectories) 4503;%(DisableSpecificWarnings) - - - ..\..;%(AdditionalIncludeDirectories) - 4503;%(DisableSpecificWarnings) - - ..\..;%(AdditionalIncludeDirectories) 4503;%(DisableSpecificWarnings) - - - ..\..;%(AdditionalIncludeDirectories) - 4503;%(DisableSpecificWarnings) - - ..\..;%(AdditionalIncludeDirectories) 4503;%(DisableSpecificWarnings) - - - ..\..;%(AdditionalIncludeDirectories) - 4503;%(DisableSpecificWarnings) - - - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/operations/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/operations/msbuild/serveramd/serveramd.vcxproj index 91fb212bc56..f488be8819b 100644 --- a/cpp/test/Ice/operations/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/operations/msbuild/serveramd/serveramd.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {306B9C8B-F11B-4071-AE80-CF69EF0BBB2B} - + @@ -47,70 +31,38 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + @@ -118,153 +70,97 @@ 4503;%(DisableSpecificWarnings) - - - ..\..;%(AdditionalIncludeDirectories) - 4503;%(DisableSpecificWarnings) - - ..\..;%(AdditionalIncludeDirectories) 4503;%(DisableSpecificWarnings) - - - ..\..;%(AdditionalIncludeDirectories) - 4503;%(DisableSpecificWarnings) - - ..\..;%(AdditionalIncludeDirectories) 4503;%(DisableSpecificWarnings) - - - ..\..;%(AdditionalIncludeDirectories) - 4503;%(DisableSpecificWarnings) - - ..\..;%(AdditionalIncludeDirectories) 4503;%(DisableSpecificWarnings) - - - ..\..;%(AdditionalIncludeDirectories) - 4503;%(DisableSpecificWarnings) - - - + - - + + - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - + - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - + - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/optional/msbuild/client/client.vcxproj b/cpp/test/Ice/optional/msbuild/client/client.vcxproj index 4bbc4dc444a..88621dbe008 100644 --- a/cpp/test/Ice/optional/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/optional/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {A82A6A91-4EEC-4F0A-BA2D-A689BDCDA9C2} - + @@ -47,220 +31,132 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - 4250;4251;4275;4503 - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - 4250;4251;4275;4503 - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - 4250;4251;4275;4503 - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - 4250;4251;4275;4503 - - - + - + - - - + + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/optional/msbuild/server/server.vcxproj b/cpp/test/Ice/optional/msbuild/server/server.vcxproj index cffb2bc2a9f..05fdfa2a453 100644 --- a/cpp/test/Ice/optional/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/optional/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {E64764EB-2B8E-454F-9635-0729D07CCA24} - + @@ -47,220 +31,132 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - 4250;4251;4275;4503 - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - 4250;4251;4275;4503 - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - 4250;4251;4275;4503 - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - 4250;4251;4275;4503 - - - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/optional/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/optional/msbuild/serveramd/serveramd.vcxproj index 2e546c00559..54ebd0da25a 100644 --- a/cpp/test/Ice/optional/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/optional/msbuild/serveramd/serveramd.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {9D99D6A3-3087-4B6B-BF7E-AD1D8BB9BEDA} - + @@ -47,220 +31,132 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - 4250;4251;4275;4503 - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - 4250;4251;4275;4503 - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - 4250;4251;4275;4503 - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - 4250;4251;4275;4503 - - - + - - + + - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - + - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - + - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/plugin/msbuild/client/client.vcxproj b/cpp/test/Ice/plugin/msbuild/client/client.vcxproj index 82d87369002..f9b3b6dc48a 100644 --- a/cpp/test/Ice/plugin/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/plugin/msbuild/client/client.vcxproj @@ -1,23 +1,7 @@ - - - + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -36,15 +20,15 @@ - + - + {83B9B9F0-EFF4-447B-A7DD-60BAE22123F8} - + @@ -52,82 +36,50 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - + - - - - + - - - - + - - - - + - - - - + - + generated;..\..\;%(AdditionalIncludeDirectories) - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + \ No newline at end of file diff --git a/cpp/test/Ice/plugin/msbuild/testplugin/testplugin.vcxproj b/cpp/test/Ice/plugin/msbuild/testplugin/testplugin.vcxproj index 5113fae6afe..a398bdba80e 100644 --- a/cpp/test/Ice/plugin/msbuild/testplugin/testplugin.vcxproj +++ b/cpp/test/Ice/plugin/msbuild/testplugin/testplugin.vcxproj @@ -1,23 +1,7 @@ - - - + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -36,15 +20,15 @@ - + - + {948059F3-CD57-4ACC-9EA5-C4550D06CB19} - + @@ -52,117 +36,65 @@ true $(DefaultPlatformToolset) - - DynamicLibrary - true - $(DefaultPlatformToolset) - DynamicLibrary false $(DefaultPlatformToolset) - - DynamicLibrary - false - $(DefaultPlatformToolset) - DynamicLibrary true $(DefaultPlatformToolset) - - DynamicLibrary - true - $(DefaultPlatformToolset) - DynamicLibrary false $(DefaultPlatformToolset) - - DynamicLibrary - false - $(DefaultPlatformToolset) - - - + + - + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + \ No newline at end of file diff --git a/cpp/test/Ice/properties/msbuild/client.vcxproj b/cpp/test/Ice/properties/msbuild/client.vcxproj index 5b507e8802f..4b5fe7cf78d 100644 --- a/cpp/test/Ice/properties/msbuild/client.vcxproj +++ b/cpp/test/Ice/properties/msbuild/client.vcxproj @@ -1,23 +1,7 @@ - - - + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -38,7 +22,7 @@ {EABE4465-0DDC-41CE-91C5-CCB9586B789F} - + @@ -46,123 +30,71 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + \ No newline at end of file diff --git a/cpp/test/Ice/proxy/msbuild/client/client.vcxproj b/cpp/test/Ice/proxy/msbuild/client/client.vcxproj index 05f98537b90..1dc261fb949 100644 --- a/cpp/test/Ice/proxy/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {D0301B50-901B-4298-B8C8-B134A320E2A0} - + @@ -47,175 +31,111 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/proxy/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/proxy/msbuild/collocated/collocated.vcxproj index 79fc56c75fc..7ccca53c8ef 100644 --- a/cpp/test/Ice/proxy/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/collocated/collocated.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {59ED55DD-0EF7-4028-B7DD-AFB6488155F6} - + @@ -47,217 +31,133 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - - + + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/proxy/msbuild/server/server.vcxproj b/cpp/test/Ice/proxy/msbuild/server/server.vcxproj index c59532c80a2..8648279fc9f 100644 --- a/cpp/test/Ice/proxy/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {2DAEF04A-7C9A-4C64-99E9-D0F503667FBF} - + @@ -47,216 +31,132 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/proxy/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/proxy/msbuild/serveramd/serveramd.vcxproj index dddffcac371..c0def425f85 100644 --- a/cpp/test/Ice/proxy/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/serveramd/serveramd.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {36CC0D35-FFFE-46D1-8EE1-1A3438DCC938} - + @@ -47,216 +31,132 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - - + + - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - + - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - + - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/retry/msbuild/client/client.vcxproj b/cpp/test/Ice/retry/msbuild/client/client.vcxproj index 4fb39a75859..05764719f69 100644 --- a/cpp/test/Ice/retry/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/retry/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {2C8EC06E-CC5B-4D04-A49E-4656CF1D199D} - + @@ -47,217 +31,133 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + generated;..\..\;%(AdditionalIncludeDirectories) - - - generated;..\..\;%(AdditionalIncludeDirectories) - - generated;..\..\;%(AdditionalIncludeDirectories) - - - generated;..\..\;%(AdditionalIncludeDirectories) - - generated;..\..\;%(AdditionalIncludeDirectories) - - - generated;..\..\;%(AdditionalIncludeDirectories) - - generated;..\..\;%(AdditionalIncludeDirectories) - - - generated;..\..\;%(AdditionalIncludeDirectories) - - - + - + - - - + + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/retry/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/retry/msbuild/collocated/collocated.vcxproj index 334b3605785..ee70af8abf0 100644 --- a/cpp/test/Ice/retry/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/retry/msbuild/collocated/collocated.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {9D7FD661-AA09-43D3-9772-66EC4915A848} - + @@ -47,219 +31,135 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - - - + + + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/retry/msbuild/server/server.vcxproj b/cpp/test/Ice/retry/msbuild/server/server.vcxproj index c2ecd156f2f..d654c777d58 100644 --- a/cpp/test/Ice/retry/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/retry/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {F689934E-7EED-4E85-A620-8FC72CD83255} - + @@ -47,219 +31,135 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - - + + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - - - + + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/scope/msbuild/client/client.vcxproj b/cpp/test/Ice/scope/msbuild/client/client.vcxproj index 51c9e5737b1..452a6c0a70d 100644 --- a/cpp/test/Ice/scope/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/scope/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {A19DC61B-84AE-4983-9B4C-4F4A338178C5} - + @@ -47,77 +31,40 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - - - - 4503;%(DisableSpecificWarnings) - - + 4503;%(DisableSpecificWarnings) @@ -128,16 +75,6 @@ 4503;%(DisableSpecificWarnings) - - - 4503;%(DisableSpecificWarnings) - - - - - 4503;%(DisableSpecificWarnings) - - 4503;%(DisableSpecificWarnings) @@ -148,114 +85,77 @@ 4503;%(DisableSpecificWarnings) - - - 4503;%(DisableSpecificWarnings) - - - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/scope/msbuild/server/server.vcxproj b/cpp/test/Ice/scope/msbuild/server/server.vcxproj index e7a93735c7b..6bd6e603ad2 100644 --- a/cpp/test/Ice/scope/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/scope/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {0DDD44E0-E425-47BE-8DAA-06CA0E8704D2} - + @@ -47,70 +31,38 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + @@ -118,152 +70,96 @@ 4503;%(DisableSpecificWarnings) - - - ..\..;%(AdditionalIncludeDirectories) - 4503;%(DisableSpecificWarnings) - - ..\..;%(AdditionalIncludeDirectories) 4503;%(DisableSpecificWarnings) - - - ..\..;%(AdditionalIncludeDirectories) - 4503;%(DisableSpecificWarnings) - - ..\..;%(AdditionalIncludeDirectories) 4503;%(DisableSpecificWarnings) - - - ..\..;%(AdditionalIncludeDirectories) - 4503;%(DisableSpecificWarnings) - - ..\..;%(AdditionalIncludeDirectories) 4503;%(DisableSpecificWarnings) - - - ..\..;%(AdditionalIncludeDirectories) - 4503;%(DisableSpecificWarnings) - - - + - + - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/servantLocator/msbuild/client/client.vcxproj b/cpp/test/Ice/servantLocator/msbuild/client/client.vcxproj index 7d30a9e9718..5c58e353576 100644 --- a/cpp/test/Ice/servantLocator/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/servantLocator/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {3329FD4A-C510-40FF-A642-365F8F56422E} - + @@ -47,175 +31,111 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/servantLocator/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/servantLocator/msbuild/collocated/collocated.vcxproj index b388533786b..3c5b931a32c 100644 --- a/cpp/test/Ice/servantLocator/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/servantLocator/msbuild/collocated/collocated.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {8698D5A5-EABD-4024-B3A0-A78793B39510} - + @@ -47,219 +31,135 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - - - + + + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/servantLocator/msbuild/server/server.vcxproj b/cpp/test/Ice/servantLocator/msbuild/server/server.vcxproj index 542a9393fbe..657baf94652 100644 --- a/cpp/test/Ice/servantLocator/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/servantLocator/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {2B6769F3-9C20-49D1-821C-65BB70A53F76} - + @@ -47,218 +31,134 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - - + + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/servantLocator/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/servantLocator/msbuild/serveramd/serveramd.vcxproj index a84f588a7a1..cf928e8b07f 100644 --- a/cpp/test/Ice/servantLocator/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/servantLocator/msbuild/serveramd/serveramd.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {425BC777-A886-4EC9-819B-35D103A7FDD0} - + @@ -47,70 +31,38 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + @@ -118,155 +70,99 @@ ICE_AMD_TEST;%(PreprocessorDefinitions) - - - ..\..;%(AdditionalIncludeDirectories) - ICE_AMD_TEST;%(PreprocessorDefinitions) - - ..\..;%(AdditionalIncludeDirectories) ICE_AMD_TEST;%(PreprocessorDefinitions) - - - ..\..;%(AdditionalIncludeDirectories) - ICE_AMD_TEST;%(PreprocessorDefinitions) - - ..\..;%(AdditionalIncludeDirectories) ICE_AMD_TEST;%(PreprocessorDefinitions) - - - ..\..;%(AdditionalIncludeDirectories) - ICE_AMD_TEST;%(PreprocessorDefinitions) - - ..\..;%(AdditionalIncludeDirectories) ICE_AMD_TEST;%(PreprocessorDefinitions) - - - ..\..;%(AdditionalIncludeDirectories) - ICE_AMD_TEST;%(PreprocessorDefinitions) - - - + - - - + + + - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - - + + - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - + - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/services/msbuild/client.vcxproj b/cpp/test/Ice/services/msbuild/client.vcxproj index 35b446b3077..28f1da3d704 100644 --- a/cpp/test/Ice/services/msbuild/client.vcxproj +++ b/cpp/test/Ice/services/msbuild/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {07BDBE85-B3C1-4E70-91E3-B2517CFB04C1} - + @@ -47,223 +31,135 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - + - - - - + ..\..;%(AdditionalIncludeDirectories) 4250;4251;4275;4503 - - - ..\..;%(AdditionalIncludeDirectories) - 4250;4251;4275;4503 - - ..\..;%(AdditionalIncludeDirectories) 4250;4251;4275;4503 - - - ..\..;%(AdditionalIncludeDirectories) - 4250;4251;4275;4503 - - ..\..;%(AdditionalIncludeDirectories) 4250;4251;4275;4503 - - - ..\..;%(AdditionalIncludeDirectories) - 4250;4251;4275;4503 - - ..\..;%(AdditionalIncludeDirectories) 4250;4251;4275;4503 - - - ..\..;%(AdditionalIncludeDirectories) - 4250;4251;4275;4503 - - - + - - + + - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - + - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/slicing/exceptions/msbuild/client/client.vcxproj b/cpp/test/Ice/slicing/exceptions/msbuild/client/client.vcxproj index 12fb8376eb4..9728d695842 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/slicing/exceptions/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {6476DBD1-9C4F-4107-8271-2B1DC2B535E5} - + @@ -47,258 +31,162 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..\;%(IncludeDirectories) - - + + - - + + - true - true true true true - true - true ..\..\ClientPrivate.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\ClientPrivate.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\ClientPrivate.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\ClientPrivate.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\ClientPrivate.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\ClientPrivate.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\ClientPrivate.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\ClientPrivate.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/slicing/exceptions/msbuild/server/server.vcxproj b/cpp/test/Ice/slicing/exceptions/msbuild/server/server.vcxproj index ac3f6ee881f..7f076882be7 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/slicing/exceptions/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {CFFE56E2-BBDE-4B6E-BB76-1A1A61453570} - + @@ -47,299 +31,183 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..\;%(IncludeDirectories) - - + + - - + + - true - true true true true - true - true ..\..\ServerPrivate.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\ServerPrivate.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\ServerPrivate.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\ServerPrivate.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\ServerPrivate.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\ServerPrivate.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\ServerPrivate.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\ServerPrivate.ice - true - true true true true - true - true ..\..\Test.ice - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.vcxproj index 1a77b06744e..3740ee46e2a 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {171056B8-17A5-4825-9110-2877A94CD933} - + @@ -47,299 +31,183 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..\;%(IncludeDirectories) - - + + - true - true true true true - true - true ..\..\ServerPrivateAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\ServerPrivateAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\ServerPrivateAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\ServerPrivateAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - + - true - true true true true - true - true ..\..\ServerPrivateAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\ServerPrivateAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\ServerPrivateAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\ServerPrivateAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - - + + - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/slicing/objects/msbuild/client/client.vcxproj b/cpp/test/Ice/slicing/objects/msbuild/client/client.vcxproj index cf9527c11e6..84226224c7a 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/slicing/objects/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {ECFBC0CA-07CD-448D-8B23-660644E9D9FC} - + @@ -47,258 +31,162 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..\;%(IncludeDirectories) - - + + - true - true true true true - true - true ..\..\ClientPrivate.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\ClientPrivate.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\ClientPrivate.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\ClientPrivate.ice - true - true true true true - true - true ..\..\Test.ice - - + + - true - true true true true - true - true ..\..\ClientPrivate.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\ClientPrivate.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\ClientPrivate.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\ClientPrivate.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/slicing/objects/msbuild/server/server.vcxproj b/cpp/test/Ice/slicing/objects/msbuild/server/server.vcxproj index 45db17fe739..b338a58ec27 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/slicing/objects/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {3A76C039-4054-4D6C-AA2D-D69C8806FB6E} - + @@ -47,299 +31,183 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..\;%(IncludeDirectories) - - + + - - + + - true - true true true true - true - true ..\..\ServerPrivate.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\ServerPrivate.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\ServerPrivate.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\ServerPrivate.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\ServerPrivate.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\ServerPrivate.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\ServerPrivate.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\ServerPrivate.ice - true - true true true true - true - true ..\..\Test.ice - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.vcxproj index 96bd5095212..6239bb0566a 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {5AB527E1-111F-4AD0-8D98-2896E1390A70} - + @@ -47,299 +31,183 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..\;%(IncludeDirectories) - - + + - true - true true true true - true - true ..\..\ServerPrivateAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\ServerPrivateAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\ServerPrivateAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\ServerPrivateAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - + - true - true true true true - true - true ..\..\ServerPrivateAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\ServerPrivateAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\ServerPrivateAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - true - true true true true - true - true ..\..\ServerPrivateAMD.ice - true - true true true true - true - true ..\..\TestAMD.ice - - + + - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/stream/msbuild/client.vcxproj b/cpp/test/Ice/stream/msbuild/client.vcxproj index 94eedb6fb63..106155c5ef4 100644 --- a/cpp/test/Ice/stream/msbuild/client.vcxproj +++ b/cpp/test/Ice/stream/msbuild/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {263E5E46-AE57-4B3B-A3CE-7B639674F3A6} - + @@ -47,198 +31,122 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + - - - - + - - - - + - - - - + - - - - + - + - + - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - + - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/stringConverter/msbuild/client/client.vcxproj b/cpp/test/Ice/stringConverter/msbuild/client/client.vcxproj index df9f0f6bbee..ee702cad6f7 100644 --- a/cpp/test/Ice/stringConverter/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/stringConverter/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {076446BE-553C-4938-9CF8-BC7DEB1BF235} - + @@ -47,174 +31,110 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + - + - + - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/stringConverter/msbuild/server/server.vcxproj b/cpp/test/Ice/stringConverter/msbuild/server/server.vcxproj index 1217c0d089a..78494a03de2 100644 --- a/cpp/test/Ice/stringConverter/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/stringConverter/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {1733A0D9-A75C-47DB-86B9-EF199E48482B} - + @@ -47,214 +31,130 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/threadPoolPriority/msbuild/client/client.vcxproj b/cpp/test/Ice/threadPoolPriority/msbuild/client/client.vcxproj index ca53fc61428..744d2f9252e 100644 --- a/cpp/test/Ice/threadPoolPriority/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/threadPoolPriority/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {CEDE5677-D376-4859-AEAE-55608D8F0440} - + @@ -47,175 +31,111 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/threadPoolPriority/msbuild/server/server.vcxproj b/cpp/test/Ice/threadPoolPriority/msbuild/server/server.vcxproj index 21dcddce7a8..ff719d14360 100644 --- a/cpp/test/Ice/threadPoolPriority/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/threadPoolPriority/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {54CA937D-F425-4EEA-B1A4-5DEC87BDDC19} - + @@ -47,216 +31,132 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/threadPoolPriority/msbuild/servercustom/servercustom.vcxproj b/cpp/test/Ice/threadPoolPriority/msbuild/servercustom/servercustom.vcxproj index a30afd1b423..05918e641bb 100644 --- a/cpp/test/Ice/threadPoolPriority/msbuild/servercustom/servercustom.vcxproj +++ b/cpp/test/Ice/threadPoolPriority/msbuild/servercustom/servercustom.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {FE519629-8AB6-4E36-AE0A-4D8FCF67C2B9} - + @@ -47,216 +31,132 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/timeout/msbuild/client/client.vcxproj b/cpp/test/Ice/timeout/msbuild/client/client.vcxproj index c79d1b53408..bcd4035a962 100644 --- a/cpp/test/Ice/timeout/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/timeout/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {2EE3C8C1-B890-4B24-932D-D699F1825C01} - + @@ -47,77 +31,40 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - - - - ..\..;%(AdditionalIncludeDirectories) - - + ..\..;%(AdditionalIncludeDirectories) @@ -128,16 +75,6 @@ ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) @@ -148,116 +85,79 @@ ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - - + + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/timeout/msbuild/server/server.vcxproj b/cpp/test/Ice/timeout/msbuild/server/server.vcxproj index 0997a9f9d4a..cf8b6ecc1f9 100644 --- a/cpp/test/Ice/timeout/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/timeout/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {ACB2D1AC-CD6D-4AF9-9C11-B0B0AA5C5A8F} - + @@ -47,216 +31,132 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/udp/msbuild/client/client.vcxproj b/cpp/test/Ice/udp/msbuild/client/client.vcxproj index 934e7bafceb..8219099a1cb 100644 --- a/cpp/test/Ice/udp/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/udp/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {C2A13189-B75A-4ACA-98A0-326956F1F6EA} - + @@ -47,175 +31,111 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Ice/udp/msbuild/server/server.vcxproj b/cpp/test/Ice/udp/msbuild/server/server.vcxproj index 2a591913841..344cb5c5017 100644 --- a/cpp/test/Ice/udp/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/udp/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {B2DDDBC0-559B-46E9-898F-958A1AA8991F} - + @@ -47,216 +31,132 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceBox/admin/msbuild/client/client.vcxproj b/cpp/test/IceBox/admin/msbuild/client/client.vcxproj index b328a6487a0..92b5e75ba7d 100644 --- a/cpp/test/IceBox/admin/msbuild/client/client.vcxproj +++ b/cpp/test/IceBox/admin/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {0AF7FE2E-9C7F-4F87-A999-D397D39CE752} - + @@ -47,215 +31,131 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceBox/admin/msbuild/testservice/testservice.vcxproj b/cpp/test/IceBox/admin/msbuild/testservice/testservice.vcxproj index 4d95184a174..753ad30f088 100644 --- a/cpp/test/IceBox/admin/msbuild/testservice/testservice.vcxproj +++ b/cpp/test/IceBox/admin/msbuild/testservice/testservice.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -37,102 +21,70 @@ - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + {508275B8-D93D-4F1B-BD48-1A4B7420F860} - + @@ -140,147 +92,83 @@ true $(DefaultPlatformToolset) - - DynamicLibrary - true - $(DefaultPlatformToolset) - DynamicLibrary false $(DefaultPlatformToolset) - - DynamicLibrary - false - $(DefaultPlatformToolset) - DynamicLibrary true $(DefaultPlatformToolset) - - DynamicLibrary - true - $(DefaultPlatformToolset) - DynamicLibrary false $(DefaultPlatformToolset) - - DynamicLibrary - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + $(ProjectName)d $(ProjectName)d - - $(ProjectName)++11d - - - $(ProjectName)++11d - - - $(ProjectName)++11 - - - $(ProjectName)++11 - $(ProjectName) $(ProjectName) - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceBox/configuration/msbuild/client/client.vcxproj b/cpp/test/IceBox/configuration/msbuild/client/client.vcxproj index 4dc8b92234f..a8074902014 100644 --- a/cpp/test/IceBox/configuration/msbuild/client/client.vcxproj +++ b/cpp/test/IceBox/configuration/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {6854119E-CB5F-4B6F-9AB9-49538B9219F6} - + @@ -47,215 +31,131 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceBox/configuration/msbuild/testservice/testservice.vcxproj b/cpp/test/IceBox/configuration/msbuild/testservice/testservice.vcxproj index 9217637278e..a45aec7e769 100644 --- a/cpp/test/IceBox/configuration/msbuild/testservice/testservice.vcxproj +++ b/cpp/test/IceBox/configuration/msbuild/testservice/testservice.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -37,102 +21,70 @@ - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + {C4A93019-9757-4999-A1E5-3C019569A525} - + @@ -140,147 +92,83 @@ true $(DefaultPlatformToolset) - - DynamicLibrary - true - $(DefaultPlatformToolset) - DynamicLibrary false $(DefaultPlatformToolset) - - DynamicLibrary - false - $(DefaultPlatformToolset) - DynamicLibrary true $(DefaultPlatformToolset) - - DynamicLibrary - true - $(DefaultPlatformToolset) - DynamicLibrary false $(DefaultPlatformToolset) - - DynamicLibrary - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + $(ProjectName)d $(ProjectName)d - - $(ProjectName)++11d - - - $(ProjectName)++11d - - - $(ProjectName)++11 - - - $(ProjectName)++11 - $(ProjectName) $(ProjectName) - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceBridge/simple/msbuild/client/client.vcxproj b/cpp/test/IceBridge/simple/msbuild/client/client.vcxproj index 3faff50e10d..c72c7ddd360 100644 --- a/cpp/test/IceBridge/simple/msbuild/client/client.vcxproj +++ b/cpp/test/IceBridge/simple/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {86FA255C-ED2F-44E3-989B-F9291165D3E1} - + @@ -47,175 +31,111 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceBridge/simple/msbuild/server/server.vcxproj b/cpp/test/IceBridge/simple/msbuild/server/server.vcxproj index 38bde64d651..99b34afb0c7 100644 --- a/cpp/test/IceBridge/simple/msbuild/server/server.vcxproj +++ b/cpp/test/IceBridge/simple/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {4D76D578-E858-485E-8498-9FC604B3B069} - + @@ -47,215 +31,131 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceDiscovery/simple/msbuild/client/client.vcxproj b/cpp/test/IceDiscovery/simple/msbuild/client/client.vcxproj index 534d3c9ea83..51cf056ea15 100644 --- a/cpp/test/IceDiscovery/simple/msbuild/client/client.vcxproj +++ b/cpp/test/IceDiscovery/simple/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {8458C2DB-4B5E-4CC9-9365-571C62B2832F} - + @@ -47,199 +31,123 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + - + - - - - - - - - - - - - - + - + - + - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceDiscovery/simple/msbuild/server/server.vcxproj b/cpp/test/IceDiscovery/simple/msbuild/server/server.vcxproj index 974367b3613..9bbcefdd16c 100644 --- a/cpp/test/IceDiscovery/simple/msbuild/server/server.vcxproj +++ b/cpp/test/IceDiscovery/simple/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {667B765B-502E-46C3-92EE-DDDDC657ED2D} - + @@ -47,224 +31,136 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - - - ..\..;%(AdditionalIncludeDirectories) - - + ..\..;%(AdditionalIncludeDirectories) - - - - - ..\..;%(AdditionalIncludeDirectories) - - + ..\..;%(AdditionalIncludeDirectories) - - - - - ..\..;%(AdditionalIncludeDirectories) - - + ..\..;%(AdditionalIncludeDirectories) - - - - - ..\..;%(AdditionalIncludeDirectories) - - + - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceGrid/activation/msbuild/client/client.vcxproj b/cpp/test/IceGrid/activation/msbuild/client/client.vcxproj index 031c4370bf1..1538e707617 100644 --- a/cpp/test/IceGrid/activation/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/activation/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,181 +23,117 @@ {F0DEFABC-1F27-4CDB-835A-1AF2958C3F9B} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceGrid/activation/msbuild/server/server.vcxproj b/cpp/test/IceGrid/activation/msbuild/server/server.vcxproj index f84f71e25da..0ba0ba967cd 100644 --- a/cpp/test/IceGrid/activation/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/activation/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,222 +23,138 @@ {C00984F2-B825-45AF-86EC-A4FEF70B02C8} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceGrid/admin/msbuild/server.vcxproj b/cpp/test/IceGrid/admin/msbuild/server.vcxproj index 1478901782f..bf4757dfa7e 100644 --- a/cpp/test/IceGrid/admin/msbuild/server.vcxproj +++ b/cpp/test/IceGrid/admin/msbuild/server.vcxproj @@ -1,23 +1,7 @@ - - - + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -36,131 +20,79 @@ - + - + {2CF45619-1C69-4072-B869-817D7954CABF} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + \ No newline at end of file diff --git a/cpp/test/IceGrid/allocation/msbuild/client/client.vcxproj b/cpp/test/IceGrid/allocation/msbuild/client/client.vcxproj index 7ae07206701..91c0d6e94be 100644 --- a/cpp/test/IceGrid/allocation/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/allocation/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,181 +23,117 @@ {0FC21E44-5EF6-4725-8B9E-CC3C91552BDE} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceGrid/allocation/msbuild/server/server.vcxproj b/cpp/test/IceGrid/allocation/msbuild/server/server.vcxproj index 7a7d31833a6..0f54471bacd 100644 --- a/cpp/test/IceGrid/allocation/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/allocation/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,222 +23,138 @@ {5DBA95DD-954C-4B77-A2D1-42E959B27C36} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceGrid/allocation/msbuild/verifier/verifier.vcxproj b/cpp/test/IceGrid/allocation/msbuild/verifier/verifier.vcxproj index 6f3d7a8e3ec..df57c357db6 100644 --- a/cpp/test/IceGrid/allocation/msbuild/verifier/verifier.vcxproj +++ b/cpp/test/IceGrid/allocation/msbuild/verifier/verifier.vcxproj @@ -1,23 +1,7 @@ - - - + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -38,129 +22,77 @@ {9EA751B7-04D5-484C-89EF-03AA2782B1D6} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + \ No newline at end of file diff --git a/cpp/test/IceGrid/deployer/msbuild/client/client.vcxproj b/cpp/test/IceGrid/deployer/msbuild/client/client.vcxproj index 0a7556223e0..445c00bb964 100644 --- a/cpp/test/IceGrid/deployer/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/deployer/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,181 +23,117 @@ {3DF7D787-3F9C-48E9-BECE-B9E7030E01A7} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceGrid/deployer/msbuild/server/server.vcxproj b/cpp/test/IceGrid/deployer/msbuild/server/server.vcxproj index 1cf7c7a6f9b..3bc523e6de4 100644 --- a/cpp/test/IceGrid/deployer/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/deployer/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,222 +23,138 @@ {727351F3-D1CC-42C5-9AA2-5840AD3F7A1A} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceGrid/deployer/msbuild/testservice/testservice.vcxproj b/cpp/test/IceGrid/deployer/msbuild/testservice/testservice.vcxproj index bff43195b9e..691b5c6326c 100644 --- a/cpp/test/IceGrid/deployer/msbuild/testservice/testservice.vcxproj +++ b/cpp/test/IceGrid/deployer/msbuild/testservice/testservice.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,81 +23,46 @@ {C3955110-CB5E-484A-938C-D7861E08D43B} - + DynamicLibrary true $(DefaultPlatformToolset) - - DynamicLibrary - true - $(DefaultPlatformToolset) - DynamicLibrary false $(DefaultPlatformToolset) - - DynamicLibrary - false - $(DefaultPlatformToolset) - DynamicLibrary true $(DefaultPlatformToolset) - - DynamicLibrary - true - $(DefaultPlatformToolset) - DynamicLibrary false $(DefaultPlatformToolset) - - DynamicLibrary - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - + - - - - - - $(ProjectName)++11d - + $(ProjectName)d @@ -123,15 +72,6 @@ $(ProjectName)d - - $(ProjectName)++11d - - - $(ProjectName)++11 - - - $(ProjectName)++11 - $(ProjectName) @@ -140,145 +80,93 @@ ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceGrid/distribution/msbuild/client/client.vcxproj b/cpp/test/IceGrid/distribution/msbuild/client/client.vcxproj index b8beb2b1b73..8ba516b0183 100644 --- a/cpp/test/IceGrid/distribution/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/distribution/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,181 +23,117 @@ {DFDF7BA0-4F61-4060-B919-7C8B2D40172E} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceGrid/distribution/msbuild/server/server.vcxproj b/cpp/test/IceGrid/distribution/msbuild/server/server.vcxproj index a46f8b5ba29..68b27afd8de 100644 --- a/cpp/test/IceGrid/distribution/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/distribution/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,222 +23,138 @@ {E4DC9D1E-8282-491F-A1FA-AF497EB1FF9C} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceGrid/noRestartUpdate/msbuild/client/client.vcxproj b/cpp/test/IceGrid/noRestartUpdate/msbuild/client/client.vcxproj index 9fd62438655..a048e78233d 100644 --- a/cpp/test/IceGrid/noRestartUpdate/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/noRestartUpdate/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,181 +23,117 @@ {D7F18F42-AD57-4F5C-B66E-FA0061BEB54F} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceGrid/noRestartUpdate/msbuild/server/server.vcxproj b/cpp/test/IceGrid/noRestartUpdate/msbuild/server/server.vcxproj index a3b14142e53..20cdb382e51 100644 --- a/cpp/test/IceGrid/noRestartUpdate/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/noRestartUpdate/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,222 +23,138 @@ {8680F272-78C1-41E2-AE78-10E37BFC6F53} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/testservice.vcxproj b/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/testservice.vcxproj index 9c5658eff56..71eda105323 100644 --- a/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/testservice.vcxproj +++ b/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/testservice.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,246 +23,150 @@ {6D4BA8B0-63B8-47D8-8B37-0A56A464BD4D} - + DynamicLibrary true $(DefaultPlatformToolset) - - DynamicLibrary - true - $(DefaultPlatformToolset) - DynamicLibrary false $(DefaultPlatformToolset) - - DynamicLibrary - false - $(DefaultPlatformToolset) - DynamicLibrary true $(DefaultPlatformToolset) - - DynamicLibrary - true - $(DefaultPlatformToolset) - DynamicLibrary false $(DefaultPlatformToolset) - - DynamicLibrary - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - + - - - - + $(ProjectName) $(ProjectName)d - - $(ProjectName)++11 - - - $(ProjectName)++11d - $(ProjectName) $(ProjectName)d - - $(ProjectName)++11 - - - $(ProjectName)++11d - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceGrid/replicaGroup/msbuild/client/client.vcxproj b/cpp/test/IceGrid/replicaGroup/msbuild/client/client.vcxproj index 7869f45a969..3beb46cd777 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/replicaGroup/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,181 +23,117 @@ {849F83BA-7817-419C-93E5-9F92541F773F} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/registryplugin.vcxproj b/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/registryplugin.vcxproj index cf730d38aa0..a38a75c2160 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/registryplugin.vcxproj +++ b/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/registryplugin.vcxproj @@ -1,23 +1,7 @@ - - - + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -36,131 +20,79 @@ - + - + {77CB36FD-F130-4416-B6B7-C24EFD83630E} - + DynamicLibrary true $(DefaultPlatformToolset) - - DynamicLibrary - true - $(DefaultPlatformToolset) - DynamicLibrary false $(DefaultPlatformToolset) - - DynamicLibrary - false - $(DefaultPlatformToolset) - DynamicLibrary true $(DefaultPlatformToolset) - - DynamicLibrary - true - $(DefaultPlatformToolset) - DynamicLibrary false $(DefaultPlatformToolset) - - DynamicLibrary - false - $(DefaultPlatformToolset) - - - + + - + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + \ No newline at end of file diff --git a/cpp/test/IceGrid/replicaGroup/msbuild/server/server.vcxproj b/cpp/test/IceGrid/replicaGroup/msbuild/server/server.vcxproj index 0d00dd070e3..c6c09dabb76 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/replicaGroup/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,222 +23,138 @@ {DA51489E-AC9D-4D59-89FC-1F103449CC5A} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceGrid/replicaGroup/msbuild/testservice/testservice.vcxproj b/cpp/test/IceGrid/replicaGroup/msbuild/testservice/testservice.vcxproj index 437c4528116..eb74bc6260b 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/testservice/testservice.vcxproj +++ b/cpp/test/IceGrid/replicaGroup/msbuild/testservice/testservice.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,99 +23,55 @@ {299B54D9-A682-40D5-B87B-A0C21BF1E839} - + DynamicLibrary true $(DefaultPlatformToolset) - - DynamicLibrary - true - $(DefaultPlatformToolset) - DynamicLibrary false $(DefaultPlatformToolset) - - DynamicLibrary - false - $(DefaultPlatformToolset) - DynamicLibrary true $(DefaultPlatformToolset) - - DynamicLibrary - true - $(DefaultPlatformToolset) - DynamicLibrary false $(DefaultPlatformToolset) - - DynamicLibrary - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - + - - - - - - $(ProjectName)++11d - + $(ProjectName)d - - $(ProjectName)++11 - $(ProjectName) $(ProjectName)d - - $(ProjectName)++11d - - - $(ProjectName)++11 - $(ProjectName) @@ -140,145 +80,93 @@ ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceGrid/replication/msbuild/client/client.vcxproj b/cpp/test/IceGrid/replication/msbuild/client/client.vcxproj index 5b9410560bc..6e0ce9e58bb 100644 --- a/cpp/test/IceGrid/replication/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/replication/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,181 +23,117 @@ {D306ADCE-34A1-4599-BD50-8598BB92B47F} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceGrid/replication/msbuild/server/server.vcxproj b/cpp/test/IceGrid/replication/msbuild/server/server.vcxproj index de6f748bbb0..1378ffa5094 100644 --- a/cpp/test/IceGrid/replication/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/replication/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,222 +23,138 @@ {3A517759-2BC3-4110-97AA-E5E7E45EA3D8} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceGrid/session/msbuild/client/client.vcxproj b/cpp/test/IceGrid/session/msbuild/client/client.vcxproj index 1b71a8f4a8a..8b50c9352b5 100644 --- a/cpp/test/IceGrid/session/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/session/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,181 +23,117 @@ {8EBD7C12-5623-467F-B80D-CFBB4C695771} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceGrid/session/msbuild/server/server.vcxproj b/cpp/test/IceGrid/session/msbuild/server/server.vcxproj index 00f6092e7c3..b42414b6a55 100644 --- a/cpp/test/IceGrid/session/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/session/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,220 +23,136 @@ {00000035-0000-0000-0000-000000000000} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceGrid/session/msbuild/verifier/verifier.vcxproj b/cpp/test/IceGrid/session/msbuild/verifier/verifier.vcxproj index d627b1a6aff..de67eb8ff6e 100644 --- a/cpp/test/IceGrid/session/msbuild/verifier/verifier.vcxproj +++ b/cpp/test/IceGrid/session/msbuild/verifier/verifier.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,220 +23,136 @@ {16EED45E-8D20-40EF-BB30-9DDD5A11B352} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceGrid/simple/msbuild/client/client.vcxproj b/cpp/test/IceGrid/simple/msbuild/client/client.vcxproj index 0c9586c4c89..4b7fbf8cbf2 100644 --- a/cpp/test/IceGrid/simple/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/simple/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,229 +23,141 @@ {2B721A85-96F1-4B92-BB31-1BCEF6ACFC8E} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - - - - - 4503;%(DisableSpecificWarnings) - - + - + 4503;%(DisableSpecificWarnings) - - - 4503;%(DisableSpecificWarnings) - - - - - - 4503;%(DisableSpecificWarnings) - - - - + 4503;%(DisableSpecificWarnings) - + 4503;%(DisableSpecificWarnings) - - - 4503;%(DisableSpecificWarnings) - - - - + 4503;%(DisableSpecificWarnings) - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceGrid/simple/msbuild/server/server.vcxproj b/cpp/test/IceGrid/simple/msbuild/server/server.vcxproj index 418f04b2c9a..9cad9452601 100644 --- a/cpp/test/IceGrid/simple/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/simple/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,222 +23,138 @@ {C5606B09-9FB7-4337-A490-2024CDCE4036} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceGrid/update/msbuild/client/client.vcxproj b/cpp/test/IceGrid/update/msbuild/client/client.vcxproj index 64fca79a55d..0fb4ccee904 100644 --- a/cpp/test/IceGrid/update/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/update/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,205 +23,129 @@ {12405F8D-7361-450D-8AFE-85BFD3AEEFD7} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - - - - + - + - - - - - - - + - + - - - - + - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceGrid/update/msbuild/server/server.vcxproj b/cpp/test/IceGrid/update/msbuild/server/server.vcxproj index 8a8dad02511..81b9348943c 100644 --- a/cpp/test/IceGrid/update/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/update/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,222 +23,138 @@ {D7224A94-13EF-4253-B3EA-801295D5966B} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceSSL/configuration/msbuild/client/client.vcxproj b/cpp/test/IceSSL/configuration/msbuild/client/client.vcxproj index 5138eccbadf..964b2ae0153 100644 --- a/cpp/test/IceSSL/configuration/msbuild/client/client.vcxproj +++ b/cpp/test/IceSSL/configuration/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {4CDBBDDD-7CB7-4063-ACCE-667D6162C5CA} - + @@ -47,77 +31,40 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - - - - advapi32.lib;crypt32.lib - - + advapi32.lib;crypt32.lib @@ -128,16 +75,6 @@ advapi32.lib;crypt32.lib - - - advapi32.lib;crypt32.lib - - - - - advapi32.lib;crypt32.lib - - advapi32.lib;crypt32.lib @@ -148,114 +85,77 @@ advapi32.lib;crypt32.lib - - - advapi32.lib;crypt32.lib - - - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceSSL/configuration/msbuild/clientopenssl/clientopenssl.vcxproj b/cpp/test/IceSSL/configuration/msbuild/clientopenssl/clientopenssl.vcxproj index 9799c2db738..f80ef513168 100644 --- a/cpp/test/IceSSL/configuration/msbuild/clientopenssl/clientopenssl.vcxproj +++ b/cpp/test/IceSSL/configuration/msbuild/clientopenssl/clientopenssl.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,89 +23,49 @@ {34135D29-7ABF-416E-80A9-4077BD6A126F} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - - - - - - - ICE_USE_OPENSSL;%(PreprocessorDefinitions) - - + - + ICE_USE_OPENSSL;%(PreprocessorDefinitions) @@ -129,23 +73,7 @@ - - - - ICE_USE_OPENSSL;%(PreprocessorDefinitions) - - - - - - - - ICE_USE_OPENSSL;%(PreprocessorDefinitions) - - - - - + ICE_USE_OPENSSL;%(PreprocessorDefinitions) @@ -153,7 +81,7 @@ - + ICE_USE_OPENSSL;%(PreprocessorDefinitions) @@ -161,188 +89,76 @@ - - - - ICE_USE_OPENSSL;%(PreprocessorDefinitions) - - - - - + ICE_USE_OPENSSL;%(PreprocessorDefinitions) - + - + - - - - true - true - true - true - true - true - true - - - true - true - true - true - true - true - true - + + - true - true true true true - true - true - + - true - true - true - true - true - true - true - - - true - true - true - true - true - true - true - - - true - true true true - true true - true - + - true - true true true true - true - true - + - true - true true true true - true - true - + - - true - true - true - true - true - true - true - - - true - true - true - true - true - true - true - - true - true true true true - true - true - + - true - true - true - true - true - true - true - - - true true true - true - true - true - true - - - true - true - true - true - true true - true - + - true - true true true true - true - true - + - true - true true true true - true - true - + - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - + + + + + \ No newline at end of file diff --git a/cpp/test/IceSSL/configuration/msbuild/server/server.vcxproj b/cpp/test/IceSSL/configuration/msbuild/server/server.vcxproj index 8ec1ea129b1..f522d484d55 100644 --- a/cpp/test/IceSSL/configuration/msbuild/server/server.vcxproj +++ b/cpp/test/IceSSL/configuration/msbuild/server/server.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {8A420B3E-C5C5-403B-874A-6D2A5A51783B} - + @@ -47,216 +31,132 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - - + + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - true - true true true true - true - true ..\..\Test.ice - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceSSL/configuration/msbuild/serveropenssl/serveropenssl.vcxproj b/cpp/test/IceSSL/configuration/msbuild/serveropenssl/serveropenssl.vcxproj index 9bbe6b1447d..058bfc39037 100644 --- a/cpp/test/IceSSL/configuration/msbuild/serveropenssl/serveropenssl.vcxproj +++ b/cpp/test/IceSSL/configuration/msbuild/serveropenssl/serveropenssl.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,77 +23,45 @@ {1A83DE5F-3401-4D5D-B9FE-A930D5B15F39} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - - + + + - - - - + - - - - + - - - - + - - - - + @@ -117,31 +69,16 @@ ICE_USE_OPENSSL;%(PreprocessorDefinitions) - + - - - ..\..;%(AdditionalIncludeDirectories) - ICE_USE_OPENSSL;%(PreprocessorDefinitions) - - ..\..;%(AdditionalIncludeDirectories) ICE_USE_OPENSSL;%(PreprocessorDefinitions) - - - - - - ..\..;%(AdditionalIncludeDirectories) - ICE_USE_OPENSSL;%(PreprocessorDefinitions) - - - + @@ -150,16 +87,7 @@ ICE_USE_OPENSSL;%(PreprocessorDefinitions) - - - - - - ..\..;%(AdditionalIncludeDirectories) - ICE_USE_OPENSSL;%(PreprocessorDefinitions) - - - + @@ -168,186 +96,73 @@ ICE_USE_OPENSSL;%(PreprocessorDefinitions) - - - - - - ..\..;%(AdditionalIncludeDirectories) - ICE_USE_OPENSSL;%(PreprocessorDefinitions) - - - + - + - + - - - - true - true - true - true - true - true - true - - - true - true - true - true - true - true - true - + + - true - true true true true - true - true - + - true - true true true true - true - true - - - true - true - true - true - true - true - true - - - true - true - true - true - true - true - true - + - true - true true true true - true - true - + - true - true true true true - true - true - + - - - true - true - true - true - true - true - true - - - true - true - true - true - true - true - true - + - true - true true true true - true - true - + - true - true - true - true - true - true - true - - - true true true - true - true - true - true - - - true - true - true - true - true true - true - + - true - true true true true - true - true - + - true - true true true true - true - true - + - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - + + + \ No newline at end of file diff --git a/cpp/test/IceStorm/federation/msbuild/publisher/publisher.vcxproj b/cpp/test/IceStorm/federation/msbuild/publisher/publisher.vcxproj index bef7151570c..8ee3cabfd0c 100644 --- a/cpp/test/IceStorm/federation/msbuild/publisher/publisher.vcxproj +++ b/cpp/test/IceStorm/federation/msbuild/publisher/publisher.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -37,182 +21,118 @@ - + - + - true - true true true true - true - true ..\..\Event.ice - true - true true true true - true - true ..\..\Event.ice - true - true true true true - true - true ..\..\Event.ice - true - true true true true - true - true ..\..\Event.ice - true - true true true true - true - true ..\..\Event.ice - true - true true true true - true - true ..\..\Event.ice - true - true true true true - true - true ..\..\Event.ice - true - true true true true - true - true ..\..\Event.ice - + {F2FC008C-2972-481A-9E30-2D194E1DBAD7} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceStorm/federation/msbuild/subscriber/subscriber.vcxproj b/cpp/test/IceStorm/federation/msbuild/subscriber/subscriber.vcxproj index 94666bf4d5c..4ab1a6500e7 100644 --- a/cpp/test/IceStorm/federation/msbuild/subscriber/subscriber.vcxproj +++ b/cpp/test/IceStorm/federation/msbuild/subscriber/subscriber.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -37,222 +21,138 @@ - + - + - true - true true true true - true - true ..\..\Event.ice - true - true true true true - true - true ..\..\Event.ice - true - true true true true - true - true ..\..\Event.ice - true - true true true true - true - true ..\..\Event.ice - true - true true true true - true - true ..\..\Event.ice - true - true true true true - true - true ..\..\Event.ice - true - true true true true - true - true ..\..\Event.ice - true - true true true true - true - true ..\..\Event.ice - + {5150E36B-EDF1-410B-A7D7-7B0D75AB92C4} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceStorm/federation2/msbuild/publisher/publisher.vcxproj b/cpp/test/IceStorm/federation2/msbuild/publisher/publisher.vcxproj index 0b3631fad86..2da81e39f7c 100644 --- a/cpp/test/IceStorm/federation2/msbuild/publisher/publisher.vcxproj +++ b/cpp/test/IceStorm/federation2/msbuild/publisher/publisher.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -37,182 +21,118 @@ - + - + - true - true true true true - true - true ..\..\Event.ice - true - true true true true - true - true ..\..\Event.ice - true - true true true true - true - true ..\..\Event.ice - true - true true true true - true - true ..\..\Event.ice - true - true true true true - true - true ..\..\Event.ice - true - true true true true - true - true ..\..\Event.ice - true - true true true true - true - true ..\..\Event.ice - true - true true true true - true - true ..\..\Event.ice - + {FA05E973-3F45-4C5A-8226-BBDAD8F9DE4F} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceStorm/federation2/msbuild/subscriber/subscriber.vcxproj b/cpp/test/IceStorm/federation2/msbuild/subscriber/subscriber.vcxproj index 89209f2d8a3..24a0ef9eab5 100644 --- a/cpp/test/IceStorm/federation2/msbuild/subscriber/subscriber.vcxproj +++ b/cpp/test/IceStorm/federation2/msbuild/subscriber/subscriber.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -37,222 +21,138 @@ - + - + - true - true true true true - true - true ..\..\Event.ice - true - true true true true - true - true ..\..\Event.ice - true - true true true true - true - true ..\..\Event.ice - true - true true true true - true - true ..\..\Event.ice - true - true true true true - true - true ..\..\Event.ice - true - true true true true - true - true ..\..\Event.ice - true - true true true true - true - true ..\..\Event.ice - true - true true true true - true - true ..\..\Event.ice - + {E879E538-6746-4EEE-8D70-0FC80B8A2FAC} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceStorm/persistent/msbuild/client/client.vcxproj b/cpp/test/IceStorm/persistent/msbuild/client/client.vcxproj index ce73fe79e73..e54502bcaca 100644 --- a/cpp/test/IceStorm/persistent/msbuild/client/client.vcxproj +++ b/cpp/test/IceStorm/persistent/msbuild/client/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -37,97 +21,65 @@ - + - + {7D48DD81-247D-467E-B94C-D23EC94BDAB0} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceStorm/rep1/msbuild/publisher/publisher.vcxproj b/cpp/test/IceStorm/rep1/msbuild/publisher/publisher.vcxproj index 632e7cab213..68098fa959a 100644 --- a/cpp/test/IceStorm/rep1/msbuild/publisher/publisher.vcxproj +++ b/cpp/test/IceStorm/rep1/msbuild/publisher/publisher.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -37,182 +21,118 @@ - + - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Single.ice - + - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Single.ice - + {58B8CF53-AC7C-4FE5-ABA1-A356034BFE10} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceStorm/rep1/msbuild/sub/sub.vcxproj b/cpp/test/IceStorm/rep1/msbuild/sub/sub.vcxproj index 4c797576efb..6e4ca59b416 100644 --- a/cpp/test/IceStorm/rep1/msbuild/sub/sub.vcxproj +++ b/cpp/test/IceStorm/rep1/msbuild/sub/sub.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -37,222 +21,138 @@ - + - + - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Single.ice - + {E6690528-7BB9-4B8E-8F15-4F3C58A736B9} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceStorm/rep1/msbuild/subscriber/subscriber.vcxproj b/cpp/test/IceStorm/rep1/msbuild/subscriber/subscriber.vcxproj index 8c122ed97aa..71cf3536ed6 100644 --- a/cpp/test/IceStorm/rep1/msbuild/subscriber/subscriber.vcxproj +++ b/cpp/test/IceStorm/rep1/msbuild/subscriber/subscriber.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -37,222 +21,138 @@ - + - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Single.ice - + - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Single.ice - + {CB22725D-1669-4945-83D3-81CA767F0B56} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceStorm/repgrid/msbuild/client.vcxproj b/cpp/test/IceStorm/repgrid/msbuild/client.vcxproj index d4f572deb6e..8334339e610 100644 --- a/cpp/test/IceStorm/repgrid/msbuild/client.vcxproj +++ b/cpp/test/IceStorm/repgrid/msbuild/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -37,182 +21,118 @@ - + - + - true - true true true true - true - true ..\Single.ice - true - true true true true - true - true ..\Single.ice - true - true true true true - true - true ..\Single.ice - true - true true true true - true - true ..\Single.ice - true - true true true true - true - true ..\Single.ice - true - true true true true - true - true ..\Single.ice - true - true true true true - true - true ..\Single.ice - true - true true true true - true - true ..\Single.ice - + {C988F9AD-ED3C-4796-A7F5-CE7678FD689A} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceStorm/repstress/msbuild/control/control.vcxproj b/cpp/test/IceStorm/repstress/msbuild/control/control.vcxproj index f1bfa94ead6..8d0288d8ae6 100644 --- a/cpp/test/IceStorm/repstress/msbuild/control/control.vcxproj +++ b/cpp/test/IceStorm/repstress/msbuild/control/control.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -37,303 +21,187 @@ - + - true - true true true true - true - true ..\..\Controller.ice - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Controller.ice - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Controller.ice - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Controller.ice - true - true true true true - true - true ..\..\Single.ice - - + + - true - true true true true - true - true ..\..\Controller.ice - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Controller.ice - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Controller.ice - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Controller.ice - true - true true true true - true - true ..\..\Single.ice - + {7C5AB509-3BB9-43F7-B4BA-D8D57BDED7BA} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceStorm/repstress/msbuild/publisher/publisher.vcxproj b/cpp/test/IceStorm/repstress/msbuild/publisher/publisher.vcxproj index c30d99cb960..d748a6030ba 100644 --- a/cpp/test/IceStorm/repstress/msbuild/publisher/publisher.vcxproj +++ b/cpp/test/IceStorm/repstress/msbuild/publisher/publisher.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -37,263 +21,167 @@ - + - true - true true true true - true - true ..\..\Controller.ice - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Controller.ice - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Controller.ice - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Controller.ice - true - true true true true - true - true ..\..\Single.ice - - + + - true - true true true true - true - true ..\..\Controller.ice - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Controller.ice - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Controller.ice - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Controller.ice - true - true true true true - true - true ..\..\Single.ice - + {A6F10BA0-D8BC-4CE6-A6B0-E9C556F4FCC0} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceStorm/repstress/msbuild/subscriber/subscriber.vcxproj b/cpp/test/IceStorm/repstress/msbuild/subscriber/subscriber.vcxproj index c4b00fcfc42..3733e43f726 100644 --- a/cpp/test/IceStorm/repstress/msbuild/subscriber/subscriber.vcxproj +++ b/cpp/test/IceStorm/repstress/msbuild/subscriber/subscriber.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -37,303 +21,187 @@ - + - true - true true true true - true - true ..\..\Controller.ice - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Controller.ice - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Controller.ice - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Controller.ice - true - true true true true - true - true ..\..\Single.ice - - + + - true - true true true true - true - true ..\..\Controller.ice - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Controller.ice - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Controller.ice - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Controller.ice - true - true true true true - true - true ..\..\Single.ice - + {6020F924-5846-452A-B704-BA762AC106DD} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceStorm/single/msbuild/publisher/publisher.vcxproj b/cpp/test/IceStorm/single/msbuild/publisher/publisher.vcxproj index 0916057177e..cdb6317f274 100644 --- a/cpp/test/IceStorm/single/msbuild/publisher/publisher.vcxproj +++ b/cpp/test/IceStorm/single/msbuild/publisher/publisher.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -37,182 +21,118 @@ - + - + - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Single.ice - + {83801760-CFF3-4B11-9CA5-4598C0DBC442} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceStorm/single/msbuild/subscriber/subscriber.vcxproj b/cpp/test/IceStorm/single/msbuild/subscriber/subscriber.vcxproj index 983a8632157..2309b305767 100644 --- a/cpp/test/IceStorm/single/msbuild/subscriber/subscriber.vcxproj +++ b/cpp/test/IceStorm/single/msbuild/subscriber/subscriber.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -37,222 +21,138 @@ - + - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Single.ice - + - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Single.ice - true - true true true true - true - true ..\..\Single.ice - + {7186CBA9-18FE-4868-8A2F-2CF50F66132A} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceStorm/stress/msbuild/publisher/publisher.vcxproj b/cpp/test/IceStorm/stress/msbuild/publisher/publisher.vcxproj index 47536aed117..57b13aa87ce 100644 --- a/cpp/test/IceStorm/stress/msbuild/publisher/publisher.vcxproj +++ b/cpp/test/IceStorm/stress/msbuild/publisher/publisher.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -37,182 +21,118 @@ - + - true - true true true true - true - true ..\..\Event.ice - true - true true true true - true - true ..\..\Event.ice - true - true true true true - true - true ..\..\Event.ice - true - true true true true - true - true ..\..\Event.ice - + - true - true true true true - true - true ..\..\Event.ice - true - true true true true - true - true ..\..\Event.ice - true - true true true true - true - true ..\..\Event.ice - true - true true true true - true - true ..\..\Event.ice - + {1F040862-DAB3-4F65-893D-0023BD2BD0E4} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceStorm/stress/msbuild/subscriber/subscriber.vcxproj b/cpp/test/IceStorm/stress/msbuild/subscriber/subscriber.vcxproj index 2e6906a385e..5284a5b836a 100644 --- a/cpp/test/IceStorm/stress/msbuild/subscriber/subscriber.vcxproj +++ b/cpp/test/IceStorm/stress/msbuild/subscriber/subscriber.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -37,222 +21,138 @@ - + - true - true true true true - true - true ..\..\Event.ice - true - true true true true - true - true ..\..\Event.ice - true - true true true true - true - true ..\..\Event.ice - true - true true true true - true - true ..\..\Event.ice - + - true - true true true true - true - true ..\..\Event.ice - true - true true true true - true - true ..\..\Event.ice - true - true true true true - true - true ..\..\Event.ice - true - true true true true - true - true ..\..\Event.ice - + {529BDB9A-7714-4CC6-A116-189159D8CC4A} - + Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/IceUtil/ctrlCHandler/msbuild/client.vcxproj b/cpp/test/IceUtil/ctrlCHandler/msbuild/client.vcxproj index 0835b752be5..e4c78c3b071 100644 --- a/cpp/test/IceUtil/ctrlCHandler/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/ctrlCHandler/msbuild/client.vcxproj @@ -1,23 +1,7 @@ - - - + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -38,7 +22,7 @@ {74127AED-9D17-4789-8B2F-9CCD660E7204} - + @@ -46,123 +30,71 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + \ No newline at end of file diff --git a/cpp/test/IceUtil/inputUtil/msbuild/client.vcxproj b/cpp/test/IceUtil/inputUtil/msbuild/client.vcxproj index f55d12dd0c1..dfc7ae62aab 100644 --- a/cpp/test/IceUtil/inputUtil/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/inputUtil/msbuild/client.vcxproj @@ -1,23 +1,7 @@ - - - + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -38,7 +22,7 @@ {2D412D9D-49F4-4259-A175-D6BBA1E8DFFD} - + @@ -46,123 +30,71 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + \ No newline at end of file diff --git a/cpp/test/IceUtil/priority/msbuild/client.vcxproj b/cpp/test/IceUtil/priority/msbuild/client.vcxproj index 7d4c4fa8528..40297817b46 100644 --- a/cpp/test/IceUtil/priority/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/priority/msbuild/client.vcxproj @@ -1,23 +1,7 @@ - - - + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -38,7 +22,7 @@ {2C646634-969C-4A25-B9F2-ACE22302A89C} - + @@ -46,135 +30,83 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - + - - - - + - - - - + - - - - + - - - - + - + ..;%(AdditionalIncludeDirectories) - - - ..;%(AdditionalIncludeDirectories) - - ..;%(AdditionalIncludeDirectories) - - - ..;%(AdditionalIncludeDirectories) - - ..;%(AdditionalIncludeDirectories) - - - ..;%(AdditionalIncludeDirectories) - - ..;%(AdditionalIncludeDirectories) - - - ..;%(AdditionalIncludeDirectories) - - - - - - - - + + + + + + - - - - - + + + + + - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + \ No newline at end of file diff --git a/cpp/test/IceUtil/sha1/msbuild/client.vcxproj b/cpp/test/IceUtil/sha1/msbuild/client.vcxproj index 5731258315e..c53a86d0fa8 100644 --- a/cpp/test/IceUtil/sha1/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/sha1/msbuild/client.vcxproj @@ -1,23 +1,7 @@ - - - + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -38,7 +22,7 @@ {15F7115E-5CD1-4CC9-9B8C-9C9357801302} - + @@ -46,123 +30,71 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + \ No newline at end of file diff --git a/cpp/test/IceUtil/stacktrace/msbuild/client.vcxproj b/cpp/test/IceUtil/stacktrace/msbuild/client.vcxproj index a45c321a734..5f2b6f18008 100644 --- a/cpp/test/IceUtil/stacktrace/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/stacktrace/msbuild/client.vcxproj @@ -1,23 +1,7 @@ - - - + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -38,7 +22,7 @@ {66CF01A0-7BE5-482E-8D27-6294E691B084} - + @@ -46,71 +30,39 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - + - - - - + - - - - + - - - - + - - - - + - + ..;%(AdditionalIncludeDirectories) @@ -119,14 +71,6 @@ advapi32.lib;%(AdditionalDependencies) - - - ..;%(AdditionalIncludeDirectories) - - - advapi32.lib;%(AdditionalDependencies) - - ..;%(AdditionalIncludeDirectories) @@ -135,14 +79,6 @@ advapi32.lib;%(AdditionalDependencies) - - - ..;%(AdditionalIncludeDirectories) - - - advapi32.lib;%(AdditionalDependencies) - - ..;%(AdditionalIncludeDirectories) @@ -151,14 +87,6 @@ advapi32.lib;%(AdditionalDependencies) - - - ..;%(AdditionalIncludeDirectories) - - - advapi32.lib;%(AdditionalDependencies) - - ..;%(AdditionalIncludeDirectories) @@ -167,26 +95,18 @@ advapi32.lib;%(AdditionalDependencies) - - - ..;%(AdditionalIncludeDirectories) - - - advapi32.lib;%(AdditionalDependencies) - - - + - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + \ No newline at end of file diff --git a/cpp/test/IceUtil/thread/msbuild/client.vcxproj b/cpp/test/IceUtil/thread/msbuild/client.vcxproj index 882440df8e8..b1949c4fbb4 100644 --- a/cpp/test/IceUtil/thread/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/thread/msbuild/client.vcxproj @@ -1,23 +1,7 @@ - - - + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -38,7 +22,7 @@ {6408610F-33BC-4BAE-B0E0-F366C7B93B88} - + @@ -46,147 +30,95 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - + - - - - + - - - - + - - - - + - - - - + - + ..;%(AdditionalIncludeDirectories) - - - ..;%(AdditionalIncludeDirectories) - - ..;%(AdditionalIncludeDirectories) - - - ..;%(AdditionalIncludeDirectories) - - ..;%(AdditionalIncludeDirectories) - - - ..;%(AdditionalIncludeDirectories) - - ..;%(AdditionalIncludeDirectories) - - - ..;%(AdditionalIncludeDirectories) - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + \ No newline at end of file diff --git a/cpp/test/IceUtil/time/msbuild/client.vcxproj b/cpp/test/IceUtil/time/msbuild/client.vcxproj index 78247af12b0..9460850c890 100644 --- a/cpp/test/IceUtil/time/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/time/msbuild/client.vcxproj @@ -1,23 +1,7 @@ - - - + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -38,7 +22,7 @@ {B1C09F91-405B-448C-84FE-1BB4E29CA620} - + @@ -46,123 +30,71 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + \ No newline at end of file diff --git a/cpp/test/IceUtil/timer/msbuild/client.vcxproj b/cpp/test/IceUtil/timer/msbuild/client.vcxproj index c606b48e912..0ea39b191c9 100644 --- a/cpp/test/IceUtil/timer/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/timer/msbuild/client.vcxproj @@ -1,23 +1,7 @@ - - - + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -38,7 +22,7 @@ {6D50FDCA-D1EB-4C60-9654-BB9FB9EA148B} - + @@ -46,123 +30,71 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + \ No newline at end of file diff --git a/cpp/test/IceUtil/unicode/msbuild/client.vcxproj b/cpp/test/IceUtil/unicode/msbuild/client.vcxproj index ee49b6d40c4..8dacf2793c8 100644 --- a/cpp/test/IceUtil/unicode/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/unicode/msbuild/client.vcxproj @@ -1,23 +1,7 @@ - - - + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -38,7 +22,7 @@ {CFB00773-94A6-411F-A2C1-20BC52772510} - + @@ -46,123 +30,71 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + \ No newline at end of file diff --git a/cpp/test/IceUtil/uuid/msbuild/client.vcxproj b/cpp/test/IceUtil/uuid/msbuild/client.vcxproj index 9775d7dc462..d3fa2237ac2 100644 --- a/cpp/test/IceUtil/uuid/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/uuid/msbuild/client.vcxproj @@ -1,23 +1,7 @@ - - - + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -38,7 +22,7 @@ {03ECBDF1-F8FB-40B0-8CC4-7F26D045B894} - + @@ -46,123 +30,71 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + \ No newline at end of file diff --git a/cpp/test/Slice/escape/msbuild/client.vcxproj b/cpp/test/Slice/escape/msbuild/client.vcxproj index 6cc14849048..752689bbe9c 100644 --- a/cpp/test/Slice/escape/msbuild/client.vcxproj +++ b/cpp/test/Slice/escape/msbuild/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC} - + @@ -47,295 +31,179 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - true - true true true true - true - true ..\Clash.ice - true - true true true true - true - true ..\Key.ice - true - true true true true - true - true ..\Clash.ice - true - true true true true - true - true ..\Key.ice - true - true true true true - true - true ..\Clash.ice - true - true true true true - true - true ..\Key.ice - true - true true true true - true - true ..\Clash.ice - true - true true true true - true - true ..\Key.ice - - + + - true - true true true true - true - true ..\Clash.ice - true - true true true true - true - true ..\Key.ice - true - true true true true - true - true ..\Clash.ice - true - true true true true - true - true ..\Key.ice - true - true true true true - true - true ..\Clash.ice - true - true true true true - true - true ..\Key.ice - true - true true true true - true - true ..\Clash.ice - true - true true true true - true - true ..\Key.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Slice/macros/msbuild/client.vcxproj b/cpp/test/Slice/macros/msbuild/client.vcxproj index 0aabff4dfad..f0f52f93dd1 100644 --- a/cpp/test/Slice/macros/msbuild/client.vcxproj +++ b/cpp/test/Slice/macros/msbuild/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {4FA5930A-77B1-46D8-B1F0-EF3D00C2E0A3} - + @@ -47,214 +31,130 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - + - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Slice/parser/msbuild/client.vcxproj b/cpp/test/Slice/parser/msbuild/client.vcxproj index 21d1e5914e7..10eef1237d5 100644 --- a/cpp/test/Slice/parser/msbuild/client.vcxproj +++ b/cpp/test/Slice/parser/msbuild/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -37,180 +21,116 @@ - - + + - true - true true true true - true - true ..\CircularA.ice - true - true true true true - true - true ..\CircularB.ice - true - true true true true - true - true ..\CircularA.ice - true - true true true true - true - true ..\CircularB.ice - true - true true true true - true - true ..\CircularA.ice - true - true true true true - true - true ..\CircularB.ice - true - true true true true - true - true ..\CircularA.ice - true - true true true true - true - true ..\CircularB.ice - true - true true true true - true - true ..\CircularA.ice - true - true true true true - true - true ..\CircularB.ice - true - true true true true - true - true ..\CircularA.ice - true - true true true true - true - true ..\CircularB.ice - true - true true true true - true - true ..\CircularA.ice - true - true true true true - true - true ..\CircularB.ice - true - true true true true - true - true ..\CircularA.ice - true - true true true true - true - true ..\CircularB.ice - + {BFB8253B-4233-410B-AC03-BBC876DAB68D} - + @@ -218,125 +138,73 @@ true $(DefaultPlatformToolset) - - StaticLibrary - true - $(DefaultPlatformToolset) - StaticLibrary false $(DefaultPlatformToolset) - - StaticLibrary - false - $(DefaultPlatformToolset) - StaticLibrary true $(DefaultPlatformToolset) - - StaticLibrary - true - $(DefaultPlatformToolset) - StaticLibrary false $(DefaultPlatformToolset) - - StaticLibrary - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\;%(IncludeDirectories) - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Slice/structure/msbuild/client.vcxproj b/cpp/test/Slice/structure/msbuild/client.vcxproj index b904970f0a1..41b392be730 100644 --- a/cpp/test/Slice/structure/msbuild/client.vcxproj +++ b/cpp/test/Slice/structure/msbuild/client.vcxproj @@ -1,24 +1,8 @@ - - - - + + + + - - Cpp11-Debug - Win32 - - - Cpp11-Debug - x64 - - - Cpp11-Release - Win32 - - - Cpp11-Release - x64 - Debug Win32 @@ -39,7 +23,7 @@ {24E0F8DA-F197-4E4B-8820-0614713CD8A9} - + @@ -47,294 +31,130 @@ true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - Application true $(DefaultPlatformToolset) - - Application - true - $(DefaultPlatformToolset) - Application false $(DefaultPlatformToolset) - - Application - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - - - true - true - true - true - true - true - true - ..\Test.ice - - - true - true - true - true - true - true - true - ..\Test.ice - + - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true - ..\Test.ice - - - true - true - true - true - true - true - true - ..\Test.ice - - - true - true - true - true - true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - + - - true - true - true - true - true - true - true - ..\Test.ice - - - true - true - true - true - true - true - true - ..\Test.ice - - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true - ..\Test.ice - - - true - true - true - true - true - true - true - ..\Test.ice - - - true - true - true - true - true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/cpp/test/Slice/utf8BOM/msbuild/client.vcxproj b/cpp/test/Slice/utf8BOM/msbuild/client.vcxproj index 5946205044b..90db31f9475 100644 --- a/cpp/test/Slice/utf8BOM/msbuild/client.vcxproj +++ b/cpp/test/Slice/utf8BOM/msbuild/client.vcxproj @@ -1,7 +1,7 @@ - - - - + + + + Debug @@ -23,7 +23,7 @@ {078030B1-68CF-4ABC-A21F-7C867477AEAC} - + @@ -31,213 +31,129 @@ true $(DefaultPlatformToolset) - - StaticLibrary - true - $(DefaultPlatformToolset) - StaticLibrary false $(DefaultPlatformToolset) - - StaticLibrary - false - $(DefaultPlatformToolset) - StaticLibrary true $(DefaultPlatformToolset) - - StaticLibrary - true - $(DefaultPlatformToolset) - StaticLibrary false $(DefaultPlatformToolset) - - StaticLibrary - false - $(DefaultPlatformToolset) - - - + + - - + + - - - - + - - - - + - - - - + - - - - + - + ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - ..\..;%(AdditionalIncludeDirectories) - - - ..\..;%(AdditionalIncludeDirectories) - - - + - + - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - true - true true true true - true - true ..\Test.ice - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file From 1b43f3c111ca773f54a39397facd5791d5f19c19 Mon Sep 17 00:00:00 2001 From: Jose Date: Fri, 2 Feb 2024 13:00:58 +0100 Subject: [PATCH 07/17] Windows build fixes --- cpp/include/Ice/Proxy.h | 2 + cpp/msbuild/ice.cpp.props | 4 +- cpp/msbuild/ice.openssl.test.sln | 32 +------------ cpp/msbuild/ice.proj | 2 +- cpp/msbuild/ice.test.props | 8 +--- cpp/msbuild/ice.test.sln | 4 +- .../Ice/impl/msbuild/server/server.vcxproj | 3 +- .../impl/msbuild/serveramd/serveramd.vcxproj | 3 +- cpp/test/IceDiscovery/simple/Client.cpp | 1 + .../clientopenssl.vcxproj.filters | 48 ------------------- .../serveropenssl.vcxproj.filters | 48 ------------------- 11 files changed, 14 insertions(+), 141 deletions(-) diff --git a/cpp/include/Ice/Proxy.h b/cpp/include/Ice/Proxy.h index 6b6cb25ca96..624c16cea2f 100644 --- a/cpp/include/Ice/Proxy.h +++ b/cpp/include/Ice/Proxy.h @@ -1581,3 +1581,5 @@ checkedCast(const ::std::shared_ptr& b, const std::string& f, const ::Ice::Co } } + +#endif diff --git a/cpp/msbuild/ice.cpp.props b/cpp/msbuild/ice.cpp.props index 2f83327deb4..01849266da8 100644 --- a/cpp/msbuild/ice.cpp.props +++ b/cpp/msbuild/ice.cpp.props @@ -3,7 +3,7 @@ cpp - yes + yes - + diff --git a/cpp/msbuild/ice.test.props b/cpp/msbuild/ice.test.props index f856d524e36..29645f2b4fe 100644 --- a/cpp/msbuild/ice.test.props +++ b/cpp/msbuild/ice.test.props @@ -3,16 +3,12 @@ 38a0 - + no - + cpp11 - - cpp98 - -