blob: 5f32a984804195acae814be16736fa5be4474516 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
From cbd1fb07b96f48ec9ed3c3806a18dbd8a7fd5703 Mon Sep 17 00:00:00 2001
From: Kohei Yoshida <kohei.yoshida@gmail.com>
Date: Thu, 11 Feb 2016 22:20:41 -0500
Subject: [PATCH] Fix some build snuffs.
---
include/mdds/multi_type_vector_def.inl | 1 -
include/mdds/sorted_string_map_def.inl | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/include/mdds/multi_type_vector_def.inl b/include/mdds/multi_type_vector_def.inl
index a2d2fe0..549502b 100644
--- include/mdds/multi_type_vector_def.inl
+++ include/mdds/multi_type_vector_def.inl
@@ -1936,7 +1936,6 @@ multi_type_vector<_CellBlockFunc, _EventFunc>::transfer_multi_blocks(
else
{
// Just move the whole block over.
- block* blk = m_blocks[block_index2];
dest.m_blocks[dest_block_pos] = blk;
if (blk->mp_data)
{
diff --git a/include/mdds/sorted_string_map_def.inl b/include/mdds/sorted_string_map_def.inl
index 1983460..1509e30 100644
--- include/mdds/sorted_string_map_def.inl
+++ include/mdds/sorted_string_map_def.inl
@@ -65,7 +65,7 @@ sorted_string_map<_ValueT>::sorted_string_map(const entry* entries, size_type en
m_entry_end(m_entries+m_entry_size)
{
#ifdef _GLIBCXX_DEBUG
- assert(std::is_sorted(m_entries, m_entry_end, compare<_ValueT>));
+ assert(std::is_sorted(m_entries, m_entry_end, detail::compare<_ValueT>));
#endif
}
--
1.9.1
|
