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
[dali_2.1.6] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
builder
/
optional-value.h
diff --git
a/dali-toolkit/internal/builder/optional-value.h
b/dali-toolkit/internal/builder/optional-value.h
index
7251ad2
..
7a1d9f4
100644
(file)
--- a/
dali-toolkit/internal/builder/optional-value.h
+++ b/
dali-toolkit/internal/builder/optional-value.h
@@
-79,7
+79,6
@@
template<typename T>
class OptionalValue
{
public:
class OptionalValue
{
public:
- typedef void (OptionalValue::*bool_type)() const;
typedef typename OptionalTypes<T>::ReturnType ReturnType;
typedef typename OptionalTypes<T>::ValueType ValueType;
typedef typename OptionalTypes<T>::ReturnType ReturnType;
typedef typename OptionalTypes<T>::ValueType ValueType;
@@
-104,18
+103,14
@@
public:
return OptionalTypes<T>::Get(mValue);
}
return OptionalTypes<T>::Get(mValue);
}
- // safe bool idiom
- operator bool_type() const
+ explicit operator bool() const
{
{
- return mOk
== true ? &OptionalValue::this_type_does_not_support_comparisons : 0
;
+ return mOk;
}
private:
bool mOk;
ValueType mValue;
}
private:
bool mOk;
ValueType mValue;
- void this_type_does_not_support_comparisons() const
- {
- }
};
template<typename T, typename U>
};
template<typename T, typename U>