diff options
| author | Joerg Sonnenberger <joerg@bec.de> | 2014-01-04 17:43:00 +0000 |
|---|---|---|
| committer | Joerg Sonnenberger <joerg@bec.de> | 2014-01-04 17:43:00 +0000 |
| commit | 634b9dd76812ff2222c779b842ec32c7a035c850 (patch) | |
| tree | 2885b14baa90425d768e8348c0aaa24ecd9dbdda /libcxx/src/memory.cpp | |
| parent | 5e9f3265f85e21a673f81381a4beba4bfb5bce51 (diff) | |
| download | bcm5719-llvm-634b9dd76812ff2222c779b842ec32c7a035c850.tar.gz bcm5719-llvm-634b9dd76812ff2222c779b842ec32c7a035c850.zip | |
Switch to using C++ style casts.
llvm-svn: 198505
Diffstat (limited to 'libcxx/src/memory.cpp')
| -rw-r--r-- | libcxx/src/memory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/src/memory.cpp b/libcxx/src/memory.cpp index 98bcc864eeb..666673fc6b4 100644 --- a/libcxx/src/memory.cpp +++ b/libcxx/src/memory.cpp @@ -208,7 +208,7 @@ align(size_t alignment, size_t size, void*& ptr, size_t& space) if (size <= space) { char* p1 = static_cast<char*>(ptr); - char* p2 = (char*)((size_t)(p1 + (alignment - 1)) & -alignment); + char* p2 = reinterpret_cast<char*>(reinterpret_cast<size_t>(p1 + (alignment - 1)) & -alignment); size_t d = static_cast<size_t>(p2 - p1); if (d <= space - size) { |
