From cf9a45da925ef5d7e75b746d8a4310aa28596bb8 Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Tue, 21 Jan 2025 08:57:53 -0800 Subject: [PATCH] Annotate parts that can be updated after next absl bump Issues #2336 --- verible/common/formatting/layout-optimizer.cc | 3 ++- verible/common/lsp/lsp-file-utils.cc | 3 ++- verible/verilog/analysis/verilog-linter.cc | 3 ++- verible/verilog/tools/ls/symbol-table-handler.cc | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/verible/common/formatting/layout-optimizer.cc b/verible/common/formatting/layout-optimizer.cc index 8ff9d073d..b7cc6f469 100644 --- a/verible/common/formatting/layout-optimizer.cc +++ b/verible/common/formatting/layout-optimizer.cc @@ -28,7 +28,7 @@ #include #include -#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" @@ -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 diff --git a/verible/common/lsp/lsp-file-utils.cc b/verible/common/lsp/lsp-file-utils.cc index 449f04b98..a5622eb4f 100644 --- a/verible/common/lsp/lsp-file-utils.cc +++ b/verible/common/lsp/lsp-file-utils.cc @@ -21,7 +21,7 @@ #include #include -#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" @@ -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)); diff --git a/verible/verilog/analysis/verilog-linter.cc b/verible/verilog/analysis/verilog-linter.cc index e7f655bef..5cad2e9df 100644 --- a/verible/verilog/analysis/verilog-linter.cc +++ b/verible/verilog/analysis/verilog-linter.cc @@ -26,7 +26,7 @@ #include #include -#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" @@ -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 diff --git a/verible/verilog/tools/ls/symbol-table-handler.cc b/verible/verilog/tools/ls/symbol-table-handler.cc index a2e889b68..7a7dd2587 100644 --- a/verible/verilog/tools/ls/symbol-table-handler.cc +++ b/verible/verilog/tools/ls/symbol-table-handler.cc @@ -24,7 +24,7 @@ #include #include -#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" @@ -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