projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Changes in Javascript plugin to compile under new mesh api" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
dali-test-suite-utils.h
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.h
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.h
index
88315d4
..
30ace77
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.h
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.h
@@
-2,7
+2,7
@@
#define __DALI_TEST_SUITE_UTILS_H__
/*
#define __DALI_TEST_SUITE_UTILS_H__
/*
- * Copyright (c) 201
4
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
5
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-18,6
+18,10
@@
*
*/
*
*/
+// EXTERNAL INCLUDES
+#include <cstdarg>
+#include <iosfwd>
+
// INTERNAL INCLUDES
#include <dali/public-api/dali-core.h>
#include <stdarg.h>
// INTERNAL INCLUDES
#include <dali/public-api/dali-core.h>
#include <stdarg.h>
@@
-139,17
+143,19
@@
inline bool CompareType<Quaternion>(Quaternion q1, Quaternion q2, float epsilon)
template <>
inline bool CompareType<Radian>(Radian q1, Radian q2, float epsilon)
{
template <>
inline bool CompareType<Radian>(Radian q1, Radian q2, float epsilon)
{
- return CompareType<float>(
float(q1), float(q2)
, epsilon);
+ return CompareType<float>(
q1.radian, q2.radian
, epsilon);
}
template <>
inline bool CompareType<Degree>(Degree q1, Degree q2, float epsilon)
{
}
template <>
inline bool CompareType<Degree>(Degree q1, Degree q2, float epsilon)
{
- return CompareType<float>(
float(q1), float(q2)
, epsilon);
+ return CompareType<float>(
q1.degree, q2.degree
, epsilon);
}
bool operator==(TimePeriod a, TimePeriod b);
}
bool operator==(TimePeriod a, TimePeriod b);
-std::ostream& operator<< (std::ostream& o, const TimePeriod value);
+std::ostream& operator<<( std::ostream& ostream, TimePeriod value );
+std::ostream& operator<<( std::ostream& ostream, Radian angle );
+std::ostream& operator<<( std::ostream& ostream, Degree angle );
/**
* Test whether two values are equal.
/**
* Test whether two values are equal.