C++ compilation issue fix

ravi688 · Feb 7, 2022 · 4ac74bf · 4ac74bf
1 parent b0967e7
commit 4ac74bf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/include/hpml/mat4/template_definitions.h b/include/hpml/mat4/template_definitions.h
@@ -33,12 +33,12 @@ HPML_API T* const* const __mat4_data(T)(mat4_t(T)* m)\
 }
 
 /*mat4_move*/
-#define mat4_move(T) move(mat4_t(T))
+#define mat4_move(T) hpml_move(mat4_t(T))
 #define instantiate_declaration_mat4_move(T) instantiate_declaration_move(mat4_t(T))
 #define instantiate_implementation_mat4_move(T) instantiate_implementation_move(mat4_t(T))
 
 /*mat4_copy*/
-#define mat4_copy(T) copy(mat4_t(T))
+#define mat4_copy(T) hpml_copy(mat4_t(T))
 #define instantiate_declaration_mat4_copy(T) instantiate_declaration_copy(mat4_t(T))
 #define instantiate_implementation_mat4_copy(T) instantiate_implementation_copy(mat4_t(T))
 

diff --git a/include/hpml/memory/template_definitions.h b/include/hpml/memory/template_definitions.h
@@ -14,15 +14,15 @@
 #define EXTERN_C
 #endif
 
-#define move(T) c_template(move, T)
-#define instantiate_declaration_move(T) EXTERN_C HPML_API void move(T)(T* dst, T src)
+#define hpml_move(T) c_template(hpml_move, T)
+#define instantiate_declaration_move(T) EXTERN_C HPML_API void hpml_move(T)(T* dst, T src)
 #define instantiate_implementation_move(T)\
-EXTERN_C HPML_API void move(T)(T* dst, T src)\
+EXTERN_C HPML_API void hpml_move(T)(T* dst, T src)\
 {\
 	memcpy(dst, &src, sizeof(T));\
 }
 
-#define copy(T)(dst, src) memcpy(T)(&dst, &src, sizeof(T))
+#define hpml_copy(T)(dst, src) memcpy(T)(&dst, &src, sizeof(T))
 #define instantiate_declaration_copy(T) NOT_IMPLEMENTED
 #define instantiate_implementation_copy(T) NOT_IMPLEMENTED