commit a974b6b9958d494c84812449424a52fd68494bbe
author Yurii Zubrytskyi <zyy@google.com> Fri Dec 20 08:12:46 2024 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Dec 20 08:12:46 2024 -0800
tree 558b14c415c1cce6cbbe0cfa94860319485474c6
parent 21a15e449e24108b0194774f43cf7c30d96205d5
parent 416507a52409606d06404196b1e5c16d9247ccc0

[zip] Move the singleton instance function for inlining am: 586c6d4f81 am: 416507a524

Original change: https://android-review.googlesource.com/c/platform/system/libziparchive/+/3426665

Change-Id: Ia72fb648f3f6957e4bbfffeec34e24ece86e8ff2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

incfs_support/include/incfs_support/signal_handling.h

diff --git a/incfs_support/include/incfs_support/signal_handling.h b/incfs_support/include/incfs_support/signal_handling.h
index 73e65ba..8c721d0 100644
--- a/incfs_support/include/incfs_support/signal_handling.h
+++ b/incfs_support/include/incfs_support/signal_handling.h
@@ -180,7 +180,10 @@
 
 class SignalHandler final {
  public:
-  static SignalHandler& instance();
+  static SignalHandler& instance() {
+    static SignalHandler self;
+    return self;
+  }
 
  private:
   SignalHandler();

incfs_support/signal_handling.cpp

diff --git a/incfs_support/signal_handling.cpp b/incfs_support/signal_handling.cpp
index 39cb0c6..0f660b6 100644
--- a/incfs_support/signal_handling.cpp
+++ b/incfs_support/signal_handling.cpp
@@ -31,11 +31,6 @@
 
 ScopedJmpBuf::~ScopedJmpBuf() { SignalHandler::mJmpBuf = mPrev; }
 
-SignalHandler& SignalHandler::instance() {
-  static SignalHandler self;
-  return self;
-}
-
 SignalHandler::SignalHandler() {
   const struct sigaction action = {
       .sa_sigaction = &handler,