Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(482)

Unified Diff: base/mac/scoped_launch_data.h

Issue 981803004: 10.10 compatibility for base::mac::ScopedLaunchData (Closed) Base URL: https://chromium.googlesource.com/chromium/mini_chromium@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/mac/scoped_launch_data.h
diff --git a/base/mac/scoped_launch_data.h b/base/mac/scoped_launch_data.h
index 57977049b25924cf944a6aa2a8f7429c87163658..0f1a16150bdcd3cc6ec40681b699dceb74bed53a 100644
--- a/base/mac/scoped_launch_data.h
+++ b/base/mac/scoped_launch_data.h
@@ -12,6 +12,17 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
+namespace {
+
+inline void LaunchDataFree(launch_data_t data) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+ return launch_data_free(data);
+#pragma clang diagnostic pop
+}
+
+} // namespace
+
namespace base {
namespace mac {
@@ -26,13 +37,13 @@ class ScopedLaunchData {
~ScopedLaunchData() {
if (object_)
- launch_data_free(object_);
+ LaunchDataFree(object_);
}
void reset(launch_data_t object = NULL) {
if (object != object_) {
if (object_)
- launch_data_free(object_);
+ LaunchDataFree(object_);
object_ = object;
}
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698