From: Jianpeng Ma Date: Tue, 25 Nov 2014 03:35:44 +0000 (+0800) Subject: include: Remove unused code: class triple. X-Git-Tag: v0.91~55^2~3^2~10 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a7274701048c21e5608b840e2c1f87eb4314df78;p=ceph.git include: Remove unused code: class triple. Signed-off-by: Jianpeng Ma --- diff --git a/src/include/Makefile.am b/src/include/Makefile.am index 7fa1e18b96f..e0952d95e82 100644 --- a/src/include/Makefile.am +++ b/src/include/Makefile.am @@ -67,7 +67,6 @@ noinst_HEADERS += \ include/str_list.h \ include/str_map.h \ include/stringify.h \ - include/triple.h \ include/types.h \ include/utime.h \ include/elist.h \ diff --git a/src/include/encoding.h b/src/include/encoding.h index 70d718c2df7..286597c02b9 100644 --- a/src/include/encoding.h +++ b/src/include/encoding.h @@ -295,7 +295,6 @@ inline void decode(T &o, bufferlist& bl) #include "include/unordered_map.h" #include "include/unordered_set.h" -#include "triple.h" // boost optional template @@ -355,23 +354,6 @@ inline void decode(std::pair &pa, bufferlist::iterator &p) decode(pa.second, p); } -// triple -template -inline void encode(const triple &t, bufferlist &bl) -{ - encode(t.first, bl); - encode(t.second, bl); - encode(t.third, bl); -} -template -inline void decode(triple &t, bufferlist::iterator &p) -{ - decode(t.first, p); - decode(t.second, p); - decode(t.third, p); -} - - // list template inline void encode(const std::list& ls, bufferlist& bl) diff --git a/src/include/triple.h b/src/include/triple.h deleted file mode 100644 index c2917127feb..00000000000 --- a/src/include/triple.h +++ /dev/null @@ -1,29 +0,0 @@ -// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- -// vim: ts=8 sw=2 smarttab -/* - * Ceph - scalable distributed file system - * - * Copyright (C) 2004-2006 Sage Weil - * - * This is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software - * Foundation. See file COPYING. - * - */ - -#ifndef CEPH_TRIPLE_H -#define CEPH_TRIPLE_H - -template -class triple { - public: - A first; - B second; - C third; - - triple() {} - triple(A f, B s, C t) : first(f), second(s), third(t) {} -}; - -#endif diff --git a/src/mds/events/EMetaBlob.h b/src/mds/events/EMetaBlob.h index dd9c1cdc392..5f44f4ff6d4 100644 --- a/src/mds/events/EMetaBlob.h +++ b/src/mds/events/EMetaBlob.h @@ -22,7 +22,6 @@ #include "../CDentry.h" #include "../LogSegment.h" -#include "include/triple.h" #include "include/interval_set.h" class MDS;