You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by an...@apache.org on 2017/10/02 00:14:15 UTC
[11/12] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Phase 4. Remove legacy/obsolete pragmas
TRAFODION-2731 CodeCleanup: Phase 4. Remove legacy/obsolete pragmas
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/781d97e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/781d97e6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/781d97e6
Branch: refs/heads/master
Commit: 781d97e6ce89495e457a70e41dd1caa9b3b10599
Parents: bd2932b
Author: Anoop Sharma <an...@esgyn.com>
Authored: Sun Oct 1 18:25:57 2017 +0000
Committer: Anoop Sharma <an...@esgyn.com>
Committed: Sun Oct 1 18:25:57 2017 +0000
----------------------------------------------------------------------
core/sql/arkcmp/ApplicationFile.cpp | 2 -
core/sql/arkcmp/CmpContext.cpp | 8 --
core/sql/arkcmp/CmpContext.h | 2 -
core/sql/arkcmp/CmpISPUtils.cpp | 2 -
core/sql/arkcmp/CmpStatement.cpp | 12 --
core/sql/arkcmp/CmpStoredProc.cpp | 4 -
core/sql/arkcmp/CmpStoredProc.h | 2 -
core/sql/arkcmp/ExtQualModuleNames.cpp | 1 -
core/sql/arkcmp/ExtQualModuleNames.h | 4 -
core/sql/arkcmp/ProcessEnv.cpp | 4 -
core/sql/arkcmp/SPUtil.cpp | 8 --
core/sql/arkcmp/SQLJFile.cpp | 2 -
core/sql/arkcmp/VersioningStoredProc.cpp | 2 -
core/sql/arkcmp/cmpargs.cpp | 2 -
core/sql/bin/ex_esp_main.cpp | 2 -
core/sql/cli/Cli.cpp | 10 --
core/sql/cli/CliExpExchange.cpp | 27 ----
core/sql/cli/CliExtern.cpp | 2 -
core/sql/cli/Context.cpp | 6 -
core/sql/cli/Context.h | 4 -
core/sql/cli/Descriptor.cpp | 24 ----
core/sql/cli/Descriptor.h | 2 -
core/sql/cli/Globals.cpp | 2 -
core/sql/cli/Globals.h | 2 -
core/sql/cli/QuasiFileManager.cpp | 10 --
core/sql/cli/Statement.cpp | 9 --
core/sql/cli/StoredProcInterface.cpp | 2 -
core/sql/cli/sql_id.cpp | 4 -
core/sql/comexe/CmpMessage.cpp | 32 -----
core/sql/comexe/CmpMessage.h | 6 -
core/sql/comexe/ComKeyMDAM.h | 2 -
core/sql/comexe/ComKeyRange.cpp | 6 -
core/sql/comexe/ComResourceInfo.cpp | 4 -
core/sql/comexe/ComTdb.cpp | 128 -----------------
core/sql/comexe/ComTdb.h | 2 -
core/sql/comexe/ComTdbControl.cpp | 2 -
core/sql/comexe/ComTdbDDL.h | 3 -
core/sql/comexe/ComTdbDp2Oper.h | 8 --
core/sql/comexe/ComTdbExeUtil.h | 1 -
core/sql/comexe/ComTdbExplain.h | 12 --
core/sql/comexe/ComTdbRoot.h | 2 -
core/sql/comexe/ComTdbSendTop.cpp | 4 -
core/sql/comexe/ComTdbSort.cpp | 4 -
core/sql/comexe/ComTdbStats.cpp | 6 -
core/sql/comexe/ComTdbTupleFlow.cpp | 38 +++--
core/sql/comexe/LateBindInfo.cpp | 12 --
core/sql/comexe/PartInputDataDesc.cpp | 12 --
core/sql/comexe/SqlTableOpenInfo.h | 2 -
core/sql/common/BigNumHelper.cpp | 14 --
core/sql/common/CharType.cpp | 23 ---
core/sql/common/Collections.cpp | 6 +-
core/sql/common/Collections.h | 7 -
core/sql/common/ComDistribution.h | 2 -
core/sql/common/ComObjectName.cpp | 4 -
core/sql/common/ComResWords.cpp | 6 -
core/sql/common/ComResWords.h | 2 -
core/sql/common/ComRtUtils.cpp | 16 ---
core/sql/common/ComSchemaName.cpp | 2 -
core/sql/common/ComSmallDefs.cpp | 2 -
core/sql/common/ComTransInfo.h | 2 -
core/sql/common/DTICommonType.h | 2 -
core/sql/common/DateTimeType.cpp | 32 -----
core/sql/common/DatetimeType.h | 8 --
core/sql/common/IntervalType.cpp | 6 -
core/sql/common/IntervalType.h | 4 -
core/sql/common/Ipc.cpp | 4 -
core/sql/common/Ipc.h | 2 -
core/sql/common/IpcGuardian.cpp | 37 -----
core/sql/common/IpcSockets.cpp | 2 -
core/sql/common/NAAssert.cpp | 2 -
core/sql/common/NAError.cpp | 2 -
core/sql/common/NAMemory.cpp | 10 --
core/sql/common/NAString.cpp | 4 -
core/sql/common/NAString2.cpp | 4 -
core/sql/common/NAStringDefGlobals.h | 1 -
core/sql/common/NATestpoint.cpp | 2 -
core/sql/common/NAType.cpp | 10 --
core/sql/common/NAWinNT.h | 4 -
core/sql/common/NumericType.cpp | 14 --
core/sql/common/NumericType.h | 3 -
core/sql/common/QueryText.h | 4 -
core/sql/common/SequenceGeneratorAttributes.h | 2 -
core/sql/common/charinfo.cpp | 4 -
core/sql/common/conversionHex.cpp | 18 ---
core/sql/common/conversionSJIS.cpp | 2 -
core/sql/common/csconvert.cpp | 2 -
core/sql/common/dfs2rec.h | 4 -
core/sql/common/ipcmsg.cpp | 42 ------
core/sql/common/nawstring.cpp | 2 -
core/sql/common/str.cpp | 28 ----
core/sql/common/swscanf.cpp | 28 ----
core/sql/common/swsprintf.cpp | 32 -----
core/sql/common/unicode_char_set.cpp | 8 --
core/sql/common/wstr.cpp | 10 --
core/sql/executor/ExBitMapTable.cpp | 4 -
core/sql/executor/ExBitMapTable.h | 3 -
core/sql/executor/ExCancel.cpp | 10 --
core/sql/executor/ExComTdb.cpp | 144 -------------------
core/sql/executor/ExExeUtilCommon.cpp | 2 -
core/sql/executor/ExExeUtilExplain.cpp | 1 -
core/sql/executor/ExExplain.cpp | 8 --
core/sql/executor/ExFirstN.cpp | 4 -
core/sql/executor/ExPack.h | 4 -
core/sql/executor/ExPackedRows.cpp | 2 -
core/sql/executor/ExPackedRows.h | 4 -
core/sql/executor/ExRsInfo.h | 3 -
core/sql/executor/ExScheduler.cpp | 2 -
core/sql/executor/ExSequence.cpp | 2 -
core/sql/executor/ExSimpleSample.h | 3 -
core/sql/executor/ExStats.h | 18 ---
core/sql/executor/ExTranspose.cpp | 2 -
core/sql/executor/ExTranspose.h | 4 -
core/sql/executor/ExUdr.cpp | 2 -
core/sql/executor/ExUdrClientIpc.cpp | 6 -
core/sql/executor/ExUdrServer.cpp | 2 -
core/sql/executor/ExVPJoin.cpp | 4 -
core/sql/executor/MdamPoint.cpp | 4 -
core/sql/executor/MdamPoint.h | 5 -
core/sql/executor/TriggerEnable.h | 2 -
core/sql/executor/ex_ddl.cpp | 10 --
core/sql/executor/ex_esp_frag_dir.cpp | 6 -
core/sql/executor/ex_esp_msg.cpp | 14 --
core/sql/executor/ex_ex.cpp | 8 --
core/sql/executor/ex_god.h | 3 -
core/sql/executor/ex_io_control.h | 10 --
core/sql/executor/ex_mdam.cpp | 14 --
core/sql/executor/ex_mj.cpp | 2 -
core/sql/executor/ex_onlj.cpp | 2 -
core/sql/executor/ex_queue.cpp | 12 --
core/sql/executor/ex_queue.h | 8 --
core/sql/executor/ex_root.cpp | 18 ---
core/sql/executor/ex_root.h | 9 --
core/sql/executor/ex_sort.cpp | 6 -
core/sql/executor/ex_split_top.cpp | 32 -----
core/sql/executor/ex_stored_proc.cpp | 16 ---
core/sql/executor/ex_tcb.h | 3 -
core/sql/executor/ex_tcb_private.h | 2 -
core/sql/executor/ex_timeout.cpp | 6 -
core/sql/executor/ex_transaction.cpp | 15 --
core/sql/executor/ex_transaction.h | 1 -
core/sql/executor/ex_tuple.cpp | 8 --
core/sql/executor/ex_tuple_flow.cpp | 4 -
core/sql/executor/ex_union.cpp | 14 --
core/sql/executor/key_range.cpp | 4 -
core/sql/executor/key_single_subset.cpp | 6 -
core/sql/executor/sql_buffer.cpp | 61 --------
core/sql/executor/sql_buffer.h | 6 -
core/sql/executor/timeout_data.cpp | 10 --
core/sql/exp/ExpAtp.cpp | 8 --
core/sql/exp/ExpAtp.h | 4 -
core/sql/exp/ExpBitMuxFunction.cpp | 10 --
core/sql/exp/ExpBitMuxFunction.h | 2 -
core/sql/exp/ExpConvMxcs.cpp | 2 -
core/sql/exp/ExpCriDesc.h | 2 -
core/sql/exp/ExpPCode.h | 2 -
core/sql/exp/ExpPCodeClauseGen.cpp | 38 -----
core/sql/exp/ExpPCodeExpGen.cpp | 4 -
core/sql/exp/ExpSequenceFunction.cpp | 2 -
core/sql/exp/ExpSqlTupp.h | 4 -
core/sql/exp/exp_aggregate.cpp | 2 -
core/sql/exp/exp_arith.cpp | 16 ---
core/sql/exp/exp_attrs.cpp | 16 ---
core/sql/exp/exp_attrs.h | 6 -
core/sql/exp/exp_bignum.cpp | 42 ------
core/sql/exp/exp_bignum.h | 2 -
core/sql/exp/exp_clause.cpp | 10 --
core/sql/exp/exp_clause.h | 4 -
core/sql/exp/exp_clause_derived.h | 2 -
core/sql/exp/exp_comp.cpp | 4 -
core/sql/exp/exp_conv.cpp | 94 ------------
core/sql/exp/exp_datetime.cpp | 14 --
core/sql/exp/exp_datetime.h | 2 -
core/sql/exp/exp_dp2_expr.cpp | 2 -
core/sql/exp/exp_dp2_expr.h | 2 -
core/sql/exp/exp_expr.cpp | 8 --
core/sql/exp/exp_expr.h | 4 -
core/sql/exp/exp_function.cpp | 93 ------------
core/sql/exp/exp_function.h | 2 -
core/sql/exp/exp_function_lower_unicode.cpp | 2 -
core/sql/exp/exp_function_substring_unicode.cpp | 2 -
core/sql/exp/exp_function_trim_unicode.cpp | 4 -
core/sql/exp/exp_function_upper_unicode.cpp | 2 -
core/sql/exp/exp_interval.cpp | 2 -
core/sql/exp/exp_like.cpp | 8 --
core/sql/exp/exp_math_func.cpp | 4 -
core/sql/exp/exp_math_func.h | 2 -
core/sql/exp/exp_tuple_desc.cpp | 8 --
core/sql/exp/exp_tuple_desc.h | 2 -
core/sql/export/ComDiags.cpp | 18 ---
core/sql/export/ComDiags.h | 2 -
core/sql/export/HeapLog.cpp | 6 -
core/sql/export/IpcMessageObj.cpp | 14 --
core/sql/export/NAAbort.cpp | 2 -
core/sql/export/NABasicObject.cpp | 4 -
core/sql/export/NAStringDef.cpp | 26 ----
core/sql/export/NAVersionedObject.cpp | 2 -
core/sql/export/NAVersionedObject.h | 2 -
core/sql/generator/GenExpGenerator.cpp | 58 --------
core/sql/generator/GenFastTransport.cpp | 2 -
core/sql/generator/GenItemExpr.cpp | 6 -
core/sql/generator/GenItemFunc.cpp | 22 ---
core/sql/generator/GenKey.cpp | 12 --
core/sql/generator/GenMapTable.cpp | 12 --
core/sql/generator/GenMdamPred.cpp | 16 ---
core/sql/generator/GenPartFunc.cpp | 2 -
core/sql/generator/GenPreCode.cpp | 34 -----
core/sql/generator/GenRel3GL.cpp | 2 -
core/sql/generator/GenRelDCL.cpp | 4 -
core/sql/generator/GenRelEnforcer.cpp | 16 ---
core/sql/generator/GenRelExeUtil.cpp | 92 ------------
core/sql/generator/GenRelGrby.cpp | 8 --
core/sql/generator/GenRelJoin.cpp | 8 --
core/sql/generator/GenRelMisc.cpp | 82 -----------
core/sql/generator/GenRelPackedRows.cpp | 10 --
core/sql/generator/GenRelScan.cpp | 8 --
core/sql/generator/GenRelSequence.cpp | 10 --
core/sql/generator/GenRelSet.cpp | 6 -
core/sql/generator/GenResources.cpp | 2 -
core/sql/generator/GenStoredProc.cpp | 2 -
core/sql/generator/GenUdr.cpp | 2 -
core/sql/generator/Generator.h | 2 -
core/sql/langman/LmContManager.cpp | 2 -
core/sql/langman/LmGenUtil.cpp | 2 -
core/sql/langman/LmJavaOptions.h | 2 -
core/sql/langman/LmRoutine.h | 3 -
core/sql/optimizer/AccessSets.cpp | 4 -
core/sql/optimizer/BindItemExpr.cpp | 20 ---
core/sql/optimizer/BindRelExpr.cpp | 34 -----
core/sql/optimizer/BindWA.cpp | 2 -
core/sql/optimizer/CascadesBasic.h | 1 -
core/sql/optimizer/ChangesTable.cpp | 14 --
core/sql/optimizer/ClusteredBitmap.cpp | 10 --
core/sql/optimizer/ColStatDesc.cpp | 14 --
core/sql/optimizer/ColumnDesc.h | 2 -
core/sql/optimizer/ColumnNameMap.h | 2 -
core/sql/optimizer/ControlDB.cpp | 10 --
core/sql/optimizer/Cost.h | 1 -
core/sql/optimizer/CostVector.h | 3 -
core/sql/optimizer/EncodedValue.cpp | 5 -
core/sql/optimizer/EstLogProp.h | 2 -
core/sql/optimizer/GroupAttr.cpp | 6 -
core/sql/optimizer/ImplRule.cpp | 3 -
core/sql/optimizer/IndexDesc.cpp | 16 ---
core/sql/optimizer/Inlining.cpp | 10 --
core/sql/optimizer/ItemArith.h | 4 -
core/sql/optimizer/ItemColRef.h | 7 -
core/sql/optimizer/ItemConstr.h | 3 -
core/sql/optimizer/ItemExpr.cpp | 32 -----
core/sql/optimizer/ItemExpr.h | 3 -
core/sql/optimizer/ItemLog.h | 3 -
core/sql/optimizer/ItemNAType.h | 1 -
core/sql/optimizer/ItemOther.h | 8 --
core/sql/optimizer/ItemSubq.h | 10 --
core/sql/optimizer/ItmBitMuxFunction.cpp | 2 -
core/sql/optimizer/ItmFlowControlFunction.cpp | 6 -
core/sql/optimizer/LargeScopeRules.cpp | 2 -
core/sql/optimizer/MJVIndexBuilder.cpp | 4 -
core/sql/optimizer/MJVIndexBuilder.h | 10 --
core/sql/optimizer/MVInfo.cpp | 44 ------
core/sql/optimizer/MVInfo.h | 24 ----
core/sql/optimizer/MVJoinGraph.cpp | 4 -
core/sql/optimizer/MVJoinGraph.h | 2 -
core/sql/optimizer/MavRelRootBuilder.cpp | 4 -
core/sql/optimizer/MultiJoin.cpp | 6 -
core/sql/optimizer/MultiJoin.h | 2 -
core/sql/optimizer/MvLog.cpp | 8 --
core/sql/optimizer/MvLog.h | 2 -
core/sql/optimizer/MvMultiTxnMavBuilder.cpp | 2 -
core/sql/optimizer/MvRefreshBuilder.cpp | 16 ---
core/sql/optimizer/MvRefreshBuilder.h | 18 ---
core/sql/optimizer/NAClusterInfo.cpp | 1 -
core/sql/optimizer/NAColumn.cpp | 8 --
core/sql/optimizer/NARoutine.cpp | 2 -
core/sql/optimizer/NARoutine.h | 2 -
core/sql/optimizer/NATable.cpp | 30 ----
core/sql/optimizer/NATable.h | 2 -
core/sql/optimizer/NodeMap.cpp | 31 ----
core/sql/optimizer/NormItemExpr.cpp | 15 --
core/sql/optimizer/NormRelExpr.cpp | 18 ---
core/sql/optimizer/ObjectNames.cpp | 6 -
core/sql/optimizer/OptItemExpr.cpp | 2 -
core/sql/optimizer/OptLogRelExpr.cpp | 4 -
core/sql/optimizer/OptPhysRelExpr.cpp | 14 --
core/sql/optimizer/OptTrigger.cpp | 7 -
core/sql/optimizer/PackedColDesc.cpp | 14 --
core/sql/optimizer/PackedColDesc.h | 1 -
core/sql/optimizer/PartFunc.cpp | 26 ----
core/sql/optimizer/PartFunc.h | 3 -
core/sql/optimizer/PartKeyDist.cpp | 6 -
core/sql/optimizer/PartReq.cpp | 30 ----
core/sql/optimizer/PartReq.h | 1 -
core/sql/optimizer/PhyProp.cpp | 12 --
core/sql/optimizer/PhyProp.h | 6 -
core/sql/optimizer/QueryGraph.cpp | 8 --
core/sql/optimizer/RETDesc.cpp | 2 -
core/sql/optimizer/Refresh.cpp | 2 -
core/sql/optimizer/Refresh.h | 26 ----
core/sql/optimizer/Rel3GL.cpp | 2 -
core/sql/optimizer/RelExeUtil.cpp | 2 -
core/sql/optimizer/RelExpr.cpp | 12 --
core/sql/optimizer/RelExpr.h | 5 -
core/sql/optimizer/RelGrby.h | 5 -
core/sql/optimizer/RelJoin.h | 13 --
core/sql/optimizer/RelMisc.h | 1 -
core/sql/optimizer/RelPackedRows.h | 1 -
core/sql/optimizer/RelSample.h | 2 -
core/sql/optimizer/RelScan.h | 2 -
core/sql/optimizer/RelSequence.h | 5 -
core/sql/optimizer/RelSet.h | 2 -
core/sql/optimizer/RelStoredProc.cpp | 8 --
core/sql/optimizer/ReqGen.cpp | 10 --
core/sql/optimizer/RoutineDesc.cpp | 4 -
core/sql/optimizer/Rule.cpp | 2 -
core/sql/optimizer/Rule.h | 5 -
core/sql/optimizer/ScanOptimizer.cpp | 6 -
core/sql/optimizer/ScmCostMethod.cpp | 2 -
core/sql/optimizer/SearchKey.cpp | 16 ---
core/sql/optimizer/Stats.cpp | 7 -
core/sql/optimizer/Stats.h | 23 ---
core/sql/optimizer/SynthType.cpp | 16 ---
core/sql/optimizer/TableDesc.cpp | 6 -
core/sql/optimizer/TransRule.cpp | 15 --
core/sql/optimizer/TransRule.h | 13 --
core/sql/optimizer/TriggerDB.cpp | 4 -
core/sql/optimizer/TriggerDB.h | 1 -
core/sql/optimizer/Triggers.cpp | 10 --
core/sql/optimizer/Triggers.h | 5 -
core/sql/optimizer/VEGTable.cpp | 36 -----
core/sql/optimizer/ValueDesc.cpp | 16 ---
core/sql/optimizer/costmethod.cpp | 12 --
core/sql/optimizer/mdam.cpp | 24 ----
core/sql/optimizer/memo.cpp | 22 ---
core/sql/optimizer/opt.cpp | 26 ----
core/sql/optimizer/opt.h | 8 --
core/sql/parser/ElemDDLFileAttr.cpp | 6 -
core/sql/parser/ElemDDLList.h | 2 -
core/sql/parser/ElemDDLPartition.cpp | 4 -
core/sql/parser/ElemDDLUdr.cpp | 4 -
core/sql/parser/ParDDLFileAttrs.cpp | 14 --
core/sql/parser/ParKeyWords.cpp | 2 -
core/sql/parser/ParKeyWords.h | 2 -
core/sql/parser/ParNameLocList.cpp | 22 ---
core/sql/parser/SqlParserAux.cpp | 36 -----
core/sql/parser/StmtNode.h | 3 -
core/sql/parser/sqlparser.y | 112 ---------------
core/sql/parser/ulexer.cpp | 8 --
core/sql/parser/ulexer.h | 2 -
core/sql/qms/QmmQmm.cpp | 1 -
core/sql/qmscommon/QRQueries.cpp | 5 -
core/sql/qmscommon/QRQueries.sql | 4 -
core/sql/refresh/RuDeltaDef.cpp | 6 -
core/sql/refresh/RuDupElimLogRecord.cpp | 4 -
core/sql/refresh/RuDupElimLogScanner.cpp | 2 -
core/sql/refresh/RuDupElimTaskExUnit.cpp | 2 -
core/sql/refresh/RuDupElimTaskExecutor.cpp | 8 --
core/sql/refresh/RuException.cpp | 12 --
core/sql/refresh/RuForceOptionsParser.cpp | 2 -
core/sql/refresh/RuOptions.cpp | 12 --
core/sql/refresh/RuRefreshTaskExecutor.cpp | 26 ----
.../refresh/RuSQLDynamicStatementContainer.cpp | 6 -
core/sql/refresh/RuSQLStatementContainer.cpp | 4 -
core/sql/refresh/RuTableSyncTaskExecutor.cpp | 4 -
core/sql/refresh/RuTaskExecutor.cpp | 4 -
core/sql/refresh/RuTestTaskExecutor.cpp | 16 ---
.../refresh/RuUnAuditRefreshTaskExecutor.cpp | 16 ---
core/sql/sort/RunDirectory.cpp | 2 -
core/sql/sort/ScratchSpace.cpp | 2 -
core/sql/sort/SortAlgo.cpp | 6 -
core/sql/sort/SortUtil.cpp | 6 -
core/sql/sort/TourTree.cpp | 2 -
core/sql/sort/TreeNode.cpp | 6 -
core/sql/sort/scratchfile_base.cpp | 2 -
core/sql/sqlcomp/CmpDescribe.cpp | 8 --
core/sql/sqlcomp/DefaultValidator.cpp | 4 -
core/sql/sqlcomp/NewDel.cpp | 8 --
core/sql/sqlcomp/nadefaults.cpp | 14 --
core/sql/sqlcomp/parser.cpp | 8 --
core/sql/sqlmsg/ComDiagsMsg.cpp | 14 --
core/sql/sqlmsg/ErrorMessage.cpp | 12 --
core/sql/sqlmsg/GetErrorMessage.cpp | 10 --
core/sql/sqlmsg/ParserMsg.cpp | 4 -
core/sql/sqlmxevents/logmxevent_sq.h | 2 -
core/sql/sqlshare/CatSQLShare.cpp | 2 -
core/sql/udrserv/UdrStreams.cpp | 2 -
core/sql/udrserv/udrutil.cpp | 2 -
core/sql/ustat/hs_cli.cpp | 43 ------
core/sql/ustat/hs_cli.h | 2 -
core/sql/ustat/hs_globals.cpp | 14 --
core/sql/ustat/hs_la.cpp | 4 -
core/sql/ustat/hs_lex.ll | 3 -
core/sql/ustat/hs_read.cpp | 16 ---
core/sql/ustat/hs_util.cpp | 2 -
core/sql/ustat/hs_yacc.y | 5 -
393 files changed, 18 insertions(+), 3921 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/arkcmp/ApplicationFile.cpp
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/ApplicationFile.cpp b/core/sql/arkcmp/ApplicationFile.cpp
index 54c3bb8..a531e17 100644
--- a/core/sql/arkcmp/ApplicationFile.cpp
+++ b/core/sql/arkcmp/ApplicationFile.cpp
@@ -104,10 +104,8 @@ bool ApplicationFile::mxcmpModule(char *mdf)
mxcmp = mxcmp ? mxcmp : DEFAULT_MXCMP;
// make sure we have enough space for the mxcmp invocation string
assert(args_ != NULL);
-#pragma nowarn(1506) // warning elimination
Int32 cmdLen = strlen(mxcmp)+args_->application().length()+
args_->otherArgs().length()+strlen(mdf)+7;
-#pragma warn(1506) // warning elimination
// for efficiency we try to use the stack-allocated cmd variable.
// but, no matter how big we declare it, eg: char cmd[12345],
// it is always possible for someone like QA try something like
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/arkcmp/CmpContext.cpp
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/CmpContext.cpp b/core/sql/arkcmp/CmpContext.cpp
index 3a8a9f9..e5c179e 100644
--- a/core/sql/arkcmp/CmpContext.cpp
+++ b/core/sql/arkcmp/CmpContext.cpp
@@ -172,9 +172,7 @@ CmpContext::CmpContext(UInt32 f, CollHeap * h)
// initialize CmpStatement related members.
statements_.insert(0);
-#pragma nowarn(1506) // warning elimination
currentStatement_ = statements_.index(0);
-#pragma warn(1506) // warning elimination
currentStatementPtrCache_ = statements_[currentStatement_];
diags_ = ComDiagsArea::allocate(heap_);
@@ -595,9 +593,7 @@ void CmpContext::setStatement(CmpStatement* s)
init();
statements_.insert(s);
s->setPrvCmpStatement(statements_[currentStatement_]);
-#pragma nowarn(1506) // warning elimination
currentStatement_ = statements_.index(s);
-#pragma warn(1506) // warning elimination
currentStatementPtrCache_ = statements_[currentStatement_];
// Commented this out, as init() is now a no-op:
@@ -608,9 +604,7 @@ void CmpContext::unsetStatement(CmpStatement* s, NABoolean exceptionRaised)
{
CollIndex i = statements_.index(s);
statements_.removeAt(i);
-#pragma nowarn(1506) // warning elimination
currentStatement_ = statements_.index(s->prvCmpStatement());
-#pragma warn(1506) // warning elimination
currentStatementPtrCache_ = statements_[currentStatement_];
for ( i = 0; i < statements_.entries(); i++ )
if (statements_[i] && statements_[i]->prvCmpStatement() == s)
@@ -624,9 +618,7 @@ void CmpContext::unsetStatement(CmpStatement* s, NABoolean exceptionRaised)
void CmpContext::setCurrentStatement(CmpStatement* s)
{
CollIndex i = statements_.index(s);
-#pragma nowarn(1506) // warning elimination
currentStatement_ = ( i == NULL_COLL_INDEX ) ? 0 : i;
-#pragma warn(1506) // warning elimination
currentStatementPtrCache_ = statements_[currentStatement_];
CMPASSERT(s->diags()->getNumber() == 0);
// diags()->clear();
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/arkcmp/CmpContext.h
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/CmpContext.h b/core/sql/arkcmp/CmpContext.h
index ea366a6..b875927 100644
--- a/core/sql/arkcmp/CmpContext.h
+++ b/core/sql/arkcmp/CmpContext.h
@@ -154,7 +154,6 @@ private :
Int32 useCount_;
};
-#pragma nowarn(1506) // warning elimination
class CmpContext
{
public :
@@ -647,7 +646,6 @@ private:
// for any Hive SQL operations we may want to do
HiveClient_JNI* hiveClient_;
}; // end of CmpContext
-#pragma warn(1506) // warning elimination
static inline CmpContext::InternalCompileEnum &InternalCompile()
{ return cmpCurrentContext->internalCompile(); }
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/arkcmp/CmpISPUtils.cpp
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/CmpISPUtils.cpp b/core/sql/arkcmp/CmpISPUtils.cpp
index 35c03ab..0786c24 100644
--- a/core/sql/arkcmp/CmpISPUtils.cpp
+++ b/core/sql/arkcmp/CmpISPUtils.cpp
@@ -83,7 +83,6 @@ SP_HELPER_STATUS CmpSPFormatFunc_ (Lng32 fieldNo,
Lng32 casting)
{
CmpSPExecDataItemReply* replyPtr = (CmpSPExecDataItemReply*)rowData;
-#pragma nowarn(262) // warning elimination
ULng32 tempNum = (ULng32)fieldNo;
ULng32 tempLen = (ULng32)fieldLen;
ComDiagsArea* diags = replyPtr->SPFuncsDiags();
@@ -97,7 +96,6 @@ SP_HELPER_STATUS CmpSPFormatFunc_ (Lng32 fieldNo,
else
return SP_NO_ERROR;
}
-#pragma warn(262) // warning elimination
SP_HELPER_STATUS CmpSPKeyValueFunc_ (
Lng32 keyIndex,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/arkcmp/CmpStatement.cpp
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/CmpStatement.cpp b/core/sql/arkcmp/CmpStatement.cpp
index f1a8f4e..e16ff5c 100644
--- a/core/sql/arkcmp/CmpStatement.cpp
+++ b/core/sql/arkcmp/CmpStatement.cpp
@@ -730,9 +730,7 @@ CmpStatement::process (const CmpMessageDDL& statement)
// from the UpdateStats() method.
char *userStr= new (heap()) char[2000];
-#pragma nowarn(1506) // warning elimination
Int32 len=strlen(sqlStr);
-#pragma warn(1506) // warning elimination
if (len > 1999)
len=1999;
@@ -1036,7 +1034,6 @@ CmpStatement::process(const CmpMessageDDLwithStatus &statement)
CmpStatement::ReturnStatus
CmpStatement::process (const CmpMessageDescribe& statement)
{
-#pragma nowarn(262) // warning elimination
ReturnStatus ret = CmpStatement_SUCCESS;
// There will be memory leak handling CmpMessageReplyCode *bound this way.
// The correct way should be making bound a local variable with statementHeap passed in.
@@ -1052,9 +1049,7 @@ CmpStatement::process (const CmpMessageDescribe& statement)
// the sqlcomp() method.
char *userStr= (char *) (heap())->allocateMemory(sizeof(char) * (2000));
-#pragma nowarn(1506) // warning elimination
Int32 len=strlen(statement.data());
-#pragma warn(1506) // warning elimination
if (len > 1999)
len=1999;
@@ -1089,7 +1084,6 @@ CmpStatement::process (const CmpMessageDescribe& statement)
sqlTextStr_=NULL;
return CmpStatement_SUCCESS;
}
-#pragma warn(262) // warning elimination
CmpStatement::ReturnStatus
CmpStatement::process (const CmpMessageUpdateHist& statement)
@@ -1099,9 +1093,7 @@ CmpStatement::process (const CmpMessageUpdateHist& statement)
// the UpdateStats() method.
char *userStr= new (heap()) char[2000];
-#pragma nowarn(1506) // warning elimination
Int32 len=strlen(statement.data());
-#pragma warn(1506) // warning elimination
if (len > 1999)
len=1999;
@@ -1365,7 +1357,6 @@ static NABoolean ISPFetchPut(CmpInternalSP* storedProc, // to fetch data
{
NABoolean bufferFull = FALSE;
// fetch until there is no more data
-#pragma nowarn(770) // warning elimination
CmpStoredProc::ExecStatus execStatus;
short putStatus;
while ( !bufferFull &&
@@ -1385,7 +1376,6 @@ static NABoolean ISPFetchPut(CmpInternalSP* storedProc, // to fetch data
}
return bufferFull;
}
-#pragma warn(770) // warning elimination
static NABoolean ISPPrepareReply(CmpISPDataObject* ispData,
CmpMessageReply* reply,
@@ -1402,7 +1392,6 @@ static NABoolean ISPPrepareReply(CmpISPDataObject* ispData,
CmpStatement::ReturnStatus
CmpStatementISP::process (CmpMessageISPRequest& isp)
{
-#pragma nowarn(262) // warning elimination
ReturnStatus ret = CmpStatement_ERROR;
#ifdef _DEBUG
@@ -1458,7 +1447,6 @@ CmpStatementISP::process (CmpMessageISPRequest& isp)
return CmpStatement_SUCCESS;
}
-#pragma warn(262) // warning elimination
CmpStatement::ReturnStatus
CmpStatementISP::process (const CmpMessageISPGetNext& getNext)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/arkcmp/CmpStoredProc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/CmpStoredProc.cpp b/core/sql/arkcmp/CmpStoredProc.cpp
index 4206685..5a3dc49 100644
--- a/core/sql/arkcmp/CmpStoredProc.cpp
+++ b/core/sql/arkcmp/CmpStoredProc.cpp
@@ -78,11 +78,9 @@ static const char emptyString[] = "";
inline static char *copyString(const NAString &s) // cf. readRealArk.cpp
{
-#pragma nowarn(1506) // warning elimination
char *c = new(CmpCommon::statementHeap()) char[s.length()+1];
str_cpy_all(c, s.data(), s.length()+1);
return c;
-#pragma warn(1506) // warning elimination
}
static void CmpSPERROR2Diags(const SP_ERROR_STRUCT* spError,
@@ -437,7 +435,6 @@ NABoolean CmpSPOutputFormat::ElemDDLColDef2ColumnDescStruct
colDesc->precision = 0;
}
-#pragma nowarn(1506) // warning elimination
if ( genericType->getTypeQualifier() == NA_CHARACTER_TYPE )
{
CharType & charType = (CharType &) *genericType;
@@ -457,7 +454,6 @@ NABoolean CmpSPOutputFormat::ElemDDLColDef2ColumnDescStruct
colDesc->datetimefractprec = dti.getFractionPrecision();
colDesc->intervalleadingprec = dti.getLeadingPrecision();
}
-#pragma warn(1506) // warning elimination
// offset, to be done (do we need it?)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/arkcmp/CmpStoredProc.h
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/CmpStoredProc.h b/core/sql/arkcmp/CmpStoredProc.h
index 3ee41cd..0614b94 100644
--- a/core/sql/arkcmp/CmpStoredProc.h
+++ b/core/sql/arkcmp/CmpStoredProc.h
@@ -586,7 +586,6 @@ public:
const CmpISPFuncs& operator = (const CmpISPFuncs&);
}; // end of CmpISPFuncs
-#pragma nowarn(1319) // warning elimination
class CmpInternalSP : public CmpStoredProc
{
public:
@@ -662,7 +661,6 @@ private:
CmpInternalSP(const CmpInternalSP&);
const CmpInternalSP& operator=(const CmpInternalSP&);
}; // CmpInternalSP
-#pragma warn(1319) // warning elimination
inline const CmpISPFuncs::ProcFuncsStruct&
CmpISPFuncs::operator[](const NAString& name) const
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/arkcmp/ExtQualModuleNames.cpp
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/ExtQualModuleNames.cpp b/core/sql/arkcmp/ExtQualModuleNames.cpp
index 828a112..bc125e1 100644
--- a/core/sql/arkcmp/ExtQualModuleNames.cpp
+++ b/core/sql/arkcmp/ExtQualModuleNames.cpp
@@ -378,4 +378,3 @@ void ExtQualModuleNames::processExtQualModuleNames()
currentTokenCode_ = scanner();
parseExternallyQualifiedModuleNames();
}
-#pragma warning (disable : 4786) //warning elimination
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/arkcmp/ExtQualModuleNames.h
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/ExtQualModuleNames.h b/core/sql/arkcmp/ExtQualModuleNames.h
index 1686808..880aa92 100644
--- a/core/sql/arkcmp/ExtQualModuleNames.h
+++ b/core/sql/arkcmp/ExtQualModuleNames.h
@@ -34,9 +34,7 @@
*/
#include <string>
-#pragma nowarn(1506) //warning elimination (to hide warnings from vector2)
#include <vector>
-#pragma warn(1506) //warning elimination
struct ThreePartModuleName {
std::string catalog, schema, module;
@@ -49,7 +47,6 @@ struct ThreePartModuleName {
}
};
-#pragma nowarn(1506) //warning elimination
class ExtQualModuleNames {
public:
// constructor
@@ -122,6 +119,5 @@ class ExtQualModuleNames {
std::string moduleTableSet_;// default module tableset
std::string moduleVersion_; // default module version
};
-#pragma warn(1506) //warning elimination
#endif // EXTQUALMODULENAMES__H
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/arkcmp/ProcessEnv.cpp
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/ProcessEnv.cpp b/core/sql/arkcmp/ProcessEnv.cpp
index 39597e4..18a0826 100644
--- a/core/sql/arkcmp/ProcessEnv.cpp
+++ b/core/sql/arkcmp/ProcessEnv.cpp
@@ -274,9 +274,7 @@ void ProcessEnv::removeEnv(char **newenvs, Lng32 nEnvs)
CollHeap *stmtHeap = CmpCommon::statementHeap();
NAList<Lng32> deleteArray(stmtHeap, 16);
-#pragma warning (disable : 4018) //warning elimination
for (j=0; j < envs_.getSize(); j++)
-#pragma warning (default : 4018) //warning elimination
{
if (envs_.used(j))
{
@@ -300,9 +298,7 @@ void ProcessEnv::removeEnv(char **newenvs, Lng32 nEnvs)
}
}
-#pragma warning (disable : 4018) //warning elimination
for (j=0; j < deleteArray.entries(); j++) {
-#pragma warning (default : 4018) //warning elimination
envs_.remove(deleteArray[j]);
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/arkcmp/SPUtil.cpp
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/SPUtil.cpp b/core/sql/arkcmp/SPUtil.cpp
index b058a8b..1510a51 100644
--- a/core/sql/arkcmp/SPUtil.cpp
+++ b/core/sql/arkcmp/SPUtil.cpp
@@ -169,13 +169,9 @@ SP_STATUS SP_FILEINFO_Process(SP_PROCESS_ACTION action,
{
char* nlptr = strchr(p, '\n');
if (nlptr) *nlptr = '\0';
-#pragma nowarn(1506) // warning elimination
short len = strlen(p);
-#pragma warn(1506) // warning elimination
memcpy(&tempstr[0], &len, sizeof(len));
-#pragma nowarn(1506) // warning elimination
fFunc(0, outputData, strlen(p) + 2, tempstr, 0);
-#pragma warn(1506) // warning elimination
// error when fetching output
if (strncmp(&tempstr[2], "errors", 6) == 0)
@@ -199,9 +195,7 @@ SP_STATUS SP_FILEINFO_Process(SP_PROCESS_ACTION action,
return SP_FAIL;
}
// char as output
-#pragma nowarn(1506) // warning elimination
fFunc(1, outputData, strlen(fileInfo->desc), fileInfo->desc, 0);
-#pragma warn(1506) // warning elimination
// datetime as output
fFunc(2, outputData, 64, fileInfo->dt1, 0);
@@ -306,9 +300,7 @@ inline short string2Varchar(char* string, char* varchar, short size)
{
if ((UInt32)strlen(string) + sizeof(short) > (UInt32)size )
return 0;
-#pragma nowarn(1506) // warning elimination
short len = strlen(string);
-#pragma warn(1506) // warning elimination
memcpy(varchar, &len, sizeof(short));
memcpy(varchar+sizeof(short), string, len);
return 1;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/arkcmp/SQLJFile.cpp
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/SQLJFile.cpp b/core/sql/arkcmp/SQLJFile.cpp
index 5c64d98..f66608d 100644
--- a/core/sql/arkcmp/SQLJFile.cpp
+++ b/core/sql/arkcmp/SQLJFile.cpp
@@ -61,12 +61,10 @@ bool SQLJFile::openFile(Cmdline_Args &args)
// invoke MDFWriter to extract modules
const char mdfWriter[]= "java sqlj.runtime.profile.util.MDFWriter";
-#pragma nowarn(1506) // warning elimination
cmdLen = strlen(mdfWriter) + strlen(moduleNamesOption) + 2 +
strlen("-CerrorFileName=") + strlen(errFileName) + 2 +
strlen("-CMDFList=") + strlen(outputFileName) + 1 +
args.application().length();
-#pragma warn(1506) // warning elimination
// for efficiency we try to use the stack-allocated cmd variable.
// but, no matter how big we declare it, eg: char cmd[12345],
// it is always possible for someone like QA try something like
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/arkcmp/VersioningStoredProc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/VersioningStoredProc.cpp b/core/sql/arkcmp/VersioningStoredProc.cpp
index ff2c600..f3cbbb6 100644
--- a/core/sql/arkcmp/VersioningStoredProc.cpp
+++ b/core/sql/arkcmp/VersioningStoredProc.cpp
@@ -448,7 +448,6 @@ SP_STATUS
{
// Provide output values from current element
const ComVersion_NodeInfo & element = nodeSet[rowIndex];
-#pragma nowarn(1506)
// First two columns are copies of the corresponding input columns
fFunc(0, outputData, strlen(context->getInputType()), (void *)context->getInputType(), TRUE);
fFunc(1, outputData, strlen(context->getInputValue()), (void *)context->getInputValue(), TRUE);
@@ -457,7 +456,6 @@ SP_STATUS
fFunc(2, outputData, sizeof(Lng32), (void *)&outputVersion, FALSE);
// Fourth column is the node name from the element
fFunc(3, outputData, strlen(element.getNodeName()), (void *)&element.getNodeName(), TRUE);
-#pragma warn(1506)
// Fifth column is the MXV of the node from the element.
outputVersion = element.getMXV();
fFunc (4, outputData, sizeof(Lng32), (void *)&outputVersion, FALSE);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/arkcmp/cmpargs.cpp
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/cmpargs.cpp b/core/sql/arkcmp/cmpargs.cpp
index 0780021..3a40e48 100644
--- a/core/sql/arkcmp/cmpargs.cpp
+++ b/core/sql/arkcmp/cmpargs.cpp
@@ -285,9 +285,7 @@ void Cmdline_Args::processArgs(Int32 argc, char **argv)
{
NAString nam(optarg);
// find the = if it exists
-#pragma nowarn(1506) // warning elimination
Int32 loopx = 0, len = nam.length();
-#pragma warn(1506) // warning elimination
while((loopx < len) && ((nam)(loopx) != '=') )loopx++;
if (len == loopx) {
diags << DgSqlCode(mxcmpUmIllformatedOptionD) << DgString0(optarg);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/bin/ex_esp_main.cpp
----------------------------------------------------------------------
diff --git a/core/sql/bin/ex_esp_main.cpp b/core/sql/bin/ex_esp_main.cpp
index 0a54fb6..57dd43c 100644
--- a/core/sql/bin/ex_esp_main.cpp
+++ b/core/sql/bin/ex_esp_main.cpp
@@ -322,7 +322,6 @@ GuaReceiveFastStart::GuaReceiveFastStart()
// Startup handling of ESP
// -----------------------------------------------------------------------
-#pragma nowarn(770) // warning elimination
Int32 runESP(Int32 argc, char** argv, GuaReceiveFastStart *guaReceiveFastStart)
{
// initialize ESP global data
@@ -406,7 +405,6 @@ Int32 runESP(Int32 argc, char** argv, GuaReceiveFastStart *guaReceiveFastStart)
// nobody wants us anymore, right now that means that we stop
return 0;
}
-#pragma warn(770) // warning elimination
void DoEspStartup(Int32 argc,
char **argv,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/cli/Cli.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/Cli.cpp b/core/sql/cli/Cli.cpp
index 8b3a78c..b128ed6 100644
--- a/core/sql/cli/Cli.cpp
+++ b/core/sql/cli/Cli.cpp
@@ -1156,9 +1156,7 @@ Lng32 SQLCLI_BreakEnabled(/*IN*/ CliGlobals * cliGlobals,
}
-#pragma nowarn(1506) // warning elimination
cliGlobals->setBreakEnabled (enabled);
-#pragma warn(1506) // warning elimination
return 0;
}
Lng32 SQLCLI_SPBreakRecvd(/*IN*/ CliGlobals * cliGlobals,
@@ -1170,14 +1168,11 @@ Lng32 SQLCLI_SPBreakRecvd(/*IN*/ CliGlobals * cliGlobals,
}
-#pragma nowarn(1506) // warning elimination
*breakRecvd = cliGlobals->SPBreakReceived();
cliGlobals->setSPBreakReceived(FALSE);
-#pragma warn(1506) // warning elimination
return 0;
}
-#pragma nowarn(770) // warning elimination
Lng32 SQLCLI_CreateContext(/*IN*/ CliGlobals * cliGlobals,
/*OUT*/ SQLCTX_HANDLE *contextHandle,
/*IN*/ char * sqlAuthId,
@@ -1215,7 +1210,6 @@ Lng32 SQLCLI_CreateContext(/*IN*/ CliGlobals * cliGlobals,
return SUCCESS;
}
-#pragma warn(770) // warning elimination
Lng32 SQLCLI_CurrentContext(/*IN*/ CliGlobals * cliGlobals,
/*OUT*/ SQLCTX_HANDLE *contextHandle)
@@ -4290,7 +4284,6 @@ static Lng32 getStmtInfo(
*(Int32 *)numeric_value = diags.getFunction(); // returns FunctionEnum type
break;
-#pragma warning (disable : 4244) //warning elimination
case SQLDIAG_ROW_COUNT:
{
Int64 rowCount;
@@ -4304,7 +4297,6 @@ static Lng32 getStmtInfo(
break;
}
-#pragma warning (default : 4244) //warning elimination
case SQLDIAG_ROWSET_ROW_COUNT:
{
@@ -7721,9 +7713,7 @@ Lng32 SQLCLI_GetCollectStatsType_Internal(/*IN*/ CliGlobals * cliGlobals,
*collectStatsType = (ULng32)ComTdb::NO_STATS;
}
-#pragma nowarn(769) // warning elimination
return retcode;
-#pragma warn(769) // warning elimination
}
// For internal use only -- do not document!
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/cli/CliExpExchange.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/CliExpExchange.cpp b/core/sql/cli/CliExpExchange.cpp
index 15e3e7b..fd0f578 100644
--- a/core/sql/cli/CliExpExchange.cpp
+++ b/core/sql/cli/CliExpExchange.cpp
@@ -151,14 +151,10 @@ ex_expr::exp_return_type InputOutputExpr::describeOutput(void * output_desc_,
0);
if (NOT isIFIO)
{
-#pragma warning (disable : 4244) //warning elimination
Lng32 displaySize =
ExpInterval::getDisplaySize(operand->getDatatype(),
-#pragma nowarn(1506) // warning elimination
operand->getPrecision(),
-#pragma warn(1506) // warning elimination
operand->getScale());
-#pragma warning (default : 4244) //warning elimination
length = displaySize;
}
} else if (operand->getDatatype() == REC_DATETIME) {
@@ -686,7 +682,6 @@ Descriptor::BulkMoveStatus Descriptor::checkBulkMoveStatusV2(
-#pragma warning (disable : 4273) //warning elimination
void InputOutputExpr::setupBulkMoveInfo(void * desc_, CollHeap * heap,
NABoolean isInputDesc,
UInt32 flags)
@@ -971,9 +966,7 @@ next_clause:
}
}
}
-#pragma warning (default : 4273) //warning elimination
-#pragma warning (disable : 4273) //warning elimination
ex_expr::exp_return_type InputOutputExpr::doBulkMove(atp_struct * atp,
void * desc_,
char * tgtRowPtr,
@@ -1026,9 +1019,7 @@ ex_expr::exp_return_type InputOutputExpr::doBulkMove(atp_struct * atp,
return ex_expr::EXPR_OK;
}
-#pragma warning (default : 4273) //warning elimination
-#pragma warning (disable : 4273) //warning elimination
ex_expr::exp_return_type
InputOutputExpr::outputValues(atp_struct *atp,
void * output_desc_,
@@ -1213,9 +1204,7 @@ InputOutputExpr::outputValues(atp_struct *atp,
default:
dataPtr = (atp->getTupp(operand->getAtpIndex())).getDataPointer();
-#pragma nowarn(270) // warning elimination
if (operand->getOffset() < 0) {
-#pragma warn(270) // warning elimination
// Offset is negative. This indicates that this offset
// is the negative of field number in a base table
// and this field follows one or more varchar fields.
@@ -2097,7 +2086,6 @@ next_clause:
return ex_expr::EXPR_OK;
}
-#pragma warning (default : 4273) //warning elimination
ex_expr::exp_return_type InputOutputExpr::describeInput(void * input_desc_,
@@ -2180,14 +2168,10 @@ ex_expr::exp_return_type InputOutputExpr::describeInput(void * input_desc_,
0);
if (NOT isIFIO)
{
-#pragma warning (disable : 4244) //warning elimination
displayLength =
ExpInterval::getDisplaySize(dataType,
-#pragma nowarn(1506) // warning elimination
operand->getPrecision(),
-#pragma warn(1506) // warning elimination
operand->getScale());
-#pragma warning (default : 4244) //warning elimination
length = displayLength;
}
@@ -2516,7 +2500,6 @@ then place the following four lines of code after the call to setRowNumberInCli.
return ex_expr::EXPR_ERROR;
*/
// error path not taken . This is only if something bad happens in NVT
-#pragma warning (disable : 4273) //warning elimination
ex_expr::exp_return_type
InputOutputExpr::inputSingleRowValue(atp_struct *atp,
void * inputDesc_,
@@ -2871,9 +2854,7 @@ InputOutputExpr::inputSingleRowValue(atp_struct *atp,
if (sourceType == REC_NCHAR_V_ANSI_UNICODE)
{
-#pragma nowarn(1506) // warning elimination
realSourceLen = NAWstrlen((wchar_t*)source) * SQL_DBCHAR_SIZE;
-#pragma warn(1506) // warning elimination
if ( realSourceLen > sourceLen )
realSourceLen = sourceLen ;
@@ -3895,9 +3876,7 @@ InputOutputExpr::inputValues(atp_struct *atp,
Int32 i;
if ((sourceType >= REC_MIN_V_N_CHAR_H)
&& (sourceType <= REC_MAX_V_N_CHAR_H)) {
-#pragma nowarn(1506) // warning elimination
for (i = strlen(source); i < operand->getLength(); i++) {
-#pragma warn(1506) // warning elimination
target[i] = 0;
}
}
@@ -3950,9 +3929,7 @@ InputOutputExpr::inputValues(atp_struct *atp,
Lng32 realSourceLen = sourceLen;
if (sourceType == REC_NCHAR_V_ANSI_UNICODE) {
-#pragma nowarn(1506) // warning elimination
realSourceLen = NAWstrlen((NAWchar*)source) * SQL_DBCHAR_SIZE;
-#pragma warn(1506) // warning elimination
if ( realSourceLen > sourceLen )
realSourceLen = sourceLen ;
@@ -4302,9 +4279,7 @@ InputOutputExpr::inputValues(atp_struct *atp,
return ex_expr::EXPR_ERROR;
}
else {
-#pragma nowarn(1506) // warning elimination
dynamicRowsetSize = *((ULng32 *) target);
-#pragma warn(1506) // warning elimination
break;
}
@@ -4351,7 +4326,6 @@ next_clause:
return ex_expr::EXPR_OK;
}
-#pragma warning (disable : 4273) //warning elimination
Lng32 InputOutputExpr::getCompiledOutputRowsetSize(atp_struct *atp)
{
ex_clause * clause = getClauses();
@@ -4369,7 +4343,6 @@ Lng32 InputOutputExpr::getCompiledOutputRowsetSize(atp_struct *atp)
return sourceRowsetSize;
}
-#pragma warning (default : 4273) //warning elimination
ex_expr::exp_return_type InputOutputExpr::addDescInfoIntoStaticDesc
(Descriptor * desc, NABoolean isInput)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/cli/CliExtern.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/CliExtern.cpp b/core/sql/cli/CliExtern.cpp
index f943c26..f4724c6 100644
--- a/core/sql/cli/CliExtern.cpp
+++ b/core/sql/cli/CliExtern.cpp
@@ -3519,7 +3519,6 @@ Lng32 SQL_EXEC_GETDIAGNOSTICSCONDINFO(
};
-#pragma nowarn(770) // warning elimination
Lng32 SQL_EXEC_GetDiagnosticsCondInfo2(
/*IN* (SQLDIAG_COND_INFO_ITEM_ID) */ Lng32 what_to_get,
/*IN*/ Lng32 conditionNum,
@@ -3633,7 +3632,6 @@ Lng32 SQL_EXEC_GetDiagnosticsCondInfo2(
return retcode;
}
-#pragma warn(770) // warning elimination
Lng32 SQL_EXEC_GETDIAGNOSTICSCONDINFO2(
/*IN* (SQLDIAG_COND_INFO_ITEM_ID) */ Lng32 what_to_get,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/cli/Context.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/Context.cpp b/core/sql/cli/Context.cpp
index 0b5a09c..ab11551 100644
--- a/core/sql/cli/Context.cpp
+++ b/core/sql/cli/Context.cpp
@@ -390,10 +390,8 @@ void ContextCli::deleteMe()
ex_assert(cmpContextInUse_.entries() == 0,
"Should not be inside recursive compilation");
-#pragma warning( disable : 4018 ) // warning elimination
for (short i = 0; i < arkcmpArray_.entries(); i++)
delete arkcmpArray_[i];
-#pragma warning( default : 4018 ) // warning elimination
arkcmpArray_.clear();
@@ -2180,14 +2178,10 @@ Lng32 ContextCli::setUdrRuntimeOptions(const char *options,
char *newOptions = (char *) exHeap()->allocateMemory(optionsLen + 1);
char *newDelims = (char *) exHeap()->allocateMemory(delimsLen + 1);
-#pragma nowarn(1506) // warning elimination
str_cpy_all(newOptions, options, optionsLen);
-#pragma warn(1506) // warning elimination
newOptions[optionsLen] = 0;
-#pragma nowarn(1506) // warning elimination
str_cpy_all(newDelims, delimiters, delimsLen);
-#pragma warn(1506) // warning elimination
newDelims[delimsLen] = 0;
if (udrRuntimeOptions_)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/cli/Context.h
----------------------------------------------------------------------
diff --git a/core/sql/cli/Context.h b/core/sql/cli/Context.h
index e691323..973a647 100644
--- a/core/sql/cli/Context.h
+++ b/core/sql/cli/Context.h
@@ -73,8 +73,6 @@ class ExUdrServer;
class UdrContextMsg;
class SequenceValueGenerator;
class LmRoutine;
-#pragma warning( disable : 4244 ) // warning elimination
-#pragma nowarn(1506) // warning elimination
class ContextCli : public ExGod {
public:
@@ -1054,8 +1052,6 @@ public:
ContextCli *context_;
};
-#pragma warn(1506) // warning elimination
-#pragma warning( default : 4244 ) // warning elimination
inline HashQueue *
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/cli/Descriptor.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/Descriptor.cpp b/core/sql/cli/Descriptor.cpp
index efa5d58..9b7446b 100644
--- a/core/sql/cli/Descriptor.cpp
+++ b/core/sql/cli/Descriptor.cpp
@@ -176,9 +176,7 @@ Descriptor::Descriptor(SQLDESC_ID * descriptor_id_,
case desc_handle:
{
-#pragma nowarn(1506) // warning elimination
descriptor_id.handle = (void*)context_->getNextDescriptorHandle();
-#pragma warn(1506) // warning elimination
}
break;
@@ -1278,14 +1276,10 @@ char * desc_var_data_alloc(char *source,
if ( CharInfo::is_NCHAR_MP(sourceCharSet) == FALSE )
sourceDataLen = str_len(source);
else
-#pragma nowarn(1506) // warning elimination
sourceDataLen = na_wcslen((NAWchar*)source) * SQL_DBCHAR_SIZE;
-#pragma warn(1506) // warning elimination
break;
case REC_NCHAR_V_ANSI_UNICODE:
-#pragma nowarn(1506) // warning elimination
sourceDataLen = na_wcslen((NAWchar*)source) * SQL_DBCHAR_SIZE;
-#pragma warn(1506) // warning elimination
break;
case REC_BYTE_F_ASCII:
case REC_NCHAR_F_UNICODE:
@@ -2410,9 +2404,7 @@ RETCODE Descriptor::setDescItem(Lng32 entry, Lng32 what_to_set,
// need to set type, len, precision and scale for both
// source and target
sourceType = REC_BYTE_V_ANSI;
-#pragma nowarn(1506) // warning elimination
sourceLen = strlen(source) + 1; // max source length including
-#pragma warn(1506) // warning elimination
// the null at the end
sourcePrecision = sourceScale = 0;
@@ -2709,27 +2701,15 @@ RETCODE Descriptor::setDescItem(Lng32 entry, Lng32 what_to_set,
break;
case SQLDESC_PARAMETER_MODE:
-#pragma warning (disable : 4244) //warning elimination
-#pragma nowarn(1506) // warning elimination
descItem.parameterMode = numeric_value;
-#pragma warn(1506) // warning elimination
-#pragma warning (default : 4244) //warning elimination
break;
case SQLDESC_ORDINAL_POSITION:
-#pragma warning (disable : 4244) //warning elimination
-#pragma nowarn(1506) // warning elimination
descItem.ordinalPosition = numeric_value;
-#pragma warn(1506) // warning elimination
-#pragma warning (default : 4244) //warning elimination
break;
case SQLDESC_PARAMETER_INDEX:
-#pragma warning (disable : 4244) //warning elimination
-#pragma nowarn(1506) // warning elimination
descItem.parameterIndex = numeric_value;
-#pragma warn(1506) // warning elimination
-#pragma warning (default : 4244) //warning elimination
break;
case SQLDESC_DESCRIPTOR_TYPE:
@@ -3482,8 +3462,6 @@ SQLCLI_OBJ_ID* Descriptor::GetNameViaDesc(SQLDESC_ID *desc_id, ContextCli *conte
return NULL;
}
-#pragma warning (disable : 4244) //warning elimination
-#pragma nowarn(1506) // warning elimination
short retcode = convDoIt(
data,
length,
@@ -3499,8 +3477,6 @@ SQLCLI_OBJ_ID* Descriptor::GetNameViaDesc(SQLDESC_ID *desc_id, ContextCli *conte
0,
&heap,
&diagsArea);
-#pragma warn(1506) // warning elimination
-#pragma warning (default : 4244) //warning elimination
if (retcode != ex_expr::EXPR_OK)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/cli/Descriptor.h
----------------------------------------------------------------------
diff --git a/core/sql/cli/Descriptor.h b/core/sql/cli/Descriptor.h
index 5f27d0f..647f99a 100644
--- a/core/sql/cli/Descriptor.h
+++ b/core/sql/cli/Descriptor.h
@@ -129,9 +129,7 @@ private:
// -----------------------------------------------------------------------
// Descriptor
// -----------------------------------------------------------------------
-#pragma warning (disable : 4275) //warning elimination
class Descriptor : public ExGod {
-#pragma warning (default : 4275) //warning elimination
enum Flags
{
/*************************************************************
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/cli/Globals.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/Globals.cpp b/core/sql/cli/Globals.cpp
index 8e42254..32cb6b0 100644
--- a/core/sql/cli/Globals.cpp
+++ b/core/sql/cli/Globals.cpp
@@ -719,9 +719,7 @@ Lng32 CliGlobals::setEnvVars(char ** envvars)
for (nEnvs=0; envvars[nEnvs]; nEnvs++);
// one extra to null terminate envvar list
-#pragma nowarn(1506) // warning elimination
Lng32 envvarsLen = (nEnvs + 1) * sizeof(char*);
-#pragma warn(1506) // warning elimination
Int32 count;
for (count=0; count < nEnvs; count++)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/cli/Globals.h
----------------------------------------------------------------------
diff --git a/core/sql/cli/Globals.h b/core/sql/cli/Globals.h
index 776722b..ca498fa 100644
--- a/core/sql/cli/Globals.h
+++ b/core/sql/cli/Globals.h
@@ -106,7 +106,6 @@ enum ArkcmpFailMode { arkcmpIS_OK_ = FALSE/*no failure*/,
arkcmpWARN_,
arkcmpERROR_ };
-#pragma nowarn(1506) // warning elimination
class CliGlobals : public NAAssertGlobals
{
public:
@@ -587,7 +586,6 @@ private:
LmLanguageManagerJava *langManJava_;
NABoolean espProcess_;
};
-#pragma warn(1506) // warning elimination
// -----------------------------------------------------------------------
// A global method to get a pointer to the CLI globals. The method
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/cli/QuasiFileManager.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/QuasiFileManager.cpp b/core/sql/cli/QuasiFileManager.cpp
index b481ede..7e1b8a3 100644
--- a/core/sql/cli/QuasiFileManager.cpp
+++ b/core/sql/cli/QuasiFileManager.cpp
@@ -129,11 +129,7 @@ RETCODE QuasiFileManager::disassocFileNumber(ComDiagsArea &diagsArea,
{
RETCODE rc = SUCCESS; // assume success
-#pragma warning (disable : 4244) //warning elimination
-#pragma nowarn(1506) // warning elimination
short fileNumber = statement->getFileNumber();
-#pragma warn(1506) // warning elimination
-#pragma warning (default : 4244) //warning elimination
if (fileNumber == -1)
{
@@ -208,11 +204,7 @@ RETCODE QuasiFileManager::awaitIox(Lng32 fileNumber,
RETCODE rc = NOT_FINISHED; // show no completions yet
QuasiFile *quasiFile;
-#pragma warning (disable : 4244) //warning elimination
-#pragma nowarn(1506) // warning elimination
quasiFile = getQuasiFile(fileNumber);
-#pragma warn(1506) // warning elimination
-#pragma warning (default : 4244) //warning elimination
if (quasiFile != NULL)
rc = quasiFile->awaitIox(ipcEnv_, tag, feError);
else
@@ -489,7 +481,6 @@ short QfoRevealSegs(CliGlobals *&cliGlobals)
//Code that does SEGMENT_HIDE_ appears in two places
// switchToNonPriv() in cli/CliLayerForNsk.cpp
// QfoHideSegs() in cli/CliLayerForNsk.cpp
-#pragma nowarn(770) // warning elimination
short QfoHideSegs(CliGlobals *cliGlobals)
{
@@ -497,7 +488,6 @@ short QfoHideSegs(CliGlobals *cliGlobals)
return 0;
}
-#pragma warn(770) // warning elimination
SQL_QFO_FUNCTION_ATTRIBUTES short Sql_Qfo_IOComp(short quasi_file_number /*in*/,
Lng32 *tag /*out*/,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/cli/Statement.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/Statement.cpp b/core/sql/cli/Statement.cpp
index cc6044f..2169373 100644
--- a/core/sql/cli/Statement.cpp
+++ b/core/sql/cli/Statement.cpp
@@ -1277,20 +1277,16 @@ NABoolean Statement::isExeDebug(char *src, Lng32 charset)
Int32 Statement::octetLen(char *s, Lng32 charset)
{
-#pragma nowarn(1506) // warning elimination
return charset==SQLCHARSETCODE_UCS2 ?
na_wcslen((const NAWchar*)s) *
CharInfo::maxBytesPerChar((CharInfo::CharSet)charset) : str_len(s);
-#pragma warn(1506) // warning elimination
}
Int32 Statement::octetLenplus1(char *s, Lng32 charset)
{
-#pragma nowarn(1506) // warning elimination
return charset==SQLCHARSETCODE_UCS2 ?
(na_wcslen((const NAWchar*)s)+1)*
CharInfo::maxBytesPerChar((CharInfo::CharSet)charset) : str_len(s)+1;
-#pragma warn(1506) // warning elimination
}
Int32 Statement::sourceLenplus1()
@@ -3001,7 +2997,6 @@ RETCODE Statement::execute(CliGlobals * cliGlobals, Descriptor * input_desc,
// make sure that the table name in the update/del stmt is the
// same as the tablename specified in the cursor.
ex_root_tdb *cursorTdb = currentOfCursorStatement_->getRootTdb();
-#pragma nowarn(1506) // warning elimination
Int16 cursorTableNameLen =
str_len( cursorTdb->getLateNameInfoList()->
getLateNameInfo(cursorTdb->baseTablenamePosition()).
@@ -4602,9 +4597,7 @@ void Statement::copyGenCode(char * gen_code, ULng32 gen_code_len,
}
if ((stmt_type == STATIC_STMT) && (root_tdb))
-#pragma nowarn(1506) // warning elimination
setRecompWarn(root_tdb->recompWarn());
-#pragma warn(1506) // warning elimination
} // if (unpackTDBs)
@@ -4956,9 +4949,7 @@ short Statement::rollbackSavepoint(ComDiagsArea & diagsArea,
if (rollbackSP)
{
-#pragma nowarn(1506) // warning elimination
short retcode = root_tcb->rollbackSavepoint();
-#pragma warn(1506) // warning elimination
if (retcode)
{
diagsArea.mergeAfter(*statementGlobals_->getDiagsArea());
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/cli/StoredProcInterface.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/StoredProcInterface.cpp b/core/sql/cli/StoredProcInterface.cpp
index 4e9fe14..a9b6559 100644
--- a/core/sql/cli/StoredProcInterface.cpp
+++ b/core/sql/cli/StoredProcInterface.cpp
@@ -229,9 +229,7 @@ short ExSPPutReplyRow(void * replyBuffer, // IN: the reply buffer
0,
0) == SqlBuffer::MOVE_SUCCESS)
{
-#pragma nowarn(1506) // warning elimination
str_cpy_all(tdesc->getTupleAddress(), replyRow, rowLen);
-#pragma warn(1506) // warning elimination
}
else
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/cli/sql_id.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/sql_id.cpp b/core/sql/cli/sql_id.cpp
index 4a7e0d4..cf020ec 100644
--- a/core/sql/cli/sql_id.cpp
+++ b/core/sql/cli/sql_id.cpp
@@ -242,9 +242,7 @@ char* getModNameInLocale(const SQLMODULE_ID* m)
if (nameInWchar == 0)
return 0;
-#pragma nowarn(1506) // warning elimination
Int32 wcNameLen = NAWstrlen(nameInWchar);
-#pragma warn(1506) // warning elimination
static char* nameInLocale = new char[MAX_CHAR_SET_STRING_LENGTH+1];
@@ -275,9 +273,7 @@ char* getIdInLocale(SQLCLI_OBJ_ID* x)
if (nameInWchar == 0)
return 0;
-#pragma nowarn(1506) // warning elimination
Int32 wcNameLen = NAWstrlen(nameInWchar);
-#pragma warn(1506) // warning elimination
static char* nameInLocale = new char[MAX_CHAR_SET_STRING_LENGTH+1];
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/comexe/CmpMessage.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/CmpMessage.cpp b/core/sql/comexe/CmpMessage.cpp
index 55bcf42..7ee112b 100644
--- a/core/sql/comexe/CmpMessage.cpp
+++ b/core/sql/comexe/CmpMessage.cpp
@@ -69,9 +69,7 @@ IpcMessageObjSize CmpMessageObj::packIntoBuffer(IpcMessageBufferPtr& buffer,
IpcMessageObjSize result = ::packIntoBuffer(buffer,length);
if (strPtr!=NULL)
-#pragma nowarn(1506) // warning elimination
str_cpy_all((char*)buffer,strPtr,length);
-#pragma warn(1506) // warning elimination
buffer += length;
return result+length;
}
@@ -103,9 +101,7 @@ void CmpMessageObj::unpackBuffer(IpcConstMessageBufferPtr& buffer,
else {
strPtr = new(h) char[length];
assert(strPtr!=NULL);
-#pragma nowarn(1506) // warning elimination
str_cpy_all((char*)strPtr,(char*) buffer,length);
-#pragma warn(1506) // warning elimination
buffer += length;
}
}
@@ -120,9 +116,7 @@ void CmpMessageObj::unpackBuffer(IpcConstMessageBufferPtr& buffer,
assert(length <= maxSize);
if ( length > 0 )
{
-#pragma nowarn(1506) // warning elimination
str_cpy_all((char*)strPtr,(char*) buffer,length);
-#pragma warn(1506) // warning elimination
buffer += length;
}
sizeMoved = length;
@@ -523,9 +517,7 @@ IpcMessageObjSize CmpMessageReply::mypackedLength()
{
IpcMessageObjSize size = CmpMessageReplyBasic::mypackedLength();
size += sizeof(sz_);
-#pragma nowarn(1506) // warning elimination
advanceSize(size,data_,sz_);
-#pragma warn(1506) // warning elimination
return size;
}
@@ -533,9 +525,7 @@ IpcMessageObjSize CmpMessageReply::packMyself(IpcMessageBufferPtr& buffer)
{
IpcMessageObjSize size= CmpMessageReplyBasic::packMyself(buffer);
size += ::packIntoBuffer(buffer,sz_);
-#pragma nowarn(1506) // warning elimination
size += packIntoBuffer(buffer,data_,sz_);
-#pragma warn(1506) // warning elimination
return size;
}
@@ -687,9 +677,7 @@ void CmpMessageRequest::copyToString(char* &dest, CmpMsgBufLenType& sz,
{
sz = sz1 + 1;
dest = new (getHeap()) char[sz];
-#pragma nowarn(1506) // warning elimination
str_cpy_all(dest, source, sz1);
-#pragma warn(1506) // warning elimination
dest[sz1] = 0;
}
else
@@ -705,9 +693,7 @@ IpcMessageObjSize CmpMessageRequest::mypackedLength()
size += sizeof(sz_);
size += sizeof(flags_);
size += sizeof(charSet_);
-#pragma nowarn(1506) // warning elimination
advanceSize(size, data_, sz_);
-#pragma warn(1506) // warning elimination
size += sizeof(parentQidLen_);
size += parentQidLen_;
return size;
@@ -719,9 +705,7 @@ IpcMessageObjSize CmpMessageRequest::packMyself(IpcMessageBufferPtr& buffer)
size += ::packIntoBuffer(buffer, sz_);
size += ::packIntoBuffer(buffer, flags_);
size += ::packIntoBuffer(buffer, charSet_);
-#pragma nowarn(1506) // warning elimination
size += packIntoBuffer(buffer, data_, sz_);
-#pragma warn(1506) // warning elimination
size += ::packIntoBuffer(buffer, parentQidLen_);
if (parentQidLen_ != 0 && parentQid_ != NULL)
size += packStrIntoBuffer(buffer, (char *)parentQid_, parentQidLen_);
@@ -942,21 +926,13 @@ IpcMessageObjSize CmpMessageISPRequest::mypackedLength()
IpcMessageObjSize size = CmpMessageRequest::mypackedLength();
advanceSize(size, procName_);
size += sizeof(inputExprSize_);
-#pragma nowarn(1506) // warning elimination
advanceSize(size,inputExpr_,inputExprSize_);
-#pragma warn(1506) // warning elimination
size += sizeof(outputExprSize_);
-#pragma nowarn(1506) // warning elimination
advanceSize(size,outputExpr_,outputExprSize_);
-#pragma warn(1506) // warning elimination
size += sizeof(keyExprSize_);
-#pragma nowarn(1506) // warning elimination
advanceSize(size,keyExpr_,keyExprSize_);
-#pragma warn(1506) // warning elimination
size += sizeof(inputDataSize_);
-#pragma nowarn(1506) // warning elimination
advanceSize(size,inputData_,inputDataSize_);
-#pragma warn(1506) // warning elimination
size += sizeof(outputRowSize_);
size += sizeof(outputTotalSize_);
@@ -969,21 +945,13 @@ IpcMessageObjSize CmpMessageISPRequest::packMyself(IpcMessageBufferPtr& buffer)
size += packIntoBuffer(buffer, procName_);
size += ::packIntoBuffer(buffer,inputExprSize_);
-#pragma nowarn(1506) // warning elimination
size += packIntoBuffer(buffer, inputExpr_, inputExprSize_);
-#pragma warn(1506) // warning elimination
size += ::packIntoBuffer(buffer,outputExprSize_);
-#pragma nowarn(1506) // warning elimination
size += packIntoBuffer(buffer, outputExpr_, outputExprSize_);
-#pragma warn(1506) // warning elimination
size += ::packIntoBuffer(buffer, keyExprSize_);
-#pragma nowarn(1506) // warning elimination
size += packIntoBuffer(buffer, keyExpr_, keyExprSize_);
-#pragma warn(1506) // warning elimination
size += ::packIntoBuffer(buffer,inputDataSize_);
-#pragma nowarn(1506) // warning elimination
size += packIntoBuffer(buffer, inputData_, inputDataSize_);
-#pragma warn(1506) // warning elimination
size += ::packIntoBuffer(buffer,outputRowSize_);
size += ::packIntoBuffer(buffer,outputTotalSize_);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/comexe/CmpMessage.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/CmpMessage.h b/core/sql/comexe/CmpMessage.h
index 5c306f5..3733239 100644
--- a/core/sql/comexe/CmpMessage.h
+++ b/core/sql/comexe/CmpMessage.h
@@ -69,7 +69,6 @@ class FragmentDir;
// -----------------------------------------------------------------------
// The base class for all the executor/compiler messages
// -----------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
class CmpMessageObj : public IpcMessageObj
{
public:
@@ -220,7 +219,6 @@ private:
CollHeap* h_;
}; // end of CmpMessageObj
-#pragma warn(1506) // warning elimination
// -----------------------------------------------------------------------
// Basic request objects
@@ -302,7 +300,6 @@ protected:
// Information that is sent to recompile a dynamic or static statement.
// This class is sent as part of the data() field.
// -----------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
class CmpCompileInfo
{
public:
@@ -426,7 +423,6 @@ protected:
Lng32 sqlTextCharSet_; // 40-43
char fillerBytes_[FILLERSIZE]; // 44-103
};
-#pragma warn(1506) // warning elimination
class CmpMessageRequest : public CmpMessageRequestBasic
{
@@ -492,7 +488,6 @@ private:
// Basic class for reply to executor
// -----------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
class CmpMessageReply : public CmpMessageReplyBasic
{
public:
@@ -560,7 +555,6 @@ private:
// This CollHeap* is used to allocate data_.
CollHeap* outh_;
}; // end of CmpMessageReply
-#pragma warn(1506) // warning elimination
// -----------------------------------------------------------------------
// connection control messages
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/comexe/ComKeyMDAM.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComKeyMDAM.h b/core/sql/comexe/ComKeyMDAM.h
index ca51fa8..f43fea0 100644
--- a/core/sql/comexe/ComKeyMDAM.h
+++ b/core/sql/comexe/ComKeyMDAM.h
@@ -55,7 +55,6 @@ typedef NAVersionedObjectPtrTempl<MdamPred> MdamPredPtr;
///////////////////////////////////////////////////////////
// Class MdamPred
///////////////////////////////////////////////////////////
-#pragma nowarn(1506) // warning elimination
class MdamPred : public NAVersionedObject
{
public:
@@ -200,7 +199,6 @@ public:
ex_expr::exp_return_type getValue2(atp_struct* atp0, atp_struct* atp1)
{ return getValue_(value2_, atp0, atp1); }
};
-#pragma warn(1506) // warning elimination
// ---------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/comexe/ComKeyRange.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComKeyRange.cpp b/core/sql/comexe/ComKeyRange.cpp
index 712de27..05d4905 100644
--- a/core/sql/comexe/ComKeyRange.cpp
+++ b/core/sql/comexe/ComKeyRange.cpp
@@ -74,19 +74,13 @@ char *keyRangeGen::findVTblPtr(short classID)
switch (classID)
{
case KEYSINGLESUBSET:
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblPtr, keySingleSubsetGen);
-#pragma warn(1506) // warning elimination
break;
case KEYMDAM:
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblPtr, keyMdamGen);
-#pragma warn(1506) // warning elimination
break;
default:
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblPtr, keyRangeGen);
-#pragma warn(1506) // warning elimination
break;
}
return vtblPtr;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/comexe/ComResourceInfo.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComResourceInfo.cpp b/core/sql/comexe/ComResourceInfo.cpp
index c9ad7f0..dbc5a5c 100644
--- a/core/sql/comexe/ComResourceInfo.cpp
+++ b/core/sql/comexe/ComResourceInfo.cpp
@@ -152,7 +152,6 @@ Lng32 ExScratchFileOptions::ipcPackObjIntoMessage(char *buffer) const
return (currPtr - buffer);
}
-#pragma nowarn(770) // warning elimination
void ExScratchFileOptions::ipcUnpackObj(Lng32 objSize,
const char *buffer,
CollHeap *heap,
@@ -175,10 +174,8 @@ void ExScratchFileOptions::ipcUnpackObj(Lng32 objSize,
// allocate one common buffer for the arrays of ExScratchDiskDrive
// structs and for all the names
Lng32 bufferLen =
-#pragma nowarn(1506) // warning elimination
(numSpecifiedDirs_) *
sizeof(ExScratchDiskDrive) + totalNameLength;
-#pragma warn(1506) // warning elimination
if (bufferLen == 0)
{
@@ -233,4 +230,3 @@ void ExScratchFileOptions::ipcUnpackObj(Lng32 objSize,
assert(currPtr-buffer == objSize);
}
-#pragma warn(770) // warning elimination
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/comexe/ComTdb.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdb.cpp b/core/sql/comexe/ComTdb.cpp
index 6677891..2578c46 100644
--- a/core/sql/comexe/ComTdb.cpp
+++ b/core/sql/comexe/ComTdb.cpp
@@ -255,9 +255,7 @@ void ComTdb::displayExpression(Space *space,ULng32 flag)
for (Int32 i = 0; i < numExpressions(); i++)
{
if (getExpressionNode(i))
-#pragma nowarn(1506) // warning elimination
getExpressionNode(i)->displayContents(space, expressionMode_,
-#pragma warn(1506) // warning elimination
(char *)getExpressionName(i),flag);
else
{
@@ -319,153 +317,115 @@ char *ComTdb::findVTblPtrCom(short classID)
case ex_FIRST_N:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbFirstN);
-#pragma warn(1506) // warning elimination
break;
}
case ex_HASH_GRBY:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbHashGrby);
-#pragma warn(1506) // warning elimination
break;
}
case ex_SORT_GRBY:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbSortGrby);
-#pragma warn(1506) // warning elimination
break;
}
case ex_TRANSPOSE:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbTranspose);
-#pragma warn(1506) // warning elimination
break;
}
case ex_UNPACKROWS:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbUnPackRows);
-#pragma warn(1506) // warning elimination
break;
}
case ex_PACKROWS:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbPackRows);
-#pragma warn(1506) // warning elimination
break;
}
case ex_SAMPLE:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbSample);
-#pragma warn(1506) // warning elimination
break;
}
case ex_LEAF_TUPLE:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbTupleLeaf);
-#pragma warn(1506) // warning elimination
break;
}
case ex_NON_LEAF_TUPLE:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbTupleNonLeaf);
-#pragma warn(1506) // warning elimination
break;
}
case ex_COMPOUND_STMT:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbCompoundStmt);
-#pragma warn(1506) // warning elimination
break;
}
case ex_TUPLE:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbTuple);
-#pragma warn(1506) // warning elimination
break;
}
case ex_SEQUENCE_FUNCTION:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbSequence);
-#pragma warn(1506) // warning elimination
break;
}
case ex_CONTROL_QUERY:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbControl);
-#pragma warn(1506) // warning elimination
break;
}
case ex_ROOT:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbRoot);
-#pragma warn(1506) // warning elimination
break;
}
case ex_ONLJ:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbOnlj);
-#pragma warn(1506) // warning elimination
break;
}
case ex_HASHJ:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbHashj);
-#pragma warn(1506) // warning elimination
break;
}
case ex_MJ:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbMj);
-#pragma warn(1506) // warning elimination
break;
}
case ex_UNION:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbUnion);
-#pragma warn(1506) // warning elimination
break;
}
case ex_EXPLAIN:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExplain);
-#pragma warn(1506) // warning elimination
break;
}
@@ -473,342 +433,256 @@ char *ComTdb::findVTblPtrCom(short classID)
// unused feature, done as part of SQ SQL code cleanup effort
case ex_SEQ:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbSeq);
-#pragma warn(1506) // warning elimination
break;
}
#endif // if 0
case ex_SORT:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbSort);
-#pragma warn(1506) // warning elimination
break;
}
case ex_SPLIT_TOP:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbSplitTop);
-#pragma warn(1506) // warning elimination
break;
}
case ex_SPLIT_BOTTOM:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbSplitBottom);
-#pragma warn(1506) // warning elimination
break;
}
case ex_SEND_TOP:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbSendTop);
-#pragma warn(1506) // warning elimination
break;
}
case ex_SEND_BOTTOM:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbSendBottom);
-#pragma warn(1506) // warning elimination
break;
}
case ex_STATS:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbStats);
-#pragma warn(1506) // warning elimination
break;
}
case ex_STORED_PROC:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbStoredProc);
-#pragma warn(1506) // warning elimination
break;
}
case ex_TUPLE_FLOW:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbTupleFlow);
-#pragma warn(1506) // warning elimination
break;
}
case ex_TRANSACTION:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbTransaction);
-#pragma warn(1506) // warning elimination
break;
}
case ex_DDL:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbDDL);
-#pragma warn(1506) // warning elimination
break;
}
case ex_DDL_WITH_STATUS:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbDDLwithStatus);
-#pragma warn(1506) // warning elimination
break;
}
case ex_DESCRIBE:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbDescribe);
-#pragma warn(1506) // warning elimination
break;
}
case ex_EXE_UTIL:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtil);
-#pragma warn(1506) // warning elimination
break;
}
case ex_MAINTAIN_OBJECT:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilMaintainObject);
-#pragma warn(1506) // warning elimination
break;
}
case ex_LONG_RUNNING:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilLongRunning);
-#pragma warn(1506) // warning elimination
break;
}
case ex_DISPLAY_EXPLAIN:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilDisplayExplain);
-#pragma warn(1506) // warning elimination
break;
}
case ex_DISPLAY_EXPLAIN_COMPLEX:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilDisplayExplainComplex);
-#pragma warn(1506) // warning elimination
break;
}
case ex_LOAD_VOLATILE_TABLE:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilLoadVolatileTable);
-#pragma warn(1506) // warning elimination
break;
}
case ex_PROCESS_VOLATILE_TABLE:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbProcessVolatileTable);
-#pragma warn(1506) // warning elimination
break;
}
case ex_CLEANUP_VOLATILE_TABLES:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilCleanupVolatileTables);
-#pragma warn(1506) // warning elimination
break;
}
case ex_GET_VOLATILE_INFO:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilGetVolatileInfo);
-#pragma warn(1506) // warning elimination
break;
}
case ex_PROCESS_INMEMORY_TABLE:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbProcessInMemoryTable);
-#pragma warn(1506) // warning elimination
break;
}
case ex_CREATE_TABLE_AS:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilCreateTableAs);
-#pragma warn(1506) // warning elimination
break;
}
case ex_FAST_DELETE:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilFastDelete);
-#pragma warn(1506) // warning elimination
break;
}
case ex_HIVE_TRUNCATE:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilHiveTruncate);
-#pragma warn(1506) // warning elimination
break;
}
case ex_GET_STATISTICS:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilGetStatistics);
-#pragma warn(1506) // warning elimination
break;
}
case ex_LOB_INFO:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilLobInfo);
-#pragma warn(1506) // warning elimination
break;
}
case ex_GET_METADATA_INFO:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilGetMetadataInfo);
-#pragma warn(1506) // warning elimination
break;
}
case ex_GET_HIVE_METADATA_INFO:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilGetHiveMetadataInfo);
-#pragma warn(1506) // warning elimination
break;
}
case ex_GET_UID:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilGetUID);
-#pragma warn(1506) // warning elimination
break;
}
case ex_GET_QID:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilGetQID);
-#pragma warn(1506) // warning elimination
break;
}
case ex_POP_IN_MEM_STATS:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilPopulateInMemStats);
-#pragma warn(1506) // warning elimination
break;
}
case ex_SET_TIMEOUT:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbTimeout);
-#pragma warn(1506) // warning elimination
break;
}
case ex_FAST_EXTRACT:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbFastExtract);
-#pragma warn(1506) // warning elimination
break;
}
case ex_UDR:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbUdr);
-#pragma warn(1506) // warning elimination
break;
}
case ex_PROBE_CACHE:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbProbeCache);
-#pragma warn(1506) // warning elimination
break;
}
case ex_CANCEL:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbCancel);
-#pragma warn(1506) // warning elimination
break;
}
case ex_SHOW_SET:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilShowSet);
-#pragma warn(1506) // warning elimination
break;
}
case ex_AQR:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilAQR);
-#pragma warn(1506) // warning elimination
break;
}
case ex_GET_ERROR_INFO:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilGetErrorInfo);
-#pragma warn(1506) // warning elimination
break;
}
case ex_HDFS_SCAN:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbHdfsScan);
-#pragma warn(1506) // warning elimination
}
break;
case ex_HIVE_MD_ACCESS:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilHiveMDaccess);
-#pragma warn(1506) // warning elimination
}
break;
@@ -826,9 +700,7 @@ char *ComTdb::findVTblPtrCom(short classID)
case ex_ARQ_WNR_INSERT:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilAqrWnrInsert);
-#pragma warn(1506) // warning elimination
break;
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/comexe/ComTdb.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdb.h b/core/sql/comexe/ComTdb.h
index 8f561f8..62b7550 100644
--- a/core/sql/comexe/ComTdb.h
+++ b/core/sql/comexe/ComTdb.h
@@ -178,7 +178,6 @@ private:
// -----------------------------------------------------------------------
// ComTdb
// -----------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
class ComTdb : public NAVersionedObject
{
// ---------------------------------------------------------------------
@@ -778,7 +777,6 @@ protected:
// ---------------------------------------------------------------------
char fillersComTdb_[34]; // 94-127
};
-#pragma warn(1506) // warning elimination
class ComTdbVirtTableBase
{