hrev54212 adds 1 changeset to branch 'master'
old head: 8ba659750993e8ab1b81704e42a63f80fe373e61
new head: ec43e4f4c22a8f82ed177bfcb21e0bf364988c12
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=ec43e4f4c22a+%5E8ba659750993
----------------------------------------------------------------------------
ec43e4f4c22a: AutoDeleter: do not allow copy
Change-Id: Ieab0fea46fc23c446bbaca407e3e80a4a7901896
Reviewed-on: https://review.haiku-os.org/c/haiku/+/2704
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>
[ X512 <danger_mail@xxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev54212
Commit: ec43e4f4c22a8f82ed177bfcb21e0bf364988c12
URL: https://git.haiku-os.org/haiku/commit/?id=ec43e4f4c22a
Author: X512 <danger_mail@xxxxxxx>
Date: Fri May 15 06:55:51 2020 UTC
Committer: waddlesplash <waddlesplash@xxxxxxxxx>
Commit-Date: Sat May 16 18:23:09 2020 UTC
----------------------------------------------------------------------------
2 files changed, 6 insertions(+), 2 deletions(-)
headers/private/shared/AutoDeleter.h | 4 ++++
src/kits/locale/DateFormat.cpp | 4 ++--
----------------------------------------------------------------------------
diff --git a/headers/private/shared/AutoDeleter.h
b/headers/private/shared/AutoDeleter.h
index 78966ba319..4a2df9146c 100644
--- a/headers/private/shared/AutoDeleter.h
+++ b/headers/private/shared/AutoDeleter.h
@@ -80,6 +80,10 @@ public:
protected:
C *fObject;
DeleteFunc fDelete;
+
+private:
+ AutoDeleter(const AutoDeleter&);
+ AutoDeleter& operator=(const AutoDeleter&);
};
diff --git a/src/kits/locale/DateFormat.cpp b/src/kits/locale/DateFormat.cpp
index b70d601915..656c916f4f 100644
--- a/src/kits/locale/DateFormat.cpp
+++ b/src/kits/locale/DateFormat.cpp
@@ -265,8 +265,8 @@ BDateFormat::GetStartOfWeek(BWeekday* startOfWeek) const
return B_BAD_VALUE;
UErrorCode err = U_ZERO_ERROR;
- ObjectDeleter<Calendar> calendar = Calendar::createInstance(
- *BFormattingConventions::Private(&fConventions).ICULocale(),
err);
+ ObjectDeleter<Calendar> calendar(Calendar::createInstance(
+ *BFormattingConventions::Private(&fConventions).ICULocale(),
err));
if (U_FAILURE(err))
return B_ERROR;
