Skip to content

Commit

Permalink
value_lexicon: Fix build with Abseil LTS 2023-08-02
Browse files Browse the repository at this point in the history
Fix broken build:

```
In file included from /usr/local/include/absl/hash/hash.h:85,
                 from /home/xxx/dev/s2geometry/src/s2/s2point.h:24,
                 from /home/xxx/dev/s2geometry/src/s2/value_lexicon_test.cc:28:
/usr/local/include/absl/hash/internal/hash.h:247:23: error: reference to 'hash_internal' is ambiguous
  247 |   using is_hashable = absl::hash_internal::is_hashable<T>;
      |                       ^~~~
In file included from /usr/local/include/absl/hash/internal/hash.h:49,
                 from /usr/local/include/absl/hash/hash.h:85,
                 from /home/xxx/dev/s2geometry/src/s2/s2point.h:24,
                 from /home/xxx/dev/s2geometry/src/s2/value_lexicon_test.cc:28:
/usr/local/include/absl/hash/internal/city.h:57:11: note: candidates are: 'namespace absl::lts_20230802::hash_internal { }'
   57 | namespace hash_internal {
      |           ^~~~~~~~~~~~~
In file included from /home/xxx/dev/s2geometry/src/s2/value_lexicon_test.cc:18:
/home/xxx/dev/s2geometry/src/s2/value_lexicon.h:33:11: note:                 'namespace absl::hash_internal { }'
   33 | namespace hash_internal {
      |           ^~~~~~~~~~~~~
```
  • Loading branch information
acelyc111 authored Nov 22, 2023
1 parent 7773d51 commit 30f7072
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions src/s2/value_lexicon.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,6 @@
#include "s2/base/integral_types.h"
#include "s2/util/gtl/dense_hash_set.h"

class S2Point;
namespace absl {
namespace hash_internal {
template <typename T>
struct Hash;
} // namespace hash_internal
} // namespace absl

// ValueLexicon is a class that maps distinct values to sequentially numbered
// integer identifiers. It automatically eliminates duplicates and uses a
// compact representation. See also SequenceLexicon.
Expand Down

0 comments on commit 30f7072

Please sign in to comment.