Merge "Exporting one constructor used by csharpbinder and making an API private....

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / layouting / measure-spec.h

diff --git a/dali-toolkit/devel-api/layouting/measure-spec.h b/dali-toolkit/devel-api/layouting/measure-spec.h
index f766247..04c4d01 100644 (file)
--- a/dali-toolkit/devel-api/layouting/measure-spec.h
+++ b/dali-toolkit/devel-api/layouting/measure-spec.h
@@ -19,6 +19,7 @@
 
 #include <dali/public-api/common/dali-common.h>
 #include <dali-toolkit/devel-api/layouting/layout-length.h>
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
 
 #include <sstream>
 
@@ -32,7 +33,7 @@ namespace Toolkit
  * how to be measured. For instance, it may measure a child with an exact width and an unspecified
  * height in order to determine height for width.
  */
-class DALI_IMPORT_API MeasureSpec
+class DALI_TOOLKIT_API MeasureSpec
 {
 public:
   using IntType = LayoutLength::IntType;
@@ -62,8 +63,11 @@ public:
 
   MeasureSpec& operator=( const MeasureSpec& rhs )
   {
-    this->mSize = rhs.mSize;
-    this->mMode = rhs.mMode;
+    if( this != &rhs )
+    {
+      this->mSize = rhs.mSize;
+      this->mMode = rhs.mMode;
+    }
     return *this;
   }