From daed763fd3a4ccc03551ad2e694e943349fbaff3 Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Fri, 2 Nov 2012 00:36:33 +0000 Subject: [PATCH] remove nolint from size tests BUG=none TEST=lint Review URL: https://webrtc-codereview.appspot.com/930009 git-svn-id: http://libyuv.googlecode.com/svn/trunk@463 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/version.h | 2 +- unit_test/basictypes_test.cc | 27 ++++++++++++++++----------- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/README.chromium b/README.chromium index ecf5f86d0..a2ac82c2c 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 455 +Version: 463 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index d5b961a44..026799f91 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,6 +11,6 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 455 +#define LIBYUV_VERSION 463 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/unit_test/basictypes_test.cc b/unit_test/basictypes_test.cc index b1f898117..1e3c76975 100644 --- a/unit_test/basictypes_test.cc +++ b/unit_test/basictypes_test.cc @@ -8,9 +8,6 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include -#include - #include "../unit_test/unit_test.h" #include "libyuv/basic_types.h" @@ -27,14 +24,22 @@ TEST_F(libyuvTest, Endian) { } TEST_F(libyuvTest, SizeOfTypes) { - EXPECT_EQ(1u, sizeof(int8)); // NOLINT Using sizeof(type) - EXPECT_EQ(1u, sizeof(uint8)); // NOLINT - EXPECT_EQ(2u, sizeof(int16)); // NOLINT - EXPECT_EQ(2u, sizeof(uint16)); // NOLINT - EXPECT_EQ(4u, sizeof(int32)); // NOLINT - EXPECT_EQ(4u, sizeof(uint32)); // NOLINT - EXPECT_EQ(8u, sizeof(int64)); // NOLINT - EXPECT_EQ(8u, sizeof(uint64)); // NOLINT + int8 i8; + uint8 u8; + int16 i16; + uint16 u16; + int32 i32; + uint32 u32; + int64 i64; + uint64 u64; + EXPECT_EQ(1u, sizeof(i8)); + EXPECT_EQ(1u, sizeof(u8)); + EXPECT_EQ(2u, sizeof(i16)); + EXPECT_EQ(2u, sizeof(u16)); + EXPECT_EQ(4u, sizeof(i32)); + EXPECT_EQ(4u, sizeof(u32)); + EXPECT_EQ(8u, sizeof(i64)); + EXPECT_EQ(8u, sizeof(u64)); } TEST_F(libyuvTest, SizeOfConstants) {