cpp: fixes include paths

This commit is contained in:
frsyuki
2010-08-27 16:45:48 +09:00
parent c8e351b31e
commit 59ba8dec4e
14 changed files with 38 additions and 35 deletions

View File

@@ -18,7 +18,7 @@
#ifndef MSGPACK_OBJECT_H__ #ifndef MSGPACK_OBJECT_H__
#define MSGPACK_OBJECT_H__ #define MSGPACK_OBJECT_H__
#include "msgpack/zone.h" #include "zone.h"
#include <stdio.h> #include <stdio.h>
#ifdef __cplusplus #ifdef __cplusplus

View File

@@ -18,9 +18,9 @@
#ifndef MSGPACK_OBJECT_HPP__ #ifndef MSGPACK_OBJECT_HPP__
#define MSGPACK_OBJECT_HPP__ #define MSGPACK_OBJECT_HPP__
#include "msgpack/object.h" #include "object.h"
#include "msgpack/pack.hpp" #include "pack.hpp"
#include "msgpack/zone.hpp" #include "zone.hpp"
#include <string.h> #include <string.h>
#include <stdexcept> #include <stdexcept>
#include <typeinfo> #include <typeinfo>

View File

@@ -18,8 +18,8 @@
#ifndef MSGPACK_PACK_H__ #ifndef MSGPACK_PACK_H__
#define MSGPACK_PACK_H__ #define MSGPACK_PACK_H__
#include "msgpack/pack_define.h" #include "pack_define.h"
#include "msgpack/object.h" #include "object.h"
#include <stdlib.h> #include <stdlib.h>
#ifdef __cplusplus #ifdef __cplusplus
@@ -96,12 +96,15 @@ int msgpack_pack_object(msgpack_packer* pk, msgpack_object d);
#define msgpack_pack_inline_func_cint(name) \ #define msgpack_pack_inline_func_cint(name) \
inline int msgpack_pack ## name inline int msgpack_pack ## name
#define msgpack_pack_inline_func_cint(name) \
inline int msgpack_pack ## name
#define msgpack_pack_user msgpack_packer* #define msgpack_pack_user msgpack_packer*
#define msgpack_pack_append_buffer(user, buf, len) \ #define msgpack_pack_append_buffer(user, buf, len) \
return (*(user)->callback)((user)->data, (const char*)buf, len) return (*(user)->callback)((user)->data, (const char*)buf, len)
#include "msgpack/pack_template.h" #include "pack_template.h"
inline void msgpack_packer_init(msgpack_packer* pk, void* data, msgpack_packer_write callback) inline void msgpack_packer_init(msgpack_packer* pk, void* data, msgpack_packer_write callback)
{ {

View File

@@ -18,7 +18,7 @@
#ifndef MSGPACK_PACK_HPP__ #ifndef MSGPACK_PACK_HPP__
#define MSGPACK_PACK_HPP__ #define MSGPACK_PACK_HPP__
#include "msgpack/pack_define.h" #include "pack_define.h"
#include <stdexcept> #include <stdexcept>
#include <limits.h> #include <limits.h>
@@ -137,7 +137,7 @@ inline void pack(Stream& s, const T& v)
#define msgpack_pack_append_buffer append_buffer #define msgpack_pack_append_buffer append_buffer
#include "msgpack/pack_template.h" #include "pack_template.h"
template <typename Stream> template <typename Stream>

View File

@@ -18,7 +18,7 @@
#ifndef MSGPACK_SBUFFER_HPP__ #ifndef MSGPACK_SBUFFER_HPP__
#define MSGPACK_SBUFFER_HPP__ #define MSGPACK_SBUFFER_HPP__
#include "msgpack/sbuffer.h" #include "sbuffer.h"
#include <stdexcept> #include <stdexcept>
namespace msgpack { namespace msgpack {

View File

@@ -1,15 +1,15 @@
#include "msgpack/type/bool.hpp" #include "type/bool.hpp"
#include "msgpack/type/float.hpp" #include "type/float.hpp"
#include "msgpack/type/int.hpp" #include "type/int.hpp"
#include "msgpack/type/list.hpp" #include "type/list.hpp"
#include "msgpack/type/deque.hpp" #include "type/deque.hpp"
#include "msgpack/type/map.hpp" #include "type/map.hpp"
#include "msgpack/type/nil.hpp" #include "type/nil.hpp"
#include "msgpack/type/pair.hpp" #include "type/pair.hpp"
#include "msgpack/type/raw.hpp" #include "type/raw.hpp"
#include "msgpack/type/set.hpp" #include "type/set.hpp"
#include "msgpack/type/string.hpp" #include "type/string.hpp"
#include "msgpack/type/vector.hpp" #include "type/vector.hpp"
#include "msgpack/type/tuple.hpp" #include "type/tuple.hpp"
#include "msgpack/type/define.hpp" #include "type/define.hpp"

View File

@@ -18,8 +18,8 @@
#ifndef MSGPACK_UNPACKER_H__ #ifndef MSGPACK_UNPACKER_H__
#define MSGPACK_UNPACKER_H__ #define MSGPACK_UNPACKER_H__
#include "msgpack/zone.h" #include "zone.h"
#include "msgpack/object.h" #include "object.h"
#include <string.h> #include <string.h>
#ifdef __cplusplus #ifdef __cplusplus

View File

@@ -18,9 +18,9 @@
#ifndef MSGPACK_UNPACK_HPP__ #ifndef MSGPACK_UNPACK_HPP__
#define MSGPACK_UNPACK_HPP__ #define MSGPACK_UNPACK_HPP__
#include "msgpack/unpack.h" #include "unpack.h"
#include "msgpack/object.hpp" #include "object.hpp"
#include "msgpack/zone.hpp" #include "zone.hpp"
#include <memory> #include <memory>
#include <stdexcept> #include <stdexcept>

View File

@@ -18,7 +18,7 @@
#ifndef MSGPACK_VREFBUFFER_H__ #ifndef MSGPACK_VREFBUFFER_H__
#define MSGPACK_VREFBUFFER_H__ #define MSGPACK_VREFBUFFER_H__
#include "msgpack/zone.h" #include "zone.h"
#include <stdlib.h> #include <stdlib.h>
#ifndef _WIN32 #ifndef _WIN32

View File

@@ -18,7 +18,7 @@
#ifndef MSGPACK_VREFBUFFER_HPP__ #ifndef MSGPACK_VREFBUFFER_HPP__
#define MSGPACK_VREFBUFFER_HPP__ #define MSGPACK_VREFBUFFER_HPP__
#include "msgpack/vrefbuffer.h" #include "vrefbuffer.h"
#include <stdexcept> #include <stdexcept>
namespace msgpack { namespace msgpack {

View File

@@ -18,7 +18,7 @@
#ifndef MSGPACK_ZBUFFER_H__ #ifndef MSGPACK_ZBUFFER_H__
#define MSGPACK_ZBUFFER_H__ #define MSGPACK_ZBUFFER_H__
#include "msgpack/sysdep.h" #include "sysdep.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <zlib.h> #include <zlib.h>

View File

@@ -18,7 +18,7 @@
#ifndef MSGPACK_ZBUFFER_HPP__ #ifndef MSGPACK_ZBUFFER_HPP__
#define MSGPACK_ZBUFFER_HPP__ #define MSGPACK_ZBUFFER_HPP__
#include "msgpack/zbuffer.h" #include "zbuffer.h"
#include <stdexcept> #include <stdexcept>
namespace msgpack { namespace msgpack {

View File

@@ -18,7 +18,7 @@
#ifndef MSGPACK_ZONE_H__ #ifndef MSGPACK_ZONE_H__
#define MSGPACK_ZONE_H__ #define MSGPACK_ZONE_H__
#include "msgpack/sysdep.h" #include "sysdep.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

View File

@@ -18,7 +18,7 @@
#ifndef MSGPACK_ZONE_HPP__ #ifndef MSGPACK_ZONE_HPP__
#define MSGPACK_ZONE_HPP__ #define MSGPACK_ZONE_HPP__
#include "msgpack/zone.h" #include "zone.h"
#include <cstdlib> #include <cstdlib>
#include <memory> #include <memory>
#include <vector> #include <vector>