winlin

Merge branch '1.0release' into develop

@@ -1206,12 +1206,12 @@ VOID TEST(KernelStreamTest, StreamRead8Bytes) @@ -1206,12 +1206,12 @@ VOID TEST(KernelStreamTest, StreamRead8Bytes)
1206 data[18] = 0x13; 1206 data[18] = 0x13;
1207 data[19] = 0x14; 1207 data[19] = 0x14;
1208 1208
1209 - EXPECT_EQ(0x0102030405060708, s.read_8bytes());  
1210 - EXPECT_EQ(0x090a0b0c0d0e0f10, s.read_8bytes()); 1209 + EXPECT_EQ(0x0102030405060708LL, s.read_8bytes());
  1210 + EXPECT_EQ(0x090a0b0c0d0e0f10LL, s.read_8bytes());
1211 1211
1212 s.skip(-1 * s.pos()); 1212 s.skip(-1 * s.pos());
1213 s.skip(5); 1213 s.skip(5);
1214 - EXPECT_EQ(0x060708090a0b0c0d, s.read_8bytes()); 1214 + EXPECT_EQ(0x060708090a0b0c0dLL, s.read_8bytes());
1215 } 1215 }
1216 1216
1217 /** 1217 /**
@@ -1364,8 +1364,8 @@ VOID TEST(KernelStreamTest, StreamWrite8Bytes) @@ -1364,8 +1364,8 @@ VOID TEST(KernelStreamTest, StreamWrite8Bytes)
1364 1364
1365 EXPECT_TRUE(ERROR_SUCCESS == s.initialize(data, 1024)); 1365 EXPECT_TRUE(ERROR_SUCCESS == s.initialize(data, 1024));
1366 1366
1367 - s.write_8bytes(0x1011121314151617);  
1368 - s.write_8bytes(0x1819202122232425); 1367 + s.write_8bytes(0x1011121314151617LL);
  1368 + s.write_8bytes(0x1819202122232425LL);
1369 1369
1370 s.skip(-1 * s.pos()); 1370 s.skip(-1 * s.pos());
1371 EXPECT_EQ(0x10, s.read_1bytes()); 1371 EXPECT_EQ(0x10, s.read_1bytes());