Skip to content

Commit

Permalink
HEAD:(zeroc-ice/ice@e96cce86b6) Cleanup slice2cpp metadata (zeroc-ice…
Browse files Browse the repository at this point in the history 
…/ice#1867)

- Remove cpp::comparable, cpp::scoped, cpp::class, cpp:range.
- Remove cpp11:: and cpp98:: top level metadata and issue a warning.
  • Loading branch information
@externl
externl authored and temp committed Feb 27, 2024
1 parent 5a2ca97 commit 5fd2044
Show file tree
Hide file tree
Showing 1,816 changed files with 2,591 additions and 14,753 deletions.
2 changes: 1 addition & 1 deletion DIAGNOSTICS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
Slice module `::Inner' should be map to Swift module `Test'
/Users/austin/Code/zeroc/ice/php/test/Ice/operations/Test.ice:329: invalid module mapping:
Slice module `::Test2' should be map to Swift module `Test'
/Users/austin/Code/zeroc/ice/cpp/test/Ice/stream/Test.ice:132: invalid module mapping:
/Users/austin/Code/zeroc/ice/cpp/test/Ice/stream/Test.ice:127: invalid module mapping:
Slice module `::Test2' should be map to Swift module `Test'
/Users/austin/Code/zeroc/ice/cpp/test/Ice/scope/Test.ice:147: invalid module mapping:
Slice module `::Inner' should be map to Swift module `Test'
Expand Down
625 changes: 29 additions & 596 deletions slice2cpp/cpp/test/Ice/custom/Test.cpp
View file

Large diffs are not rendered by default.

230 changes: 0 additions & 230 deletions slice2cpp/cpp/test/Ice/custom/Test.h
View file

Large diffs are not rendered by default.

578 changes: 28 additions & 550 deletions slice2cpp/cpp/test/Ice/custom/TestAMD.cpp
View file

Large diffs are not rendered by default.

210 changes: 0 additions & 210 deletions slice2cpp/cpp/test/Ice/custom/TestAMD.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,12 +143,6 @@ using DPrxListSeq = ::std::vector<DPrxList>;
using DPrxSeqList = std::list< ::Test::DPrxSeq>;

using DoubleSeq = ::std::vector<double>;
struct ClassOtherStruct;

using ClassOtherStructSeq = ::std::vector<ClassOtherStruct>;
struct ClassStruct;

using ClassStructSeq = ::std::vector<ClassStruct>;

using IntStringDict = Test::CustomMap<std::int32_t, std::string>;

Expand Down Expand Up @@ -298,81 +292,6 @@ class TestIntfPrx : public ::Ice::Proxy<TestIntfPrx, ::Ice::ObjectPrx>
void _iceI_opVariableArray(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<VariableList, VariableList>>>&, const ::std::pair<const Variable*, const Variable*>&, const ::Ice::Context&) const;
/// \endcond

BoolSeq opBoolRange(const BoolSeq& inSeq, BoolSeq& outSeq, const ::Ice::Context& context = ::Ice::noExplicitContext) const;

::std::future<::std::tuple<BoolSeq, BoolSeq>> opBoolRangeAsync(const BoolSeq& inSeq, const ::Ice::Context& context = ::Ice::noExplicitContext) const;

::std::function<void()>
opBoolRangeAsync(const BoolSeq& inSeq,
::std::function<void(::Test::BoolSeq, ::Test::BoolSeq)> response,
::std::function<void(::std::exception_ptr)> ex = nullptr,
::std::function<void(bool)> sent = nullptr,
const ::Ice::Context& context = ::Ice::noExplicitContext) const;

/// \cond INTERNAL
void _iceI_opBoolRange(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<BoolSeq, BoolSeq>>>&, const BoolSeq&, const ::Ice::Context&) const;
/// \endcond

ByteList opByteRange(const ByteList& inSeq, ByteList& outSeq, const ::Ice::Context& context = ::Ice::noExplicitContext) const;

::std::future<::std::tuple<ByteList, ByteList>> opByteRangeAsync(const ByteList& inSeq, const ::Ice::Context& context = ::Ice::noExplicitContext) const;

::std::function<void()>
opByteRangeAsync(const ByteList& inSeq,
::std::function<void(::Test::ByteList, ::Test::ByteList)> response,
::std::function<void(::std::exception_ptr)> ex = nullptr,
::std::function<void(bool)> sent = nullptr,
const ::Ice::Context& context = ::Ice::noExplicitContext) const;

/// \cond INTERNAL
void _iceI_opByteRange(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<ByteList, ByteList>>>&, const ByteList&, const ::Ice::Context&) const;
/// \endcond

VariableList opVariableRange(const VariableList& inSeq, VariableList& outSeq, const ::Ice::Context& context = ::Ice::noExplicitContext) const;

::std::future<::std::tuple<VariableList, VariableList>> opVariableRangeAsync(const VariableList& inSeq, const ::Ice::Context& context = ::Ice::noExplicitContext) const;

::std::function<void()>
opVariableRangeAsync(const VariableList& inSeq,
::std::function<void(::Test::VariableList, ::Test::VariableList)> response,
::std::function<void(::std::exception_ptr)> ex = nullptr,
::std::function<void(bool)> sent = nullptr,
const ::Ice::Context& context = ::Ice::noExplicitContext) const;

/// \cond INTERNAL
void _iceI_opVariableRange(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<VariableList, VariableList>>>&, const VariableList&, const ::Ice::Context&) const;
/// \endcond

ByteList opByteRangeType(const ByteList& inSeq, ByteList& outSeq, const ::Ice::Context& context = ::Ice::noExplicitContext) const;

::std::future<::std::tuple<ByteList, ByteList>> opByteRangeTypeAsync(const ByteList& inSeq, const ::Ice::Context& context = ::Ice::noExplicitContext) const;

::std::function<void()>
opByteRangeTypeAsync(const ByteList& inSeq,
::std::function<void(::Test::ByteList, ::Test::ByteList)> response,
::std::function<void(::std::exception_ptr)> ex = nullptr,
::std::function<void(bool)> sent = nullptr,
const ::Ice::Context& context = ::Ice::noExplicitContext) const;

/// \cond INTERNAL
void _iceI_opByteRangeType(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<ByteList, ByteList>>>&, const ByteList&, const ::Ice::Context&) const;
/// \endcond

VariableList opVariableRangeType(const VariableList& inSeq, VariableList& outSeq, const ::Ice::Context& context = ::Ice::noExplicitContext) const;

::std::future<::std::tuple<VariableList, VariableList>> opVariableRangeTypeAsync(const VariableList& inSeq, const ::Ice::Context& context = ::Ice::noExplicitContext) const;

::std::function<void()>
opVariableRangeTypeAsync(const VariableList& inSeq,
::std::function<void(::Test::VariableList, ::Test::VariableList)> response,
::std::function<void(::std::exception_ptr)> ex = nullptr,
::std::function<void(bool)> sent = nullptr,
const ::Ice::Context& context = ::Ice::noExplicitContext) const;

/// \cond INTERNAL
void _iceI_opVariableRangeType(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<VariableList, VariableList>>>&, const VariableList&, const ::Ice::Context&) const;
/// \endcond

std::deque<bool> opBoolSeq(const std::deque<bool>& inSeq, std::deque<bool>& outSeq, const ::Ice::Context& context = ::Ice::noExplicitContext) const;

::std::future<::std::tuple<std::deque<bool>, std::deque<bool>>> opBoolSeqAsync(const std::deque<bool>& inSeq, const ::Ice::Context& context = ::Ice::noExplicitContext) const;
Expand Down Expand Up @@ -658,21 +577,6 @@ class TestIntfPrx : public ::Ice::Proxy<TestIntfPrx, ::Ice::ObjectPrx>
void _iceI_opCList(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<CList, CList>>>&, const CList&, const ::Ice::Context&) const;
/// \endcond

ClassStruct opClassStruct(const ClassStruct& inS, const ClassStructSeq& inSeq, ClassStruct& outS, ClassStructSeq& outSeq, const ::Ice::Context& context = ::Ice::noExplicitContext) const;

::std::future<::std::tuple<ClassStruct, ClassStruct, ClassStructSeq>> opClassStructAsync(const ClassStruct& inS, const ClassStructSeq& inSeq, const ::Ice::Context& context = ::Ice::noExplicitContext) const;

::std::function<void()>
opClassStructAsync(const ClassStruct& inS, const ClassStructSeq& inSeq,
::std::function<void(::Test::ClassStruct, ::Test::ClassStruct, ::Test::ClassStructSeq)> response,
::std::function<void(::std::exception_ptr)> ex = nullptr,
::std::function<void(bool)> sent = nullptr,
const ::Ice::Context& context = ::Ice::noExplicitContext) const;

/// \cond INTERNAL
void _iceI_opClassStruct(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<ClassStruct, ClassStruct, ClassStructSeq>>>&, const ClassStruct&, const ClassStructSeq&, const ::Ice::Context&) const;
/// \endcond

void opOutArrayByteSeq(const ByteSeq& org, ByteSeq& copy, const ::Ice::Context& context = ::Ice::noExplicitContext) const;

::std::future<ByteSeq> opOutArrayByteSeqAsync(const ByteSeq& org, const ::Ice::Context& context = ::Ice::noExplicitContext) const;
Expand All @@ -688,21 +592,6 @@ class TestIntfPrx : public ::Ice::Proxy<TestIntfPrx, ::Ice::ObjectPrx>
void _iceI_opOutArrayByteSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<ByteSeq>>&, const ByteSeq&, const ::Ice::Context&) const;
/// \endcond

void opOutRangeByteSeq(const ByteSeq& org, ByteSeq& copy, const ::Ice::Context& context = ::Ice::noExplicitContext) const;

::std::future<ByteSeq> opOutRangeByteSeqAsync(const ByteSeq& org, const ::Ice::Context& context = ::Ice::noExplicitContext) const;

::std::function<void()>
opOutRangeByteSeqAsync(const ByteSeq& org,
::std::function<void(::Test::ByteSeq)> response,
::std::function<void(::std::exception_ptr)> ex = nullptr,
::std::function<void(bool)> sent = nullptr,
const ::Ice::Context& context = ::Ice::noExplicitContext) const;

/// \cond INTERNAL
void _iceI_opOutRangeByteSeq(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<ByteSeq>>&, const ByteSeq&, const ::Ice::Context&) const;
/// \endcond

IntStringDict opIntStringDict(const IntStringDict& idict, IntStringDict& odict, const ::Ice::Context& context = ::Ice::noExplicitContext) const;

::std::future<::std::tuple<IntStringDict, IntStringDict>> opIntStringDictAsync(const IntStringDict& idict, const ::Ice::Context& context = ::Ice::noExplicitContext) const;
Expand Down Expand Up @@ -908,36 +797,6 @@ class C : public ::Ice::ValueHelper<C, ::Ice::Value>
static C _iceS_C_init;
/// \endcond

struct ClassOtherStruct
{
::std::int32_t x;

/**
* Obtains a tuple containing all of the struct's data members.
* @return The data members in a tuple.
*/
std::tuple<const ::std::int32_t&> ice_tuple() const
{
return std::tie(x);
}
};

struct ClassStruct
{
::Test::ClassOtherStructSeq otherSeq;
::Test::ClassOtherStruct other;
::std::int32_t y;

/**
* Obtains a tuple containing all of the struct's data members.
* @return The data members in a tuple.
*/
std::tuple<const ::Test::ClassOtherStructSeq&, const ::Test::ClassOtherStruct&, const ::std::int32_t&> ice_tuple() const
{
return std::tie(otherSeq, other, y);
}
};

class DictClass : public ::Ice::ValueHelper<DictClass, ::Ice::Value>
{
public:
Expand Down Expand Up @@ -1084,31 +943,6 @@ class TestIntf : public virtual ::Ice::Object
bool _iceD_opVariableArray(::IceInternal::Incoming&, const ::Ice::Current&);
/// \endcond

virtual void opBoolRangeAsync(BoolSeq inSeq, ::std::function<void(const BoolSeq& returnValue, const BoolSeq& outSeq)> response, ::std::function<void(::std::exception_ptr)> exception, const ::Ice::Current& current) = 0;
/// \cond INTERNAL
bool _iceD_opBoolRange(::IceInternal::Incoming&, const ::Ice::Current&);
/// \endcond

virtual void opByteRangeAsync(ByteList inSeq, ::std::function<void(const ByteList& returnValue, const ByteList& outSeq)> response, ::std::function<void(::std::exception_ptr)> exception, const ::Ice::Current& current) = 0;
/// \cond INTERNAL
bool _iceD_opByteRange(::IceInternal::Incoming&, const ::Ice::Current&);
/// \endcond

virtual void opVariableRangeAsync(VariableList inSeq, ::std::function<void(const VariableList& returnValue, const VariableList& outSeq)> response, ::std::function<void(::std::exception_ptr)> exception, const ::Ice::Current& current) = 0;
/// \cond INTERNAL
bool _iceD_opVariableRange(::IceInternal::Incoming&, const ::Ice::Current&);
/// \endcond

virtual void opByteRangeTypeAsync(ByteList inSeq, ::std::function<void(const ByteList& returnValue, const ByteList& outSeq)> response, ::std::function<void(::std::exception_ptr)> exception, const ::Ice::Current& current) = 0;
/// \cond INTERNAL
bool _iceD_opByteRangeType(::IceInternal::Incoming&, const ::Ice::Current&);
/// \endcond

virtual void opVariableRangeTypeAsync(VariableList inSeq, ::std::function<void(const VariableList& returnValue, const VariableList& outSeq)> response, ::std::function<void(::std::exception_ptr)> exception, const ::Ice::Current& current) = 0;
/// \cond INTERNAL
bool _iceD_opVariableRangeType(::IceInternal::Incoming&, const ::Ice::Current&);
/// \endcond

virtual void opBoolSeqAsync(std::deque<bool> inSeq, ::std::function<void(const std::deque<bool>& returnValue, const std::deque<bool>& outSeq)> response, ::std::function<void(::std::exception_ptr)> exception, const ::Ice::Current& current) = 0;
/// \cond INTERNAL
bool _iceD_opBoolSeq(::IceInternal::Incoming&, const ::Ice::Current&);
Expand Down Expand Up @@ -1204,21 +1038,11 @@ class TestIntf : public virtual ::Ice::Object
bool _iceD_opCList(::IceInternal::Incoming&, const ::Ice::Current&);
/// \endcond

virtual void opClassStructAsync(ClassStruct inS, ClassStructSeq inSeq, ::std::function<void(const ClassStruct& returnValue, const ClassStruct& outS, const ClassStructSeq& outSeq)> response, ::std::function<void(::std::exception_ptr)> exception, const ::Ice::Current& current) = 0;
/// \cond INTERNAL
bool _iceD_opClassStruct(::IceInternal::Incoming&, const ::Ice::Current&);
/// \endcond

virtual void opOutArrayByteSeqAsync(ByteSeq org, ::std::function<void(const ::std::pair<const ::std::uint8_t*, const ::std::uint8_t*>& copy)> response, ::std::function<void(::std::exception_ptr)> exception, const ::Ice::Current& current) = 0;
/// \cond INTERNAL
bool _iceD_opOutArrayByteSeq(::IceInternal::Incoming&, const ::Ice::Current&);
/// \endcond

virtual void opOutRangeByteSeqAsync(ByteSeq org, ::std::function<void(const ByteSeq& copy)> response, ::std::function<void(::std::exception_ptr)> exception, const ::Ice::Current& current) = 0;
/// \cond INTERNAL
bool _iceD_opOutRangeByteSeq(::IceInternal::Incoming&, const ::Ice::Current&);
/// \endcond

virtual void opIntStringDictAsync(IntStringDict idict, ::std::function<void(const IntStringDict& returnValue, const IntStringDict& odict)> response, ::std::function<void(::std::exception_ptr)> exception, const ::Ice::Current& current) = 0;
/// \cond INTERNAL
bool _iceD_opIntStringDict(::IceInternal::Incoming&, const ::Ice::Current&);
Expand Down Expand Up @@ -1306,40 +1130,6 @@ struct StreamableTraits< ::Test::E>
static const bool fixedLength = false;
};

template<>
struct StreamableTraits<::Test::ClassOtherStruct>
{
static const StreamHelperCategory helper = StreamHelperCategoryStruct;
static const int minWireSize = 4;
static const bool fixedLength = true;
};

template<typename S>
struct StreamReader<::Test::ClassOtherStruct, S>
{
static void read(S* istr, ::Test::ClassOtherStruct& v)
{
istr->readAll(v.x);
}
};

template<>
struct StreamableTraits<::Test::ClassStruct>
{
static const StreamHelperCategory helper = StreamHelperCategoryStruct;
static const int minWireSize = 9;
static const bool fixedLength = false;
};

template<typename S>
struct StreamReader<::Test::ClassStruct, S>
{
static void read(S* istr, ::Test::ClassStruct& v)
{
istr->readAll(v.otherSeq, v.other, v.y);
}
};

template<typename S>
struct StreamReader<::Test::DictClass, S>
{
Expand Down
51 changes: 6 additions & 45 deletions slice2cpp/cpp/test/Ice/optional/Test.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ enum class MyEnum : unsigned char
struct SmallStruct;
struct FixedStruct;
struct VarStruct;
struct ClassVarStruct;

using ByteSeq = ::std::vector<::std::uint8_t>;

Expand Down Expand Up @@ -1136,20 +1135,6 @@ struct VarStruct
}
};

struct ClassVarStruct
{
::std::int32_t a;

/**
* Obtains a tuple containing all of the struct's data members.
* @return The data members in a tuple.
*/
std::tuple<const ::std::int32_t&> ice_tuple() const
{
return std::tie(a);
}
};

class MultiOptional : public ::Ice::ValueHelper<MultiOptional, ::Ice::Value>
{
public:
Expand Down Expand Up @@ -1580,20 +1565,19 @@ class OptionalWithCustom : public ::Ice::ValueHelper<OptionalWithCustom, ::Ice::
/**
* One-shot constructor to initialize all data members.
*/
OptionalWithCustom(const ::std::optional<::Test::SmallStructList>& l, const ::std::optional<::Test::SmallStructList>& lp, const ::std::optional<::Test::ClassVarStruct>& s) :
OptionalWithCustom(const ::std::optional<::Test::SmallStructList>& l, const ::std::optional<::Test::SmallStructList>& lp) :
l(l),
lp(lp),
s(s)
lp(lp)
{
}

/**
* Obtains a tuple containing all of the value's data members.
* @return The data members in a tuple.
*/
std::tuple<const ::std::optional<::Test::SmallStructList>&, const ::std::optional<::Test::SmallStructList>&, const ::std::optional<::Test::ClassVarStruct>&> ice_tuple() const
std::tuple<const ::std::optional<::Test::SmallStructList>&, const ::std::optional<::Test::SmallStructList>&> ice_tuple() const
{
return std::tie(l, lp, s);
return std::tie(l, lp);
}

/**
Expand All @@ -1608,12 +1592,6 @@ class OptionalWithCustom : public ::Ice::ValueHelper<OptionalWithCustom, ::Ice::

::std::optional<::Test::SmallStructList> lp;

public:

::std::optional<::Test::ClassVarStruct> s;

protected:

template<typename T, typename S>
friend struct Ice::StreamWriter;
template<typename T, typename S>
Expand Down Expand Up @@ -2411,23 +2389,6 @@ struct StreamReader<::Test::VarStruct, S>
}
};

template<>
struct StreamableTraits<::Test::ClassVarStruct>
{
static const StreamHelperCategory helper = StreamHelperCategoryStruct;
static const int minWireSize = 4;
static const bool fixedLength = true;
};

template<typename S>
struct StreamReader<::Test::ClassVarStruct, S>
{
static void read(S* istr, ::Test::ClassVarStruct& v)
{
istr->readAll(v.a);
}
};

template<typename S>
struct StreamWriter<::Test::MultiOptional, S>
{
Expand Down Expand Up @@ -2587,7 +2548,7 @@ struct StreamWriter<::Test::OptionalWithCustom, S>
{
static void write(S* ostr, const ::Test::OptionalWithCustom& v)
{
ostr->writeAll({1, 2, 3}, v.l, v.lp, v.s);
ostr->writeAll({1, 2}, v.l, v.lp);
}
};

Expand All @@ -2596,7 +2557,7 @@ struct StreamReader<::Test::OptionalWithCustom, S>
{
static void read(S* istr, ::Test::OptionalWithCustom& v)
{
istr->readAll({1, 2, 3}, v.l, v.lp, v.s);
istr->readAll({1, 2}, v.l, v.lp);
}
};

Expand Down
Loading

0 comments on commit 5fd2044

Please sign in to comment.