Repository: incubator-drill Updated Branches: refs/heads/master fd7aee133 -> ae2790ed8
DRILL-1511: C++ Client. Fix compiling issues in DRILL-1297 patch. - Remove forward enum type declaration (not allowed in C++ 03). - Add space between `<` and `::` to fix compilation of clang Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/b7aebbd7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/b7aebbd7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/b7aebbd7 Branch: refs/heads/master Commit: b7aebbd7b6e4c5de83e7c26ca63a216dfd910c33 Parents: fd7aee1 Author: Xiao Meng <xiaom...@gmail.com> Authored: Wed Oct 8 12:51:12 2014 -0700 Committer: Parth Chandra <pchan...@maprtech.com> Committed: Tue Oct 21 19:25:20 2014 -0700 ---------------------------------------------------------------------- contrib/native/client/src/clientlib/drillClient.cpp | 4 ++-- contrib/native/client/src/include/drill/drillClient.hpp | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/b7aebbd7/contrib/native/client/src/clientlib/drillClient.cpp ---------------------------------------------------------------------- diff --git a/contrib/native/client/src/clientlib/drillClient.cpp b/contrib/native/client/src/clientlib/drillClient.cpp index db7d5a8..70058ec 100644 --- a/contrib/native/client/src/clientlib/drillClient.cpp +++ b/contrib/native/client/src/clientlib/drillClient.cpp @@ -278,7 +278,7 @@ void DrillClient::close() { status_t DrillClient::submitQuery(Drill::QueryType t, const std::string& plan, pfnQueryResultsListener listener, void* listenerCtx, QueryHandle_t* qHandle){ - ::exec::shared::QueryType castedType = static_cast<::exec::shared::QueryType> (t); + ::exec::shared::QueryType castedType = static_cast< ::exec::shared::QueryType> (t); DrillClientQueryResult* pResult=this->m_pImpl->SubmitQuery(castedType, plan, listener, listenerCtx); *qHandle=(QueryHandle_t)pResult; return QRY_SUCCESS; @@ -286,7 +286,7 @@ status_t DrillClient::submitQuery(Drill::QueryType t, const std::string& plan, p RecordIterator* DrillClient::submitQuery(Drill::QueryType t, const std::string& plan, DrillClientError* err){ RecordIterator* pIter=NULL; - ::exec::shared::QueryType castedType = static_cast<::exec::shared::QueryType> (t); + ::exec::shared::QueryType castedType = static_cast< ::exec::shared::QueryType> (t); DrillClientQueryResult* pResult=this->m_pImpl->SubmitQuery(castedType, plan, NULL, NULL); if(pResult){ pIter=new RecordIterator(pResult); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/b7aebbd7/contrib/native/client/src/include/drill/drillClient.hpp ---------------------------------------------------------------------- diff --git a/contrib/native/client/src/include/drill/drillClient.hpp b/contrib/native/client/src/include/drill/drillClient.hpp index f1369ee..65c07d6 100644 --- a/contrib/native/client/src/include/drill/drillClient.hpp +++ b/contrib/native/client/src/include/drill/drillClient.hpp @@ -47,7 +47,6 @@ namespace exec{ namespace shared{ class DrillPBError; - enum QueryType; }; };
