boostorg/container
1
0
Fork 1
mirror of https://github.com/boostorg/container.git synced 2025-08-02 14:04:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix compile error in GCC due to missing include and fixed some signed/unsigned comparison warnings

Browse Source
This commit is contained in:
Ion Gaztañaga
2014-09-23 18:50:46 +02:00
parent e697122a2c
commit 92e81fcf77
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
test/expand_bwd_test_template.hpp
View File

@@ -16,6 +16,7 @@
#include <typeinfo> #include <typeinfo>
#include "expand_bwd_test_allocator.hpp" #include "expand_bwd_test_allocator.hpp"
#include <algorithm> #include <algorithm>
#include "movable_int.hpp"
#include <boost/type_traits/remove_volatile.hpp> #include <boost/type_traits/remove_volatile.hpp>
#include <boost/move/make_unique.hpp> #include <boost/move/make_unique.hpp>
@@ -56,29 +57,29 @@ bool test_insert_with_expand_bwd()
typedef typename VectorWithExpandBwdAllocator::value_type value_type; typedef typename VectorWithExpandBwdAllocator::value_type value_type;
typedef typename boost::remove_volatile<value_type>::type non_volatile_value_type; typedef typename boost::remove_volatile<value_type>::type non_volatile_value_type;
typedef std::vector<non_volatile_value_type> Vect; typedef std::vector<non_volatile_value_type> Vect;
const int MemorySize = 1000; const unsigned int MemorySize = 1000;
//Distance old and new buffer //Distance old and new buffer
const int Offset[] = const unsigned int Offset[] =
{ 350, 300, 250, 200, 150, 100, 150, 100, { 350, 300, 250, 200, 150, 100, 150, 100,
150, 50, 50, 50 }; 150, 50, 50, 50 };
//Initial vector size //Initial vector size
const int InitialSize[] = const unsigned int InitialSize[] =
{ 200, 200, 200, 200, 200, 200, 200, 200, { 200, 200, 200, 200, 200, 200, 200, 200,
200, 200, 200, 200 }; 200, 200, 200, 200 };
//Size of the data to insert //Size of the data to insert
const int InsertSize[] = const unsigned int InsertSize[] =
{ 100, 100, 100, 100, 100, 100, 200, 200, { 100, 100, 100, 100, 100, 100, 200, 200,
300, 25, 100, 200 }; 300, 25, 100, 200 };
//Number of tests //Number of tests
const int Iterations = sizeof(InsertSize)/sizeof(int); const unsigned int Iterations = sizeof(InsertSize)/sizeof(int);
//Insert position //Insert position
const int Position[] = const int Position[] =
{ 0, 100, 200 }; { 0, 100, 200 };
for(int pos = 0; pos < sizeof(Position)/sizeof(Position[0]); ++pos){ for(unsigned int pos = 0; pos < sizeof(Position)/sizeof(Position[0]); ++pos){
for(int iteration = 0; iteration < Iterations; ++iteration) for(unsigned int iteration = 0; iteration < Iterations; ++iteration)
{ {
boost::movelib::unique_ptr<char[]> memptr = boost::movelib::unique_ptr<char[]> memptr =
boost::movelib::make_unique_definit<char[]>(MemorySize*sizeof(value_type)); boost::movelib::make_unique_definit<char[]>(MemorySize*sizeof(value_type));
@@ -93,7 +94,7 @@ bool test_insert_with_expand_bwd()
return false; return false;
Vect data_to_insert; Vect data_to_insert;
data_to_insert.resize(InsertSize[iteration]); data_to_insert.resize(InsertSize[iteration]);
for(int i = 0; i < InsertSize[iteration]; ++i){ for(unsigned int i = 0; i < InsertSize[iteration]; ++i){
data_to_insert[i] = -i; data_to_insert[i] = -i;
} }
@@ -133,14 +134,14 @@ bool test_assign_with_expand_bwd()
{ {
typedef typename VectorWithExpandBwdAllocator::value_type value_type; typedef typename VectorWithExpandBwdAllocator::value_type value_type;
typedef typename boost::remove_volatile<value_type>::type non_volatile_value_type; typedef typename boost::remove_volatile<value_type>::type non_volatile_value_type;
const int MemorySize = 200; const unsigned int MemorySize = 200;
const int Offset[] = { 50, 50, 50}; const unsigned int Offset[] = { 50, 50, 50};
const int InitialSize[] = { 25, 25, 25}; const unsigned int InitialSize[] = { 25, 25, 25};
const int InsertSize[] = { 15, 35, 55}; const unsigned int InsertSize[] = { 15, 35, 55};
const int Iterations = sizeof(InsertSize)/sizeof(int); const unsigned int Iterations = sizeof(InsertSize)/sizeof(int);
for(int iteration = 0; iteration <Iterations; ++iteration) for(unsigned int iteration = 0; iteration <Iterations; ++iteration)
{ {
boost::movelib::unique_ptr<char[]> memptr = boost::movelib::unique_ptr<char[]> memptr =
boost::movelib::make_unique_definit<char[]>(MemorySize*sizeof(value_type)); boost::movelib::make_unique_definit<char[]>(MemorySize*sizeof(value_type));
@@ -148,14 +149,14 @@ bool test_assign_with_expand_bwd()
//Create initial data //Create initial data
std::vector<non_volatile_value_type> initial_data; std::vector<non_volatile_value_type> initial_data;
initial_data.resize(InitialSize[iteration]); initial_data.resize(InitialSize[iteration]);
for(int i = 0; i < InitialSize[iteration]; ++i){ for(unsigned int i = 0; i < InitialSize[iteration]; ++i){
initial_data[i] = i; initial_data[i] = i;
} }
//Create data to assign //Create data to assign
std::vector<non_volatile_value_type> data_to_insert; std::vector<non_volatile_value_type> data_to_insert;
data_to_insert.resize(InsertSize[iteration]); data_to_insert.resize(InsertSize[iteration]);
for(int i = 0; i < InsertSize[iteration]; ++i){ for(unsigned int i = 0; i < InsertSize[iteration]; ++i){
data_to_insert[i] = -i; data_to_insert[i] = -i;
} }