rename files to match upstream's preferences
This commit is contained in:
parent
df35adc438
commit
dd36e4e838
2
Makefile
2
Makefile
@ -3,7 +3,7 @@ JANSSON_LIBS := $(shell pkg-config --libs jansson)
|
||||
|
||||
all: test
|
||||
|
||||
test-bin: test.cc janssonxx.h janssonxx.tcc Makefile
|
||||
test-bin: test.cpp jansson.hpp jansson-impl.hpp Makefile
|
||||
$(CXX) -o $@ -g -O0 -Wall $(JANSSON_CFLAGS) $< $(JANSSON_LIBS)
|
||||
|
||||
test: test-bin
|
||||
|
@ -1,3 +1,14 @@
|
||||
// janssonxx - C++ wrapper for jansson, implementation file
|
||||
//
|
||||
// author: Sean Middleditch <sean@middleditch.us>
|
||||
//
|
||||
// janssonxx is free software; you can redistribute it and/or modify
|
||||
// it under the terms of the MIT license. See LICENSE for details.
|
||||
|
||||
#if !defined(IN_JANSSON_HPP)
|
||||
# error "jansson-impl.hpp may only by included from jansson.hpp"
|
||||
#endif
|
||||
|
||||
namespace jansson {
|
||||
namespace _private {
|
||||
// assignment operator
|
@ -5,9 +5,8 @@
|
||||
// janssonxx is free software; you can redistribute it and/or modify
|
||||
// it under the terms of the MIT license. See LICENSE for details.
|
||||
|
||||
|
||||
#if !defined(JANSSONXX_H)
|
||||
#define JANSSONXX_H 1
|
||||
#if !defined(JANSSON_HPP)
|
||||
#define JANSSON_HPP 1
|
||||
|
||||
#include <string>
|
||||
#include <ostream>
|
||||
@ -300,6 +299,8 @@ inline std::ostream& operator<<(std::ostream& os, const jansson::Value& value);
|
||||
inline std::istream& operator>>(std::istream& is, jansson::Value& value);
|
||||
|
||||
// include implementation code
|
||||
#include "janssonxx.tcc"
|
||||
#define IN_JANSSON_HPP 1
|
||||
#include "jansson-impl.hpp"
|
||||
#undef IN_JANSSON_HPP
|
||||
|
||||
#endif // defined(JANSSONXX_H)
|
||||
#endif // defined(JANSSON_HPP)
|
@ -2,7 +2,7 @@
|
||||
#include <iomanip>
|
||||
#include <malloc.h>
|
||||
|
||||
#include "janssonxx.h"
|
||||
#include "jansson.hpp"
|
||||
|
||||
using namespace std;
|
||||
|
Loading…
Reference in New Issue
Block a user