Skip to content

Commit

Permalink
format
Browse files Browse the repository at this point in the history
  • Loading branch information
marcalff committed Sep 12, 2023
1 parent dd3d4f1 commit af8fd0f
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
3 changes: 2 additions & 1 deletion api/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ elseif(WITH_STL STREQUAL "ON")
target_compile_definitions(opentelemetry_api
INTERFACE OPENTELEMETRY_STL_VERSION=2023)
else()
message(FATAL_ERROR "WITH_STL must be ON, OFF, CXX11, CXX14, CXX17, CXX20 or CXX23")
message(
FATAL_ERROR "WITH_STL must be ON, OFF, CXX11, CXX14, CXX17, CXX20 or CXX23")
endif()

if(WITH_GSL)
Expand Down
7 changes: 4 additions & 3 deletions docs/building-with-stdlib.md
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,13 @@ Visual Studio provides 1st class debug experience for the standard library.
Supported build flavors:

* `nostd` - OpenTelemetry backport of classes for C++11. Not using standard lib.
* `stdlib` - Standard Library. Native experience with
C++11/C++14/C++17/C++20/C++23 compiler.
* `stdlib` - Standard Library.
Native experience with C++11/C++14/C++17/C++20/C++23 compiler.
Depending on the stdlib level in effect,
C++ features are used from the standard library,
completed with `nostd` replacement implementations.
C++17 and below works but with additional dependencies, e.g. either MS-GSL or Abseil for
C++17 and below works but with additional dependencies,
e.g. either MS-GSL or Abseil for
`std::span` implementation (`gsl::span` or `absl::Span`).
* `absl` - TODO: this should allow using Abseil C++ library only (no MS-GSL).

Expand Down
5 changes: 3 additions & 2 deletions docs/dependencies.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,9 @@ Both these dependencies are listed here:
[SDK](/sdk):
- Uses Standard C++ library for latest features (std::string_view,
std::variant, std::span, std::shared_ptr, std::unique_ptr) with C++14/17/20
compiler if cmake option `WITH_STL` is enabled or macro `OPENTELEMETRY_STL_VERSION` is
defined. License: `GNU General Public License`
compiler if cmake option `WITH_STL` is enabled
or macro `OPENTELEMETRY_STL_VERSION` is defined.
License: `GNU General Public License`
- For C++11/14/17 compilers, fallback to gsl::span if [GSL C++
library](https://github.com/microsoft/GSL) is installed. License: `MIT
License`
Expand Down

0 comments on commit af8fd0f

Please sign in to comment.