Merge "Allow multiple renderers per Actor and sharing renderers between actors" into...

[platform/core/uifw/dali-core.git] / dali / public-api / math / matrix.h

diff --git a/dali/public-api/math/matrix.h b/dali/public-api/math/matrix.h
index 5e44903..2a02708 100644 (file)
--- a/dali/public-api/math/matrix.h
+++ b/dali/public-api/math/matrix.h
@@ -2,7 +2,7 @@
 #define __DALI_MATRIX_H__
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2015 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.
@@ -19,13 +19,20 @@
  */
 
 // EXTERNAL INCLUDES
-#include <iostream>
+#include <iosfwd>
 
 // INTERNAL INCLUDES
+#include <dali/public-api/common/dali-common.h>
+#include <dali/public-api/common/type-traits.h>
 #include <dali/public-api/math/vector4.h>
 
 namespace Dali
 {
+/**
+ * @addtogroup dali_core_math
+ * @{
+ */
+
 class Quaternion;
 
 /**
@@ -358,6 +365,12 @@ private:
  */
 DALI_IMPORT_API std::ostream& operator<< (std::ostream& o, const Matrix& matrix);
 
+// Allow Matrix to be treated as a POD type
+template <> struct TypeTraits< Matrix > : public BasicTypes< Matrix > { enum { IS_TRIVIAL_TYPE = true }; };
+
+/**
+ * @}
+ */
 } // namespace Dali
 
 #endif // __DALI_MATRIX_H__