diff options
author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-04 22:06:23 +0000 |
---|---|---|
committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-04 22:06:23 +0000 |
commit | 341740b1ece43055e7efc1fb53d1732735e04b41 (patch) | |
tree | 7a1b2781a97682245740118d5d8658305ebcfd53 /media/base/container_names.cc | |
parent | d3f5812d4ac720db72a37f2b02c2a4a84b2e4939 (diff) | |
download | chromium_src-341740b1ece43055e7efc1fb53d1732735e04b41.zip chromium_src-341740b1ece43055e7efc1fb53d1732735e04b41.tar.gz chromium_src-341740b1ece43055e7efc1fb53d1732735e04b41.tar.bz2 |
Make TAG() return an unsigned number.
Attempts to fix this clang error:
..\..\media\base\container_names.cc(1555,10) : error(clang): case value evaluates to -272908453, which cannot be narrowed to type 'uint32' (aka 'unsigned int') [-Wc++11-narrowing]
case TAG('\xef','\xbb','\xbf','['):
^
..\..\media\base\container_names.cc(19,5) : note(clang): expanded from macro 'TAG'
((static_cast<uint8>(a) << 24) | (static_cast<uint8>(b) << 16) | \
^
1 error generated.
This happens because uint << integer literal results in int.
(One reason why functions should be preferred over macros.)
BUG=82385
TBR=acolwell@chromium.org
Review URL: https://codereview.chromium.org/369193002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281444 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/container_names.cc')
-rw-r--r-- | media/base/container_names.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/base/container_names.cc b/media/base/container_names.cc index f062929..4312e57 100644 --- a/media/base/container_names.cc +++ b/media/base/container_names.cc @@ -16,8 +16,8 @@ namespace media { namespace container_names { #define TAG(a, b, c, d) \ - ((static_cast<uint8>(a) << 24) | (static_cast<uint8>(b) << 16) | \ - (static_cast<uint8>(c) << 8) | (static_cast<uint8>(d))) + ((static_cast<uint8>(a) << 24u) | (static_cast<uint8>(b) << 16u) | \ + (static_cast<uint8>(c) << 8u) | (static_cast<uint8>(d))) #define RCHECK(x) \ do { \ |