From 42f96b7dd968f93cb157a63e32d6dedeef2cd0dd Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Sat, 10 Jul 2010 01:50:32 +0000 Subject: [PATCH] Made sure memset and memcpy were in the std:: namespace --- Cantera/src/base/vec_functions.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cantera/src/base/vec_functions.h b/Cantera/src/base/vec_functions.h index c3b14fff1..d3ed6ebd3 100644 --- a/Cantera/src/base/vec_functions.h +++ b/Cantera/src/base/vec_functions.h @@ -181,7 +181,7 @@ namespace Cantera { inline void fbo_copy_dbl_1(doublereal * const copyTo, const doublereal * const copyFrom, const int len) { if (len > 0) { - (void) memcpy((void *)copyTo, (const void *)copyFrom, len * sizeof(doublereal)); + (void) std::memcpy((void *)copyTo, (const void *)copyFrom, len * sizeof(doublereal)); } } @@ -196,7 +196,7 @@ namespace Cantera { inline void fvo_copy_dbl_1(std::vector ©To, const std::vector ©From, const int len) { if (len > 0) { - (void) memcpy((void *)(©To[0]), (const void *)(©From[0]), len * sizeof(doublereal)); + (void) std::memcpy((void *)(©To[0]), (const void *)(©From[0]), len * sizeof(doublereal)); } } @@ -209,7 +209,7 @@ namespace Cantera { */ inline void fbo_zero_dbl_1(doublereal * const v, const int len) { if (len > 0) { - (void) memset((void *)v, 0, len * sizeof(doublereal)); + (void) std::memset((void *)v, 0, len * sizeof(doublereal)); } } @@ -222,7 +222,7 @@ namespace Cantera { */ inline void fvo_zero_dbl_1(std::vector &v, const int len) { if (len > 0) { - (void) memset((void *)(&v[0]), 0, len * sizeof(doublereal)); + (void) std::memset((void *)(&v[0]), 0, len * sizeof(doublereal)); } }