pfi/pficommon — pull request #53 by tkng (2012-04-27 12:13:33+00:00)
Title: Add 'inline' qualifier to the function text::json::merge.

I'm new to github, sorry if I'm doing wrong.

The function pfi::text::json::merge(json js1, json js2) should have a 'inline' qualifier (or static qualifier? but Eiichiro teach me that I should use inline in such a case.) because the function is defined in a header file.

Without the qualifier, the header file cannot be included from multiple cpp files because of a multiple definition problem.

In this pull request, I also provided a test code to validate this problem, but it might too pedantic. It add a new file to test the multiple definition is not occured.