Merge branch 'devel/master' into sandbox/dkdk/tizen

[platform/core/uifw/dali-adaptor.git] / dali / internal / system / common / environment-options.h

diff --git a/dali/internal/system/common/environment-options.h b/dali/internal/system/common/environment-options.h
old mode 100755 (executable)
new mode 100644 (file)
index 2ec1a09..547adfa
--- a/dali/internal/system/common/environment-options.h
+++ b/dali/internal/system/common/environment-options.h
@@ -73,7 +73,7 @@ public:
   /**
    * Install the log function for the current thread.
    */
-  virtual void InstallLogFunction() const;
+  void InstallLogFunction() const override;
 
   /**
    * Un-install the log function for the current thread.
@@ -317,9 +317,9 @@ public:
   bool StencilBufferRequired() const;
 
   /**
-   * @return whether the partial update is available.
+   * @return Whether the partial update is required.
    */
-  bool PartialUpdateAvailable() const;
+  bool PartialUpdateRequired() const;
 
   /// Deleted copy constructor.
   EnvironmentOptions( const EnvironmentOptions& ) = delete;
@@ -388,7 +388,7 @@ private: // Data
   bool mGlesCallAccumulate;                       ///< Whether or not to accumulate gles call statistics
   bool mDepthBufferRequired;                      ///< Whether the depth buffer is required
   bool mStencilBufferRequired;                    ///< Whether the stencil buffer is required
-  bool mPartialUpdateAvailable;                   ///< whether the partial update is available
+  bool mPartialUpdateRequired;                    ///< Whether the partial update is required
   std::unique_ptr<TraceManager> mTraceManager;    ///< TraceManager
 };