Skip to content

Commit

Permalink
Merge pull request #2338 from hzeller/feature-20250121-perf-single-ch…
Browse files Browse the repository at this point in the history
…ar-find

Annotate parts that can be updated after next absl bump
  • Loading branch information
hzeller authored Jan 21, 2025
2 parents 26d4b0e + cf9a45d commit aadb25c
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
3 changes: 2 additions & 1 deletion verible/common/formatting/layout-optimizer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include <ostream>
#include <utility>

#include "absl/base/config.h"
#include "absl/base/config.h" // for ABSL_LTS_RELEASE_VERSION
#include "absl/container/fixed_array.h"
#include "absl/log/log.h"
#include "verible/common/formatting/basic-format-style.h"
Expand All @@ -42,6 +42,7 @@
#include "verible/common/util/value-saver.h"

#if ABSL_LTS_RELEASE_VERSION > 20240200
// https://github.com/chipsalliance/verible/issues/2336
#include "absl/log/vlog_is_on.h"
#endif

Expand Down
3 changes: 2 additions & 1 deletion verible/common/lsp/lsp-file-utils.cc
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <string>
#include <string_view>

#include "absl/base/config.h"
#include "absl/base/config.h" // for ABSL_LTS_RELEASE_VERSION
#include "absl/strings/escaping.h"
#include "absl/strings/match.h"
#include "absl/strings/str_cat.h"
Expand Down Expand Up @@ -59,6 +59,7 @@ std::string DecodeURI(std::string_view uri) {
std::isxdigit(uri[pos + 1])) {
std::string hex;
#if ABSL_LTS_RELEASE_VERSION > 20240200
// https://github.com/chipsalliance/verible/issues/2336
if (!absl::HexStringToBytes(uri.substr(pos, 2), &hex)) break;
#else
hex = absl::HexStringToBytes(uri.substr(pos, 2));
Expand Down
3 changes: 2 additions & 1 deletion verible/verilog/analysis/verilog-linter.cc
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include <utility>
#include <vector>

#include "absl/base/config.h"
#include "absl/base/config.h" // for ABSL_LTS_RELEASE_VERSION
#include "absl/flags/flag.h"
#include "absl/log/log.h"
#include "absl/status/status.h"
Expand Down Expand Up @@ -57,6 +57,7 @@
#include "verible/verilog/parser/verilog-token-enum.h"

#if ABSL_LTS_RELEASE_VERSION > 20240200
// https://github.com/chipsalliance/verible/issues/2336
#include "absl/log/vlog_is_on.h"
#endif

Expand Down
3 changes: 2 additions & 1 deletion verible/verilog/tools/ls/symbol-table-handler.cc
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <string_view>
#include <vector>

#include "absl/base/config.h"
#include "absl/base/config.h" // for ABSL_LTS_RELEASE_VERSION
#include "absl/container/flat_hash_map.h"
#include "absl/flags/flag.h"
#include "absl/log/log.h"
Expand All @@ -51,6 +51,7 @@
#include "verible/verilog/tools/ls/lsp-parse-buffer.h"

#if ABSL_LTS_RELEASE_VERSION > 20240200
// https://github.com/chipsalliance/verible/issues/2336
#include "absl/log/vlog_is_on.h"
#endif

Expand Down

0 comments on commit aadb25c

Please sign in to comment.