test/*.h: use inline rather than INLINE

inline is always available in c++

Change-Id: Ie8e4fc4df75309b649d7ef36bb5aadd95554035f

diff --git a/test/util.h b/test/util.h
index 270fdb35d7bec63b77ba0764ae2237d07e92970d..b27bffa94be61b5b3f8c2ae43508ee314121d796 100644 (file)
--- 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 d7dbfb009a0a19df5bb65603d4f2f0d61ff33a70..db01575462a7e9564be4519674b24c54226a217c 100644 (file)
--- 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");
 }