summaryrefslogtreecommitdiffstats
path: root/libcxx/include/new
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2013-10-04 22:09:00 +0000
committerHoward Hinnant <hhinnant@apple.com>2013-10-04 22:09:00 +0000
commit3af48ef76e11f63dfb548b24ff64562ce340434e (patch)
tree5d279c6f2337cddf6cf004fbd3a81ed4ded8ebb2 /libcxx/include/new
parent1b5b5c95cc2ed97c7869649d214a87c97d39ad0e (diff)
downloadbcm5719-llvm-3af48ef76e11f63dfb548b24ff64562ce340434e.tar.gz
bcm5719-llvm-3af48ef76e11f63dfb548b24ff64562ce340434e.zip
G M: Changes all references to "x inline" to "inline x" where x = _libcpp_always_inline or _libcpp_inline_visibility macros.
The patch touches these files: locale array deque new string utility vector __bit_reference __split_buffer locale_win32.h There is no intended functionality change and it is expected that reversing the position of the inline keyword with regard to the other keywords does not change the meaning of anything, least not for apple/Linux etc. It is intended to make libcxx more consistent with itself and to prevent the 1000 or so "inline.cpp(3) : warning C4141: 'inline' : used more than once" warnings that MS's cl.exe compiler emits without this patch, i.e. if inline is not the first keyword before a function name etc. Prefer "inline [other inline related keyword]" over "[other related keyword] inline". After this patch, libcxx should be consistent to this pattern. llvm-svn: 191987
Diffstat (limited to 'libcxx/include/new')
-rw-r--r--libcxx/include/new8
1 files changed, 4 insertions, 4 deletions
diff --git a/libcxx/include/new b/libcxx/include/new
index b0c479231b1..d1248562ffb 100644
--- a/libcxx/include/new
+++ b/libcxx/include/new
@@ -140,9 +140,9 @@ _LIBCPP_NEW_DELETE_VIS void operator delete[](void* __p, const std::nothrow_t&)
#undef _LIBCPP_NEW_DELETE_VIS
-_LIBCPP_INLINE_VISIBILITY inline void* operator new (std::size_t, void* __p) _NOEXCEPT {return __p;}
-_LIBCPP_INLINE_VISIBILITY inline void* operator new[](std::size_t, void* __p) _NOEXCEPT {return __p;}
-_LIBCPP_INLINE_VISIBILITY inline void operator delete (void*, void*) _NOEXCEPT {}
-_LIBCPP_INLINE_VISIBILITY inline void operator delete[](void*, void*) _NOEXCEPT {}
+inline _LIBCPP_INLINE_VISIBILITY void* operator new (std::size_t, void* __p) _NOEXCEPT {return __p;}
+inline _LIBCPP_INLINE_VISIBILITY void* operator new[](std::size_t, void* __p) _NOEXCEPT {return __p;}
+inline _LIBCPP_INLINE_VISIBILITY void operator delete (void*, void*) _NOEXCEPT {}
+inline _LIBCPP_INLINE_VISIBILITY void operator delete[](void*, void*) _NOEXCEPT {}
#endif // _LIBCPP_NEW
OpenPOWER on IntegriCloud