Merge Change 76213 to release; Fixes #4811

[SVN r76265]
This commit is contained in:
Marshall Clow
2012-01-01 21:12:58 +00:00
parent 199a89a1e9
commit e87ce37b34

View File

@ -126,7 +126,7 @@ namespace boost {
} }
// Use fixed storage // Use fixed storage
::memcpy(DestStorage, SrcStorage, sizeof(set_value_type)*m_Size); ::std::memcpy(DestStorage, SrcStorage, sizeof(set_value_type)*m_Size);
} }
// Destructor // Destructor
@ -206,7 +206,7 @@ namespace boost {
} }
// Copy the data // Copy the data
::memcpy(DestStorage, SrcStorage, sizeof(set_value_type)*m_Size); ::std::memcpy(DestStorage, SrcStorage, sizeof(set_value_type)*m_Size);
return *this; return *this;
} }