From e4c785beb42be21f84874a48895d541daf2871f0 Mon Sep 17 00:00:00 2001 From: Daniel Sipka Date: Thu, 1 Oct 2015 12:16:35 +0200 Subject: [PATCH] MSVC2013 workarounds --- test/data/complex.hpp | 12 ++++++------ test/data/dot_notation.hpp | 4 ++-- test/data/higher_order_sections.hpp | 4 ++-- test/data/partial_view.hpp | 4 ++-- test/data/partial_whitespace.hpp | 4 ++-- test/data/simple.hpp | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/test/data/complex.hpp b/test/data/complex.hpp index 481580d..a438098 100644 --- a/test/data/complex.hpp +++ b/test/data/complex.hpp @@ -5,9 +5,9 @@ private: std::string m_url; public: complex_item(const std::string& name, bool current, const std::string& url): - m_name{name}, m_current{current}, m_url{url} + m_name(name), m_current(current), m_url(url) { - register_methods(this, { + register_methods(this, std::map{ {"name", &complex_item::name}, {"current", &complex_item::current}, {"url", &complex_item::url}, {"link", &complex_item::link} }); @@ -36,14 +36,14 @@ private: mstch::array m_item; public: complex(): - m_header{"Colors"}, - m_item{ + m_header("Colors"), + m_item(mstch::array{ std::make_shared("red", true, "#Red"), std::make_shared("green", false, "#Green"), std::make_shared("blue", false, "#Blue") - } + }) { - register_methods(this, { + register_methods(this, std::map{ {"header", &complex::header}, {"item", &complex::item}, {"list", &complex::list}, {"empty", &complex::empty} }); diff --git a/test/data/dot_notation.hpp b/test/data/dot_notation.hpp index 9a6574d..c287107 100644 --- a/test/data/dot_notation.hpp +++ b/test/data/dot_notation.hpp @@ -4,9 +4,9 @@ private: mstch::map m_currency; public: dot_notation_price(): - m_value{200}, m_currency{{"symbol", std::string{"$"}}, {"name", std::string{"USD"}}} + m_value(200), m_currency(mstch::map{{"symbol", std::string{"$"}}, {"name", std::string{"USD"}}}) { - register_methods(this, { + register_methods(this, std::map{ {"value", &dot_notation_price::value}, {"vat", &dot_notation_price::vat}, {"currency", &dot_notation_price::currency}}); diff --git a/test/data/higher_order_sections.hpp b/test/data/higher_order_sections.hpp index d99a5a5..ef2582c 100644 --- a/test/data/higher_order_sections.hpp +++ b/test/data/higher_order_sections.hpp @@ -2,8 +2,8 @@ class higher_order_sections: public mstch::object { private: std::string m_helper; public: - higher_order_sections(): m_helper{"To tinker?"} { - register_methods(this, { + higher_order_sections(): m_helper("To tinker?") { + register_methods(this, std::map{ {"name", &higher_order_sections::name}, {"helper", &higher_order_sections::helper}, {"bolder", &higher_order_sections::bolder} diff --git a/test/data/partial_view.hpp b/test/data/partial_view.hpp index 09869a8..5c2c3eb 100644 --- a/test/data/partial_view.hpp +++ b/test/data/partial_view.hpp @@ -3,8 +3,8 @@ private: int m_value; public: - partial_view(): m_value{10000} { - register_methods(this, { + partial_view(): m_value(10000) { + register_methods(this, std::map{ {"greeting", &partial_view::greeting}, {"farewell", &partial_view::farewell}, {"name", &partial_view::name}, diff --git a/test/data/partial_whitespace.hpp b/test/data/partial_whitespace.hpp index f61447c..85fa5dc 100644 --- a/test/data/partial_whitespace.hpp +++ b/test/data/partial_whitespace.hpp @@ -2,8 +2,8 @@ class partial_whitespace: public mstch::object { private: int m_value; public: - partial_whitespace(): m_value{10000} { - register_methods(this, { + partial_whitespace(): m_value(10000) { + register_methods(this, std::map{ {"greeting", &partial_whitespace::greeting}, {"farewell", &partial_whitespace::farewell}, {"name", &partial_whitespace::name}, diff --git a/test/data/simple.hpp b/test/data/simple.hpp index a2a64c3..254a6d3 100644 --- a/test/data/simple.hpp +++ b/test/data/simple.hpp @@ -3,9 +3,9 @@ private: int m_value; public: simple(): - m_value{10000} + m_value(10000) { - register_methods(this, { + register_methods(this, std::map{ {"name", &simple::name}, {"value", &simple::value}, {"taxed_value", &simple::taxed_value},