trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbirds...@apache.org
Subject [1/2] incubator-trafodion git commit: [TRAFODION-1868] Compatibility with gcc 4.8
Date Fri, 11 Mar 2016 18:24:12 GMT
Repository: incubator-trafodion
Updated Branches:
  refs/heads/master 0da990344 -> 1eb60514a


[TRAFODION-1868] Compatibility with gcc 4.8


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/1ec16451
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/1ec16451
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/1ec16451

Branch: refs/heads/master
Commit: 1ec16451e37fa21e3978a88def5188a6ff22900c
Parents: 5a6549b
Author: Liu Ming <ming.liu@esgyn.cn>
Authored: Thu Mar 10 02:26:07 2016 +0000
Committer: Liu Ming <ming.liu@esgyn.cn>
Committed: Thu Mar 10 02:26:07 2016 +0000

----------------------------------------------------------------------
 core/dbsecurity/auth/Makefile           | 2 +-
 core/sql/exp/ExpHbaseInterface.h        | 1 -
 core/sql/optimizer/RelFastTransport.cpp | 2 +-
 core/sql/sqlcomp/CmpSeabaseDDLindex.cpp | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1ec16451/core/dbsecurity/auth/Makefile
----------------------------------------------------------------------
diff --git a/core/dbsecurity/auth/Makefile b/core/dbsecurity/auth/Makefile
index 1e3ea4c..f916a94 100644
--- a/core/dbsecurity/auth/Makefile
+++ b/core/dbsecurity/auth/Makefile
@@ -73,7 +73,7 @@ INCLUDES	= -I. -I./inc -I ../shared/inc \
 	        -I ../../sql/common
 
 
-LINK_OPTIONS	= -L$(LIBEXPDIR) -lldap -lssl
+LINK_OPTIONS	= -L$(LIBEXPDIR) -lldap -lssl -llber
 LINK_OPTIONS   += $(LNK_FLGS) 
 
 COMMON_LIBS =  -ltdm_sqlcli -larkcmp_dll  

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1ec16451/core/sql/exp/ExpHbaseInterface.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpHbaseInterface.h b/core/sql/exp/ExpHbaseInterface.h
index 53f2143..aeccee4 100644
--- a/core/sql/exp/ExpHbaseInterface.h
+++ b/core/sql/exp/ExpHbaseInterface.h
@@ -42,7 +42,6 @@
 
 #include <iostream>
 
-#include <boost/lexical_cast.hpp>
 #include <protocol/TBinaryProtocol.h>
 #include <transport/TSocket.h>
 #include <transport/TTransportUtils.h>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1ec16451/core/sql/optimizer/RelFastTransport.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/RelFastTransport.cpp b/core/sql/optimizer/RelFastTransport.cpp
index 182ff65..5049d76 100644
--- a/core/sql/optimizer/RelFastTransport.cpp
+++ b/core/sql/optimizer/RelFastTransport.cpp
@@ -203,7 +203,7 @@ short FastExtract::setOptions(NAList<UnloadOption*> *
 
   for (CollIndex i = 0; i < fastExtractOptionList->entries(); i++)
   {
-    UnloadOption::UnloadOption * feo = (*fastExtractOptionList)[i];
+    UnloadOption * feo = (*fastExtractOptionList)[i];
     switch (feo->option_)
     {
       case UnloadOption::DELIMITER_:

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1ec16451/core/sql/sqlcomp/CmpSeabaseDDLindex.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLindex.cpp b/core/sql/sqlcomp/CmpSeabaseDDLindex.cpp
index 8e6e8a8..a70f8ef 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLindex.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLindex.cpp
@@ -1969,7 +1969,7 @@ void CmpSeabaseDDL::alterSeabaseTableDisableOrEnableAllIndexes(
     char * catName = NULL;
     char * schName = NULL;
     indexes->position();
-    for (int idx = 0; idx < indexes->numEntries(); idx++)
+    for (int ii = 0; ii < indexes->numEntries(); ii++)
     {
       OutputInfo * idx = (OutputInfo*) indexes->getNext();
 


Mime
View raw message