Skip to content
Snippets Groups Projects
Commit 1b203568 authored by Rainer Kartmann's avatar Rainer Kartmann
Browse files

Update usage of deprecated functions

parent c6f9cbe2
No related branches found
No related tags found
No related merge requests found
#include "Query.h"
#include <ArmarXCore/core/ice_conversions.h>
#include <RobotAPI/libraries/armem/core/wm/ice_conversions.h>
#include <RobotAPI/libraries/armem/core/ice_conversions_templates.h>
namespace armarx::armem::client
{
using armarx::fromIce;
using armarx::toIce;
QueryInput QueryInput::fromIce(const armem::query::data::Input& ice)
{
return armem::fromIce<QueryInput>(ice);
return armarx::fromIce<QueryInput>(ice);
}
armem::query::data::Input QueryInput::toIce() const
{
return armem::toIce<armem::query::data::Input>(*this);
return armarx::toIce<armem::query::data::Input>(*this);
}
QueryResult QueryResult::fromIce(const armem::query::data::Result& ice)
{
return armem::fromIce<QueryResult>(ice);
return armarx::fromIce<QueryResult>(ice);
}
armem::query::data::Result QueryResult::toIce() const
{
return armem::toIce<armem::query::data::Result>(*this);
return armarx::toIce<armem::query::data::Result>(*this);
}
std::ostream& operator<<(std::ostream& os, const QueryResult& rhs)
......@@ -41,7 +47,7 @@ namespace armarx::armem
void client::toIce(armem::query::data::Input& ice, const QueryInput& input)
{
ice.memoryQueries = input.memoryQueries;
ice.withData = (input.dataMode == DataMode::WithData);
toIce(ice.withData, (input.dataMode == DataMode::WithData));
}
void client::fromIce(const armem::query::data::Input& ice, QueryInput& input)
......@@ -53,13 +59,13 @@ namespace armarx::armem
void client::toIce(armem::query::data::Result& ice, const QueryResult& result)
{
toIce(ice, dynamic_cast<const detail::SuccessHeader&>(result));
armarx::armem::toIce(ice.memory, result.memory);
toIce(ice.memory, result.memory);
}
void client::fromIce(const armem::query::data::Result& ice, QueryResult& result)
{
fromIce(ice, dynamic_cast<detail::SuccessHeader&>(result));
armarx::armem::fromIce(ice.memory, result.memory);
fromIce(ice.memory, result.memory);
}
}
#include "selectors.h"
#include <ArmarXCore/core/ice_conversions.h>
#include <ArmarXCore/core/time/ice_conversions.h>
#include <RobotAPI/libraries/armem/core/ice_conversions.h>
......@@ -74,6 +75,8 @@ namespace armarx::armem::client::query
SnapshotSelector& SnapshotSelector::beforeTime(Time timestamp, long maxEntries)
{
using armarx::toIce;
auto& q = _addQuery<dq::entity::BeforeTime>();
toIce(q.timestamp, timestamp);
toIce(q.maxEntries, maxEntries);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment