From ccb6553a5da93d78eec360803cc18f42f9491fd6 Mon Sep 17 00:00:00 2001 From: Arseny Smirnov Date: Fri, 16 Feb 2018 12:09:50 +0300 Subject: [PATCH] Improve TRY_RESULT define GitOrigin-RevId: 399a4102f795c0c44d3089a1a3b341393c9f0f95 --- tdnet/td/net/HttpReader.cpp | 2 +- tdutils/td/utils/Status.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tdnet/td/net/HttpReader.cpp b/tdnet/td/net/HttpReader.cpp index 380d93bf7..1cfa7666a 100644 --- a/tdnet/td/net/HttpReader.cpp +++ b/tdnet/td/net/HttpReader.cpp @@ -738,7 +738,7 @@ Status HttpReader::open_temp_file(CSlice desired_file_name) { return Status::OK(); } - rmdir(r_directory.move_as_ok()).ignore(); + rmdir(directory).ignore(); LOG(WARNING) << "Failed to create temporary file " << desired_file_name << ": " << second_try.error(); return second_try.move_as_error(); } diff --git a/tdutils/td/utils/Status.h b/tdutils/td/utils/Status.h index 8bfaea970..8ef2846df 100644 --- a/tdutils/td/utils/Status.h +++ b/tdutils/td/utils/Status.h @@ -25,7 +25,7 @@ return try_status.move_as_error(); \ } \ } -#define TRY_RESULT(name, result) TRY_RESULT_IMPL(TD_CONCAT(r_, name), name, result) +#define TRY_RESULT(name, result) TRY_RESULT_IMPL(TD_CONCAT(TD_CONCAT(r_, name), __LINE__), name, result) #define TRY_RESULT_IMPL(r_name, name, result) \ auto r_name = (result); \