projects
/
folly.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c3d672e
)
Build workaround for nvcc in Malloc.h
author
Giuseppe Ottaviano
<ott@fb.com>
Thu, 4 Feb 2016 01:32:42 +0000
(17:32 -0800)
committer
facebook-github-bot-1
<folly-bot@fb.com>
Thu, 4 Feb 2016 02:20:28 +0000
(18:20 -0800)
Summary: See comment.
Reviewed By: juancarabina, luciang
Differential Revision:
D2896262
fb-gh-sync-id:
cb884651d47b86c0a5b3c2c22f421b2b1f39dc35
folly/Malloc.h
patch
|
blob
|
history
diff --git
a/folly/Malloc.h
b/folly/Malloc.h
index 828c1b659ab8fd1487b3eb82b266c4aeabbb6eb6..8e99e37956432de4bd039e95c70451d807915e08 100644
(file)
--- a/
folly/Malloc.h
+++ b/
folly/Malloc.h
@@
-116,7
+116,8
@@
namespace folly {
#endif
// Cannot depend on Portability.h when _LIBSTDCXX_FBSTRING.
-#ifdef __GNUC__
+// Disabled for nvcc because it fails on attributes on lambdas.
+#if defined(__GNUC__) && !defined(__NVCC__)
#define FOLLY_MALLOC_NOINLINE __attribute__((__noinline__))
#else
#define FOLLY_MALLOC_NOINLINE