From 583f1d82b8f2368dda2eab718d1fedfb497ea385 Mon Sep 17 00:00:00 2001 From: Konstantin Osipov <kostja@tarantool.org> Date: Thu, 15 May 2014 16:36:25 +0400 Subject: [PATCH] pickle.h is now only used for box.pack(), to connect to tarantool 1.5 --- src/box/bitset_index.cc | 1 - src/box/box.cc | 1 - src/box/hash_index.cc | 1 - src/box/lua/call.cc | 1 + src/box/replica.cc | 1 - src/box/request.cc | 1 - src/box/sophia_index.cc | 1 - src/box/tuple.h | 1 - src/box/tuple_update.cc | 1 - 9 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/box/bitset_index.cc b/src/box/bitset_index.cc index 8523aa48fb..992af64cde 100644 --- a/src/box/bitset_index.cc +++ b/src/box/bitset_index.cc @@ -33,7 +33,6 @@ #include "tuple.h" #include "exception.h" -#include "pickle.h" #include "bitset/index.h" static inline struct tuple * diff --git a/src/box/box.cc b/src/box/box.cc index 26c13cf79f..ccfba24dea 100644 --- a/src/box/box.cc +++ b/src/box/box.cc @@ -34,7 +34,6 @@ #include "recovery.h" #include "replica.h" #include "log_io.h" -#include <pickle.h> #include <say.h> #include <admin.h> #include <iproto.h> diff --git a/src/box/hash_index.cc b/src/box/hash_index.cc index 3a270e28c8..fb3a4d4848 100644 --- a/src/box/hash_index.cc +++ b/src/box/hash_index.cc @@ -29,7 +29,6 @@ #include "hash_index.h" #include "say.h" #include "tuple.h" -#include "pickle.h" #include "exception.h" #include "errinj.h" diff --git a/src/box/lua/call.cc b/src/box/lua/call.cc index 559e66299a..6e052a6cb0 100644 --- a/src/box/lua/call.cc +++ b/src/box/lua/call.cc @@ -27,6 +27,7 @@ * SUCH DAMAGE. */ #include "box/lua/call.h" +#include "pickle.h" #include <arpa/inet.h> diff --git a/src/box/replica.cc b/src/box/replica.cc index 4099c56ce0..55bbe1b83d 100644 --- a/src/box/replica.cc +++ b/src/box/replica.cc @@ -35,7 +35,6 @@ #include "log_io.h" #include "fiber.h" -#include "pickle.h" #include "coio_buf.h" #include "recovery.h" #include "tarantool.h" diff --git a/src/box/request.cc b/src/box/request.cc index b17eb91e68..6d721bc606 100644 --- a/src/box/request.cc +++ b/src/box/request.cc @@ -35,7 +35,6 @@ #include "port.h" #include "lua/call.h" #include <errinj.h> -#include <pickle.h> #include <fiber.h> #include <scoped_guard.h> #include <third_party/base64.h> diff --git a/src/box/sophia_index.cc b/src/box/sophia_index.cc index 40339ec04e..534a41fc94 100644 --- a/src/box/sophia_index.cc +++ b/src/box/sophia_index.cc @@ -29,7 +29,6 @@ #include "sophia_index.h" #include "say.h" #include "tuple.h" -#include "pickle.h" #include "scoped_guard.h" #include "exception.h" #include "errinj.h" diff --git a/src/box/tuple.h b/src/box/tuple.h index e766bd668f..ee94617c9b 100644 --- a/src/box/tuple.h +++ b/src/box/tuple.h @@ -30,7 +30,6 @@ */ #include "trivia/util.h" #include "key_def.h" /* for enum field_type */ -#include <pickle.h> enum { FORMAT_ID_MAX = UINT16_MAX - 1, FORMAT_ID_NIL = UINT16_MAX }; diff --git a/src/box/tuple_update.cc b/src/box/tuple_update.cc index 814ada6505..5e9a83b6ac 100644 --- a/src/box/tuple_update.cc +++ b/src/box/tuple_update.cc @@ -34,7 +34,6 @@ #include "salad/rope.h" #include <exception.h> -#include <pickle.h> #include "msgpuck/msgpuck.h" /** UPDATE request implementation. -- GitLab