🔀 merge branch 'cotire' of https://github.com/tusharpm/json into tusharpm-cotire

This commit is contained in:
Niels Lohmann
2017-02-22 19:45:10 +01:00
7 changed files with 4067 additions and 9 deletions
+7
View File
@@ -0,0 +1,7 @@
#pragma once
#include "catch.hpp"
#define private public
#include "json.hpp"
using nlohmann::json;
+5 -4
View File
@@ -26,16 +26,17 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/
#include <array>
#include <map>
#include <string>
#include <memory>
#include "catch.hpp"
#include "json.hpp"
using nlohmann::json;
#include <array>
#include <map>
#include <string>
#include <memory>
namespace udt
{
enum class country