Float merge #40
Closed
Float merge #40
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ryspeed Conflicts: README.md build.sh changelog.txt config.mk doc/ref_cpp/data/dyn_query_ref.yaml doc/ref_cpp/data/dyn_table_ref.yaml doc/ref_cpp/data/dyn_view_ref.yaml doc/ref_cpp/data/group_ref.yaml doc/ref_cpp/data/mixed_ref.yaml doc/ref_cpp/data/reference.yaml doc/ref_cpp/data/shared_group_ref.yaml doc/ref_cpp/data/typed_table_ref.yaml generic.mk src/tightdb/Makefile src/tightdb/alloc_slab.cpp src/tightdb/array.cpp src/tightdb/array.hpp src/tightdb/binary_data.hpp src/tightdb/column.cpp src/tightdb/query.cpp src/tightdb/query.hpp src/tightdb/query_engine.hpp src/tightdb/table.cpp src/tightdb/table.hpp src/tightdb/utilities.cpp src/tightdb/utilities.hpp test/.gitignore test/TestQuery.cpp test/main.cpp test/testshared.cpp
…ryspeed Conflicts: test/testshared.cpp
…_float Conflicts: TightDB.vcxproj TightDB.vcxproj.filters
…n() methods (except for IsIntColumn()). Further templated Column::aggregate()
Added testcases to ArrayBasic.
Conflicts: TightDB.vcxproj TightDB.vcxproj.filters changelog.txt src/tightdb/alloc_slab.cpp src/tightdb/alloc_slab.hpp src/tightdb/array.cpp src/tightdb/array.hpp src/tightdb/column.cpp src/tightdb/column.hpp src/tightdb/column_mixed.cpp src/tightdb/column_mixed.hpp src/tightdb/column_string.hpp src/tightdb/column_tpl.hpp src/tightdb/mixed.hpp src/tightdb/table.cpp src/tightdb/table.hpp src/tightdb/table_accessors.hpp src/tightdb/table_view.cpp src/tightdb/table_view.hpp src/tightdb/utilities.hpp test/TestQuery.cpp test/main.cpp test/testtable.cpp test/transactions.cpp
| @@ -1,4 +1,5 @@ | |||
| #include <tightdb/index_string.hpp> | |||
| #include <stdio.h> | |||
added 3 commits
January 30, 2013 09:02
Renamed classes ArrayBasic->BasicArray, ColumnBasic->BasicColumn
…ee GitHub comments. Moved definitions of ArrayFloat and ArrayDouble to Array.hpp. Removed column_float.hpp and column_double.hpp. Now defined in column_fwd.hpp. Created column_mixed_tpl.hpp and moved many methods to this file to allow inline of simple methods.
ghost
assigned
| ParentNode* p = this; | ||
| size_t i = v.size(); | ||
| v.push_back(this); | ||
| p = p->child_criteria(); | ||
|
|
There was a problem hiding this comment.
Consider changing signature to
void gather_children(std::vector<ParentNode*>& v)
Note the '&'.
| @@ -318,6 +318,15 @@ | |||
|
|
|||
| Query& tableview(const Array& arr) { m_impl.tableview(arr); return *this; } | |||
|
|
|||
| // Query& Query::tableview(const TableView& tv) | |||
There was a problem hiding this comment.
Are these comments needed?
| @@ -35,7 +35,7 @@ void ExecuteTest(T& testObject, TestDetails const& details) | |||
| stream << "Unhandled exception: " << e.what(); | |||
| CurrentTest::Results()->OnTestFailure(details, stream.GetText()); | |||
| } | |||
| catch (...) | |||
| catch (...) | |||
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merged floats and master.