From 66e5c07b4fee4a872451a549476055fc875ba68d Mon Sep 17 00:00:00 2001 From: Jesse Beder Date: Tue, 25 Mar 2014 22:01:35 -0500 Subject: [PATCH 1/3] Extend format build target to all build tools --- CMakeLists.txt | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f5d9444..fe6b2a4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -318,10 +318,8 @@ if(YAML_CPP_BUILD_TOOLS) endif() ### Formatting -if(${CMAKE_BUILD_TOOL} MATCHES make OR ${CMAKE_BUILD_TOOL} MATCHES gmake) - get_property(all_sources GLOBAL PROPERTY SRCS_LIST) - add_custom_target(format - COMMAND clang-format --style=file -i ${all_sources} - COMMENT "Running clang-format" - VERBATIM) -endif() \ No newline at end of file +get_property(all_sources GLOBAL PROPERTY SRCS_LIST) +add_custom_target(format + COMMAND clang-format --style=file -i ${all_sources} + COMMENT "Running clang-format" + VERBATIM) From 47af59f09c89692dc11562d4b1a840c187b4cf82 Mon Sep 17 00:00:00 2001 From: Jesse Beder Date: Tue, 25 Mar 2014 22:03:27 -0500 Subject: [PATCH 2/3] Add dll tag to Binary --- include/yaml-cpp/binary.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/include/yaml-cpp/binary.h b/include/yaml-cpp/binary.h index 7a503d9..d236a0c 100644 --- a/include/yaml-cpp/binary.h +++ b/include/yaml-cpp/binary.h @@ -10,11 +10,14 @@ #include #include -namespace YAML { -std::string EncodeBase64(const unsigned char *data, std::size_t size); -std::vector DecodeBase64(const std::string &input); +#include "yaml-cpp/dll.h" -class Binary { +namespace YAML { +YAML_CPP_API std::string EncodeBase64(const unsigned char *data, + std::size_t size); +YAML_CPP_API std::vector DecodeBase64(const std::string &input); + +class YAML_CPP_API Binary { public: Binary() : m_unownedData(0), m_unownedSize(0) {} Binary(const unsigned char *data_, std::size_t size_) From a499d2edaddf2094ff1ed8e8535256bf5f2b991f Mon Sep 17 00:00:00 2001 From: Jesse Beder Date: Tue, 25 Mar 2014 22:04:53 -0500 Subject: [PATCH 3/3] Add missing include to scanscalar.cpp --- src/scanscalar.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/scanscalar.cpp b/src/scanscalar.cpp index 165742e..8253b8d 100644 --- a/src/scanscalar.cpp +++ b/src/scanscalar.cpp @@ -1,6 +1,9 @@ +#include "scanscalar.h" + +#include + #include "exp.h" #include "regeximpl.h" -#include "scanscalar.h" #include "stream.h" #include "yaml-cpp/exceptions.h" // IWYU pragma: keep