Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
marcalff committed Sep 12, 2023
1 parent 6e829da commit dd3d4f1
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions exporters/otlp/test/otlp_grpc_exporter_test.cc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

#ifndef HAVE_CPP_STDLIB
#ifndef OPENTELEMETRY_STL_VERSION
// Unfortunately as of 04/27/2021 the fix is NOT in the vcpkg snapshot of Google Test.
// Remove above `#ifdef` once the GMock fix for C++20 is in the mainline.
//
Expand Down Expand Up @@ -284,4 +284,4 @@ TEST_F(OtlpGrpcExporterTestPeer, ConfigUnknownInsecureFromEnv)
} // namespace otlp
} // namespace exporter
OPENTELEMETRY_END_NAMESPACE
#endif
#endif /* OPENTELEMETRY_STL_VERSION */
4 changes: 2 additions & 2 deletions exporters/otlp/test/otlp_http_exporter_test.cc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

#ifndef HAVE_CPP_STDLIB
#ifndef OPENTELEMETRY_STL_VERSION

# include <chrono>
# include <thread>
Expand Down Expand Up @@ -612,4 +612,4 @@ TEST_F(OtlpHttpExporterTestPeer, ConfigFromTracesEnv)
} // namespace otlp
} // namespace exporter
OPENTELEMETRY_END_NAMESPACE
#endif
#endif /* OPENTELEMETRY_STL_VERSION */
4 changes: 2 additions & 2 deletions exporters/otlp/test/otlp_http_log_record_exporter_test.cc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

#ifndef HAVE_CPP_STDLIB
#ifndef OPENTELEMETRY_STL_VERSION

# include <chrono>
# include <thread>
Expand Down Expand Up @@ -740,4 +740,4 @@ TEST_F(OtlpHttpLogRecordExporterTestPeer, DefaultEndpoint)
} // namespace otlp
} // namespace exporter
OPENTELEMETRY_END_NAMESPACE
#endif
#endif /* OPENTELEMETRY_STL_VERSION */
4 changes: 2 additions & 2 deletions exporters/zipkin/test/zipkin_exporter_test.cc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

#ifndef HAVE_CPP_STDLIB
#ifndef OPENTELEMETRY_STL_VERSION

# include "opentelemetry/exporters/zipkin/zipkin_exporter.h"
# include "opentelemetry/ext/http/client/curl/http_client_curl.h"
Expand Down Expand Up @@ -246,4 +246,4 @@ TEST_F(ZipkinExporterTestPeer, ConfigFromEnv)
} // namespace zipkin
} // namespace exporter
OPENTELEMETRY_END_NAMESPACE
#endif // HAVE_CPP_STDLIB
#endif /* OPENTELEMETRY_STL_VERSION */

0 comments on commit dd3d4f1

Please sign in to comment.