You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/12/10 09:10:05 UTC
ignite git commit: IGNITE-2099: Finished CPP part.
Repository: ignite
Updated Branches:
refs/heads/ignite-2099 84006b957 -> 20ff80a7c
IGNITE-2099: Finished CPP part.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/20ff80a7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/20ff80a7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/20ff80a7
Branch: refs/heads/ignite-2099
Commit: 20ff80a7c577fadfab0f2723dc3746a3e15fbc72
Parents: 84006b9
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Thu Dec 10 11:11:02 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Dec 10 11:11:02 2015 +0300
----------------------------------------------------------------------
.../src/binary_reader_writer_raw_test.cpp | 10 +++----
.../core-test/src/binary_reader_writer_test.cpp | 10 +++----
.../core/include/ignite/binary/binary_consts.h | 29 ++------------------
3 files changed, 12 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/20ff80a7/modules/platforms/cpp/core-test/src/binary_reader_writer_raw_test.cpp
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core-test/src/binary_reader_writer_raw_test.cpp b/modules/platforms/cpp/core-test/src/binary_reader_writer_raw_test.cpp
index 8d47c24..4e7e2df 100644
--- a/modules/platforms/cpp/core-test/src/binary_reader_writer_raw_test.cpp
+++ b/modules/platforms/cpp/core-test/src/binary_reader_writer_raw_test.cpp
@@ -1496,7 +1496,7 @@ BOOST_AUTO_TEST_CASE(TestCollectionEmpty)
BOOST_AUTO_TEST_CASE(TestCollectionEmptyTyped)
{
- CollectionType typ = IGNITE_COLLECTION_CONCURRENT_SKIP_LIST_SET;
+ CollectionType typ = IGNITE_COLLECTION_LINKED_HASH_SET;
CheckRawCollectionEmpty(&typ);
}
@@ -1508,7 +1508,7 @@ BOOST_AUTO_TEST_CASE(TestCollection)
BOOST_AUTO_TEST_CASE(TestCollectionTyped)
{
- CollectionType typ = IGNITE_COLLECTION_CONCURRENT_SKIP_LIST_SET;
+ CollectionType typ = IGNITE_COLLECTION_LINKED_HASH_SET;
CheckRawCollection(&typ);
}
@@ -1520,7 +1520,7 @@ BOOST_AUTO_TEST_CASE(TestCollectionIterators)
BOOST_AUTO_TEST_CASE(TestCollectionIteratorsTyped)
{
- CollectionType typ = IGNITE_COLLECTION_CONCURRENT_SKIP_LIST_SET;
+ CollectionType typ = IGNITE_COLLECTION_LINKED_HASH_SET;
CheckRawCollectionIterators(&typ);
}
@@ -1573,7 +1573,7 @@ BOOST_AUTO_TEST_CASE(TestMapEmpty)
BOOST_AUTO_TEST_CASE(TestMapEmptyTyped)
{
- MapType typ = IGNITE_MAP_CONCURRENT_HASH_MAP;
+ MapType typ = IGNITE_MAP_LINKED_HASH_MAP;
CheckRawMapEmpty(&typ);
}
@@ -1585,7 +1585,7 @@ BOOST_AUTO_TEST_CASE(TestMap)
BOOST_AUTO_TEST_CASE(TestMapTyped)
{
- MapType typ = IGNITE_MAP_CONCURRENT_HASH_MAP;
+ MapType typ = IGNITE_MAP_LINKED_HASH_MAP;
CheckRawMap(&typ);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/20ff80a7/modules/platforms/cpp/core-test/src/binary_reader_writer_test.cpp
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core-test/src/binary_reader_writer_test.cpp b/modules/platforms/cpp/core-test/src/binary_reader_writer_test.cpp
index b2551ec..71177b8 100644
--- a/modules/platforms/cpp/core-test/src/binary_reader_writer_test.cpp
+++ b/modules/platforms/cpp/core-test/src/binary_reader_writer_test.cpp
@@ -1891,7 +1891,7 @@ BOOST_AUTO_TEST_CASE(TestCollectionEmpty)
BOOST_AUTO_TEST_CASE(TestCollectionEmptyTyped)
{
- CollectionType typ = IGNITE_COLLECTION_CONCURRENT_SKIP_LIST_SET;
+ CollectionType typ = IGNITE_COLLECTION_LINKED_HASH_SET;
CheckCollectionEmpty(&typ);
}
@@ -1903,7 +1903,7 @@ BOOST_AUTO_TEST_CASE(TestCollection)
BOOST_AUTO_TEST_CASE(testCollectionTyped)
{
- CollectionType typ = IGNITE_COLLECTION_CONCURRENT_SKIP_LIST_SET;
+ CollectionType typ = IGNITE_COLLECTION_LINKED_HASH_SET;
CheckCollection(&typ);
}
@@ -1915,7 +1915,7 @@ BOOST_AUTO_TEST_CASE(TestCollectionIterators)
BOOST_AUTO_TEST_CASE(TestCollectionIteratorsTyped)
{
- CollectionType typ = IGNITE_COLLECTION_CONCURRENT_SKIP_LIST_SET;
+ CollectionType typ = IGNITE_COLLECTION_LINKED_HASH_SET;
CheckCollectionIterators(&typ);
}
@@ -1980,7 +1980,7 @@ BOOST_AUTO_TEST_CASE(TestMapEmpty)
BOOST_AUTO_TEST_CASE(TestMapEmptyTyped)
{
- MapType typ = IGNITE_MAP_CONCURRENT_HASH_MAP;
+ MapType typ = IGNITE_MAP_LINKED_HASH_MAP;
CheckMapEmpty(&typ);
}
@@ -1992,7 +1992,7 @@ BOOST_AUTO_TEST_CASE(TestMap)
BOOST_AUTO_TEST_CASE(TestMapTyped)
{
- MapType typ = IGNITE_MAP_CONCURRENT_HASH_MAP;
+ MapType typ = IGNITE_MAP_LINKED_HASH_MAP;
CheckMap(&typ);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/20ff80a7/modules/platforms/cpp/core/include/ignite/binary/binary_consts.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/include/ignite/binary/binary_consts.h b/modules/platforms/cpp/core/include/ignite/binary/binary_consts.h
index 68ed9f9..7f0fd1e 100644
--- a/modules/platforms/cpp/core/include/ignite/binary/binary_consts.h
+++ b/modules/platforms/cpp/core/include/ignite/binary/binary_consts.h
@@ -52,17 +52,7 @@ namespace ignite
/**
* Linked hash set. Maps to LinkedHashSet in Java.
*/
- IGNITE_COLLECTION_LINKED_HASH_SET = 4,
-
- /**
- * Tree set. Maps to TreeSet in Java.
- */
- IGNITE_COLLECTION_TREE_SET = 5,
-
- /**
- * Concurrent skip list set. Maps to ConcurrentSkipListSet in Java.
- */
- IGNITE_COLLECTION_CONCURRENT_SKIP_LIST_SET = 6
+ IGNITE_COLLECTION_LINKED_HASH_SET = 4
};
/**
@@ -83,22 +73,7 @@ namespace ignite
/**
* Linked hash map. Maps to LinkedHashMap in Java.
*/
- IGNITE_MAP_LINKED_HASH_MAP = 2,
-
- /**
- * Tree map. Maps to TreeMap in Java.
- */
- IGNITE_MAP_TREE_MAP = 3,
-
- /**
- * Concurrent hash map. Maps to ConcurrentHashMap in Java.
- */
- IGNITE_MAP_CONCURRENT_HASH_MAP = 4,
-
- /**
- * Properties map. Maps to Properties in Java.
- */
- IGNITE_MAP_PROPERTIES_MAP = 5
+ IGNITE_MAP_LINKED_HASH_MAP = 2
};
}
}