ref: e5732bcf0595ae85c658a7acac46a8230230772e
parent: b5c50ae91f3ebde0d2e4241f955167f68aa51173
author: James Zern <[email protected]>
date: Wed Sep 2 14:00:21 EDT 2015
test/*.h: use inline rather than INLINE inline is always available in c++ Change-Id: Ie8e4fc4df75309b649d7ef36bb5aadd95554035f
--- 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));
--- a/test/video_source.h
+++ b/test/video_source.h
@@ -48,7 +48,7 @@
#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");
}