From d140ccb790b3b29a5a86fa665039885acc551075 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Thu, 15 Mar 2018 14:52:15 -0700 Subject: [PATCH] Fix constexpr compile error on Windows --- domain-server/src/DomainServer.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp index 1d1e8d4dc3..a11fe74c58 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -2134,7 +2134,6 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url _contentManager->getAllBackupsAndStatus(deferred); return true; } else if (url.path().startsWith(URI_API_BACKUPS_ID)) { - constexpr const char* CONTENT_TYPE_ZIP = "application/zip"; auto id = url.path().mid(QString(URI_API_BACKUPS_ID).length()); auto deferred = makePromise("consolidateBackup"); deferred->then([connectionPtr, JSON_MIME_TYPE, id](QString error, QVariantMap result) { @@ -2148,6 +2147,8 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url auto path = result["backupFilePath"].toString(); auto file { std::unique_ptr(new QFile(path)) }; if (file->open(QIODevice::ReadOnly)) { + constexpr const char* CONTENT_TYPE_ZIP = "application/zip"; + auto downloadedFilename = id; downloadedFilename.replace(QRegularExpression(".zip$"), ".content.zip"); auto contentDisposition = "attachment; filename=\"" + downloadedFilename + "\"";