Skip to content
Permalink
Browse files

error in file locked dialog, fmt v4.0.0, tinyxml2 v5.0.1

  • Loading branch information...
alabuzhev committed Jun 28, 2017
1 parent d42ad8b commit ae979b97854a1d349842949eab4c4c79099cadd2
@@ -1,3 +1,11 @@
drkns 28.06.2017 19:02:42 +0000 - build 4980

1. Ошибка отображения информации о заблокированном файле.

2. fmt v4.0.0.

3. TinyXML-2 v5.0.1

drkns 25.06.2017 02:03:37 +0000 - build 4979

1. Рефакторинг.
@@ -28272,14 +28272,14 @@ upd:"opened"

MObjectLockedSwitchTo
"Переключиться"
"Switch to:"
"Switch to"
"Přepnout na"
"Gehe zu"
upd:"Switch to"
upd:"Switch to"
"Cambiar a:"
"Cambiar a"
"Prepnúť na"
"Vai A:"
"Vai A"
"Перемкнутися"

MObjectLockedClose
@@ -568,8 +568,8 @@ operation OperationFailed(const string& Object, lng Title, const string& Descrip
{
Result = Message(MSG_WARNING | MSG_ERRORTYPE,
msg(Title),
std::move(Msgs),
std::move(Buttons));
Msgs,
Buttons);

if(SwitchBtn)
{
@@ -41,6 +41,9 @@
#endif

#if FMT_USE_WINDOWS_H
# if !defined(FMT_HEADER_ONLY) && !defined(WIN32_LEAN_AND_MEAN)
# define WIN32_LEAN_AND_MEAN
# endif
# if defined(NOMINMAX) || defined(FMT_WIN_MINMAX)
# include <windows.h>
# else
@@ -50,8 +53,6 @@
# endif
#endif

using fmt::internal::Arg;

#if FMT_EXCEPTIONS
# define FMT_TRY try
# define FMT_CATCH(x) catch (x)
@@ -212,16 +213,6 @@ void report_error(FormatFunc func, int error_code,
}
} // namespace

namespace internal {

// This method is used to preserve binary compatibility with fmt 3.0.
// It can be removed in 4.0.
FMT_FUNC void format_system_error(
Writer &out, int error_code, StringRef message) FMT_NOEXCEPT {
fmt::format_system_error(out, error_code, message);
}
} // namespace internal

FMT_FUNC void SystemError::init(
int err_code, CStringRef format_str, ArgList args) {
error_code_ = err_code;
@@ -455,14 +446,14 @@ void internal::FixedBuffer<Char>::grow(std::size_t) {
FMT_THROW(std::runtime_error("buffer overflow"));
}

FMT_FUNC Arg internal::FormatterBase::do_get_arg(
FMT_FUNC internal::Arg internal::FormatterBase::do_get_arg(
unsigned arg_index, const char *&error) {
Arg arg = args_[arg_index];
internal::Arg arg = args_[arg_index];
switch (arg.type) {
case Arg::NONE:
case internal::Arg::NONE:
error = "argument index out of range";
break;
case Arg::NAMED_ARG:
case internal::Arg::NAMED_ARG:
arg = *static_cast<const internal::Arg*>(arg.pointer);
break;
default:
@@ -513,11 +504,11 @@ template void internal::FixedBuffer<char>::grow(std::size_t);

template void internal::ArgMap<char>::init(const ArgList &args);

template int internal::CharTraits<char>::format_float(
template FMT_API int internal::CharTraits<char>::format_float(
char *buffer, std::size_t size, const char *format,
unsigned width, int precision, double value);

template int internal::CharTraits<char>::format_float(
template FMT_API int internal::CharTraits<char>::format_float(
char *buffer, std::size_t size, const char *format,
unsigned width, int precision, long double value);

@@ -527,11 +518,11 @@ template void internal::FixedBuffer<wchar_t>::grow(std::size_t);

template void internal::ArgMap<wchar_t>::init(const ArgList &args);

template int internal::CharTraits<wchar_t>::format_float(
template FMT_API int internal::CharTraits<wchar_t>::format_float(
wchar_t *buffer, std::size_t size, const wchar_t *format,
unsigned width, int precision, double value);

template int internal::CharTraits<wchar_t>::format_float(
template FMT_API int internal::CharTraits<wchar_t>::format_float(
wchar_t *buffer, std::size_t size, const wchar_t *format,
unsigned width, int precision, long double value);

Oops, something went wrong.

0 comments on commit ae979b9

Please sign in to comment.
You can’t perform that action at this time.