diff options
Diffstat (limited to 'chromium/third_party/s2cellid')
8 files changed, 7 insertions, 8 deletions
diff --git a/chromium/third_party/s2cellid/README.chromium b/chromium/third_party/s2cellid/README.chromium index 234bbaa3334..3686d251cd7 100644 --- a/chromium/third_party/s2cellid/README.chromium +++ b/chromium/third_party/s2cellid/README.chromium @@ -44,7 +44,7 @@ Local Modifications: - Change int64 -> int64 - Change GG_ULONGLONG -> static_cast<uint64_t> - Remove absl/base/macros.h and use chromium base/macros.h -- Change glog to use chromium base/logging.h +- Change glog to use chromium base/{logging.h, check.h, etc.} - Remove s2/base/strings/stringprintf.h to use chromium base/strings/stringprintf.h - Remove base/casts.h and change implicit_cast to static_cast. - Append std:: to string type. diff --git a/chromium/third_party/s2cellid/src/s2/r1interval.h b/chromium/third_party/s2cellid/src/s2/r1interval.h index 5590574cb72..f9fb48a1d62 100644 --- a/chromium/third_party/s2cellid/src/s2/r1interval.h +++ b/chromium/third_party/s2cellid/src/s2/r1interval.h @@ -23,7 +23,7 @@ #include <iosfwd> #include <iostream> -#include "base/logging.h" +#include "base/check.h" #include "s2/_fpcontractoff.h" #include "s2/util/math/vector.h" // IWYU pragma: export diff --git a/chromium/third_party/s2cellid/src/s2/r2rect.cc b/chromium/third_party/s2cellid/src/s2/r2rect.cc index 0761e6fc311..38347acd58c 100644 --- a/chromium/third_party/s2cellid/src/s2/r2rect.cc +++ b/chromium/third_party/s2cellid/src/s2/r2rect.cc @@ -19,7 +19,6 @@ #include <iosfwd> -#include "base/logging.h" #include "s2/r1interval.h" #include "s2/r2.h" diff --git a/chromium/third_party/s2cellid/src/s2/r2rect.h b/chromium/third_party/s2cellid/src/s2/r2rect.h index 1aa82fc03be..c9b45f75259 100644 --- a/chromium/third_party/s2cellid/src/s2/r2rect.h +++ b/chromium/third_party/s2cellid/src/s2/r2rect.h @@ -20,7 +20,7 @@ #include <iosfwd> -#include "base/logging.h" +#include "base/check.h" #include "s2/_fpcontractoff.h" #include "s2/r1interval.h" #include "s2/r2.h" diff --git a/chromium/third_party/s2cellid/src/s2/s2cellid.cc b/chromium/third_party/s2cellid/src/s2/s2cellid.cc index 8d891b585e3..4bb1d4f894a 100644 --- a/chromium/third_party/s2cellid/src/s2/s2cellid.cc +++ b/chromium/third_party/s2cellid/src/s2/s2cellid.cc @@ -24,8 +24,8 @@ #include <vector> #include <mutex> +#include "base/check_op.h" #include "base/format_macros.h" -#include "base/logging.h" #include "base/strings/stringprintf.h" #include "s2/r1interval.h" #include "s2/s2latlng.h" diff --git a/chromium/third_party/s2cellid/src/s2/s2cellid.h b/chromium/third_party/s2cellid/src/s2/s2cellid.h index 5f695e092eb..1b15d308a7b 100644 --- a/chromium/third_party/s2cellid/src/s2/s2cellid.h +++ b/chromium/third_party/s2cellid/src/s2/s2cellid.h @@ -24,7 +24,7 @@ #include <string> #include <vector> -#include "base/logging.h" +#include "base/check_op.h" #include "s2/_fpcontractoff.h" #include "s2/r2.h" #include "s2/r2rect.h" diff --git a/chromium/third_party/s2cellid/src/s2/s2coords.h b/chromium/third_party/s2cellid/src/s2/s2coords.h index 5b0961bbbdd..44bd9795dda 100644 --- a/chromium/third_party/s2cellid/src/s2/s2coords.h +++ b/chromium/third_party/s2cellid/src/s2/s2coords.h @@ -100,7 +100,7 @@ #include <algorithm> #include <cmath> -#include "base/logging.h" +#include "base/check_op.h" #include "s2/r2.h" #include "s2/s2coords-internal.h" #include "s2/s2point.h" diff --git a/chromium/third_party/s2cellid/src/s2/util/math/vector.h b/chromium/third_party/s2cellid/src/s2/util/math/vector.h index 0b0587ccb40..02140676333 100644 --- a/chromium/third_party/s2cellid/src/s2/util/math/vector.h +++ b/chromium/third_party/s2cellid/src/s2/util/math/vector.h @@ -28,7 +28,7 @@ #include <limits> #include <type_traits> -#include "base/logging.h" +#include "base/check_op.h" #include "base/macros.h" template <typename T> |