-
Notifications
You must be signed in to change notification settings - Fork 11.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[CUDA] Move device placement new definitions into a wrapper header.
Previously, these were always included -- after this change, you have to #include <new>, which is consistent with how things ought to work. llvm-svn: 285251
- Loading branch information
Justin Lebar
committed
Oct 26, 2016
1 parent
6f5ec7e
commit ebeeab8
Showing
3 changed files
with
48 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
/*===---- complex - CUDA wrapper for <new> ------------------------------=== | ||
* | ||
* Permission is hereby granted, free of charge, to any person obtaining a copy | ||
* of this software and associated documentation files (the "Software"), to deal | ||
* in the Software without restriction, including without limitation the rights | ||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
* copies of the Software, and to permit persons to whom the Software is | ||
* furnished to do so, subject to the following conditions: | ||
* | ||
* The above copyright notice and this permission notice shall be included in | ||
* all copies or substantial portions of the Software. | ||
* | ||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
* THE SOFTWARE. | ||
* | ||
*===-----------------------------------------------------------------------=== | ||
*/ | ||
|
||
#ifndef __CLANG_CUDA_WRAPPERS_NEW | ||
#define __CLANG_CUDA_WRAPPERS_NEW | ||
|
||
#include_next <new> | ||
|
||
// Device overrides for placement new and delete. | ||
#pragma push_macro("CUDA_NOEXCEPT") | ||
#if __cplusplus >= 201103L | ||
#define CUDA_NOEXCEPT noexcept | ||
#else | ||
#define CUDA_NOEXCEPT | ||
#endif | ||
|
||
__device__ inline void *operator new(__SIZE_TYPE__, void *__ptr) CUDA_NOEXCEPT { | ||
return __ptr; | ||
} | ||
__device__ inline void *operator new[](__SIZE_TYPE__, void *__ptr) CUDA_NOEXCEPT { | ||
return __ptr; | ||
} | ||
__device__ inline void operator delete(void *, void *) CUDA_NOEXCEPT {} | ||
__device__ inline void operator delete[](void *, void *) CUDA_NOEXCEPT {} | ||
#pragma pop_macro("CUDA_NOEXCEPT") | ||
|
||
#endif // include guard |