• Jordan Werthman's avatar
    Prevent conflict in base/thread_annotations.h · 0ec2bec1
    Jordan Werthman authored
    Much like dynamic_annotations, Chromium's //base contains a copy of
    base/thread_annotations.h which causes macro classes and ODR
    violations when compiling a target with both //base and Abseil.
    
    In order to prevent these issues, the ./rename_dynamic_annotations.sh
    script has been generalized to also rename base/thread_annotations.h
    macros and symbols.
    
    Verified that WebRTC uses its own custom thread_annotations.h with
    "namespaced" macros and GoogleTest does not include
    thread_annotations.h so this change should be a no-op for all
    targets currently depending on Abseil.
    
    Bug: None
    Change-Id: I1b0115128aa22f4a3982082ede437ae8f0324bc1
    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1592684Reviewed-by: default avatarMirko Bonadei <mbonadei@chromium.org>
    Commit-Queue: Jordan Werthman <jordanjtw@google.com>
    Cr-Commit-Position: refs/heads/master@{#656439}
    0ec2bec1
hashtablez_sampler.h 10.2 KB