From: Christopher Dykes Date: Tue, 6 Jun 2017 20:30:54 +0000 (-0700) Subject: Fix the build of MallctlHelperTest without JEMalloc X-Git-Tag: v2017.06.12.00~32 X-Git-Url: http://plrg.eecs.uci.edu/git/?p=folly.git;a=commitdiff_plain;h=c797a08c3b5b0bd01b6d3dce214c32509ef22093 Fix the build of MallctlHelperTest without JEMalloc Summary: `kDecayCmd` was guarded such that it wasn't being defined at all if JEMalloc wasn't available. Closes https://github.com/facebook/folly/issues/608 Reviewed By: interwq Differential Revision: D5193721 fbshipit-source-id: 1a2666de70e90eac1e9f2e130d0452b01b3239fa --- diff --git a/folly/test/MallctlHelperTest.cpp b/folly/test/MallctlHelperTest.cpp index e2b22fe6..e2f26954 100644 --- a/folly/test/MallctlHelperTest.cpp +++ b/folly/test/MallctlHelperTest.cpp @@ -25,7 +25,6 @@ using namespace folly; -#ifdef FOLLY_HAVE_LIBJEMALLOC #if JEMALLOC_VERSION_MAJOR > 4 static constexpr char const* kDecayCmd = "arena.0.dirty_decay_ms"; const char* malloc_conf = "dirty_decay_ms:10"; @@ -33,7 +32,6 @@ const char* malloc_conf = "dirty_decay_ms:10"; static constexpr char const* kDecayCmd = "arena.0.decay_time"; const char* malloc_conf = "purge:decay,decay_time:10"; #endif -#endif class MallctlHelperTest : public ::testing::Test { protected: