merge "default" into "JSON-23"

JSON-23
Roker 6 years ago
commit 32929bb638
  1. 2
      server/function_map.hh
  2. 9
      server/pep-types.cc

@ -116,7 +116,7 @@ struct Out
typedef T* c_type; // the according type in C function parameter
enum { is_output = true, need_input = NeedInput }; // if need_input=false it would no longer consume an element in the input parameter array.
explicit Out() : value{ new T{} }
Out() : value{ new T{} }
{
if(typeid(T)==typeid(_message*))
{

@ -497,8 +497,13 @@ js::Value to_json<stringlist_t*>(stringlist_t* const& osl)
while(sl)
{
std::string value = sl->value;
a.push_back( std::move(value) );
if(sl->value)
{
std::string value = sl->value;
a.push_back( std::move(value) );
}else{
a.push_back( js::Value{} ); // add 'null' value, might fix JSON-24.
}
sl = sl->next;
}

Loading…
Cancel
Save