Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
42c58d9c
Kaydet (Commit)
42c58d9c
authored
Tem 20, 2012
tarafından
David Tardon
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
fix mdds breakage in mingw build
Change-Id: Iad7e4c12144799a6b33b3cd39476da5653b1bdd1
üst
618376bc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
56 additions
and
1 deletion
+56
-1
0001-help-compiler-select-the-right-overload-of-vector-in.patch
...elp-compiler-select-the-right-overload-of-vector-in.patch
+52
-0
makefile.mk
mdds/makefile.mk
+4
-1
No files found.
mdds/0001-help-compiler-select-the-right-overload-of-vector-in.patch
0 → 100644
Dosyayı görüntüle @
42c58d9c
From 900cbea3ec067833b4284584f6dfa5502dc36de8 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Fri, 20 Jul 2012 10:30:38 +0200
Subject: [PATCH] help compiler select the right overload of vector::insert
---
include/mdds/multi_type_vector_def.inl | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/mdds/multi_type_vector_def.inl b/include/mdds/multi_type_vector_def.inl
index 252a260..fb72070 100644
--- a/include/mdds/multi_type_vector_def.inl
+++ misc/build/mdds_0.6.0/include/mdds/multi_type_vector_def.inl
@@ -1148,7 +1148,7 @@ void multi_type_vector<_CellBlockFunc>::insert_empty_impl(size_type row, size_ty
// Insert two new block below the current; one for the empty block being
// inserted, and one for the lower part of the current non-empty block.
- m_blocks.insert(m_blocks.begin()+block_index+1, 2, NULL);
+ m_blocks.insert(m_blocks.begin()+block_index+1, 2u, NULL);
m_blocks[block_index+1] = new block(length);
m_blocks[block_index+2] = new block(size_blk_next);
@@ -1302,7 +1302,7 @@ void multi_type_vector<_CellBlockFunc>::insert_cells_to_middle(
// Insert two new blocks.
size_type n1 = row - start_row;
size_type n2 = blk->m_size - n1;
- m_blocks.insert(m_blocks.begin()+block_index+1, 2, NULL);
+ m_blocks.insert(m_blocks.begin()+block_index+1, 2u, NULL);
blk->m_size = n1;
m_blocks[block_index+1] = new block(length);
@@ -1467,7 +1467,7 @@ void multi_type_vector<_CellBlockFunc>::set_cells_to_single_block(
assert(start_row_in_block < start_row && end_row < end_row_in_block);
// Insert two new blocks below the current one.
- m_blocks.insert(m_blocks.begin()+block_index+1, 2, NULL);
+ m_blocks.insert(m_blocks.begin()+block_index+1, 2u, NULL);
// first new block is for the data array being inserted.
size_type new_size = end_row - start_row + 1;
@@ -1985,7 +1985,7 @@ void multi_type_vector<_CellBlockFunc>::set_empty_in_single_block(
// First, insert two new blocks at position past the current block.
size_type lower_block_size = end_row_in_block - end_row;
- m_blocks.insert(m_blocks.begin()+block_index+1, 2, NULL);
+ m_blocks.insert(m_blocks.begin()+block_index+1, 2u, NULL);
m_blocks[block_index+1] = new block(empty_block_size); // empty block.
m_blocks[block_index+2] = new block(lower_block_size);
--
1.7.10.2
mdds/makefile.mk
Dosyayı görüntüle @
42c58d9c
...
...
@@ -29,7 +29,10 @@ TARGET=mdds
TARFILE_NAME
=
mdds_0.6.0
TARFILE_MD5
=
3e89a35f253a4f1c7de68c57d851ef38
PATCH_FILES
=
mdds_0.6.0.patch
PATCH_FILES
=
\
mdds_0.6.0.patch
\
0001-help-compiler-select-the-right-overload-of-vector-in.patch
\
CONFIGURE_DIR
=
CONFIGURE_ACTION
=
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment