Skip to content

Commit

Permalink
Avoid symbol confliction on macOS (#78)
Browse files Browse the repository at this point in the history
  • Loading branch information
Shikugawa authored May 27, 2021
1 parent 630ad69 commit 7ed4662
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 11 deletions.
3 changes: 2 additions & 1 deletion .bazelrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
build --enable_platform_specific_config
build:linux --cxxopt=-std=c++17
build --features=-supports_dynamic_linker
build --cxxopt=-std=c++17
build:windows --cxxopt=-std:c++17

try-import %workspace%/user.bazelrc
8 changes: 8 additions & 0 deletions source/propagation_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -108,4 +108,12 @@ SpanContextExtensionImpl::SpanContextExtensionImpl(
}
}

SpanContextPtr createSpanContext(std::string_view ctx) {
return std::make_unique<SpanContextImpl>(ctx);
}

SpanContextExtensionPtr createSpanContextExtension(std::string_view ctx) {
return std::make_unique<SpanContextExtensionImpl>(ctx);
}

} // namespace cpp2sky
8 changes: 0 additions & 8 deletions source/propagation_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,4 @@ class SpanContextExtensionImpl : public SpanContextExtension {
TracingMode tracing_mode_ = TracingMode::Default;
};

SpanContextPtr createSpanContext(std::string_view ctx) {
return std::make_unique<SpanContextImpl>(ctx);
}

SpanContextExtensionPtr createSpanContextExtension(std::string_view ctx) {
return std::make_unique<SpanContextExtensionImpl>(ctx);
}

} // namespace cpp2sky
2 changes: 0 additions & 2 deletions source/tracer_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,4 @@ class TracerImpl : public Tracer {
std::list<MatcherPtr> op_name_matchers_;
};

TracerPtr createInsecureGrpcTracer(TracerConfig& cfg);

} // namespace cpp2sky

0 comments on commit 7ed4662

Please sign in to comment.