aphrody-labs/PowerShell
1
0 Fork 0
mirror of https://github.com/aphrody-labs/PowerShell.git synced 2026-10-14 13:49:09 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Get rid of merge conflict

Browse Source
This commit is contained in:
Aaron committed 2015-08-26 13:03:51 -07:00
1 parent 95060b345f
commit 5d59019d01
2 files changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/impl/pal.h
+3 -3
View File
@@ -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
src/tests/test-getcpinfo.cpp
+1 -1
View File
@@ -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');
}