diff options
| -rw-r--r-- | libs/gui/Android.bp | 7 | ||||
| -rw-r--r-- | libs/ui/Android.bp | 1 | ||||
| -rw-r--r-- | libs/ui/FenceTime.cpp | 12 | ||||
| -rw-r--r-- | libs/ui/include/ui/FenceTime.h | 5 |
4 files changed, 5 insertions, 20 deletions
diff --git a/libs/gui/Android.bp b/libs/gui/Android.bp index ef3e592c09..98264ac35f 100644 --- a/libs/gui/Android.bp +++ b/libs/gui/Android.bp @@ -31,6 +31,7 @@ cc_library_shared { "-Werror", ], cppflags: [ + "-std=c++1z", "-Weverything", // The static constructors and destructors in this library have not been noted to @@ -58,7 +59,7 @@ cc_library_shared { "-Wno-weak-vtables", // Allow four-character integer literals - "-Wno-four-char-constants", + "-Wno-four-char-constants", // Allow documentation warnings "-Wno-documentation", @@ -116,7 +117,7 @@ cc_library_shared { "SyncFeatures.cpp", "view/Surface.cpp", "bufferqueue/1.0/B2HProducerListener.cpp", - "bufferqueue/1.0/H2BGraphicBufferProducer.cpp" + "bufferqueue/1.0/H2BGraphicBufferProducer.cpp", ], shared_libs: [ @@ -124,7 +125,7 @@ cc_library_shared { "libsync", "libbinder", "libbufferhub", - "libbufferhubqueue", // TODO(b/70046255): Remove this once BufferHub is integrated into libgui. + "libbufferhubqueue", // TODO(b/70046255): Remove this once BufferHub is integrated into libgui. "libpdx_default_transport", "libcutils", "libEGL", diff --git a/libs/ui/Android.bp b/libs/ui/Android.bp index e3ef2a9e1d..160505088f 100644 --- a/libs/ui/Android.bp +++ b/libs/ui/Android.bp @@ -26,6 +26,7 @@ cc_library_shared { "-Werror", ], cppflags: [ + "-std=c++1z", "-Weverything", // The static constructors and destructors in this library have not been noted to diff --git a/libs/ui/FenceTime.cpp b/libs/ui/FenceTime.cpp index 14147663de..340231d352 100644 --- a/libs/ui/FenceTime.cpp +++ b/libs/ui/FenceTime.cpp @@ -33,18 +33,6 @@ namespace android { const auto FenceTime::NO_FENCE = std::make_shared<FenceTime>(Fence::NO_FENCE); -void* FenceTime::operator new(size_t byteCount) noexcept { - void *p = nullptr; - if (posix_memalign(&p, alignof(FenceTime), byteCount)) { - return nullptr; - } - return p; -} - -void FenceTime::operator delete(void *p) { - free(p); -} - FenceTime::FenceTime(const sp<Fence>& fence) : mState(((fence.get() != nullptr) && fence->isValid()) ? State::VALID : State::INVALID), diff --git a/libs/ui/include/ui/FenceTime.h b/libs/ui/include/ui/FenceTime.h index 871fcf2dfe..a5a1fcbde7 100644 --- a/libs/ui/include/ui/FenceTime.h +++ b/libs/ui/include/ui/FenceTime.h @@ -113,11 +113,6 @@ public: void signalForTest(nsecs_t signalTime); - // Override new and delete since this needs 8-byte alignment, which - // is not guaranteed on x86. - static void* operator new(size_t nbytes) noexcept; - static void operator delete(void *p); - private: // For tests only. If forceValidForTest is true, then getSignalTime will // never return SIGNAL_TIME_INVALID and isValid will always return true. |