peisongxiao/yaml-cpp
1
0
Fork 0
mirror of https://github.com/jbeder/yaml-cpp.git synced 2025-09-09 12:41:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modified old gcc version patch so it still uses the new Node::Read in Visual Studio. Also broke up the \uNNNN characters in the spec tests into \xNN-type strings.

Browse Source
This commit is contained in:
Jesse Beder
2009-09-16 05:31:28 +00:00
parent 5733b77b84
commit 94eb7f1dbd
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/nodereadimpl.h
View File

@@ -9,7 +9,7 @@ namespace YAML
// Note: this doesn't work on gcc 3.2, but does on gcc 3.4 and above. I'm not sure about 3.3. // Note: this doesn't work on gcc 3.2, but does on gcc 3.4 and above. I'm not sure about 3.3.
#if (__GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ <= 3)) #if __GNUC__ && (__GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ <= 3))
// trick doesn't work? Just fall back to ConvertScalar. // trick doesn't work? Just fall back to ConvertScalar.
// This means that we can't use any user-defined types as keys in a map // This means that we can't use any user-defined types as keys in a map
template <typename T> template <typename T>

4
yaml-reader/spectests.cpp
View File

@@ -477,7 +477,7 @@ namespace Test {
parser.GetNextDocument(doc); parser.GetNextDocument(doc);
YAML_ASSERT(doc.size() == 6); YAML_ASSERT(doc.size() == 6);
YAML_ASSERT(doc["unicode"] == "Sosa did fine.\u263A"); YAML_ASSERT(doc["unicode"] == "Sosa did fine.\xe2\x98\xba");
YAML_ASSERT(doc["control"] == "\b1998\t1999\t2000\n"); YAML_ASSERT(doc["control"] == "\b1998\t1999\t2000\n");
YAML_ASSERT(doc["hex esc"] == "\x0d\x0a is \r\n"); YAML_ASSERT(doc["hex esc"] == "\x0d\x0a is \r\n");
YAML_ASSERT(doc["single"] == "\"Howdy!\" he cried."); YAML_ASSERT(doc["single"] == "\"Howdy!\" he cried.");
@@ -809,7 +809,7 @@ namespace Test {
YAML::Node doc; YAML::Node doc;
parser.GetNextDocument(doc); parser.GetNextDocument(doc);
YAML_ASSERT(doc == "Fun with \x5C \x22 \x07 \x08 \x1B \x0C \x0A \x0D \x09 \x0B " + std::string("\x00", 1) + " \x20 \xA0 \x85 \u2028 \u2029 A A A"); YAML_ASSERT(doc == "Fun with \x5C \x22 \x07 \x08 \x1B \x0C \x0A \x0D \x09 \x0B " + std::string("\x00", 1) + " \x20 \xA0 \x85 \xe2\x80\xa8 \xe2\x80\xa9 A A A");
return true; return true;
} }