Merge "Clean up the code to build successfully on macOS" into devel/master

[platform/core/uifw/dali-core.git] / dali / internal / common / shader-saver.h

diff --git a/dali/internal/common/shader-saver.h b/dali/internal/common/shader-saver.h
index 1083282..8b83ae3 100644 (file)
--- a/dali/internal/common/shader-saver.h
+++ b/dali/internal/common/shader-saver.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SHADER_DISPATCHER_H__
-#define __DALI_INTERNAL_SHADER_DISPATCHER_H__
+#ifndef DALI_INTERNAL_SHADER_DISPATCHER_H
+#define DALI_INTERNAL_SHADER_DISPATCHER_H
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * 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.
@@ -27,14 +27,10 @@
 namespace Dali
 {
 
-namespace Integration
-{
-class ShaderData;
-typedef IntrusivePtr<ShaderData> ShaderDataPtr;
-}
-
 namespace Internal
 {
+class ShaderData;
+using ShaderDataPtr = IntrusivePtr<ShaderData>;
 
 /**
  * Abstract interface for passing a ShaderData object towards being saved.
@@ -47,18 +43,18 @@ public:
    * A function saving the binary from a ShaderDataPtr or passing it on to where it can be saved.
    * @param[in] shaderData A smart pointer to a ShaderData for which the program binary should be saved.
    */
-  virtual void SaveBinary( Integration::ShaderDataPtr shaderData ) = 0;
+  virtual void SaveBinary( Internal::ShaderDataPtr shaderData ) = 0;
 
 protected:
   /**
    * Destructor. Protected as no derived class should ever be deleted
    * through a reference to this pure abstract interface.
    */
-  virtual ~ShaderSaver(){}
+  virtual ~ShaderSaver() = default;
 };
 
 } // namespace Internal
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SHADER_DISPATCHER_H__
+#endif // DALI_INTERNAL_SHADER_DISPATCHER_H