From 2e1b273c3ea45d6a7ca78d5d927f202f3aeb9b87 Mon Sep 17 00:00:00 2001 From: Yedidya Feldblum <yfeldblum@fb.com> Date: Fri, 3 Nov 2017 16:53:23 -0700 Subject: [PATCH] Move folly/SafeAssert.h Summary: [Folly] Move `folly/SafeAssert.h` to `folly/lang/`. Reviewed By: Orvid Differential Revision: D6230421 fbshipit-source-id: 0086cd6fedd4ce0e7a4d5302a41153ec1a502e74 --- folly/Makefile.am | 4 ++-- folly/experimental/StampedPtr.h | 2 +- folly/experimental/symbolizer/Elf.h | 2 +- folly/{ => lang}/SafeAssert.cpp | 2 +- folly/{ => lang}/SafeAssert.h | 0 folly/{ => lang}/test/SafeAssertTest.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename folly/{ => lang}/SafeAssert.cpp (97%) rename folly/{ => lang}/SafeAssert.h (100%) rename folly/{ => lang}/test/SafeAssertTest.cpp (96%) diff --git a/folly/Makefile.am b/folly/Makefile.am index 79bcecb02..e1c0e4645 100644 --- a/folly/Makefile.am +++ b/folly/Makefile.am @@ -314,6 +314,7 @@ nobase_follyinclude_HEADERS = \ json.h \ lang/Assume.h \ lang/Launder.h \ + lang/SafeAssert.h \ Lazy.h \ LifoSem.h \ Likely.h \ @@ -392,7 +393,6 @@ nobase_follyinclude_HEADERS = \ Range.h \ Replaceable.h \ RWSpinLock.h \ - SafeAssert.h \ ScopeGuard.h \ SharedMutex.h \ Singleton.h \ @@ -567,6 +567,7 @@ libfolly_la_SOURCES = \ io/async/ssl/SSLErrors.cpp \ json.cpp \ lang/Assume.cpp \ + lang/SafeAssert.cpp \ detail/MemoryIdler.cpp \ detail/SocketFastOpen.cpp \ MacAddress.cpp \ @@ -592,7 +593,6 @@ libfolly_la_SOURCES = \ portability/Time.cpp \ portability/Unistd.cpp \ Random.cpp \ - SafeAssert.cpp \ ScopeGuard.cpp \ SharedMutex.cpp \ MicroLock.cpp \ diff --git a/folly/experimental/StampedPtr.h b/folly/experimental/StampedPtr.h index 27432fdc6..d8d2f65cc 100644 --- a/folly/experimental/StampedPtr.h +++ b/folly/experimental/StampedPtr.h @@ -16,7 +16,7 @@ #pragma once -#include <folly/SafeAssert.h> +#include <folly/lang/SafeAssert.h> #include <stdint.h> diff --git a/folly/experimental/symbolizer/Elf.h b/folly/experimental/symbolizer/Elf.h index 2bf37a9de..c097be692 100644 --- a/folly/experimental/symbolizer/Elf.h +++ b/folly/experimental/symbolizer/Elf.h @@ -29,7 +29,7 @@ #include <folly/Conv.h> #include <folly/Likely.h> #include <folly/Range.h> -#include <folly/SafeAssert.h> +#include <folly/lang/SafeAssert.h> namespace folly { namespace symbolizer { diff --git a/folly/SafeAssert.cpp b/folly/lang/SafeAssert.cpp similarity index 97% rename from folly/SafeAssert.cpp rename to folly/lang/SafeAssert.cpp index 62f3bc447..20e35aeee 100644 --- a/folly/SafeAssert.cpp +++ b/folly/lang/SafeAssert.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include <folly/SafeAssert.h> +#include <folly/lang/SafeAssert.h> #include <folly/Conv.h> #include <folly/FileUtil.h> diff --git a/folly/SafeAssert.h b/folly/lang/SafeAssert.h similarity index 100% rename from folly/SafeAssert.h rename to folly/lang/SafeAssert.h diff --git a/folly/test/SafeAssertTest.cpp b/folly/lang/test/SafeAssertTest.cpp similarity index 96% rename from folly/test/SafeAssertTest.cpp rename to folly/lang/test/SafeAssertTest.cpp index 8df2b8cac..fc2ba6a7a 100644 --- a/folly/test/SafeAssertTest.cpp +++ b/folly/lang/test/SafeAssertTest.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include <folly/SafeAssert.h> +#include <folly/lang/SafeAssert.h> #include <glog/logging.h> -- 2.26.2