trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ansha...@apache.org
Subject [09/12] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup: Phase 4. Remove legacy/obsolete pragmas
Date Mon, 02 Oct 2017 00:14:13 GMT
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/str.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/str.cpp b/core/sql/common/str.cpp
index 35d713c..4c87abe 100644
--- a/core/sql/common/str.cpp
+++ b/core/sql/common/str.cpp
@@ -246,9 +246,7 @@ char *str_itoa(ULng32 i, char *outstr)
       temp = i;
       while (temp > 0)
 	{
-#pragma nowarn(1506)   // warning elimination
 	  outstr[j--] = '0' + (char) (temp%10);
-#pragma warn(1506)  // warning elimination
 	  temp = temp / 10;
 	}
     }
@@ -295,9 +293,7 @@ char *str_ltoa(Int64 i, char *outstr)
       temp = ii;
       while (temp > 0)
 	{
-#pragma nowarn(1506)   // warning elimination
 	  outstr[j--] = '0' + (char) (temp%10);
-#pragma warn(1506)  // warning elimination
 	  temp = temp / 10;
 	}
       if (neg)
@@ -459,14 +455,10 @@ Int32 str_cpy_convert(char * tgt, char * src,
    for (Lng32 i = 0; i < length; i++)
     {
       if (upshift)
-#pragma nowarn(1506)   // warning elimination
 	tgt[i] = TOUPPER(src[i]);
-#pragma warn(1506)  // warning elimination
 
       if (!upshift)
-#pragma nowarn(1506)   // warning elimination
 	tgt[i] = TOLOWER(src[i]);
-#pragma warn(1506)  // warning elimination
     }
 
    return 0;
@@ -510,9 +502,7 @@ Int32 str_inc(const ULng32 length, char * s)
 void str_complement(const ULng32 length, char * s)
 {
   for (ULng32 i = 0; i < length; i++)
-#pragma nowarn(1506)   // warning elimination
     s[i] = ~(s[i]);
-#pragma warn(1506)  // warning elimination
 }
 
 // ----------------------------------------------------------------------
@@ -570,22 +560,16 @@ Lng32 str_encode(char *tgt, Lng32 tgtMaxLen, void *src, Lng32 srcLen)
   while (srcix < srcLen)
     {
       // high-order 6 bits of input byte 0 go into output char 0
-#pragma nowarn(1506)   // warning elimination
       key_out[tgtix]   = (key_in[srcix] >> 2) + minChar;
-#pragma warn(1506)  // warning elimination
       // low-order 2 bits of input byte 0 go into output char 1
-#pragma nowarn(1506)   // warning elimination
       key_out[tgtix+1] = ((key_in[srcix] & 0x3) << 4) + minChar;
-#pragma warn(1506)  // warning elimination
 
       if (srcix+1 < srcLen)
 	{
 	  // add high-order 4 bits of input byte 1 to output char 1
 	  key_out[tgtix+1] += key_in[srcix+1] >> 4;
 	  // low-order 4 bits of input byte 1 go to output char 2
-#pragma nowarn(1506)   // warning elimination
 	  key_out[tgtix+2]  = ((key_in[srcix+1] & 0xf) << 2) + minChar;
-#pragma warn(1506)  // warning elimination
 	}
 
       if (srcix+2 < srcLen)
@@ -593,9 +577,7 @@ Lng32 str_encode(char *tgt, Lng32 tgtMaxLen, void *src, Lng32 srcLen)
 	  // add high-order 2 bits of input byte 2 to output char 2
 	  key_out[tgtix+2] += key_in[srcix+2] >> 6;
 	  // low-order 6 bits of input byte 2 go to output char 3
-#pragma nowarn(1506)   // warning elimination
 	  key_out[tgtix+3]  = (key_in[srcix+2] & 0x3f) + minChar;
-#pragma warn(1506)  // warning elimination
 	}
 
       srcix += 3;
@@ -764,9 +746,7 @@ Lng32 str_to_ansi_id(char *src, char *tgt,Lng32 &tgtLen, short mustValidate, cha
   NABoolean empty = TRUE;
   if (dQuoteSeen)
     {
-#pragma warning (disable : 4018)   //warning elimination
       for (i = 0; i < tgtLen;i++)
-#pragma warning (default : 4018)   //warning elimination
 	{
 	  if (isSpace8859_1(tgt[i])) // Convert all tabs to spaces
 	    tgt[i] = ' ';
@@ -786,9 +766,7 @@ Lng32 str_to_ansi_id(char *src, char *tgt,Lng32 &tgtLen, short mustValidate, cha
   UInt32 j = 0;
 
   i = 0;
-#pragma warning (disable : 4018)   //warning elimination
   for (i = 0; i < tgtLen; i++)
-#pragma warning (default : 4018)   //warning elimination
     {
       if (dQuoteSeen)
 	{
@@ -802,10 +780,8 @@ Lng32 str_to_ansi_id(char *src, char *tgt,Lng32 &tgtLen, short mustValidate, cha
 	      // a double quote has been seen inside the string
 	      // remove the second double quote by shifting all
 	      // the chars to the right of it by
-#pragma warning (disable : 4018)   //warning elimination
 	      for (j = i; j < tgtLen; j++)
 		tgt[j] = tgt[j+1];
-#pragma warning (default : 4018)   //warning elimination
 	      tgtLen--;
 
 	    }
@@ -820,9 +796,7 @@ Lng32 str_to_ansi_id(char *src, char *tgt,Lng32 &tgtLen, short mustValidate, cha
 	      if (allowedChars)
 		{
 		  short found = 0;
-#pragma warning (disable : 4018)   //warning elimination
 		  for (UInt32 j = 0; j <str_len(allowedChars); j++)
-#pragma warning (default : 4018)   //warning elimination
 		    {
 		      if (tgt[i] == allowedChars[j])
 			found = 1;
@@ -834,9 +808,7 @@ Lng32 str_to_ansi_id(char *src, char *tgt,Lng32 &tgtLen, short mustValidate, cha
 	      else
 		return -1;
 	    }
-#pragma nowarn(1506)   // warning elimination
 	  tgt[i] = TOUPPER(tgt[i]);
-#pragma warn(1506)  // warning elimination
 	}
     } // end for
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/swscanf.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/swscanf.cpp b/core/sql/common/swscanf.cpp
index 241fc64..58a0b56 100644
--- a/core/sql/common/swscanf.cpp
+++ b/core/sql/common/swscanf.cpp
@@ -147,9 +147,7 @@ __sccl(NAWchar* tab, NAWchar* fmt)
 		v = 0;		/* default => reject */
 	/* should probably use memset here */
 	for (n = 0; n < 256; n++)
-#pragma nowarn(1506)   // warning elimination 
 		tab[n] = v;
-#pragma warn(1506)  // warning elimination 
 	if (c == 0)
 		return (fmt - 1);/* format ended before closing ] */
 
@@ -162,9 +160,7 @@ __sccl(NAWchar* tab, NAWchar* fmt)
 	 */
 	v = 1 - v;
 	for (;;) {
-#pragma nowarn(1506)   // warning elimination 
 		tab[c] = v;		/* take character c */
-#pragma warn(1506)  // warning elimination 
 doswitch:
 		n = *fmt++;		/* and examine the next */
 		switch (n) {
@@ -198,9 +194,7 @@ doswitch:
 			}
 			fmt++;
 			do {		/* fill in the range */
-#pragma nowarn(1506)   // warning elimination 
 				tab[++c] = v;
-#pragma warn(1506)  // warning elimination 
 			} while (c < n);
 #if 1	/* XXX another disgusting compatibility hack */
 			/*
@@ -265,9 +259,7 @@ __svfscanf(SCANBUF* fp, NAWchar const* fmt0, va_list ap)
 		c = *fmt++;
 		if (c == 0)
 			return (nassigned);
-#pragma nowarn(1506)   // warning elimination 
 		if (na_iswspace(c)) {
-#pragma warn(1506)  // warning elimination 
 			for (;;) {
 				if (fp->_r <= 0 && __srefill(fp))
 					return (nassigned);
@@ -407,9 +399,7 @@ literal:
 			if (flags & SUPPRESS)	/* ??? */
 				continue;
 			if (flags & SHORT)
-#pragma nowarn(1506)   // warning elimination 
 				*va_arg(ap, short *) = nread;
-#pragma warn(1506)  // warning elimination 
 			else if (flags & LONG)
 				*va_arg(ap, Lng32 *) = nread;
 			else
@@ -670,9 +660,7 @@ literal:
 				/*
 				 * c is legal: store it and look at the next.
 				 */
-#pragma nowarn(1506)   // warning elimination 
 				*p++ = c;
-#pragma warn(1506)  // warning elimination 
 				if (--fp->_r > 0)
 					fp->_p++;
 				else if (__srefill(fp))
@@ -692,9 +680,7 @@ literal:
 			c = ((NAWchar *)p)[-1];
 			if (c == L'x' || c == L'X') {
 				--p;
-#pragma nowarn(1506)   // warning elimination 
 				(void) ungetc(c, fp);
-#pragma warn(1506)  // warning elimination 
             
 			}
 			if ((flags & SUPPRESS) == 0) {
@@ -708,19 +694,13 @@ literal:
 					*va_arg(ap, void **) =
 					    (void *)(Lng32)res;
 				else if (flags & QUAD)
-#pragma nowarn(1506)   // warning elimination 
 					*va_arg(ap, quad_t *) = res;
-#pragma warn(1506)  // warning elimination 
 				else if (flags & LONG)
-#pragma nowarn(1506)   // warning elimination 
 					*va_arg(ap, Lng32 *) = (Lng32) res;
-#pragma warn(1506)  // warning elimination 
 				else if (flags & SHORT)
 					*va_arg(ap, Int16 *) = (Int16) res;
 				else
-#pragma nowarn(1506)   // warning elimination 
 					*va_arg(ap, Int32 *) = (Int32) res;
-#pragma warn(1506)  // warning elimination 
 				nassigned++;
 			}
 			nread += p - buf;
@@ -780,10 +760,8 @@ literal:
 				}
 				break;
 		fok:
-#pragma nowarn(1506)   // warning elimination 
 				*p++ = c;
 				*q++ = (char)c;
-#pragma warn(1506)  // warning elimination 
 				if (--fp->_r > 0)
 					fp->_p++;
 				else if (__srefill(fp))
@@ -804,14 +782,10 @@ literal:
 				/* just a bad exponent (e and maybe sign) */
 				c = *(NAWchar *)--p;
 				if (c != L'e' && c != L'E') {
-#pragma nowarn(1506)   // warning elimination 
 					(void) ungetc(c, fp);/* sign */
-#pragma warn(1506)  // warning elimination 
                c = *(NAWchar *)--p;
 				}
-#pragma nowarn(1506)   // warning elimination 
 				(void) ungetc(c, fp);
-#pragma warn(1506)  // warning elimination 
 			}
 			if ((flags & SUPPRESS) == 0) {
 				double res;
@@ -820,9 +794,7 @@ literal:
 				//res = na_wcstod(buf, (NAWchar **) NULL);
 				res = strtod(sb_buf, NULL);
 				if (flags & LONGDBL)
-#pragma nowarn(1255)   // warning elimination 
 					*va_arg(ap, long double *) = res;
-#pragma warn(1255)  // warning elimination 
 				else if (flags & LONG)
 					*va_arg(ap, double *) = res;
 				else

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/swsprintf.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/swsprintf.cpp b/core/sql/common/swsprintf.cpp
index fbcc1e8..d8e38d3 100644
--- a/core/sql/common/swsprintf.cpp
+++ b/core/sql/common/swsprintf.cpp
@@ -115,12 +115,8 @@ static char *cvt __P((double, Int32, Int32, char *, Int32 *, Int32, Int32 *));
 static Int32 exponent __P((char *, Int32, Int32));
 
 #else /* no FLOATING_POINT */
-#pragma warning (disable : 4005)   //warning elimination
-#pragma nowarn(140)   // warning elimination 
 #undef  BUF
 #define	BUF		40
-#pragma warn(140)  // warning elimination 
-#pragma warning (default : 4005)   //warning elimination
 
 #endif /* FLOATING_POINT */
 
@@ -140,12 +136,8 @@ static Int32 exponent __P((char *, Int32, Int32));
 #define	ALT		0x001		/* alternate form */
 #define	HEXPREFIX	0x002		/* add 0x or 0X prefix */
 #define	LADJUST		0x004		/* left adjustment */
-#pragma warning (disable : 4005)   //warning elimination
-#pragma nowarn(140)   // warning elimination 
 #undef  LONGDBL
 #define	LONGDBL		0x008		/* long double; unimplemented */
-#pragma warn(140)  // warning elimination 
-#pragma warning (default : 4005)   //warning elimination
 #define	LONGINT		0x010		/* long integer */
 #define	QUADINT		0x020		/* quad integer */
 #define	SHORTINT	0x040		/* short integer */
@@ -368,9 +360,7 @@ reswitch:	switch (ch) {
 			flags |= QUADINT;
 			goto rflag;
 		case L'c':
-#pragma nowarn(1506)   // warning elimination 
 			*(cp = buf) = va_arg(ap, Int32);
-#pragma warn(1506)  // warning elimination 
 			size = 1;
 			sign = L'\0';
 			break;
@@ -381,9 +371,7 @@ reswitch:	switch (ch) {
 		case L'i':
 			_uquad = SARG();
 			if ((quad_t)_uquad < 0) {
-#pragma warning (disable : 4146)   //warning elimination
 				_uquad = -_uquad;
-#pragma warning (default : 4146)   //warning elimination
 				sign = L'-';
 			}
 			base = DEC;
@@ -460,9 +448,7 @@ reswitch:	switch (ch) {
 			else if (flags & LONGINT)
 				*va_arg(ap, Lng32 *) = ret;
 			else if (flags & SHORTINT)
-#pragma nowarn(1506)   // warning elimination 
 				*va_arg(ap, short *) = ret;
-#pragma warn(1506)  // warning elimination 
 			else
 				*va_arg(ap, Int32 *) = ret;
 			continue;	/* no output */
@@ -506,9 +492,7 @@ reswitch:	switch (ch) {
 				} else
 					size = prec;
 			} else
-#pragma nowarn(1506)   // warning elimination 
 				size = na_wcslen(cp);
-#pragma warn(1506)  // warning elimination 
 			sign = L'\0';
 			break;
 		case L'U':
@@ -554,11 +538,7 @@ number:			if ((dprec = prec) >= 0)
 				switch (base) {
 				case OCT:
 					do {
-#pragma warning (disable : 4244)   //warning elimination
-#pragma nowarn(1506)   // warning elimination 
 						*--cp = to_char(_uquad & 7);
-#pragma warn(1506)  // warning elimination 
-#pragma warning (default : 4244)   //warning elimination
 						_uquad >>= 3;
 					} while (_uquad);
 					/* handle octal leading 0 */
@@ -569,16 +549,10 @@ number:			if ((dprec = prec) >= 0)
 				case DEC:
 					/* many numbers are 1 digit */
 					while (_uquad >= 10) {
-#pragma warning (disable : 4244)   //warning elimination
-#pragma nowarn(1506)   // warning elimination 
 						*--cp = to_char(_uquad % 10);
-#pragma warn(1506)  // warning elimination 
 						_uquad /= 10;
 					}
-#pragma nowarn(1506)   // warning elimination 
 					*--cp = to_char(_uquad);
-#pragma warn(1506)  // warning elimination 
-#pragma warning (default : 4244)   //warning elimination
 					break;
 
 				case HEX:
@@ -590,9 +564,7 @@ number:			if ((dprec = prec) >= 0)
 
 				default:
 					cp = (NAWchar *) WIDE_("bug in vfprintf: bad base");
-#pragma nowarn(1506)   // warning elimination 
 					size = na_wcslen(cp);
-#pragma warn(1506)  // warning elimination 
 					goto skipsize;
 				}
 			}
@@ -604,9 +576,7 @@ number:			if ((dprec = prec) >= 0)
 				goto done;
 			/* pretend it was %c with argument ch */
 			cp = buf;
-#pragma nowarn(1506)   // warning elimination 
 			*cp = ch;
-#pragma warn(1506)  // warning elimination 
 			size = 1;
 			sign = L'\0';
 			break;
@@ -641,9 +611,7 @@ number:			if ((dprec = prec) >= 0)
 			PRINT(&sign, 1);
 		} else if (flags & HEXPREFIX) {
 			ox[0] = L'0';
-#pragma nowarn(1506)   // warning elimination 
 			ox[1] = ch;
-#pragma warn(1506)  // warning elimination 
 			PRINT(ox, 2);
 		}
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/unicode_char_set.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/unicode_char_set.cpp b/core/sql/common/unicode_char_set.cpp
index e469da8..8ecba4e 100644
--- a/core/sql/common/unicode_char_set.cpp
+++ b/core/sql/common/unicode_char_set.cpp
@@ -119,15 +119,11 @@ binary_search(NAWchar wc, Int32 lower, Int32 upper,
 NAWchar unicode_char_set::to_upper(const NAWchar x)
 {
    if ( IN_RANGE(x, 0x61, 0x7a) ) { // frequently used chars checked first
-#pragma nowarn(1506)   // warning elimination 
       return x - 0x61 + 0x41;
-#pragma warn(1506)  // warning elimination 
    }
 
    if ( IN_RANGE(x, 0xe0, 0xf6) ) { // frequently used chars checked first
-#pragma nowarn(1506)   // warning elimination 
       return x - 0xe0 + 0xc0;
-#pragma warn(1506)  // warning elimination 
    }
 
    return binary_search(x, 0, 
@@ -214,15 +210,11 @@ long unicode_char_set::to_upper(NAWchar *str, long srcLen,
 NAWchar unicode_char_set::to_lower(const NAWchar x)
 {
   if ( IN_RANGE(x, 0x41, 0x5a) ) { // frequently used chars checked first
-#pragma nowarn(1506)   // warning elimination 
      return  x + 0x61 - 0x41;
-#pragma warn(1506)  // warning elimination 
   }
 
   if ( IN_RANGE(x, 0xc0, 0xd6) ) { // frequently used chars checked first
-#pragma nowarn(1506)   // warning elimination 
      return x + 0xe0 - 0xc0;
-#pragma warn(1506)  // warning elimination 
   }
 
    return binary_search(x, 0, sizeof(unicode_upper2lower_mapping_table)/sizeof(unicode_mapping_t)-1, 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/wstr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/wstr.cpp b/core/sql/common/wstr.cpp
index e8f33cd..4480998 100644
--- a/core/sql/common/wstr.cpp
+++ b/core/sql/common/wstr.cpp
@@ -134,24 +134,18 @@ Int32 na_wcsnncmp (const NAWchar *wstr1, UInt32 len1,
         return 0;
     }
   else
-#pragma nowarn(1506)   // warning elimination
     return *--wstr1 - *--wstr2;
 //    return (*(const UInt16*)--wstr1 - *(const UInt16*)--wstr2);
-#pragma warn(1506)  // warning elimination 
 }
 
 Int32 na_wcsncmp (const NAWchar * wstr1, const NAWchar * wstr2, UInt32 len)
 {
    if ( len == 0 ) return 0;
 
-#pragma warning (disable : 4018)   //warning elimination
    for (Int32 i=0; i<len; i++ )
-#pragma warning (default : 4018)   //warning elimination
    {
      if ( *wstr1 != *wstr2 )
-#pragma nowarn(1506)   // warning elimination 
         return ( *wstr1 - *wstr2 );
-#pragma warn(1506)  // warning elimination 
 
      if ( *wstr1 == 0 ) break;
 
@@ -166,9 +160,7 @@ Int32 na_wcscmp (const NAWchar * wstr1, const NAWchar * wstr2)
    while (*wstr1 == *wstr2++)
 		if (*wstr1++ == 0)
 			return (0);
-#pragma nowarn(1506)   // warning elimination 
 	return (*wstr1 - *--wstr2);
-#pragma warn(1506)  // warning elimination 
 }
 
 #if 0 /* As of 8/30/2011, there are no callers in SQ SQL. */
@@ -177,9 +169,7 @@ Int32 na_wcsicmp (const NAWchar * wstr1, const NAWchar * wstr2)
    while (na_towlower(*wstr1) == na_towlower(*wstr2++))
 		if (*wstr1++ == 0)
 			return (0);
-#pragma nowarn(1506)   // warning elimination 
 	return (*wstr1 - *--wstr2);
-#pragma warn(1506)  // warning elimination 
 }
 #endif /* As of 8/30/2011, there are no callers in SQ SQL. */
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExBitMapTable.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExBitMapTable.cpp b/core/sql/executor/ExBitMapTable.cpp
index 375007f..186c097 100644
--- a/core/sql/executor/ExBitMapTable.cpp
+++ b/core/sql/executor/ExBitMapTable.cpp
@@ -90,9 +90,7 @@ ExBitMapTable::ExBitMapTable(Int32 keySize, Int32 dataSize, Int32 countOffset,
   //   [rowSize] - data, key, and next for group 1
   //   [rowSize] - data, key, and next for group NumberGroups-1
   //
-#pragma nowarn(1506)   // warning elimination 
   const Int32 minimumMemorySize = 32 * (sizeof(char*) + rowSize_);
-#pragma warn(1506)  // warning elimination 
   memSize_ *= 2;
   while(!memory_ && (memSize_ >= 2 * minimumMemorySize)) {
     memSize_ /= 2;
@@ -110,10 +108,8 @@ ExBitMapTable::ExBitMapTable(Int32 keySize, Int32 dataSize, Int32 countOffset,
 
   // Compute the maximum number of groups that can be stored in the table. 
   //
-#pragma nowarn(1506)   // warning elimination 
   maximumNumberGroups_ = (memSize_ - sizeof(char*) * numberHashBuckets_)
     / rowSize_;
-#pragma warn(1506)  // warning elimination 
 
   // The buckets 
   // BitMap at memory_. To start there is only one BitMap.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExBitMapTable.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExBitMapTable.h b/core/sql/executor/ExBitMapTable.h
index 670b903..1179bbf 100644
--- a/core/sql/executor/ExBitMapTable.h
+++ b/core/sql/executor/ExBitMapTable.h
@@ -45,9 +45,6 @@
 #include "Int64.h"
 #include "ComDefs.h"
 
-#pragma warning (disable : 4005)   //warning elimination
-#pragma warning (default : 4005)   //warning elimination
-
 // External forward declarations
 //
 class NAMemory;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExCancel.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExCancel.cpp b/core/sql/executor/ExCancel.cpp
index 12bafbb..32b5c53 100755
--- a/core/sql/executor/ExCancel.cpp
+++ b/core/sql/executor/ExCancel.cpp
@@ -285,7 +285,6 @@ ExWorkProcRetcode ExCancelTcb::work()
         break;
       }  // end case NOT_STARTED
 
-#pragma warning (disable : 4291)
 
       case SEND_MESSAGE:
       {
@@ -320,7 +319,6 @@ ExWorkProcRetcode ExCancelTcb::work()
                       pid_,
                       cancelTdb().getCancelPidBlockThreshold());
 
-#pragma warning (default : 4291)
 
           *cancelStream_ << *cancelMsg;
 
@@ -332,13 +330,11 @@ ExWorkProcRetcode ExCancelTcb::work()
           bool suspendLogging = (TRUE == cliGlobals->currContext()->
                     getSessionDefaults()->getSuspendLogging());
 
-#pragma warning (disable : 4291)
           SuspendQueryRequest * suspendMsg = new (cliGlobals->getIpcHeap()) 
             SuspendQueryRequest(rtsHandle, cliGlobals->getIpcHeap(),
                                 ComTdbCancel::Force ==
                                 cancelTdb().forced_,
                                 suspendLogging);
-#pragma warning (default : 4291)
 
           *cancelStream_ << *suspendMsg;
 
@@ -353,11 +349,9 @@ ExWorkProcRetcode ExCancelTcb::work()
           bool suspendLogging = (TRUE == cliGlobals->currContext()->
                     getSessionDefaults()->getSuspendLogging());
 
-#pragma warning (disable : 4291)
           ActivateQueryRequest * activateMsg = new (cliGlobals->getIpcHeap()) 
             ActivateQueryRequest(rtsHandle, cliGlobals->getIpcHeap(),
                                  suspendLogging);
-#pragma warning (default : 4291)
 
           *cancelStream_ << *activateMsg;
 
@@ -370,10 +364,8 @@ ExWorkProcRetcode ExCancelTcb::work()
           char * qid = cancelTdb().qid_;
           Lng32 qid_len = str_len(qid);
 
-#pragma warning (disable : 4291)
           RtsQueryId *rtsQueryId = new (cliGlobals->getIpcHeap())
                            RtsQueryId( cliGlobals->getIpcHeap(), qid, qid_len);
-#pragma warning (default : 4291)
 
           *cancelStream_ << *rtsQueryId;
           rtsQueryId->decrRefCount();
@@ -430,12 +422,10 @@ ExWorkProcRetcode ExCancelTcb::work()
         if (!cancelStream_->moreObjects())
           return WORK_OK; 
 
-#pragma warning (disable : 4291)
 
         ControlQueryReply *reply = new (cliGlobals->getIpcHeap()) 
               ControlQueryReply(INVALID_RTS_HANDLE, cliGlobals->getIpcHeap());
 
-#pragma warning (default : 4291)
 
         *cancelStream_ >> *reply;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExComTdb.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExComTdb.cpp b/core/sql/executor/ExComTdb.cpp
index 428f54f..3766b3d 100644
--- a/core/sql/executor/ExComTdb.cpp
+++ b/core/sql/executor/ExComTdb.cpp
@@ -122,56 +122,42 @@ char *ComTdb::findVTblPtrExe(short classID)
 
     case ex_HASH_GRBY:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ex_hash_grby_tdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
 
     case ex_SORT_GRBY:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ex_sort_grby_tdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
    case ex_FIRST_N:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ExFirstNTdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
 
     case ex_TRANSPOSE:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ExTransposeTdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
 
     case ex_UNPACKROWS:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ExUnPackRowsTdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
 
     case ex_PACKROWS:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ExPackRowsTdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
 
     case ex_SAMPLE:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ExSampleTdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
 
@@ -179,282 +165,212 @@ char *ComTdb::findVTblPtrExe(short classID)
 // unused feature, done as part of SQ SQL code cleanup effort
     case ex_SIMPLE_SAMPLE:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ExSimpleSampleTdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
 #endif // if 0
 
     case ex_LEAF_TUPLE:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ExTupleLeafTdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
 
     case ex_COMPOUND_STMT:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr, ExCatpoundStmtTdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
 
     case ex_NON_LEAF_TUPLE:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ExTupleNonLeafTdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
 
     case ex_CONTROL_QUERY:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ExControlTdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
 
     case ex_ROOT:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ex_root_tdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
 
     case ex_ONLJ:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ExOnljTdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
 
     case ex_HASHJ:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ex_hashj_tdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
 
     case ex_MJ:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ex_mj_tdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
 
     case ex_UNION:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ex_union_tdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
     case ex_FAST_EXTRACT:
     {
-#pragma nowarn(1506)   // warning elimination
       GetVTblPtr(vtblptr,ExFastExtractTdb);
-#pragma warn(1506)  // warning elimination
       break;
     }
 
     case ex_UDR:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ExUdrTdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
     case ex_EXPLAIN:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ExExplainTdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
 
     case ex_SEQUENCE_FUNCTION:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ExSequenceTdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
 
     case ex_SORT:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ExSortTdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
 
     case ex_SPLIT_TOP:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ex_split_top_tdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
 
     case ex_SPLIT_BOTTOM:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ex_split_bottom_tdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
 
     case ex_SEND_TOP:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ex_send_top_tdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
 
     case ex_SEND_BOTTOM:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ex_send_bottom_tdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
 
     case ex_STATS:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ExStatsTdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
 
     case ex_STORED_PROC:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ExStoredProcTdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
 
     case ex_TUPLE_FLOW:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ExTupleFlowTdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
 
     case ex_SET_TIMEOUT:  
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ExTimeoutTdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
 
     case ex_TRANSACTION:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ExTransTdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
 
     case ex_DDL:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ExDDLTdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
 
     case ex_DDL_WITH_STATUS:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ExDDLwithStatusTdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
 
     case ex_DESCRIBE:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ExDescribeTdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
 
     case ex_EXE_UTIL:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ExExeUtilTdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
 
     case ex_FAST_DELETE:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ExExeUtilFastDeleteTdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
 
     case ex_HIVE_TRUNCATE:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ExExeUtilHiveTruncateTdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
 
     case ex_HIVE_QUERY:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ExExeUtilHiveQueryTdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
 
     case ex_PROCESS_VOLATILE_TABLE:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ExProcessVolatileTableTdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
 
   case ex_LOAD_VOLATILE_TABLE:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ExExeUtilLoadVolatileTableTdb);
-#pragma warn(1506)  // warning elimination 
 
       break;
     }
 
   case ex_CLEANUP_VOLATILE_TABLES:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ExExeUtilCleanupVolatileTablesTdb);
-#pragma warn(1506)  // warning elimination 
 
       break;
     }
   
   case ex_GET_VOLATILE_INFO:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ExExeUtilGetVolatileInfoTdb);
-#pragma warn(1506)  // warning elimination 
 
       break;
     }
@@ -462,59 +378,45 @@ char *ComTdb::findVTblPtrExe(short classID)
 
     case ex_PROCESS_INMEMORY_TABLE:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ExProcessInMemoryTableTdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
 
     case ex_CREATE_TABLE_AS:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ExExeUtilCreateTableAsTdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
 
     case ex_GET_STATISTICS:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ExExeUtilGetStatisticsTdb);
-#pragma warn(1506)  // warning elimination 
 
       break;
     }
 case ex_LOB_INFO:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ExExeUtilLobInfoTdb);
-#pragma warn(1506)  // warning elimination 
 
       break;
     }
   case ex_GET_METADATA_INFO:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ExExeUtilGetMetadataInfoTdb);
-#pragma warn(1506)  // warning elimination 
 
       break;
     }
 
   case ex_GET_HIVE_METADATA_INFO:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ExExeUtilGetHiveMetadataInfoTdb);
-#pragma warn(1506)  // warning elimination 
 
       break;
     }
 
     case ex_GET_UID:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ExExeUtilGetUIDTdb);
-#pragma warn(1506)  // warning elimination 
 
       break;
     }
@@ -528,43 +430,33 @@ case ex_LOB_INFO:
 
     case ex_POP_IN_MEM_STATS:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ExExeUtilPopulateInMemStatsTdb);
-#pragma warn(1506)  // warning elimination 
 
       break;
     }
   
     case ex_DISPLAY_EXPLAIN:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ExExeUtilDisplayExplainTdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
 
     case ex_DISPLAY_EXPLAIN_COMPLEX:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ExExeUtilDisplayExplainComplexTdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
 
     case ex_PROBE_CACHE:
     {
-#pragma nowarn(1506)   // warning elimination
       GetVTblPtr(vtblptr,ExProbeCacheTdb);
-#pragma warn(1506)  // warning elimination
 
       break;
     }
 
     case ex_LONG_RUNNING:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ExExeUtilLongRunningTdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
 
@@ -572,136 +464,104 @@ case ex_LOB_INFO:
 
     case ex_SHOW_SET:
     {
-#pragma nowarn(1506)   // warning elimination
       GetVTblPtr(vtblptr,ExExeUtilShowSetTdb);
-#pragma warn(1506)  // warning elimination
 
       break;
     }
 
     case ex_AQR:
     {
-#pragma nowarn(1506)   // warning elimination
       GetVTblPtr(vtblptr,ExExeUtilAQRTdb);
-#pragma warn(1506)  // warning elimination
 
       break;
     }
 
    case ex_GET_ERROR_INFO:
     {
-#pragma nowarn(1506)   // warning elimination
       GetVTblPtr(vtblptr,ExExeUtilGetErrorInfoTdb);
-#pragma warn(1506)  // warning elimination
 
       break;
     }
   case ex_PROCESS_STATISTICS:
     {
-#pragma nowarn(1506)   // warning elimination 
       GetVTblPtr(vtblptr,ExExeUtilGetProcessStatisticsTdb);
-#pragma warn(1506)  // warning elimination 
       break;
     }
   case ex_ARQ_WNR_INSERT:
   {
-#pragma nowarn(1506)   // warning elimination
     GetVTblPtr(vtblptr,ExExeUtilAqrWnrInsertTdb);
     break;
-#pragma warn(1506)  // warning elimination
   }
 
    case ex_HDFS_SCAN:
    {
-#pragma nowarn(1506)   // warning elimination
       GetVTblPtr(vtblptr,ExHdfsScanTdb);
-#pragma warn(1506)  // warning elimination
       break;
    }
 
    case ex_LOB_EXTRACT:
     {
-#pragma nowarn(1506)   // warning elimination
       GetVTblPtr(vtblptr,ExExeUtilLobExtractTdb);
-#pragma warn(1506)  // warning elimination
 
       break;
     }
   case ex_LOB_UPDATE_UTIL:
     {
-#pragma nowarn(1506)   // warning elimination
       GetVTblPtr(vtblptr,ExExeUtilLobUpdateTdb);
-#pragma warn(1506)  // warning elimination
 
       break;
     }
    case ex_LOB_SHOWDDL:
     {
-#pragma nowarn(1506)   // warning elimination
       GetVTblPtr(vtblptr,ExExeUtilLobShowddlTdb);
-#pragma warn(1506)  // warning elimination
 
       break;
     }
 
   case ex_HIVE_MD_ACCESS:
     {
-#pragma nowarn(1506)   // warning elimination
       GetVTblPtr(vtblptr,ExExeUtilHiveMDaccessTdb);
-#pragma warn(1506)  // warning elimination
 
       break;
     }
 
   case ex_HBASE_ACCESS:
     {
-#pragma nowarn(1506)   // warning elimination
       GetVTblPtr(vtblptr,ExHbaseAccessTdb);
-#pragma warn(1506)  // warning elimination
 
       break;
     }
 
   case ex_HBASE_COPROC_AGGR:
     {
-#pragma nowarn(1506)   // warning elimination
       GetVTblPtr(vtblptr,ExHbaseCoProcAggrTdb);
-#pragma warn(1506)  // warning elimination
 
       break;
     }
 
   case ex_HBASE_LOAD:
     {
-#pragma nowarn(1506)   // warning elimination
       GetVTblPtr(vtblptr,ExExeUtilHBaseBulkLoadTdb);
-#pragma warn(1506)  // warning elimination
 
       break;
     }
   case ex_HBASE_UNLOAD:
     {
-#pragma nowarn(1506)   // warning elimination
       GetVTblPtr(vtblptr,ExExeUtilHBaseBulkUnLoadTdb);
-#pragma warn(1506)  // warning elimination
 
       break;
     }
 
   case ex_ORC_AGGR:
     {
-#pragma nowarn(1506)   // warning elimination
       GetVTblPtr(vtblptr,ExOrcFastAggrTdb);
-#pragma warn(1506)  // warning elimination
 
       break;
     }
 
     case ex_CANCEL:
     {
-#pragma nowarn(1506)   // warning elimination
       GetVTblPtr(vtblptr,ExCancelTdb);
-#pragma warn(1506)  // warning elimination
 
       break;
     }
@@ -764,14 +624,12 @@ void resetBufSize(ex_tcb * tcb, Lng32 &tcbSpaceNeeded, Lng32 &poolSpaceNeeded)
       tcb->computeNeededPoolInfo(numBuffs, 
 				 staticPoolSpaceSize, dynPoolSpaceSize);
 
-#pragma nowarn(1506)   // warning elimination 
       // size of pool space that was allocated during the build
       // phase. This value is included in tcbSpaceNeeded.
       // compute tcb space needed by subtracting staticPoolSize
       tcbSpaceNeeded -= staticPoolSpaceSize;
 
       poolSpaceNeeded += dynPoolSpaceSize;
-#pragma warn(1506)  // warning elimination 
 
       if ((tcb->resizePoolInfo()) &&
 	  (numBuffs >= 0))
@@ -780,7 +638,6 @@ void resetBufSize(ex_tcb * tcb, Lng32 &tcbSpaceNeeded, Lng32 &poolSpaceNeeded)
     }
 }
 
-#pragma nowarn(262)   // warning elimination 
 Lng32 getTotalTcbSpace(char*inTdb, char * otherInfo, char * parentMemory)
 {
   ComTdb * tdb = (ComTdb*)inTdb;
@@ -836,4 +693,3 @@ Lng32 getTotalTcbSpace(char*inTdb, char * otherInfo, char * parentMemory)
 
   return totalSpaceNeeded;
 }
-#pragma warn(262)  // warning elimination 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExExeUtilCommon.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExExeUtilCommon.cpp b/core/sql/executor/ExExeUtilCommon.cpp
index 0bd991d..19d11fd 100644
--- a/core/sql/executor/ExExeUtilCommon.cpp
+++ b/core/sql/executor/ExExeUtilCommon.cpp
@@ -135,11 +135,9 @@ ExExeUtilTcb::ExExeUtilTcb(const ComTdbExeUtil & exe_util_tdb,
   CollHeap * heap = (glob ? glob->getDefaultHeap() : 0);
 
   // Allocate the buffer pool
-#pragma nowarn(1506)   // warning elimination 
   pool_ = new(space) sql_buffer_pool(exe_util_tdb.numBuffers_,
 				     exe_util_tdb.bufferSize_,
 				     space);
-#pragma warn(1506)  // warning elimination 
   
   childTcb_ = child_tcb;
   if (childTcb_)

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExExeUtilExplain.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExExeUtilExplain.cpp b/core/sql/executor/ExExeUtilExplain.cpp
index 12107e5..43f284b 100644
--- a/core/sql/executor/ExExeUtilExplain.cpp
+++ b/core/sql/executor/ExExeUtilExplain.cpp
@@ -143,7 +143,6 @@ ex_tcb_private_state * ExExeUtilDisplayExplainTcb::allocatePstates(
   return pa.allocatePstates(this, numElems, pstateLength);
 }
 
-#pragma nowarn(1313)  // warning elimination
 static const QueryString displayExplainQuery[] =
 {
   {" select translate(case when module_name is null then cast(_ucs2'?' as char(60) character set ucs2 not null) "},

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExExplain.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExExplain.cpp b/core/sql/executor/ExExplain.cpp
index 51c3002..0cf537b 100644
--- a/core/sql/executor/ExExplain.cpp
+++ b/core/sql/executor/ExExplain.cpp
@@ -136,11 +136,9 @@ ExExplainTcb::ExExplainTcb(const ExExplainTdb &explainTdb, ex_globals *glob)
 
   // Allocate the buffer pool
   // Allocate the specified number of buffers each can hold 5 tuples.
-#pragma nowarn(1506)   // warning elimination 
   pool_ = new(space) sql_buffer_pool(explainTdb.numBuffers_,
 				     explainTdb.bufferSize_,
 				     space);
-#pragma warn(1506)  // warning elimination 
 
   // Allocate the queues used to communicate with parent
   qParent_.down = new(space) ex_queue(ex_queue::DOWN_QUEUE,
@@ -256,13 +254,11 @@ ExExplainTcb::loadModule()
       SQLMODULE_ID moduleId;
 
       // Added for multi charset module names
-#pragma nowarn(1506)   // warning elimination 
       init_SQLMODULE_ID(&moduleId, 
 			SQLCLI_CURRENT_VERSION,
 			modName_,
 			0, SQLCHARSETSTRING_ISO88591, strlen(modName_)
 		       );
-#pragma warn(1506)  // warning elimination 
       //moduleId.module_name = modName_;
     }
   
@@ -1057,13 +1053,11 @@ ExExplainTcb::getNextExplainTree()
     {
       // Define the pattern string
       // The Wild Card character is '\'
-#pragma nowarn(1506)   // warning elimination
       LikePatternString 
 	patternString(stmtPattern_, 
 		      (stmtPattern_ ? str_len(stmtPattern_) : 0), 
 		      CharInfo::ISO88591,
 		      "\\", 1 );
-#pragma warn(1506)  // warning elimination 
 
       // Define a pattern for the pattern string
       LikePattern pattern(patternString, getHeap());
@@ -1129,9 +1123,7 @@ ExExplainTcb::getNextExplainTree()
 	      (str_cmp(modName_, moduleName, length) == 0)));
 
 	  if(modNameMatches &&
-#pragma nowarn(1506)   // warning elimination 
 	     (pattern.matches(ident, (ident ? str_len(ident) : 0), CharInfo::UTF8) == TRUE) &&
-#pragma warn(1506)  // warning elimination 
 	     stmt->getRootTdb())
           {
 	      // Remember the current statement, so that the position

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExFirstN.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExFirstN.cpp b/core/sql/executor/ExFirstN.cpp
index c6093ab..0937eea 100644
--- a/core/sql/executor/ExFirstN.cpp
+++ b/core/sql/executor/ExFirstN.cpp
@@ -74,11 +74,9 @@ ExFirstNTcb::ExFirstNTcb(const ExFirstNTdb & firstn_tdb,
   CollHeap * heap = (glob ? glob->getDefaultHeap() : NULL);
   
   // Allocate the buffer pool
-#pragma nowarn(1506)   // warning elimination 
   pool_ = new(space) sql_buffer_pool(firstn_tdb.numBuffers_,
 				     firstn_tdb.bufferSize_,
 				     space);
-#pragma warn(1506)  // warning elimination 
   
   // get the queue that child use to communicate with me
   qchild_  = child_tcb.getParentQueue(); 
@@ -177,7 +175,6 @@ short ExFirstNTcb::moveChildDataToParent()
 ////////////////////////////////////////////////////////////////////////////
 // This is where the action is.
 ////////////////////////////////////////////////////////////////////////////
-#pragma nowarn(262)   // warning elimination 
 short ExFirstNTcb::work()
 {
   // if no parent request, return
@@ -475,7 +472,6 @@ short ExFirstNTcb::work()
 
   return 0;
 }
-#pragma warn(262)  // warning elimination 
 
 short ExFirstNTcb::cancel()
 {

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExPack.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExPack.h b/core/sql/executor/ExPack.h
index 9b4ea93..953396c 100644
--- a/core/sql/executor/ExPack.h
+++ b/core/sql/executor/ExPack.h
@@ -172,28 +172,24 @@ public:
   ExWorkProcRetcode workReturnRow();
   
   // Stub to workUp() used by scheduler.
-// warning elimination (removed "inline")
   static ExWorkProcRetcode sWorkUp(ex_tcb *tcb)
   {
     return ((ExPackRowsTcb *) tcb)->workUp(); 
   } 
   
   // Stub to workDown() used by scheduler.
-// warning elimination (removed "inline")
   static ExWorkProcRetcode sWorkDown(ex_tcb *tcb)
   {
     return ((ExPackRowsTcb *) tcb)->workDown(); 
   }
   
   // Stub to processCancel() used by scheduler.
-// warning elimination (removed "inline")
   static ExWorkProcRetcode sCancel(ex_tcb *tcb)
   {
     return ((ExPackRowsTcb *) tcb)->processCancel(); 
   }
 
   // Return the parent queue pair.
-// warning elimination (removed "inline")
   ex_queue_pair getParentQueue() const { return qParent_; }
 
   // Return a reference to the Pack TDB associated with this Pack TCB.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExPackedRows.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExPackedRows.cpp b/core/sql/executor/ExPackedRows.cpp
index bbc82f5..49d5bb1 100644
--- a/core/sql/executor/ExPackedRows.cpp
+++ b/core/sql/executor/ExPackedRows.cpp
@@ -116,11 +116,9 @@ ExUnPackRowsTcb::ExUnPackRowsTcb(const ExUnPackRowsTdb &unPackRowsTdbLocal,
   // Allocate the buffer pool. Allocate a buffer big enough to hold
   // twice the size of my upqueue.
   //
-#pragma nowarn(1506)   // warning elimination 
   pool_ = new(space) ExSimpleSQLBuffer(unPackRowsTdb().queueSizeUp_ * 2,
                                        unPackRowsTdb().unPackColsTupleLen_,
                                        space);
-#pragma warn(1506)  // warning elimination 
 
   // get the queue used by my child to communicate with me
   //

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExPackedRows.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExPackedRows.h b/core/sql/executor/ExPackedRows.h
index e80a609..cfd2253 100644
--- a/core/sql/executor/ExPackedRows.h
+++ b/core/sql/executor/ExPackedRows.h
@@ -219,7 +219,6 @@ public:
   
   // Stub to workUp() used by scheduler.
   //
-  // warning elimination (removed "inline")
   static ExWorkProcRetcode sWorkUp(ex_tcb *tcb)
   {
     return ((ExUnPackRowsTcb *)tcb)->workUp(); 
@@ -227,7 +226,6 @@ public:
   
   // Stub to workDown() used by scheduler.
   // 
-  // warning elimination (removed "inline")
   static ExWorkProcRetcode sWorkDown(ex_tcb *tcb)
   {
     return ((ExUnPackRowsTcb *)tcb)->workDown(); 
@@ -235,7 +233,6 @@ public:
   
   // Stub to processCancel() used by scheduler.
   //
-// warning elimination (removed "inline")
   static ExWorkProcRetcode sCancel(ex_tcb *tcb)
   {
     return ((ExUnPackRowsTcb *)tcb)->processCancel(); 
@@ -243,7 +240,6 @@ public:
 
   // Return the parent queue pair.
   //
-// warning elimination (removed "inline")
   ex_queue_pair getParentQueue() const { return qParent_; }
 
   // Return a reference to the UnPackRows TDB associated with this 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExRsInfo.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExRsInfo.h b/core/sql/executor/ExRsInfo.h
index f837af3..2cd6485 100644
--- a/core/sql/executor/ExRsInfo.h
+++ b/core/sql/executor/ExRsInfo.h
@@ -55,7 +55,6 @@ class UdrClientControlStream;
 // DLL. The Windows compiler generates a warning about them requiring
 // a DLL interface in order to be used by ExRsInfo clients. We
 // will suppress such warnings.
-#pragma warning ( disable : 4251 )
 
 //------------------------------------------------------------------------
 // class RsInfo
@@ -244,6 +243,4 @@ private:
 #endif
 }; // class ExRsInfo
 
-#pragma warning ( default : 4251 )
-
 #endif // EX_RS_INFO_H

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExScheduler.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExScheduler.cpp b/core/sql/executor/ExScheduler.cpp
index 544eba8..76cb9be 100644
--- a/core/sql/executor/ExScheduler.cpp
+++ b/core/sql/executor/ExScheduler.cpp
@@ -328,7 +328,6 @@ ExWorkProcRetcode ExScheduler::work(Int64 prevWaitTime)
               ex_queue_pair pq = subtask->tcb_->getParentQueue();
               if (pq.down != NULL)
               {
-#pragma warning (disable : 4244)   //warning elimination
                 stats->getDownQueueStats().addEntry(
                                            (double)pq.down->getLength());
                 stats->setDownQueueSize(pq.down->getSize());
@@ -337,7 +336,6 @@ ExWorkProcRetcode ExScheduler::work(Int64 prevWaitTime)
               {
                 stats->getUpQueueStats().addEntry(
                                          (double)pq.up->getLength());
-#pragma warning (default : 4244)   //warning elimination
                  stats->setUpQueueSize(pq.up->getSize());
               }
             }

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExSequence.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExSequence.cpp b/core/sql/executor/ExSequence.cpp
index 272a3a8..9458c19 100644
--- a/core/sql/executor/ExSequence.cpp
+++ b/core/sql/executor/ExSequence.cpp
@@ -257,14 +257,12 @@ ExSequenceTcb::ExSequenceTcb (const ExSequenceTdb &  myTdb,
   childTcb_ = &child_tcb;
 
   // Allocate the buffer pool
-#pragma nowarn(1506)   // warning elimination 
   pool_ = new(space) sql_buffer_pool(myTdb.numBuffers_,
     myTdb.bufferSize_,
     space);
 
   allocRowLength_ = ROUND8(myTdb.recLen_);
 
-#pragma warn(1506)  // warning elimination 
 
   // Initialize the machinery for maintaining the row history for
   // computing sequence functions.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExSimpleSample.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExSimpleSample.h b/core/sql/executor/ExSimpleSample.h
index 4d19302..14095b9 100644
--- a/core/sql/executor/ExSimpleSample.h
+++ b/core/sql/executor/ExSimpleSample.h
@@ -148,14 +148,12 @@ public:
   ExWorkProcRetcode workUp();
 
   // Stub to workUp() used by scheduler.
-// warning elimination (removed "inline")
   static ExWorkProcRetcode sWorkUp(ex_tcb *tcb)
   {
     return ((ExSimpleSampleTcb *) tcb)->workUp();
   }
 
   // Stub to workDown() used by scheduler.
-// warning elimination (removed "inline")
   static ExWorkProcRetcode sWorkDown(ex_tcb *tcb)
   {
     return ((ExSimpleSampleTcb *) tcb)->workDown();
@@ -168,7 +166,6 @@ public:
   // }
 
   // Return the parent queue pair. 
-// warning elimination (removed "inline")
   ex_queue_pair getParentQueue() const { return qParent_; }
 
   // Return a reference to the TDB associated with this TCB.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExStats.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExStats.h b/core/sql/executor/ExStats.h
index 51c78f6..f6b074a 100644
--- a/core/sql/executor/ExStats.h
+++ b/core/sql/executor/ExStats.h
@@ -220,7 +220,6 @@ private:
 // Statistics for operators which use clusters (HJ, HGB,
 // materialize)
 //////////////////////////////////////////////////////////////////
-#pragma nowarn(1103)   // warning elimination 
 class ExClusterStats  : public ExStatsBase {
 public:
   ExClusterStats();
@@ -285,16 +284,12 @@ private:
   ExClusterStats * next_;
 };
 
-
-#pragma warn(1103)  // warning elimination 
-
 //////////////////////////////////////////////////////////////////
 // class ExTimeStats
 //
 // ExTimeStats collects time information. Real-time, process or 
 // thread CPU time.
 //////////////////////////////////////////////////////////////////
-#pragma nowarn(1103)   // warning elimination 
 class ExTimeStats  : public ExStatsBase {
 friend class ExOperStats;
 friend class ExHashJoinStats;
@@ -317,7 +312,6 @@ public:
    { 
      sumTime_ += time;
    }
-#pragma warn(1103)  // warning elimination 
 
   // start an active period (record the starting time)
   void start();
@@ -358,9 +352,6 @@ private:
 // Data members that identify an ExOperStats uniquely within
 // a given statement
 //////////////////////////////////////////////////////////////////
-#pragma nowarn(1103)   // warning elimination 
-#pragma nowarn(161)   // warning elimination 
-#pragma nowarn(1026)   // warning elimination 
 struct ExOperStatsId
 {
   ExFragId fragId_;
@@ -386,11 +377,6 @@ struct ExOperStatsId
  };
 
 
-#pragma warn(1103)  // warning elimination 
-#pragma warn(161)  // warning elimination 
-#pragma warn(1026)  // warning elimination 
-
-
 // Define the number of retcodes here instead of taking the enum
 // value WORK_LAST_RETCODE from file ExScheduler.h. The reason is
 // that otherwise we couldn't change WORK_LAST_RETCODE without
@@ -478,7 +464,6 @@ private:
 //     (this number is included in Total number of bytes sent/recvd
 //  -- sent/recvd counters (See ExStatsCounter)
 /////////////////////////////////////////////////////////////////////
-#pragma nowarn(1103)   // warning elimination 
 class ExBufferStats  : public ExStatsBase
 {
 public:
@@ -545,8 +530,6 @@ private:
 };
 
 
-#pragma warn(1103)  // warning elimination 
-
 //////////////////////////////////////////////////////////////////
 // class ExOperStats
 //
@@ -695,7 +678,6 @@ public:
   inline void setCollectStatsType(ComTdb::CollectStatsType s)  
   {collectStatsType_ = s;}
 
-// warning elimination (removed "inline")
   virtual const char * getStatTypeAsString() const {return "EX_OPER_STATS";}; 
 
   inline Int64 getActualRowsReturned() const { return actualRowsReturned_; }

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExTranspose.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExTranspose.cpp b/core/sql/executor/ExTranspose.cpp
index 30d6ec3..ae2d2ff 100644
--- a/core/sql/executor/ExTranspose.cpp
+++ b/core/sql/executor/ExTranspose.cpp
@@ -109,12 +109,10 @@ ExTransposeTcb::ExTransposeTcb(const ExTransposeTdb &transTdbLocal,
   //transTdb().bufferSize_,
   //space);
   //
-#pragma nowarn(1506)   // warning elimination 
   pool_ = new(space) ExSimpleSQLBuffer(transTdb().numBuffers_,
 				       transTdb().bufferSize_, 
 				       transTdb().transRowLen_,
 				       space);
-#pragma warn(1506)  // warning elimination
  
   // get the queue used by my child to communicate with me
   //

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExTranspose.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExTranspose.h b/core/sql/executor/ExTranspose.h
index 992749c..a2a537a 100644
--- a/core/sql/executor/ExTranspose.h
+++ b/core/sql/executor/ExTranspose.h
@@ -221,7 +221,6 @@ public:
   // Stub to workUp() used by scheduler.
   //
   
-// warning elimination (removed "inline")
   static ExWorkProcRetcode sWorkUp(ex_tcb *tcb)
   {
     return ((ExTransposeTcb *) tcb)->workUp(); 
@@ -229,7 +228,6 @@ public:
   
   // Stub to workDown() used by scheduler.
   // 
-// warning elimination (removed "inline")
   static ExWorkProcRetcode sWorkDown(ex_tcb *tcb)
   {
     return ((ExTransposeTcb *) tcb)->workDown(); 
@@ -237,7 +235,6 @@ public:
   
   // Stub to processCancel() used by scheduler.
   // 
-// warning elimination (removed "inline")
   static ExWorkProcRetcode sCancel(ex_tcb *tcb)
   {
     return ((ExTransposeTcb *) tcb)->processCancel(); 
@@ -245,7 +242,6 @@ public:
 
   // Return the parent queue pair.
   //
-// warning elimination (removed "inline")
   ex_queue_pair getParentQueue() const { return qParent_; }
 
   // Return a reference to the Transpose TDB associated with this 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExUdr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExUdr.cpp b/core/sql/executor/ExUdr.cpp
index cacf484..24b6aaf 100644
--- a/core/sql/executor/ExUdr.cpp
+++ b/core/sql/executor/ExUdr.cpp
@@ -47,7 +47,6 @@
 //   method would decide to initiate the restart.
 //
 
-#pragma nowarn(262)   // warning elimination 
 #include "ex_stdh.h"
 #include "ExUdr.h"
 #include "ExUdrServer.h"
@@ -4771,5 +4770,4 @@ ExUdrPrivateState::~ExUdrPrivateState()
 {
 }
 
-#pragma warn(262)  // warning elimination 
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExUdrClientIpc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExUdrClientIpc.cpp b/core/sql/executor/ExUdrClientIpc.cpp
index ac531e7..6925a1a 100644
--- a/core/sql/executor/ExUdrClientIpc.cpp
+++ b/core/sql/executor/ExUdrClientIpc.cpp
@@ -45,7 +45,6 @@
 #ifdef UDR_DEBUG
 #include "ErrorMessage.h"
 
-#pragma nowarn(140)   //warning elimination
 #define UdrDebug0(s) \
   ( UdrPrintf(traceFile_,(s)) )
 #define UdrDebug1(s,a1) \
@@ -58,7 +57,6 @@
   ( UdrPrintf(traceFile_,(s),(a1),(a2),(a3),(a4)) )
 #define UdrDebug5(s,a1,a2,a3,a4,a5) \
   ( UdrPrintf(traceFile_,(s),(a1),(a2),(a3),(a4),(a5)) )
-#pragma warn(140)   //warning elimination
 
 #else
 //
@@ -90,8 +88,6 @@
 //---------------------------------------------------------------------------
 // class UdrClientControlStream
 //---------------------------------------------------------------------------
-#pragma nowarn(109)  // warning elimination 
-#pragma nowarn(1252)  // warning elimination 
 UdrClientControlStream::UdrClientControlStream(IpcEnvironment *env,
                                                ExUdrTcb *tcb,
                                                ExExeStmtGlobals *stmtGlobals,
@@ -109,8 +105,6 @@ UdrClientControlStream::UdrClientControlStream(IpcEnvironment *env,
 #endif
 {
 }
-#pragma warn(109)  // warning elimination 
-#pragma warn(1252)  // warning elimination 
 
 UdrClientControlStream::~UdrClientControlStream()
 {

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExUdrServer.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExUdrServer.cpp b/core/sql/executor/ExUdrServer.cpp
index 7a7b20a..bcd01be 100644
--- a/core/sql/executor/ExUdrServer.cpp
+++ b/core/sql/executor/ExUdrServer.cpp
@@ -64,7 +64,6 @@ static const char *GetStatusString(ExUdrServer::ExUdrServerStatus s)
   return "***UNKNOWN***";
 } */
 
-#pragma nowarn(140)   // warning elimination 
 #define UdrDebug0(s) \
   ( UdrPrintf(traceFile_,(s)) )
 #define UdrDebug1(s,a1) \
@@ -77,7 +76,6 @@ static const char *GetStatusString(ExUdrServer::ExUdrServerStatus s)
   ( UdrPrintf(traceFile_,(s),(a1),(a2),(a3),(a4)) )
 #define UdrDebug5(s,a1,a2,a3,a4,a5) \
   ( UdrPrintf(traceFile_,(s),(a1),(a2),(a3),(a4),(a5)) )
-#pragma warn(140)  // warning elimination
 
 #else
 //

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExVPJoin.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExVPJoin.cpp b/core/sql/executor/ExVPJoin.cpp
index 201d4b1..30eb1ae 100644
--- a/core/sql/executor/ExVPJoin.cpp
+++ b/core/sql/executor/ExVPJoin.cpp
@@ -350,14 +350,10 @@ ExWorkProcRetcode ExVPJoinTcb::workUp()
 
 		      // Append this child's output to result ATP.
 		      //
-#pragma nowarn(1506)   // warning elimination 
 		      short numResTups = reply->numTuples()-vpJoinTdb().firstReplyAtpIx_;
-#pragma warn(1506)  // warning elimination 
 		      short dest_start_tupp = outIx;
 		      short src_start_tupp = vpJoinTdb().firstReplyAtpIx_;
-#pragma nowarn(1506)   // warning elimination 
 		      short src_end_tupp =  numResTups + vpJoinTdb().firstReplyAtpIx_ - 1;
-#pragma warn(1506)  // warning elimination 
 		      
 
 		      resAtp->copyPartialAtp(reply->getAtp(), // source atp

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/MdamPoint.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/MdamPoint.cpp b/core/sql/executor/MdamPoint.cpp
index 1ecc00c..762940b 100644
--- a/core/sql/executor/MdamPoint.cpp
+++ b/core/sql/executor/MdamPoint.cpp
@@ -83,9 +83,7 @@ NABoolean MdamPoint::beginContains(const ULng32 keyLen, const char * v)
     {
       return FALSE;
     };
-#pragma nowarn(203)   // warning elimination 
   return TRUE;  // To get rid of compiler warning.
-#pragma warn(203)  // warning elimination 
 }
 
 
@@ -113,9 +111,7 @@ NABoolean MdamPoint::endContains(const ULng32 keyLen, const char * v) const
     {
       return FALSE;
     };
-#pragma nowarn(203)   // warning elimination 
   return TRUE;  // To get rid of compiler warning.
-#pragma warn(203)  // warning elimination 
 }
 
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/MdamPoint.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/MdamPoint.h b/core/sql/executor/MdamPoint.h
index 815cd06..40315f8 100644
--- a/core/sql/executor/MdamPoint.h
+++ b/core/sql/executor/MdamPoint.h
@@ -55,7 +55,6 @@
 class MdamEndPoint;
 // End of forward declarations.
 
-#pragma nowarn(1103)   // warning elimination 
 class MdamPoint
 {
 
@@ -114,8 +113,6 @@ private:
 }; // class MdamPoint
 
 
-#pragma warn(1103)   // warning elimination 
-
 // *****************************************************************************
 // Inline member functions for class MdamPoint
 // *****************************************************************************
@@ -133,11 +130,9 @@ inline MdamPoint::MdamPoint(const tupp & tupp,
 inline MdamEnums::MdamOrder MdamPoint::compare
              (const MdamPoint * other, const ULng32 keyLen) const
 {
-#pragma nowarn(1506)   // warning elimination 
   short retVal = str_cmp(tupp_.getDataPointer(), 
                                       other->tupp_.getDataPointer(),
                                       Int32(keyLen));
-#pragma warn(1506)  // warning elimination 
   if (retVal < 0)
      return MdamEnums::MDAM_LESS;
   else

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/TriggerEnable.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/TriggerEnable.h b/core/sql/executor/TriggerEnable.h
index a1e5430..4530369 100644
--- a/core/sql/executor/TriggerEnable.h
+++ b/core/sql/executor/TriggerEnable.h
@@ -121,7 +121,6 @@ private:
 // 
 
 
-#pragma nowarn(1506)   // warning elimination 
 class TriggerStatusWA : public NABasicObject
 {
 
@@ -193,7 +192,6 @@ private:
 	ex_root_tcb* rootTcb_;
 
 };
-#pragma warn(1506)  // warning elimination 
 
 #endif
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ex_ddl.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_ddl.cpp b/core/sql/executor/ex_ddl.cpp
index b370a16..36772a2 100644
--- a/core/sql/executor/ex_ddl.cpp
+++ b/core/sql/executor/ex_ddl.cpp
@@ -93,11 +93,9 @@ ExDDLTcb::ExDDLTcb(const ComTdbDDL & ddl_tdb,
   CollHeap * heap = (glob ? glob->getDefaultHeap() : 0);
   
   // Allocate the buffer pool
-#pragma nowarn(1506)   // warning elimination 
   pool_ = new(space) sql_buffer_pool(ddl_tdb.numBuffers_,
 				     ddl_tdb.bufferSize_,
 				     space);
-#pragma warn(1506)  // warning elimination 
   
   // Allocate the queue to communicate with parent
   qparent_.down = new(space) ex_queue(ex_queue::DOWN_QUEUE,
@@ -1268,12 +1266,8 @@ Lng32 ExDescribeTcb::returnLeaks(short &error)
   ex_queue_entry * up_entry = qparent_.up->getTailEntry();
 	    
   // allocate space 
-#pragma nowarn(1506)   // warning elimination 
   if (pool_->get_free_tuple(up_entry->getTupp(describeTdb().tuppIndex_),
-#pragma warn(1506)  // warning elimination 
-#pragma nowarn(1506)   // warning elimination 
 			    describeTdb().outputRowlen_))
-#pragma warn(1506)  // warning elimination 
 	      
     {
       // no more space in the pool.
@@ -1283,17 +1277,13 @@ Lng32 ExDescribeTcb::returnLeaks(short &error)
     }
 	
   char *entry = up_entry->
-#pragma nowarn(1506)   // warning elimination 
 		getTupp(describeTdb().tuppIndex_).getDataPointer();
-#pragma warn(1506)  // warning elimination 
 
   // For ARKCMP and/or SQLCI
   if (HeapLogRoot::fetchLine(entry,
 			     describeTdb().flags_, 
 			     pstate.dataPtr_,
-#pragma nowarn(1506)   // warning elimination 
 			     pstate.dataLen_) == 1)
-#pragma warn(1506)  // warning elimination 
     { // eof
       pstate.currLen_ = pstate.dataLen_;
       pstate.step_ = DONE_;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ex_esp_frag_dir.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_esp_frag_dir.cpp b/core/sql/executor/ex_esp_frag_dir.cpp
index fa4c9c9..ae7a6b5 100644
--- a/core/sql/executor/ex_esp_frag_dir.cpp
+++ b/core/sql/executor/ex_esp_frag_dir.cpp
@@ -234,7 +234,6 @@ ExFragInstanceHandle ExEspFragInstanceDir::addEntry(ExMsgFragment *msgFragment,
 
       // allocate the globals in their own heap, like the master
       // executor does it
-#pragma nowarn(1506)   // warning elimination 
       inst->globals_ = new(stmtHeap) ExEspStmtGlobals(
 	   (short) msgFragment->getNumTemps(),
 	   cliGlobals_,
@@ -246,7 +245,6 @@ ExFragInstanceHandle ExEspFragInstanceDir::addEntry(ExMsgFragment *msgFragment,
 	   msgFragment->getInjectErrorAtExpr(),
            inst->queryId_,
            inst->queryIdLen_);
-#pragma warn(1506)  // warning elimination 
     }
   else
     inst->globals_ = NULL; // no globals needed for DP2 fragments
@@ -547,7 +545,6 @@ void ExEspFragInstanceDir::releaseOrphanEntries()
     }
 }
 
-#pragma nowarn(770)   // warning elimination 
 void ExEspFragInstanceDir::hasTransidReleaseRequest(
      ExFragInstanceHandle handle)
 {
@@ -629,7 +626,6 @@ void ExEspFragInstanceDir::hasReleaseRequest(
 }
 
 
-#pragma warn(770)  // warning elimination 
 
 void ExEspFragInstanceDir::work(Int64 prevWaitTime)
 {
@@ -1305,7 +1301,6 @@ void ExEspControlMessage::actOnReceive(IpcConnection *connection)
   send(FALSE);
 }
 
-#pragma nowarn(262)   // warning elimination 
 void ExEspControlMessage::actOnLoadFragmentReq(
      IpcConnection *connection,
      ComDiagsArea & /*da*/)
@@ -1359,7 +1354,6 @@ void ExEspControlMessage::actOnLoadFragmentReq(
   
   // the reply is handled by the caller
 }
-#pragma warn(262)  // warning elimination 
 
 void ExEspControlMessage::actOnFixupFragmentReq(ComDiagsArea &da)
 {

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ex_esp_msg.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_esp_msg.cpp b/core/sql/executor/ex_esp_msg.cpp
index 51e1b0e..029a186 100644
--- a/core/sql/executor/ex_esp_msg.cpp
+++ b/core/sql/executor/ex_esp_msg.cpp
@@ -616,9 +616,7 @@ IpcMessageObjSize TupMsgBuffer::packObjIntoMessage(IpcMessageBufferPtr buffer)
   theBuffer_->drivePack();
 
   // now move the SqlBuffer
-#pragma nowarn(1506)   // warning elimination 
   str_cpy_all(buffer,(char *) theBuffer_, theBuffer_->get_buffer_size());
-#pragma warn(1506)  // warning elimination 
 
   result += theBuffer_->get_buffer_size();
 
@@ -645,9 +643,7 @@ void TupMsgBuffer::unpackObj(IpcMessageObjType objType,
   ex_assert(allocSize_ >= (Lng32) sqlBufferSize,
 	    "TupMsgBuffer too small for unpack");
 
-#pragma nowarn(1506)   // warning elimination 
   str_cpy_all((char *) theBuffer_, buffer, sqlBufferSize);
-#pragma warn(1506)  // warning elimination 
 
   // convert offsets in buffer to pointers
   theBuffer_->driveUnpack();
@@ -689,9 +685,7 @@ IpcMessageObjSize ExProcessIdsOfFrag::packObjIntoMessage(
      IpcMessageBufferPtr buffer)
 {
   IpcMessageObjSize result = packBaseClassIntoMessage(buffer);
-#pragma nowarn(1506)   // warning elimination 
   Int32 np = processIds_.entries();
-#pragma warn(1506)  // warning elimination 
 
   // pack fragment id and number of entries
   str_cpy_all(buffer, (const char *) &spare_, sizeof(spare_));
@@ -953,9 +947,7 @@ IpcMessageObjSize ExMsgFragment::packObjIntoMessage(IpcMessageBufferPtr buffer)
   }
   else
   {
-#pragma nowarn(1506)   // warning elimination 
     str_cpy_all(buffer,fragment_,f_.fragmentLength_);
-#pragma warn(1506)  // warning elimination 
     buffer += f_.fragmentLength_;
   }
 
@@ -1035,9 +1027,7 @@ void ExMsgFragment::unpackObj(IpcMessageObjType objType,
   }
   else
   {
-#pragma nowarn(1506)   // warning elimination 
     str_cpy_all(fragment_, buffer,f_.fragmentLength_);
-#pragma warn(1506)  // warning elimination 
     buffer += f_.fragmentLength_;
   }
 
@@ -1106,7 +1096,6 @@ ExMsgTimeoutData::packObjIntoMessage(IpcMessageBufferPtr buffer)
   return (IpcMessageObjSize) (buffer - start);
 }
 
-#pragma nowarn(262)   // warning elimination 
 void ExMsgTimeoutData::unpackObj(IpcMessageObjType objType,
 				 IpcMessageObjVersion objVersion,
 				 NABoolean sameEndianness,
@@ -1129,7 +1118,6 @@ void ExMsgTimeoutData::unpackObj(IpcMessageObjType objType,
 
   iOwnTD_ = TRUE;  // on the ESP side; I own the newly allocated timeoutData_
 }
-#pragma warn(262)  // warning elimination 
 
 
 
@@ -1289,9 +1277,7 @@ void ExMsgResourceInfo::unpackObj(IpcMessageObjType objType,
   // sfo_ is const
   sfo_ = sfo;
 
-#pragma nowarn(1506)   // warning elimination 
   sfo->ipcUnpackObj(objSize - (buffer-start),
-#pragma warn(1506)  // warning elimination 
 		    buffer,
 		    getHeap(),
 		    totalNameLength_,

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ex_ex.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_ex.cpp b/core/sql/executor/ex_ex.cpp
index 96214e5..da1a411 100644
--- a/core/sql/executor/ex_ex.cpp
+++ b/core/sql/executor/ex_ex.cpp
@@ -208,9 +208,7 @@ Int32 ex_tcb::fixup()
   Int32 nc = numChildren();
   for (Int32 i=0; i<nc; i++)
   {
-#pragma nowarn(1506)   // warning elimination 
      error = ((ex_tcb *)getChild(i))->fixup();
-#pragma warn(1506)  // warning elimination 
      if (error)
         break;
   }
@@ -226,9 +224,7 @@ Int32 ex_tcb::rollbackSavepoint()
   Int32 nc = numChildren();
   for (Int32 i=0; i<nc; i++)
     {
-#pragma nowarn(1506)   // warning elimination 
       error = ((ex_tcb *)getChild(i))->rollbackSavepoint();
-#pragma warn(1506)  // warning elimination 
       if (error)
         break;
     }
@@ -261,9 +257,7 @@ NABoolean ex_tcb::closeTables()
 unsigned short ex_tcb::getExpressionMode() const
 { 
   if (globals_->getInjectErrorAtExpr())
-#pragma nowarn(1506)   // warning elimination 
     return tdb.expressionMode_ | ex_expr::INJECT_ERROR; 
-#pragma warn(1506)  // warning elimination 
   else
     return tdb.expressionMode_; 
 };
@@ -656,9 +650,7 @@ NABoolean ExExprComputeSpace(ex_tcb * tcb)
 void ex_log_ems( const char *f, Int32 l, const char * m)
 {
 }
-#pragma nowarn(770)   // warning elimination 
 void assert_botch_longjmp( const char *f, Int32 l, const char * m)
 {
 
 }
-#pragma warn(770)  // warning elimination 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ex_god.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_god.h b/core/sql/executor/ex_god.h
index 9bbe887..3655945 100644
--- a/core/sql/executor/ex_god.h
+++ b/core/sql/executor/ex_god.h
@@ -44,14 +44,11 @@
 #include <stdlib.h>
 #include "NAHeap.h"
 
-#pragma nowarn(1103)   // warning elimination 
 class ExGod : public NABasicObject 
 {
 protected:
   virtual ~ExGod();
 };
-#pragma warn(1103)  // warning elimination 
-
 
 // the next two methods will eventually be removed after all
 // executor objects have been derived from ExGod(or something

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ex_io_control.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_io_control.h b/core/sql/executor/ex_io_control.h
index 8678e57..d8830cd 100644
--- a/core/sql/executor/ex_io_control.h
+++ b/core/sql/executor/ex_io_control.h
@@ -116,9 +116,7 @@ inline void ControlInfo::setBufferSequenceNumber(ULng32 snum)
 
 inline NABoolean ControlInfo::getIsDiagsAreaPresent() const
 {
-#pragma nowarn(1506)   // warning elimination 
   return (ciFlags_ & HAS_DIAGSAREA);
-#pragma warn(1506)  // warning elimination 
 }
 
 inline void ControlInfo::setIsDiagsAreaPresent(NABoolean val)
@@ -144,9 +142,7 @@ inline void ControlInfo::setIsDiagsAreaUnpacked(NABoolean val)
 
 inline NABoolean ControlInfo::getIsExtDiagsAreaPresent() const
 {
-#pragma nowarn(1506)   // warning elimination 
   return (ciFlags_ & HAS_EXT_DIAGSAREA);
-#pragma warn(1506)  // warning elimination 
 }
 
 inline void ControlInfo::setIsExtDiagsAreaPresent(NABoolean val)
@@ -159,9 +155,7 @@ inline void ControlInfo::setIsExtDiagsAreaPresent(NABoolean val)
 
 inline NABoolean ControlInfo::getIsDataRowPresent() const
 {
-#pragma nowarn(1506)   // warning elimination 
   return (ciFlags_ & HAS_DATA);
-#pragma warn(1506)  // warning elimination 
 }
 
 inline void ControlInfo::setIsDataRowPresent(NABoolean val)
@@ -174,9 +168,7 @@ inline void ControlInfo::setIsDataRowPresent(NABoolean val)
 
 inline NABoolean ControlInfo::getIsStatsAreaPresent() const
 {
-#pragma nowarn(1506)   // warning elimination 
   return (ciFlags_ & HAS_STATSAREA);
-#pragma warn(1506)  // warning elimination 
 }
 
 inline void ControlInfo::setIsStatsAreaPresent(NABoolean val)
@@ -189,9 +181,7 @@ inline void ControlInfo::setIsStatsAreaPresent(NABoolean val)
 
 inline NABoolean ControlInfo::getIsExtStatsAreaPresent() const
 {
-#pragma nowarn(1506)   // warning elimination 
   return (ciFlags_ & HAS_EXT_STATSAREA);
-#pragma warn(1506)  // warning elimination 
 }
 
 inline void ControlInfo::setIsExtStatsAreaPresent(NABoolean val)

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ex_mdam.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_mdam.cpp b/core/sql/executor/ex_mdam.cpp
index 770a09e..fda177e 100644
--- a/core/sql/executor/ex_mdam.cpp
+++ b/core/sql/executor/ex_mdam.cpp
@@ -166,21 +166,11 @@ MdamColumn::MdamColumn(MdamColumn * previous,
     }
 
   // allocate storage to hold current, hi, lo, nonNullHi, nonNullLo values
-#pragma nowarn(1506)   // warning elimination 
   pool->get_free_tuple(currentValue_,columnGenInfo_->getLength());
-#pragma warn(1506)  // warning elimination 
-#pragma nowarn(1506)   // warning elimination 
   pool->get_free_tuple(hi_,columnGenInfo_->getLength());
-#pragma warn(1506)  // warning elimination 
-#pragma nowarn(1506)   // warning elimination 
   pool->get_free_tuple(lo_,columnGenInfo_->getLength());
-#pragma warn(1506)  // warning elimination 
-#pragma nowarn(1506)   // warning elimination 
   pool->get_free_tuple(nonNullHi_,columnGenInfo_->getLength());
-#pragma warn(1506)  // warning elimination 
-#pragma nowarn(1506)   // warning elimination 
   pool->get_free_tuple(nonNullLo_,columnGenInfo_->getLength());
-#pragma warn(1506)  // warning elimination 
 
   // go tell MdamColumnGen to fix up its expressions
   // (aside:  too bad we have to do it here -- if there were fixup
@@ -482,9 +472,7 @@ if (keyData)
   {
     // the sparse probe was successful -- save the key value
     Int32 len = Int32(columnGenInfo_->getLength());
-#pragma nowarn(1506)   // warning elimination 
     Lng32 offset = columnGenInfo_->getOffset();
-#pragma warn(1506)  // warning elimination 
     char * cv = currentValue_.getDataPointer();
 
     str_cpy_all(cv,keyData + offset,len);
@@ -586,11 +574,9 @@ while ((predIterator.positionToNextOr(&currentPred_)) &&
     
         tupp & pv  = workAtp->getTupp(valueAtpIndex);
         tupp & pv2 = workAtp->getTupp(valueAtpIndex+1);
-#pragma nowarn(1506)   // warning elimination 
         pool->get_free_tuple(pv,columnGenInfo_->getLength());
         if (predPtr->getPredType() == MdamPred::MDAM_BETWEEN)
           pool->get_free_tuple(pv2,columnGenInfo_->getLength());
-#pragma warn(1506)  // warning elimination 
     
         got_a_predicate = TRUE;
         dataConvErrorFlag = 0;  // The zero hard-coded here should be

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ex_mj.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_mj.cpp b/core/sql/executor/ex_mj.cpp
index 55a589b..fcabf19 100644
--- a/core/sql/executor/ex_mj.cpp
+++ b/core/sql/executor/ex_mj.cpp
@@ -2072,9 +2072,7 @@ short ex_mj_unique_tcb::work()
 	} // switch pstate.step
     } // while
 
-#pragma nowarn(203)   // warning elimination
   return WORK_OK;
-#pragma warn(203)  // warning elimination
 }
 
 ///////////////////////////////////////////////////////////////////////////

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ex_onlj.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_onlj.cpp b/core/sql/executor/ex_onlj.cpp
index 5c5f4b6..12ec582 100644
--- a/core/sql/executor/ex_onlj.cpp
+++ b/core/sql/executor/ex_onlj.cpp
@@ -96,7 +96,6 @@ ExOnljTcb::ExOnljTcb(const ExOnljTdb &  nljTdb,  //
 
   // Allocate the buffer pool, if 'special' left join
   if ((isLeftJoin()) && (nljTdb.ljExpr_)) {
-#pragma nowarn(1506)   // warning elimination 
     pool_ = new(glob->getSpace()) sql_buffer_pool(nljTdb.numBuffers_,
                                                   nljTdb.bufferSize_,
                                                   glob->getSpace());
@@ -115,7 +114,6 @@ ExOnljTcb::ExOnljTcb(const ExOnljTdb &  nljTdb,  //
     }
 
   }
-#pragma warn(1506)  // warning elimination 
   
   // Copy predicate pointers
   beforePred_ = nljTdb.preJoinPred_;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ex_queue.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_queue.cpp b/core/sql/executor/ex_queue.cpp
index 1ac4cb0..2d746da 100644
--- a/core/sql/executor/ex_queue.cpp
+++ b/core/sql/executor/ex_queue.cpp
@@ -290,9 +290,7 @@ NABoolean ex_queue::allocateAtps(CollHeap * space,
       // at a time We are sent back the size of the atp struct since
       // it also allocates space for number of tuples per criDesc.
       numNewAtps = size_;
-#pragma nowarn(1506)   // warning elimination 
       atps = allocateAtpArray( criDesc_, numNewAtps, &atpSize, space, failureIsFatal);
-#pragma warn(1506)  // warning elimination 
     }
 
   // check whether the caller provided the ATPs or whether we were
@@ -354,16 +352,12 @@ NABoolean ex_queue::allocatePstate(ex_tcb * tcb,
 {
   queue_index i;
   ex_tcb_private_state *actualPstates = pstates;
-#pragma nowarn(1506)   // warning elimination 
   Lng32 actualNumPstates = numNewPstates;
-#pragma warn(1506)  // warning elimination 
   Lng32 actualPstateLength = pstateLength;
 
   if (actualPstates == NULL)
     {
-#pragma nowarn(1506)   // warning elimination 
       actualNumPstates = size_;
-#pragma warn(1506)  // warning elimination 
       // NOTE: actualNumPstates may be changed (reduced) by this call
       actualPstates = tcb->allocatePstates(actualNumPstates,
 					   actualPstateLength);
@@ -485,9 +479,7 @@ queue_index ex_queue::resize(ex_tcb *    tcb,
   // allocate array of ATPs if needed
   if (needAtps)
     {
-#pragma nowarn(1506)   // warning elimination 
       atps = allocateAtpArray(criDesc_, sizeDelta, &atpSize, space, FALSE);
-#pragma warn(1506)  // warning elimination 
 
       // for now, give up if it wasn't possible to allocate the ATPs in
       // one piece (one could try to allocate them one by one)
@@ -500,9 +492,7 @@ queue_index ex_queue::resize(ex_tcb *    tcb,
   // allocate an array of pstate objects if needed
   if (needsPstates_)
     {
-#pragma nowarn(1506)   // warning elimination 
       numAllocatedPstates = sizeDelta;
-#pragma warn(1506)  // warning elimination 
       pstates = tcb->allocatePstates(numAllocatedPstates,pstateLength);
       if (pstates == NULL)
 	{
@@ -801,9 +791,7 @@ void ex_queue::injectErrorOrCancel()
     {
        if ((rand() & (freq-1)) != 0)
          return;
-#pragma nowarn(269)   // warning elimination 
         NABoolean needsError = FALSE;
-#pragma warn(269)  // warning elimination 
         switch (qe->upState.status)
         {
         case Q_OK_MMORE:

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ex_queue.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_queue.h b/core/sql/executor/ex_queue.h
index 2b51c52..cd586da 100644
--- a/core/sql/executor/ex_queue.h
+++ b/core/sql/executor/ex_queue.h
@@ -285,9 +285,7 @@ public:
 #ifndef _DEBUG
 inline
 #endif
-  //#pragma nowarn(734)
   void removeHead();
-  //#pragma warn(734)
 
   // soln 10-040111-2308 start
   // removes the head entry. Same as removeHead except that it doesn't 
@@ -312,17 +310,13 @@ inline
                                        { insertSubtask_ = insertSubtask; }
   inline void setUnblockSubtask(ExSubtask *unblockSubtask)
                                      { unblockSubtask_ = unblockSubtask; }
-// warning elimination (removed "inline")
   void setCancelSubtask(ExSubtask *cancelSubtask)
   { ExQueueAssert(upDown_ == DOWN_QUEUE,""); cancelSubtask_ = cancelSubtask; }
   inline void setResizeSubtask(ExSubtask *resizeSubtask)
                                        { resizeSubtask_ = resizeSubtask; }
 
-//?johannes?
-  // warning elimination (removed "inline")
   void setNextSubtask(ExSubtask *nextSubtask)
   { ExQueueAssert(upDown_ == DOWN_QUEUE,""); nextSubtask_ = nextSubtask; }
-//?johannes??
 
   static queue_index roundUp2Power(queue_index i);
 
@@ -711,7 +705,6 @@ inline Int32 ex_queue::isVacant(const queue_index i) const
     return !((head_ <= i) || (i < tail_));  
 }
 
-//#pragma nowarn(734)
 #ifndef _DEBUG
 inline void ex_queue::removeHead()
 {
@@ -741,7 +734,6 @@ inline void ex_queue::removeHead()
     }
 } // ex_queue::removeHead()
 #endif
-//#pragma warn(734)
 
 inline void ex_queue::cancelRequest(const queue_index i)
 {

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ex_root.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_root.cpp b/core/sql/executor/ex_root.cpp
index 1f8b2b4..e8b264f 100644
--- a/core/sql/executor/ex_root.cpp
+++ b/core/sql/executor/ex_root.cpp
@@ -77,7 +77,6 @@ jmp_buf ExeBuf;
 //
 // Build a root tcb
 //
-#pragma nowarn(262)   // warning elimination 
 ex_tcb * ex_root_tdb::build(CliGlobals *cliGlobals, ex_globals * glob)
 {
   ExExeStmtGlobals * exe_glob = glob->castToExExeStmtGlobals();
@@ -337,7 +336,6 @@ ex_tcb * ex_root_tdb::build(CliGlobals *cliGlobals, ex_globals * glob)
 
 } // ex_root_tdb::build
 
-#pragma warn(262)  // warning elimination 
 
 
 ///////////////////////////////////////////////////////////////////////////
@@ -624,9 +622,7 @@ void ex_root_tcb::inputPkeyRow(char * pkey_row)
 {
   char * dataPtr =
     workAtp_->getTupp(root_tdb().criDesc_->noTuples()-1).getDataPointer();
-#pragma nowarn(1506)   // warning elimination 
   str_cpy_all(dataPtr, pkey_row, root_tdb().pkeyLen_);
-#pragma warn(1506)  // warning elimination 
 }
 
 ///////////////////////////////////////////////////////////////////////////
@@ -1112,7 +1108,6 @@ void ex_root_tcb::snapshotScanCleanup(ComDiagsArea* & diagsArea)
 ////////////////////////////////////////////////////////
 // RETURNS: 0, success. 100, EOF. -1, error. 1, warning
 ////////////////////////////////////////////////////////
-#pragma nowarn(262)   // warning elimination 
 Int32 ex_root_tcb::fetch(CliGlobals *cliGlobals,
 		       ExExeStmtGlobals * glob, 
 		       Descriptor * output_desc,
@@ -1568,9 +1563,7 @@ Int32 ex_root_tcb::fetch(CliGlobals *cliGlobals,
                     da->negateCondition(da->returnIndex(-EXE_CS_EOD));
                     CollIndex index;
 		    while ((index = da->returnIndex(-EXE_CS_EOD)) != NULL_COLL_INDEX ) {
-#pragma nowarn(1506)   // warning elimination 
 		      da->deleteError(index);  
-#pragma warn(1506)  // warning elimination 
 		    }
 		    if (da->getNumber(DgSqlCode::ERROR_) == 0) {
                       retcode = 0;
@@ -1915,12 +1908,10 @@ Int32 ex_root_tcb::fetch(CliGlobals *cliGlobals,
 
     } // while
 }
-#pragma warn(262)  // warning elimination 
 
 ////////////////////////////////////////////////////////
 // RETURNS: 0, success. 100, EOF. -1, error. 1, warning
 ////////////////////////////////////////////////////////
-#pragma nowarn(262)   // warning elimination 
 Int32 ex_root_tcb::fetchMultiple(CliGlobals *cliGlobals,
 			       ExExeStmtGlobals * glob, 
 			       Descriptor * output_desc,
@@ -2008,7 +1999,6 @@ Int32 ex_root_tcb::fetchMultiple(CliGlobals *cliGlobals,
   return retcode;
 }
 
-#pragma warn(262)  // warning elimination 
 
 //////////////////////////////////////////////////////
 // OLT execute. Does execute/fetch in one shot. Used
@@ -2196,9 +2186,7 @@ Int32 ex_root_tcb::oltExecute(ExExeStmtGlobals * glob,
                     da->negateCondition(da->returnIndex(-EXE_CS_EOD));
                     CollIndex index ;
                     while ((index = da->returnIndex(-EXE_CS_EOD)) != NULL_COLL_INDEX ) {
-#pragma nowarn(1506)   // warning elimination 
                       da->deleteError(index);  }
-#pragma warn(1506)  // warning elimination 
                     if (da->getNumber(DgSqlCode::ERROR_) == 0) {
                       if (setRetcode) {
                         retcode = 0;
@@ -2923,7 +2911,6 @@ void ex_root_tcb::deregisterCB()
   if (isCbFinishedMessageSent())
     return;
 
-#pragma warning (disable : 4291)
 
   // The stream's actOnSend method will delete (or call decrRefCount()) 
   // for this object.
@@ -2939,7 +2926,6 @@ void ex_root_tcb::deregisterCB()
   QueryFinished *queryFinished = 
     new (context->getIpcHeap()) QueryFinished( rtsHandle, 
                                                   context->getIpcHeap());
-#pragma warning (default : 4291)
 
   //Create the stream on the IpcHeap, since we don't dispose of it immediately.
   //We just add it to the list of completed messages in the IpcEnv, and it is disposed of later.
@@ -3050,12 +3036,10 @@ void QueryStartedMsgStream::actOnReceive(IpcConnection *connection)
   {
     CollHeap *ipcHeap = connection->getEnvironment()->getHeap();
 
-    #pragma warning (disable : 4291)
 
     QueryStartedReply *reply = new (ipcHeap) 
             QueryStartedReply(INVALID_RTS_HANDLE, ipcHeap);
 
-    #pragma warning (default : 4291)
 
     *this >> *reply;
 
@@ -3136,12 +3120,10 @@ void QueryFinishedMsgStream::actOnReceive(IpcConnection *connection)
 
     CollHeap *ipcHeap = connection->getEnvironment()->getHeap();
 
-  #pragma warning (disable : 4291)
 
     RmsGenericReply *reply = new (ipcHeap) 
               RmsGenericReply(ipcHeap);
 
-  #pragma warning (default : 4291)
 
     *this >> *reply;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ex_root.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_root.h b/core/sql/executor/ex_root.h
index 9797c9e..61e04fd 100644
--- a/core/sql/executor/ex_root.h
+++ b/core/sql/executor/ex_root.h
@@ -77,7 +77,6 @@ class ExMasterStats;
 // -----------------------------------------------------------------------
 // ex_root_tdb
 // -----------------------------------------------------------------------
-#pragma nowarn(1319)   // warning elimination 
 class ex_root_tdb : public ComTdbRoot
 {
 public:
@@ -126,15 +125,10 @@ private:
   //    the classes to the comexe project.
   // ---------------------------------------------------------------------
 };
-#pragma warn(1319)  // warning elimination 
-
-
-
 
 /////////////////////////////////////
 // Task control block
 /////////////////////////////////////
-#pragma nowarn(1319)   // warning elimination 
 class ex_root_tcb : public ex_tcb
 {
 
@@ -211,7 +205,6 @@ public:
       return (ex_root_tdb &) tdb;
     };
 
-// warning elimination (removed "inline")
   ex_queue_pair getParentQueue() const 
     { 
       ex_queue_pair temp;
@@ -367,7 +360,6 @@ private:
   // or triggered by fragDirEventHandler_
   ExWorkProcRetcode workOnFragDir();
   // static version
-// warning elimination (removed "inline")
   static ExWorkProcRetcode sWorkOnFragDir(ex_tcb *tcb)
                         { return ((ex_root_tcb *) tcb)->workOnFragDir(); }
 
@@ -390,7 +382,6 @@ private:
   void populateCancelDiags( ComDiagsArea &diags);
 
 };
-#pragma warn(1319)  // warning elimination 
 
 inline const ex_tcb* ex_root_tcb::getChild(Int32 pos) const
 {

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ex_sort.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_sort.cpp b/core/sql/executor/ex_sort.cpp
index 5280d0f..7ea6650 100644
--- a/core/sql/executor/ex_sort.cpp
+++ b/core/sql/executor/ex_sort.cpp
@@ -625,7 +625,6 @@ void ExSortTcb::createSortDiags()
 ////////////////////////////////////////////////////////////////////////
 // processSortError()
 // 
-#pragma nowarn(262)   // warning elimination 
 NABoolean ExSortTcb::processSortError(ex_queue_entry *pentry_down,
 				      queue_index parentIndex,
 				      queue_index downIndex)
@@ -653,7 +652,6 @@ NABoolean ExSortTcb::processSortError(ex_queue_entry *pentry_down,
 
   return TRUE;
 }
-#pragma warn(262)  // warning elimination 
 
 short ExSortTcb::workStatus(short workRC)
 {
@@ -1891,15 +1889,11 @@ ExSortPrivateState::~ExSortPrivateState()
 };
 void ReleaseTupp(void * td)
 {
-#pragma nowarn(1506)   // warning elimination 
   ((tupp_descriptor *)td)->setReferenceCount(((tupp_descriptor *)td)->getReferenceCount() - 1);
-#pragma warn(1506)  // warning elimination 
 }
 void CaptureTupp(void * td)
 {
-#pragma nowarn(1506)   // warning elimination 
   ((tupp_descriptor *)td)->setReferenceCount(((tupp_descriptor *)td)->getReferenceCount() + 1);
-#pragma warn(1506)  // warning elimination 
 }
 ////////////////////////////////////////////////////////////////////////////
 // ExSortFromTopTcb: input is from parent, output is to child



Mime
View raw message