Skip to content

Commit 409d6db

Browse files
fix compilation error on mac.
1 parent e2be2a3 commit 409d6db

File tree

5 files changed

+29
-7
lines changed

5 files changed

+29
-7
lines changed

src/corelib.pro

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ QT += sql network xml qml
77
# C++ Standards Support
88
CONFIG += c++20
99
windows:QMAKE_CXXFLAGS += /Zc:__cplusplus /std:c++20 /permissive-
10+
macx:QMAKE_MACOSX_DEPLOYMENT_TARGET = 14.0
1011

1112
DEFINES *= QT_USE_QSTRINGBUILDER
1213
DEFINES += TF_MAKEDLL

src/tactioncontext.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -242,14 +242,14 @@ void TActionContext::execute(THttpRequest &request)
242242
}
243243

244244
} catch (ClientErrorException &e) {
245-
Tf::warn("Caught {}: status code:{}", qUtf8Printable(e.className()), e.statusCode());
246-
tSystemWarn("Caught {}: status code:{}", qUtf8Printable(e.className()), e.statusCode());
245+
Tf::warn("Caught {}: status code:{}", e.className(), e.statusCode());
246+
tSystemWarn("Caught {}: status code:{}", e.className(), e.statusCode());
247247
int responseBytes = writeResponse(e.statusCode(), responseHeader);
248248
accessLogger.setResponseBytes(responseBytes);
249249
accessLogger.setStatusCode(e.statusCode());
250250
} catch (TfException &e) {
251-
Tf::error("Caught {}: {} [{}:{}]", qUtf8Printable(e.className()), qUtf8Printable(e.message()), qUtf8Printable(e.fileName()), e.lineNumber());
252-
tSystemError("Caught {}: {} [{}:{}]", qUtf8Printable(e.className()), qUtf8Printable(e.message()), qUtf8Printable(e.fileName()), e.lineNumber());
251+
Tf::error("Caught {}: {} [{}:{}]", e.className(), e.message(), e.fileName(), e.lineNumber());
252+
tSystemError("Caught {}: {} [{}:{}]", e.className(), e.message(), e.fileName(), e.lineNumber());
253253
closeSocket();
254254
accessLogger.setResponseBytes(0);
255255
accessLogger.setStatusCode(Tf::InternalServerError);

src/tactioncontroller.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ QString TActionController::getRenderingData(const QString &templateName, const Q
507507
QByteArray TActionController::renderView(TActionView *view)
508508
{
509509
if (!view) {
510-
tSystemError("view null pointer. action:{}", qUtf8Printable(activeAction()));
510+
tSystemError("view null pointer. action:{}", activeAction());
511511
return QByteArray();
512512
}
513513
view->setController(this);
@@ -730,7 +730,7 @@ bool TActionController::userLogin(const TAbstractUser *user)
730730
}
731731

732732
if (isUserLoggedIn()) {
733-
tSystemWarn("userLogin: Duplicate login detected. Force logout [user:{}]", qUtf8Printable(identityKeyOfLoginUser()));
733+
tSystemWarn("userLogin: Duplicate login detected. Force logout [user:{}]", identityKeyOfLoginUser());
734734
}
735735

736736
session().insert(LOGIN_USER_NAME_KEY, user->identityKey());

src/tactionmailer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ bool TActionMailer::deliver(const QString &templateName)
5656
TDispatcher<TActionView> viewDispatcher(viewClassName(CONTROLLER_NAME, templateName));
5757
TActionView *view = viewDispatcher.object();
5858
if (!view) {
59-
tSystemError("no such template : {}", qUtf8Printable(templateName));
59+
tSystemError("no such template : {}", templateName);
6060
return false;
6161
}
6262

src/tsystemglobal.h

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,27 @@ class TSystemLogger;
88
class TAccessLog;
99
class QSqlError;
1010

11+
#ifdef TF_HAVE_STD_FORMAT // std::format
12+
13+
namespace std {
14+
template<>
15+
struct std::formatter<QByteArray, char> : std::formatter<std::string, char> {
16+
auto format(const QByteArray &ba, std::format_context &ctx) const {
17+
return std::formatter<std::string, char>::format(ba.toStdString(), ctx);
18+
}
19+
};
20+
21+
template<>
22+
struct formatter<QString, char> : formatter<std::string, char> {
23+
auto format(const QString &str, format_context &ctx) const {
24+
return std::formatter<std::string, char>::format(str.toStdString(), ctx);
25+
}
26+
};
27+
}
28+
29+
#endif
30+
31+
1132
namespace Tf {
1233
T_CORE_EXPORT void setupSystemLogger(TSystemLogger *logger = nullptr); // internal use
1334
T_CORE_EXPORT void releaseSystemLogger(); // internal use

0 commit comments

Comments
 (0)