Merge core

c324bf8a · Jesse Beder · 391111c0 · 2b2e6071 · c324bf8a · c324bf8a
Commit c324bf8a authored Jan 24, 2015 by Jesse Beder
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 6 deletions

include/yaml-cpp/emitterstyle.h include/yaml-cpp/emitterstyle.h +1 -5

test/CMakeLists.txt test/CMakeLists.txt +1 -1

No files found.
--- a/include/yaml-cpp/emitterstyle.h
+++ b/include/yaml-cpp/emitterstyle.h
@@ -9,11 +9,7 @@
 namespace YAML {
 struct EmitterStyle {
-  enum value {
+  enum value { Default, Block, Flow };
-    Default,
-    Block,
-    Flow,
-  };
 };
 }

--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -31,4 +31,4 @@ set_target_properties(run-tests PROPERTIES
 )
 target_link_libraries(run-tests yaml-cpp gtest gmock)
-#add_test(yaml-reader-test run-tests)
+add_test(yaml-test ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/run-tests)