X-Git-Url: http://plrg.eecs.uci.edu/git/?p=folly.git;a=blobdiff_plain;f=folly%2Fportability%2FMemory.h;h=60e2e2ad9bfe09d67253099cd701c507dd76cdce;hp=d932a5dc13422224ca1b38b98418b8bd2632e3db;hb=47b2f8dfdc39b149accf9ae830551eee670d98d1;hpb=337e897a2510b8f1291c6be95b3eb18f0c80cb68 diff --git a/folly/portability/Memory.h b/folly/portability/Memory.h index d932a5dc..60e2e2ad 100644 --- a/folly/portability/Memory.h +++ b/folly/portability/Memory.h @@ -1,5 +1,5 @@ /* - * Copyright 2017 Facebook, Inc. + * Copyright 2016-present Facebook, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,11 @@ #pragma once -#include +#include // @shim namespace folly { namespace detail { -void* aligned_malloc(size_t size, size_t align); -void aligned_free(void* aligned_ptr); +using folly::aligned_free; +using folly::aligned_malloc; } // namespace detail } // namespace folly