Purge underscored header file barriers

[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 51421ac..666dd30 100644 (file)
--- a/dali-toolkit/internal/builder/optional-value.h
+++ b/dali-toolkit/internal/builder/optional-value.h
@@ -1,23 +1,23 @@
-#ifndef __DALI_TOOLKIT_INTERNAL_BUILDER_OPTIONAL__
-#define __DALI_TOOLKIT_INTERNAL_BUILDER_OPTIONAL__
+#ifndef DALI_TOOLKIT_INTERNAL_BUILDER_OPTIONAL_H
+#define DALI_TOOLKIT_INTERNAL_BUILDER_OPTIONAL_H
 
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * Copyright (c) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
-// INTERNAL INCLUDES
 template <typename T>
 struct OptionalTypes
 {
@@ -25,7 +25,7 @@ struct OptionalTypes
   typedef const T& ReturnType;
   static ReturnType Get(const ValueType& v) { return v; }
   static ValueType Set(const ReturnType v) { return v; }
-  static bool Ok(const ValueType v) { return true; }
+  static bool Ok(const ValueType& v) { return true; }
 };
 
 template <typename T>
@@ -67,26 +67,24 @@ public:
     return mOk == true ? &OptionalValue::this_type_does_not_support_comparisons : 0;
   }
 
-  template <typename OT>
-  bool operator!=( const OT& rhs )
-  {
-    this->this_type_does_not_support_comparisons();
-    return false;
-  }
-
-  template <typename OT>
-  bool operator==( const OT& rhs )
-  {
-    this->this_type_does_not_support_comparisons();
-    return false;
-  }
-
 private:
   bool mOk;
   ValueType mValue;
   void this_type_does_not_support_comparisons() const {}
-  // todo operator=() ? use OptionalTypes<T>::Ok(mValue)
 };
 
+template <typename T, typename U>
+bool operator==( const OptionalValue<T>& lhs, const OptionalValue<U>& rhs )
+{
+  lhs.this_type_does_not_support_comparisons();
+  return false;
+}
+
+template <typename T, typename U>
+bool operator!=( const OptionalValue<T>& lhs, const OptionalValue<U>& rhs )
+{
+  lhs.this_type_does_not_support_comparisons();
+  return false;
+}
 
-#endif // header
+#endif // DALI_TOOLKIT_INTERNAL_BUILDER_OPTIONAL_H