summaryrefslogtreecommitdiff
path: root/lib/asan
diff options
context:
space:
mode:
authorReid Kleckner <rnk@google.com>2017-07-06 21:51:32 +0000
committerReid Kleckner <rnk@google.com>2017-07-06 21:51:32 +0000
commit656a9d2e240ebab85ebdd6b3f11c95b7f669a3bf (patch)
treedb1feb705b4bfc53a36bbb1dcea1d5ad3a5652bb /lib/asan
parent10bdcb2d1ae8ae45b6d047428c6f56bb9859c319 (diff)
[asan] Fix -Winvalid-paste error with clang-cl
We don't need to paste tokens here. String literal concatenation works just fine here with MSVC and Clang. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@307321 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/asan')
-rw-r--r--lib/asan/asan_new_delete.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/asan/asan_new_delete.cc b/lib/asan/asan_new_delete.cc
index 942b169d9..e68c7f3e2 100644
--- a/lib/asan/asan_new_delete.cc
+++ b/lib/asan/asan_new_delete.cc
@@ -26,7 +26,7 @@
// VS2015 dynamic CRT (MD) work.
#if SANITIZER_WINDOWS
#define CXX_OPERATOR_ATTRIBUTE
-#define COMMENT_EXPORT(sym) __pragma(comment(linker, "/export:"##sym))
+#define COMMENT_EXPORT(sym) __pragma(comment(linker, "/export:" sym))
#ifdef _WIN64
COMMENT_EXPORT("??2@YAPEAX_K@Z") // operator new
COMMENT_EXPORT("??2@YAPEAX_KAEBUnothrow_t@std@@@Z") // operator new nothrow