Skip to content

Commit

Permalink
revert deprecation notices for the time being
Browse files Browse the repository at this point in the history
  • Loading branch information
teh-cmc committed Jan 28, 2025
1 parent b309c72 commit 637f059
Showing 1 changed file with 6 additions and 12 deletions.
18 changes: 6 additions & 12 deletions rerun_cpp/src/rerun/component_batch.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,7 @@ namespace rerun {
///
/// Automatically registers the component type the first time this type is encountered.
template <typename T>
[[deprecated("Use from_loggable(components, descriptor) (with explicit descriptor) instead"
)]] static Result<ComponentBatch>
from_loggable(const rerun::Collection<T>& components) {
static Result<ComponentBatch> from_loggable(const rerun::Collection<T>& components) {
return from_loggable(components, Loggable<T>::Descriptor);
}

Expand Down Expand Up @@ -95,9 +93,7 @@ namespace rerun {
///
/// Automatically registers the component type the first time this type is encountered.
template <typename T>
[[deprecated("Use from_loggable(components, descriptor) (with explicit descriptor) instead"
)]] static Result<ComponentBatch>
from_loggable(const T& component) {
static Result<ComponentBatch> from_loggable(const T& component) {
// Collection adapter will automatically borrow for single elements, but let's do this explicitly, avoiding the extra hoop.
const auto collection = Collection<T>::borrow(&component, 1);
return from_loggable(collection);
Expand All @@ -121,9 +117,7 @@ namespace rerun {
///
/// Automatically registers the component type the first time this type is encountered.
template <typename T>
[[deprecated("Use from_loggable(components, descriptor) (with explicit descriptor) instead"
)]] static Result<ComponentBatch>
from_loggable(const std::optional<T>& component) {
static Result<ComponentBatch> from_loggable(const std::optional<T>& component) {
if (component.has_value()) {
return from_loggable(component.value());
} else {
Expand Down Expand Up @@ -153,9 +147,9 @@ namespace rerun {
///
/// Automatically registers the component type the first time this type is encountered.
template <typename T>
[[deprecated("Use from_loggable(components, descriptor) (with explicit descriptor) instead"
)]] static Result<ComponentBatch>
from_loggable(const std::optional<rerun::Collection<T>>& components) {
static Result<ComponentBatch> from_loggable(
const std::optional<rerun::Collection<T>>& components
) {
if (components.has_value()) {
return from_loggable(components.value());
} else {
Expand Down

0 comments on commit 637f059

Please sign in to comment.