From 7c4cc9bf5fad5bb6dc2aa62b14eae14ab3681c77 Mon Sep 17 00:00:00 2001 From: Jesse Beder Date: Tue, 8 Sep 2009 20:57:18 +0000 Subject: [PATCH] Cleaned up the read template overloads (per litb's update); it seems the old version didn't compile in VS2008. Also updated the VS project files. --- include/nodereadimpl.h | 4 ++-- yaml-reader.vcproj | 16 ++++++++++++++++ yamlcpp.vcproj | 4 ++++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/include/nodereadimpl.h b/include/nodereadimpl.h index 5beaa09..1ea7cf3 100644 --- a/include/nodereadimpl.h +++ b/include/nodereadimpl.h @@ -38,12 +38,12 @@ namespace YAML struct flag { char c[2]; }; flag Convert(...); - char (& operator,(flag, flag) )[1]; + int operator,(flag, flag); template void operator,(flag, T const&); - char (& operator,(char(&)[1], flag) )[1]; + char operator,(int, flag); } template diff --git a/yaml-reader.vcproj b/yaml-reader.vcproj index 84ad1d3..0e550f9 100644 --- a/yaml-reader.vcproj +++ b/yaml-reader.vcproj @@ -179,6 +179,10 @@ RelativePath=".\yaml-reader\parsertests.cpp" > + + @@ -189,6 +193,18 @@ Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" > + + + + + + diff --git a/yamlcpp.vcproj b/yamlcpp.vcproj index 749ac8e..8673b8f 100644 --- a/yamlcpp.vcproj +++ b/yamlcpp.vcproj @@ -191,6 +191,10 @@ RelativePath=".\src\node.cpp" > + +