From 2bf6eeb0db03dd1c30ddd160589cbd416e0128b7 Mon Sep 17 00:00:00 2001 From: Rob Patro Date: Wed, 10 Dec 2014 16:06:15 -0500 Subject: [PATCH] Changed header guard for format.h Previously, if spdlog was being used in a project that also uses cppformat, this file (with it's custom namespace) would not be included. This is because, while the definitions were added to the spdlog namespace, the include guard was left the same as in the actual cppformat library. This change modifies the include guard by prefixing it with SPDLOG_. --- include/spdlog/details/format.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/spdlog/details/format.h b/include/spdlog/details/format.h index 337b4ab8..b74da1f2 100644 --- a/include/spdlog/details/format.h +++ b/include/spdlog/details/format.h @@ -25,8 +25,8 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef FMT_FORMAT_H_ -#define FMT_FORMAT_H_ +#ifndef SPDLOG_FMT_FORMAT_H_ +#define SPDLOG_FMT_FORMAT_H_ #include @@ -2879,4 +2879,4 @@ FMT_VARIADIC(int, fprintf, std::FILE *, StringRef) # pragma GCC diagnostic pop //pop -Wshadow warnings ignore #endif -#endif // FMT_FORMAT_H_ +#endif // SPDLOG_FMT_FORMAT_H_