From 5d59019d01e68a698cf6631a2a85c8b671b7cd3e Mon Sep 17 00:00:00 2001 From: Aaron Date: Wed, 26 Aug 2015 13:03:51 -0700 Subject: [PATCH] Get rid of merge conflict --- src/impl/pal.h | 6 +++--- src/tests/test-getcpinfo.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/impl/pal.h b/src/impl/pal.h index 4947c1cac..0bb04f05a 100644 --- a/src/impl/pal.h +++ b/src/impl/pal.h @@ -601,9 +601,9 @@ typedef unsigned char PAL_Boolean; //!* NameSpace namespace const_cpinfo{ - constexpr int MAX_DEFAULTCHAR = 2; - constexpr int MAX_LEADBYTES = 12; - constexpr int UTF8 = 65001; + constexpr int MAX_DEFAULTCHAR = 2; + constexpr int MAX_LEADBYTES = 12; + constexpr int UTF8 = 65001; } //!* Structs diff --git a/src/tests/test-getcpinfo.cpp b/src/tests/test-getcpinfo.cpp index 108819d9b..3ec759645 100644 --- a/src/tests/test-getcpinfo.cpp +++ b/src/tests/test-getcpinfo.cpp @@ -19,7 +19,7 @@ TEST(GetCPInfo,Utf8) EXPECT_EQ(cpinfo->DefaultChar[0], '?'); EXPECT_EQ(cpinfo->DefaultChar[1], '0'); EXPECT_EQ(cpinfo->MaxCharSize,4); - for(int i = 0; i < const_cpinfo::MAX_LEADBYTES; i++) + for (int i = 0; i < const_cpinfo::MAX_LEADBYTES; i++) { EXPECT_EQ(cpinfo->LeadByte[i], '0'); }