From e0d38508fc8b6bc3915b2235a85a068eacfb87bf Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Tue, 11 Jun 2024 18:46:31 +0200
Subject: Merging upstream version 1.62.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 src/shrpx_log.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/shrpx_log.h')

diff --git a/src/shrpx_log.h b/src/shrpx_log.h
index bc30097..7a334ca 100644
--- a/src/shrpx_log.h
+++ b/src/shrpx_log.h
@@ -33,7 +33,6 @@
 #include <vector>
 #include <chrono>
 
-#include "shrpx_config.h"
 #include "shrpx_log_config.h"
 #include "tls.h"
 #include "template.h"
@@ -97,6 +96,7 @@ namespace shrpx {
 
 class Downstream;
 struct DownstreamAddr;
+struct LoggingConfig;
 
 enum SeverityLevel { INFO, NOTICE, WARN, ERROR, FATAL };
 
@@ -266,7 +266,7 @@ enum class LogFragmentType {
 };
 
 struct LogFragment {
-  LogFragment(LogFragmentType type, StringRef value = StringRef::from_lit(""))
+  LogFragment(LogFragmentType type, StringRef value = ""_sr)
       : type(type), value(std::move(value)) {}
   LogFragmentType type;
   StringRef value;
-- 
cgit v1.2.3