Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove f ice #1686

Merged
merged 7 commits into from
Jan 18, 2024
Merged

Remove f ice #1686

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
06db776
Remove remaining F.ice files
bernardnormier Jan 17, 2024
c13e726
Update Windows build
bernardnormier Jan 17, 2024
2585899
Fix gcc build failure
bernardnormier Jan 18, 2024
a096c90
Merge remote-tracking branch 'bernardnormier/remove-f-ice' into remov…
bernardnormier Jan 18, 2024
c5f98be
Merge remote-tracking branch 'origin/main' into remove-f-ice
bernardnormier Jan 18, 2024
67cd09e
Fix merge conflict
bernardnormier Jan 18, 2024
dfac933
Additional gcc build fix
bernardnormier Jan 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 73 additions & 0 deletions cpp/include/Ice/LocatorF.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//

#ifndef ICE_LOCATOR_F_H
#define ICE_LOCATOR_F_H

#include "Config.h"
#include <memory>
#include "ProxyF.h"
#include "SharedPtr.h"

#ifdef ICE_CPP11_MAPPING // C++11 mapping

namespace Ice
{

class Locator;
class LocatorPrx;
class LocatorRegistry;
class LocatorRegistryPrx;

using LocatorPtr = ::std::shared_ptr<Locator>;
using LocatorPrxPtr = ::std::shared_ptr<LocatorPrx>;

using LocatorRegistryPtr = ::std::shared_ptr<LocatorRegistry>;
using LocatorRegistryPrxPtr = ::std::shared_ptr<LocatorRegistryPrx>;

}

#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

#endif
56 changes: 56 additions & 0 deletions cpp/include/Ice/RouterF.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//

#ifndef ICE_ROUTER_F_H
#define ICE_ROUTER_F_H

#include "Config.h"
#include <memory>
#include "ProxyF.h"
#include "SharedPtr.h"

#ifdef ICE_CPP11_MAPPING // C++11 mapping

namespace Ice
{

class Router;
class RouterPrx;

using RouterPtr = ::std::shared_ptr<Router>;
using RouterPrxPtr = ::std::shared_ptr<RouterPrx>;

}

#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

#endif
98 changes: 0 additions & 98 deletions cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj
View file
Open in desktop

Large diffs are not rendered by default.

54 changes: 0 additions & 54 deletions cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,6 @@
<ClCompile Include="Win32\Debug\Locator.cpp">
<Filter>Source Files\Win32\Debug</Filter>
</ClCompile>
<ClCompile Include="Win32\Debug\LocatorF.cpp">
<Filter>Source Files\Win32\Debug</Filter>
</ClCompile>
<ClCompile Include="Win32\Debug\Metrics.cpp">
<Filter>Source Files\Win32\Debug</Filter>
</ClCompile>
Expand All @@ -120,9 +117,6 @@
<ClCompile Include="Win32\Debug\Router.cpp">
<Filter>Source Files\Win32\Debug</Filter>
</ClCompile>
<ClCompile Include="Win32\Debug\RouterF.cpp">
<Filter>Source Files\Win32\Debug</Filter>
</ClCompile>
<ClCompile Include="Win32\Debug\Version.cpp">
<Filter>Source Files\Win32\Debug</Filter>
</ClCompile>
Expand All @@ -138,9 +132,6 @@
<ClCompile Include="x64\Debug\Locator.cpp">
<Filter>Source Files\x64\Debug</Filter>
</ClCompile>
<ClCompile Include="x64\Debug\LocatorF.cpp">
<Filter>Source Files\x64\Debug</Filter>
</ClCompile>
<ClCompile Include="x64\Debug\Metrics.cpp">
<Filter>Source Files\x64\Debug</Filter>
</ClCompile>
Expand All @@ -156,9 +147,6 @@
<ClCompile Include="x64\Debug\Router.cpp">
<Filter>Source Files\x64\Debug</Filter>
</ClCompile>
<ClCompile Include="x64\Debug\RouterF.cpp">
<Filter>Source Files\x64\Debug</Filter>
</ClCompile>
<ClCompile Include="x64\Debug\Version.cpp">
<Filter>Source Files\x64\Debug</Filter>
</ClCompile>
Expand All @@ -174,9 +162,6 @@
<ClCompile Include="Win32\Release\Locator.cpp">
<Filter>Source Files\Win32\Release</Filter>
</ClCompile>
<ClCompile Include="Win32\Release\LocatorF.cpp">
<Filter>Source Files\Win32\Release</Filter>
</ClCompile>
<ClCompile Include="Win32\Release\Metrics.cpp">
<Filter>Source Files\Win32\Release</Filter>
</ClCompile>
Expand All @@ -192,9 +177,6 @@
<ClCompile Include="Win32\Release\Router.cpp">
<Filter>Source Files\Win32\Release</Filter>
</ClCompile>
<ClCompile Include="Win32\Release\RouterF.cpp">
<Filter>Source Files\Win32\Release</Filter>
</ClCompile>
<ClCompile Include="Win32\Release\Version.cpp">
<Filter>Source Files\Win32\Release</Filter>
</ClCompile>
Expand All @@ -210,9 +192,6 @@
<ClCompile Include="x64\Release\Locator.cpp">
<Filter>Source Files\x64\Release</Filter>
</ClCompile>
<ClCompile Include="x64\Release\LocatorF.cpp">
<Filter>Source Files\x64\Release</Filter>
</ClCompile>
<ClCompile Include="x64\Release\Metrics.cpp">
<Filter>Source Files\x64\Release</Filter>
</ClCompile>
Expand All @@ -228,9 +207,6 @@
<ClCompile Include="x64\Release\Router.cpp">
<Filter>Source Files\x64\Release</Filter>
</ClCompile>
<ClCompile Include="x64\Release\RouterF.cpp">
<Filter>Source Files\x64\Release</Filter>
</ClCompile>
<ClCompile Include="x64\Release\Version.cpp">
<Filter>Source Files\x64\Release</Filter>
</ClCompile>
Expand Down Expand Up @@ -706,9 +682,6 @@
<ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\Locator.h">
<Filter>Header Files\Win32\Debug</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\LocatorF.h">
<Filter>Header Files\Win32\Debug</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\Metrics.h">
<Filter>Header Files\Win32\Debug</Filter>
</ClInclude>
Expand All @@ -724,9 +697,6 @@
<ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\Router.h">
<Filter>Header Files\Win32\Debug</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\RouterF.h">
<Filter>Header Files\Win32\Debug</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\Version.h">
<Filter>Header Files\Win32\Debug</Filter>
</ClInclude>
Expand All @@ -742,9 +712,6 @@
<ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\Locator.h">
<Filter>Header Files\x64\Debug</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\LocatorF.h">
<Filter>Header Files\x64\Debug</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\Metrics.h">
<Filter>Header Files\x64\Debug</Filter>
</ClInclude>
Expand All @@ -760,9 +727,6 @@
<ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\Router.h">
<Filter>Header Files\x64\Debug</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\RouterF.h">
<Filter>Header Files\x64\Debug</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\Version.h">
<Filter>Header Files\x64\Debug</Filter>
</ClInclude>
Expand All @@ -778,9 +742,6 @@
<ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\Locator.h">
<Filter>Header Files\Win32\Release</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\LocatorF.h">
<Filter>Header Files\Win32\Release</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\Metrics.h">
<Filter>Header Files\Win32\Release</Filter>
</ClInclude>
Expand All @@ -796,9 +757,6 @@
<ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\Router.h">
<Filter>Header Files\Win32\Release</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\RouterF.h">
<Filter>Header Files\Win32\Release</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\Version.h">
<Filter>Header Files\Win32\Release</Filter>
</ClInclude>
Expand All @@ -814,9 +772,6 @@
<ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\Locator.h">
<Filter>Header Files\x64\Release</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\LocatorF.h">
<Filter>Header Files\x64\Release</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\Metrics.h">
<Filter>Header Files\x64\Release</Filter>
</ClInclude>
Expand All @@ -832,9 +787,6 @@
<ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\Router.h">
<Filter>Header Files\x64\Release</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\RouterF.h">
<Filter>Header Files\x64\Release</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\Version.h">
<Filter>Header Files\x64\Release</Filter>
</ClInclude>
Expand Down Expand Up @@ -891,9 +843,6 @@
<SliceCompile Include="..\..\..\..\..\slice\Ice\Locator.ice">
<Filter>Slice Files</Filter>
</SliceCompile>
<SliceCompile Include="..\..\..\..\..\slice\Ice\LocatorF.ice">
<Filter>Slice Files</Filter>
</SliceCompile>
<SliceCompile Include="..\..\..\..\..\slice\Ice\Metrics.ice">
<Filter>Slice Files</Filter>
</SliceCompile>
Expand All @@ -909,9 +858,6 @@
<SliceCompile Include="..\..\..\..\..\slice\Ice\Router.ice">
<Filter>Slice Files</Filter>
</SliceCompile>
<SliceCompile Include="..\..\..\..\..\slice\Ice\RouterF.ice">
<Filter>Slice Files</Filter>
</SliceCompile>
<SliceCompile Include="..\..\..\..\..\slice\Ice\Version.ice">
<Filter>Slice Files</Filter>
</SliceCompile>
Expand Down
Loading
Loading