summaryrefslogtreecommitdiff
path: root/ucb
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2016-10-29 12:43:54 +0900
committerTakeshi Abe <tabe@fixedpoint.jp>2016-10-31 03:48:49 +0000
commitb589c4cd8765b0611afe435354364df891d78852 (patch)
tree4dbfacf74480e2154a2e38c3fd41fe9d34f08fc3 /ucb
parent3d83c42008ab51202c0577f493e8ed3fde0310b7 (diff)
Omit comparator which is the same as default std::less<key_type>
Change-Id: I72a0b618577caececaaf3eb4df53d4cb192251da Reviewed-on: https://gerrit.libreoffice.org/30369 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Takeshi Abe <tabe@fixedpoint.jp>
Diffstat (limited to 'ucb')
-rw-r--r--ucb/source/ucp/tdoc/tdoc_docmgr.hxx11
-rw-r--r--ucb/source/ucp/webdav-neon/NeonLockStore.hxx10
2 files changed, 2 insertions, 19 deletions
diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx
index 1cace6937fe6..7dd5a07459ec 100644
--- a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx
@@ -54,16 +54,7 @@ namespace tdoc_ucp {
};
- struct ltref
- {
- bool operator()(
- const OUString & r1, const OUString & r2 ) const
- {
- return r1 < r2;
- }
- };
-
- typedef std::map< OUString, StorageInfo, ltref > DocumentList;
+ typedef std::map< OUString, StorageInfo > DocumentList;
class OfficeDocumentsManager :
diff --git a/ucb/source/ucp/webdav-neon/NeonLockStore.hxx b/ucb/source/ucp/webdav-neon/NeonLockStore.hxx
index 8a52f1872f49..b0f968a9f208 100644
--- a/ucb/source/ucp/webdav-neon/NeonLockStore.hxx
+++ b/ucb/source/ucp/webdav-neon/NeonLockStore.hxx
@@ -43,14 +43,6 @@ namespace webdav_ucp
class TickerThread;
class NeonSession;
-struct ltptr
-{
- bool operator()( const NeonLock * p1, const NeonLock * p2 ) const
- {
- return p1 < p2;
- }
-};
-
struct LockInfo
{
rtl::Reference< NeonSession > xSession;
@@ -66,7 +58,7 @@ struct LockInfo
};
-typedef std::map< NeonLock *, LockInfo, ltptr > LockInfoMap;
+typedef std::map< NeonLock *, LockInfo > LockInfoMap;
class NeonLockStore
{
ushlist)); /* print info for each entry in the descriptor queue */ while (head != tail) { char flags[6] = { 'x', 'x', 'x', 'x', 0 }; descqp = &sde->descq[head]; desc[0] = le64_to_cpu(descqp->qw[0]); desc[1] = le64_to_cpu(descqp->qw[1]); flags[0] = (desc[1] & SDMA_DESC1_INT_REQ_FLAG) ? 'I' : '-'; flags[1] = (desc[1] & SDMA_DESC1_HEAD_TO_HOST_FLAG) ? 'H' : '-'; flags[2] = (desc[0] & SDMA_DESC0_FIRST_DESC_FLAG) ? 'F' : '-'; flags[3] = (desc[0] & SDMA_DESC0_LAST_DESC_FLAG) ? 'L' : '-'; addr = (desc[0] >> SDMA_DESC0_PHY_ADDR_SHIFT) & SDMA_DESC0_PHY_ADDR_MASK; gen = (desc[1] >> SDMA_DESC1_GENERATION_SHIFT) & SDMA_DESC1_GENERATION_MASK; len = (desc[0] >> SDMA_DESC0_BYTE_COUNT_SHIFT) & SDMA_DESC0_BYTE_COUNT_MASK; dd_dev_err(sde->dd, "SDMA sdmadesc[%u]: flags:%s addr:0x%016llx gen:%u len:%u bytes\n", head, flags, addr, gen, len); dd_dev_err(sde->dd, "\tdesc0:0x%016llx desc1 0x%016llx\n", desc[0], desc[1]); if (desc[0] & SDMA_DESC0_FIRST_DESC_FLAG) dd_dev_err(sde->dd, "\taidx: %u amode: %u alen: %u\n", (u8)((desc[1] & SDMA_DESC1_HEADER_INDEX_SMASK) >> SDMA_DESC1_HEADER_INDEX_SHIFT), (u8)((desc[1] & SDMA_DESC1_HEADER_MODE_SMASK) >> SDMA_DESC1_HEADER_MODE_SHIFT), (u8)((desc[1] & SDMA_DESC1_HEADER_DWS_SMASK) >> SDMA_DESC1_HEADER_DWS_SHIFT)); head++; head &= sde->sdma_mask; } } #define SDE_FMT \ "SDE %u CPU %d STE %s C 0x%llx S 0x%016llx E 0x%llx T(HW) 0x%llx T(SW) 0x%x H(HW) 0x%llx H(SW) 0x%x H(D) 0x%llx DM 0x%llx GL 0x%llx R 0x%llx LIS 0x%llx AHGI 0x%llx TXT %u TXH %u DT %u DH %u FLNE %d DQF %u SLC 0x%llx\n" /** * sdma_seqfile_dump_sde() - debugfs dump of sde * @s: seq file * @sde: send dma engine to dump * * This routine dumps the sde to the indicated seq file. */ void sdma_seqfile_dump_sde(struct seq_file *s, struct sdma_engine *sde) { u16 head, tail; struct hw_sdma_desc *descqp; u64 desc[2]; u64 addr; u8 gen; u16 len; head = sde->descq_head & sde->sdma_mask; tail = ACCESS_ONCE(sde->descq_tail) & sde->sdma_mask; seq_printf(s, SDE_FMT, sde->this_idx, sde->cpu, sdma_state_name(sde->state.current_state), (unsigned long long)read_sde_csr(sde, SD(CTRL)), (unsigned long long)read_sde_csr(sde, SD(STATUS)), (unsigned long long)read_sde_csr(sde, SD(ENG_ERR_STATUS)), (unsigned long long)read_sde_csr(sde, SD(TAIL)), tail, (unsigned long long)read_sde_csr(sde, SD(HEAD)), head, (unsigned long long)le64_to_cpu(*sde->head_dma), (unsigned long long)read_sde_csr(sde, SD(MEMORY)), (unsigned long long)read_sde_csr(sde, SD(LEN_GEN)), (unsigned long long)read_sde_csr(sde, SD(RELOAD_CNT)), (unsigned long long)sde->last_status, (unsigned long long)sde->ahg_bits, sde->tx_tail, sde->tx_head, sde->descq_tail, sde->descq_head, !list_empty(&sde->flushlist), sde->descq_full_count, (unsigned long long)read_sde_csr(sde, SEND_DMA_CHECK_SLID)); /* print info for each entry in the descriptor queue */ while (head != tail) { char flags[6] = { 'x', 'x', 'x', 'x', 0 }; descqp = &sde->descq[head]; desc[0] = le64_to_cpu(descqp->qw[0]); desc[1] = le64_to_cpu(descqp->qw[1]); flags[0] = (desc[1] & SDMA_DESC1_INT_REQ_FLAG) ? 'I' : '-'; flags[1] = (desc[1