(GCC 6.2) Ensure GetTimeMilliseconds is defined only once in automated-tests

Previously this was defined in an anonymous namespace in a header file but not used in
all files that this header file was included in. This caused a compilation error when
compiling with GCC 6.2.

Change-Id: I99d6c75c094c305478b93c6dad7fc03d47f6281d

diff --git a/automated-tests/src/dali-platform-abstraction/utc-image-loading-common.cpp b/automated-tests/src/dali-platform-abstraction/utc-image-loading-common.cpp
index 3d80c50..11a3356 100644 (file)
--- a/automated-tests/src/dali-platform-abstraction/utc-image-loading-common.cpp
+++ b/automated-tests/src/dali-platform-abstraction/utc-image-loading-common.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,13 @@
 
 #include "utc-image-loading-common.h"
 
+double GetTimeMilliseconds( Integration::PlatformAbstraction& abstraction )
+{
+  timespec timeSpec;
+  clock_gettime( CLOCK_MONOTONIC, &timeSpec );
+  return ( timeSpec.tv_sec * 1e3 ) + ( timeSpec.tv_nsec / 1e6 );
+}
+
 /** Live platform abstraction recreated for each test case. */
 Integration::PlatformAbstraction * gAbstraction = 0;
 

diff --git a/automated-tests/src/dali-platform-abstraction/utc-image-loading-common.h b/automated-tests/src/dali-platform-abstraction/utc-image-loading-common.h
index d82f98e..cc6f713 100644 (file)
--- a/automated-tests/src/dali-platform-abstraction/utc-image-loading-common.h
+++ b/automated-tests/src/dali-platform-abstraction/utc-image-loading-common.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -65,14 +65,6 @@ const char* const VALID_IMAGES[] = {
 };
 const unsigned NUM_VALID_IMAGES = sizeof(VALID_IMAGES) / sizeof(VALID_IMAGES[0]);
 
-/** Returns elapsed milliseconds. */
-double GetTimeMilliseconds( Integration::PlatformAbstraction& abstraction )
-{
-  timespec timeSpec;
-  clock_gettime( CLOCK_MONOTONIC, &timeSpec );
-  return ( timeSpec.tv_sec * 1e3 ) + ( timeSpec.tv_nsec / 1e6 );
-}
-
 } // anon namespace
 
 /** Live platform abstraction recreated for each test case. */
@@ -82,6 +74,7 @@ extern Integration::PlatformAbstraction * gAbstraction;
 typedef std::pair<ImageDimensions, std::pair<FittingMode::Type, std::pair<SamplingMode::Type, bool> > > ImageParameters;
 extern std::vector<ImageParameters> gCancelAttributes;
 
+double GetTimeMilliseconds( Integration::PlatformAbstraction& abstraction ); ///< Returns elapsed milliseconds.
 
 void utc_dali_loading_startup(void);
 void utc_dali_loading_cleanup(void);