Skip to content

[BUILD] Use nostd::enable_if_t instead of std::enable_if_t #2648

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

Merged
marcalff merged 4 commits into from
Apr 29, 2024
Merged

[BUILD] Use nostd::enable_if_t instead of std::enable_if_t #2648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d072f91
Use `nostd::enable_if_t` instead of `std::enable_if_t`
owent Apr 26, 2024
713940a
Fix style
owent Apr 26, 2024
51412d3
Fix style
owent Apr 26, 2024
222636c
Merge branch 'main' into use_nostd_version_of_enable_if_t
marcalff Apr 29, 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
9 changes: 5 additions & 4 deletions exporters/etw/include/opentelemetry/exporters/etw/etw_properties.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "opentelemetry/common/key_value_iterable_view.h"

#include <opentelemetry/nostd/span.h>
#include <opentelemetry/nostd/type_traits.h>
#include <map>
#include <string>
#include <vector>
Expand Down Expand Up @@ -106,7 +107,7 @@ class PropertyValue : public PropertyVariant
* @param vec Vector of integral type primitives to convert to span.
* @return Span of integral type primitives.
*/
template <typename T, std::enable_if_t<std::is_integral<T>::value, bool> = true>
template <typename T, nostd::enable_if_t<std::is_integral<T>::value, bool> = true>
static nostd::span<const T> to_span(const std::vector<T> &vec)
{
nostd::span<const T> result(vec.data(), vec.size());
Expand All @@ -119,7 +120,7 @@ class PropertyValue : public PropertyVariant
* @param vec Vector of float type primitives to convert to span.
* @return Span of float type primitives.
*/
template <typename T, std::enable_if_t<std::is_floating_point<T>::value, bool> = true>
template <typename T, nostd::enable_if_t<std::is_floating_point<T>::value, bool> = true>
static nostd::span<const T> to_span(const std::vector<T> &vec)
{
nostd::span<const T> result(vec.data(), vec.size());
Expand All @@ -139,7 +140,7 @@ class PropertyValue : public PropertyVariant
* @param v
* @return
*/
template <typename TInteger, std::enable_if_t<std::is_integral<TInteger>::value, bool> = true>
template <typename TInteger, nostd::enable_if_t<std::is_integral<TInteger>::value, bool> = true>
PropertyValue(TInteger number) : PropertyVariant(number)
{}

Expand All @@ -148,7 +149,7 @@ class PropertyValue : public PropertyVariant
* @param v
* @return
*/
template <typename TFloat, std::enable_if_t<std::is_floating_point<TFloat>::value, bool> = true>
template <typename TFloat, nostd::enable_if_t<std::is_floating_point<TFloat>::value, bool> = true>
PropertyValue(TFloat number) : PropertyVariant(double(number))
{}

Expand Down
3 changes: 2 additions & 1 deletion sdk/include/opentelemetry/sdk/instrumentationscope/instrumentation_scope.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

#include "opentelemetry/common/key_value_iterable_view.h"
#include "opentelemetry/nostd/string_view.h"
#include "opentelemetry/nostd/type_traits.h"
#include "opentelemetry/nostd/unique_ptr.h"
#include "opentelemetry/nostd/variant.h"
#include "opentelemetry/sdk/common/attribute_utils.h"
Expand Down Expand Up @@ -73,7 +74,7 @@ class InstrumentationScope
*/
template <
class ArgumentType,
std::enable_if_t<opentelemetry::common::detail::is_key_value_iterable<ArgumentType>::value>
nostd::enable_if_t<opentelemetry::common::detail::is_key_value_iterable<ArgumentType>::value>
* = nullptr>
static nostd::unique_ptr<InstrumentationScope> Create(nostd::string_view name,
nostd::string_view version,
Expand Down