Skip to content

Commit

Permalink
Use mozc/src/base/logging.h instead of absl/log and absl/log:check.
Browse files Browse the repository at this point in the history
* This fixes warnings of redefinition of CHECK.
* Mozc's logging.h internally includes absl/log and absl/log:check if necessary.

#codehealth

PiperOrigin-RevId: 604218914
  • Loading branch information
hiroyuki-komatsu committed Feb 5, 2024
1 parent 1dd8b8c commit a90cb18
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 10 deletions.
3 changes: 1 addition & 2 deletions src/converter/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,6 @@ mozc_cc_binary(
"//request:conversion_request",
"//session:request_test_util",
"@com_google_absl//absl/flags:flag",
"@com_google_absl//absl/log:check",
"@com_google_absl//absl/status:statusor",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/strings:str_format",
Expand Down Expand Up @@ -693,12 +692,12 @@ mozc_cc_binary(
deps = [
":quality_regression_util",
"//base:init_mozc",
"//base:logging",
"//base:system_util",
"//base/file:temp_dir",
"//engine",
"//engine:eval_engine_factory",
"@com_google_absl//absl/flags:flag",
"@com_google_absl//absl/log:check",
"@com_google_absl//absl/status",
"@com_google_absl//absl/status:statusor",
],
Expand Down
1 change: 0 additions & 1 deletion src/converter/converter_main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
#include <vector>

#include "absl/flags/flag.h"
#include "absl/log/check.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/str_format.h"
Expand Down
2 changes: 1 addition & 1 deletion src/converter/quality_regression_main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@
#include <vector>

#include "absl/flags/flag.h"
#include "absl/log/check.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "base/file/temp_dir.h"
#include "base/init_mozc.h"
#include "base/logging.h"
#include "base/system_util.h"
#include "converter/quality_regression_util.h"
#include "engine/engine.h"
Expand Down
5 changes: 2 additions & 3 deletions src/session/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -745,6 +745,7 @@ mozc_cc_library(
":session_usage_observer",
"//base:config_file_stream",
"//base:file_util",
"//base:logging",
"//base:number_util",
"//base:util",
"//base/protobuf:descriptor",
Expand All @@ -763,8 +764,6 @@ mozc_cc_library(
"//protocol:config_cc_proto",
"//storage:registry",
"//usage_stats",
"@com_google_absl//absl/log",
"@com_google_absl//absl/log:check",
"@com_google_absl//absl/status",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/types:span",
Expand Down Expand Up @@ -819,6 +818,7 @@ mozc_cc_test(
":session_handler_tool",
"//base:file_stream",
"//base:file_util",
"//base:logging",
"//engine:engine_interface",
"//engine:mock_data_engine_factory",
"//prediction:user_history_predictor",
Expand All @@ -827,7 +827,6 @@ mozc_cc_test(
"//testing:mozctest",
"@com_google_absl//absl/flags:flag",
"@com_google_absl//absl/flags:reflection",
"@com_google_absl//absl/log",
"@com_google_absl//absl/status",
"@com_google_absl//absl/status:statusor",
"@com_google_absl//absl/strings",
Expand Down
2 changes: 1 addition & 1 deletion src/session/session_handler_scenario_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@
#include "absl/flags/declare.h"
#include "absl/flags/flag.h"
#include "absl/flags/reflection.h"
#include "absl/log/log.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_format.h"
#include "absl/strings/str_replace.h"
#include "base/file_stream.h"
#include "base/file_util.h"
#include "base/logging.h"
#include "engine/engine_interface.h"
#include "engine/mock_data_engine_factory.h"
#include "protocol/commands.pb.h"
Expand Down
3 changes: 1 addition & 2 deletions src/session/session_handler_tool.cc
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@
#include <utility>
#include <vector>

#include "absl/log/check.h"
#include "absl/log/log.h"
#include "absl/status/status.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/str_join.h"
Expand All @@ -46,6 +44,7 @@
#include "absl/types/span.h"
#include "base/config_file_stream.h"
#include "base/file_util.h"
#include "base/logging.h"
#include "base/number_util.h"
#include "base/protobuf/descriptor.h"
#include "base/protobuf/message.h"
Expand Down

0 comments on commit a90cb18

Please sign in to comment.