From e5732bcf0595ae85c658a7acac46a8230230772e Mon Sep 17 00:00:00 2001 From: James Zern Date: Wed, 2 Sep 2015 18:00:21 -0700 Subject: [PATCH] test/*.h: use inline rather than INLINE inline is always available in c++ Change-Id: Ie8e4fc4df75309b649d7ef36bb5aadd95554035f --- test/util.h | 2 +- test/video_source.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/util.h b/test/util.h index 270fdb35d..b27bffa94 100644 --- a/test/util.h +++ b/test/util.h @@ -19,7 +19,7 @@ // Macros #define GET_PARAM(k) std::tr1::get< k >(GetParam()) -static INLINE double compute_psnr(const vpx_image_t *img1, const vpx_image_t *img2) { +inline double compute_psnr(const vpx_image_t *img1, const vpx_image_t *img2) { assert((img1->fmt == img2->fmt) && (img1->d_w == img2->d_w) && (img1->d_h == img2->d_h)); diff --git a/test/video_source.h b/test/video_source.h index d7dbfb009..db0157546 100644 --- a/test/video_source.h +++ b/test/video_source.h @@ -48,7 +48,7 @@ static std::string GetDataPath() { #undef TO_STRING #undef STRINGIFY -static INLINE FILE *OpenTestDataFile(const std::string& file_name) { +inline FILE *OpenTestDataFile(const std::string& file_name) { const std::string path_to_source = GetDataPath() + "/" + file_name; return fopen(path_to_source.c_str(), "rb"); } -- 2.50.1