Commit2d1f3bc

committed

Fix some 32-bit shift warnings in MSVC

7b37823 widened AclMode to 64 bits which resulted in 3 new additionalwarnings on MSVC. Here we make use of UINT64CONST to reassure thecompiler that we do intend the bit shift expression to yield a 64-bitresult.Discussion:https://postgr.es/m/CAApHDvo=pn01Y_3zASZZqn+cotF1c4QFCwWgk6MiF0VscaE5ug@mail.gmail.com

1 parentec5affd commit2d1f3bcCopy full SHA for 2d1f3bc

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -626,9 +626,9 @@ aclitemout(PG_FUNCTION_ARGS)`
`626`	`626`
`627`	`627`	`for (i=0;i<N_ACL_RIGHTS;++i)`
`628`	`628`	`{`
`629`		`-if (ACLITEM_GET_PRIVS(*aip)& (1 <<i))`
	`629`	`+if (ACLITEM_GET_PRIVS(*aip)& (UINT64CONST(1) <<i))`
`630`	`630`	`*p++=ACL_ALL_RIGHTS_STR[i];`
`631`		`-if (ACLITEM_GET_GOPTIONS(*aip)& (1 <<i))`
	`631`	`+if (ACLITEM_GET_GOPTIONS(*aip)& (UINT64CONST(1) <<i))`
`632`	`632`	`p++='';`
`633`	`633`	`}`
`634`	`634`
`@@ -1786,7 +1786,7 @@ aclexplode(PG_FUNCTION_ARGS)`
`1786`	`1786`	`break;`
`1787`	`1787`	`}`
`1788`	`1788`	`aidata=&aidat[idx[0]];`
`1789`		`-priv_bit=1 <<idx[1];`
	`1789`	`+priv_bit=UINT64CONST(1) <<idx[1];`
`1790`	`1790`
`1791`	`1791`	`if (ACLITEM_GET_PRIVS(*aidata)&priv_bit)`
`1792`	`1792`	`{`

Comments

(0)