Commit 69c610fd authored by Kirill Terekhov's avatar Kirill Terekhov
Browse files

small changes

parent 740692df
......@@ -96,6 +96,7 @@ namespace INMOST
var_expression() : value(0), index(ENUMUNDEF) {}
var_expression(const var_expression & other) :value(other.value), index(other.index) {}
var_expression(INMOST_DATA_REAL_TYPE pvalue, INMOST_DATA_ENUM_TYPE pindex) : value(pvalue), index(pindex) {}
var_expression(INMOST_DATA_REAL_TYPE pvalue) : value(pvalue), index(ENUMUNDEF) {}
__INLINE void SetValue(INMOST_DATA_REAL_TYPE val) { value = val; }
__INLINE INMOST_DATA_REAL_TYPE GetValue() const { return value; }
__INLINE INMOST_DATA_ENUM_TYPE GetIndex() const { return index; }
......
......@@ -2255,7 +2255,7 @@ namespace INMOST
typedef std::pair<int, buffer_type > proc_buffer_type;
typedef std::vector< proc_buffer_type > exch_buffer_type;
typedef std::vector<INMOST_MPI_Request> exch_reqs_type;
typedef struct
typedef struct exch_recv_reqs_t
{
std::vector<unsigned> buf;
std::vector<unsigned> cnt;
......@@ -2304,7 +2304,7 @@ namespace INMOST
element_set & operator [](int i){ return container[i]; }
const element_set & operator [](int i) const { return container[i]; }
bool empty() {bool ret = true; for(int i = 0; i < 5 && ret; i++) ret &= container[i].empty(); return ret;}
int size() {unsigned ret = 0; for(int i = 0; i < 5; ++i) ret += container[i].size(); return ret;}
unsigned size() {unsigned ret = 0; for(int i = 0; i < 5; ++i) ret += (unsigned)container[i].size(); return ret;}
};
typedef std::map<int, elements_by_type > parallel_storage;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment