Skip to content

Commit 7ed4662

Browse files
authored
Avoid symbol confliction on macOS (#78)
1 parent 630ad69 commit 7ed4662

File tree

4 files changed

+10
-11
lines changed

4 files changed

+10
-11
lines changed

.bazelrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
build --enable_platform_specific_config
2-
build:linux --cxxopt=-std=c++17
2+
build --features=-supports_dynamic_linker
3+
build --cxxopt=-std=c++17
34
build:windows --cxxopt=-std:c++17
45

56
try-import %workspace%/user.bazelrc

source/propagation_impl.cc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,4 +108,12 @@ SpanContextExtensionImpl::SpanContextExtensionImpl(
108108
}
109109
}
110110

111+
SpanContextPtr createSpanContext(std::string_view ctx) {
112+
return std::make_unique<SpanContextImpl>(ctx);
113+
}
114+
115+
SpanContextExtensionPtr createSpanContextExtension(std::string_view ctx) {
116+
return std::make_unique<SpanContextExtensionImpl>(ctx);
117+
}
118+
111119
} // namespace cpp2sky

source/propagation_impl.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,4 @@ class SpanContextExtensionImpl : public SpanContextExtension {
6262
TracingMode tracing_mode_ = TracingMode::Default;
6363
};
6464

65-
SpanContextPtr createSpanContext(std::string_view ctx) {
66-
return std::make_unique<SpanContextImpl>(ctx);
67-
}
68-
69-
SpanContextExtensionPtr createSpanContextExtension(std::string_view ctx) {
70-
return std::make_unique<SpanContextExtensionImpl>(ctx);
71-
}
72-
7365
} // namespace cpp2sky

source/tracer_impl.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,4 @@ class TracerImpl : public Tracer {
6262
std::list<MatcherPtr> op_name_matchers_;
6363
};
6464

65-
TracerPtr createInsecureGrpcTracer(TracerConfig& cfg);
66-
6765
} // namespace cpp2sky

0 commit comments

Comments
 (0)