From 445328ace6f0c52668a19613f366b2ed7a3069d9 Mon Sep 17 00:00:00 2001 From: Aaron Jacobs Date: Tue, 1 Jul 2014 09:15:11 +1000 Subject: [PATCH] Fixed some clang-format weirdness. --- src/lib_json/json_batchallocator.h | 9 +++------ src/lib_json/json_reader.cpp | 4 ++-- src/lib_json/json_writer.cpp | 4 ++-- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/lib_json/json_batchallocator.h b/src/lib_json/json_batchallocator.h index 7e7ad82..96e0332 100644 --- a/src/lib_json/json_batchallocator.h +++ b/src/lib_json/json_batchallocator.h @@ -19,14 +19,11 @@ namespace Json { * the page size, the number of object in each page). * * It does not allow the destruction of a single object. All the allocated - *objects - * can be destroyed at once. The memory can be either released or reused for - *future - * allocation. + * objects can be destroyed at once. The memory can be either released or reused + * for future allocation. * * The in-place new operator must be used to construct the object using the - *pointer - * returned by allocate. + * pointer returned by allocate. */ template class BatchAllocator { diff --git a/src/lib_json/json_reader.cpp b/src/lib_json/json_reader.cpp index 3d0d328..4cdb9a5 100644 --- a/src/lib_json/json_reader.cpp +++ b/src/lib_json/json_reader.cpp @@ -16,8 +16,8 @@ #include #if defined(_MSC_VER) && _MSC_VER >= 1400 // VC++ 8.0 -#pragma warning(disable \ - : 4996) // disable warning about strdup being deprecated. +// Disable warning about strdup being deprecated. +#pragma warning(disable : 4996) #endif namespace Json { diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp index cba5d13..ffdcbd7 100644 --- a/src/lib_json/json_writer.cpp +++ b/src/lib_json/json_writer.cpp @@ -15,8 +15,8 @@ #include #if defined(_MSC_VER) && _MSC_VER >= 1400 // VC++ 8.0 -#pragma warning(disable \ - : 4996) // disable warning about strdup being deprecated. +// Disable warning about strdup being deprecated. +#pragma warning(disable : 4996) #endif namespace Json {