Repository: orc Updated Branches: refs/heads/master 69e8d7c4d -> 0d5a92e1a
Fixed ORC-29: Ensure successful compilation without C++11. Project: http://git-wip-us.apache.org/repos/asf/orc/repo Commit: http://git-wip-us.apache.org/repos/asf/orc/commit/0d5a92e1 Tree: http://git-wip-us.apache.org/repos/asf/orc/tree/0d5a92e1 Diff: http://git-wip-us.apache.org/repos/asf/orc/diff/0d5a92e1 Branch: refs/heads/master Commit: 0d5a92e1acd18a366f93c7acf3be0bd9d55f76d1 Parents: 69e8d7c Author: Aliaksei Sandryhaila <[email protected]> Authored: Fri Jan 8 11:39:54 2016 -0800 Committer: Aliaksei Sandryhaila <[email protected]> Committed: Fri Jan 8 11:39:54 2016 -0800 ---------------------------------------------------------------------- c++/src/TypeImpl.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/orc/blob/0d5a92e1/c++/src/TypeImpl.cc ---------------------------------------------------------------------- diff --git a/c++/src/TypeImpl.cc b/c++/src/TypeImpl.cc index d3507b0..2690e6e 100644 --- a/c++/src/TypeImpl.cc +++ b/c++/src/TypeImpl.cc @@ -416,7 +416,7 @@ namespace orc { std::unique_ptr<Type> buildSelectedType(const Type *fileType, const std::vector<bool>& selected) { if (fileType == nullptr || !selected[fileType->getColumnId()]) { - return nullptr; + return std::unique_ptr<Type>(); } TypeImpl* result;
