IOT-1874 Enable /W4 /WX for resource/csdk/security

Change-Id: Ib4b1fbd905a1c8510128f422b6b39d3ef4e42f45
Signed-off-by: Alex Kelley <alexke@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17591
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Reviewed-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>

diff --git a/resource/csdk/security/SConscript b/resource/csdk/security/SConscript
index 398b0a4..70cc82e 100644 (file)
--- a/resource/csdk/security/SConscript
+++ b/resource/csdk/security/SConscript
@@ -64,10 +64,7 @@ if target_os in ['windows', 'msys_nt']:
     #    - Disabled due to the widespread usage in internal IoTivity components as well as external libs.
     #  - warning C4232: nonstandard extension used: 'read': address of dllimport 'fread' is not static, identity not guaranteed
     #    - fread, frwrite, etc are provided by the platform and cannot be changed.
-       # libocsrm_env.AppendUnique(CCFLAGS=['/wd4201', '/wd4232', '/W4', '/WX'])
-    # Leave /W3 /WX enabled until IOT-1835 and IOT-1836 are merged. This is to prevent build breaks and possible /W3 issues from
-    # being merged while the different pieces of the update to /W4 are under review and being merged.
-       libocsrm_env.AppendUnique(CCFLAGS=['/W3', '/WX'])
+       libocsrm_env.AppendUnique(CCFLAGS=['/wd4201', '/wd4232', '/W4', '/WX'])
 
 if target_os in ['linux', 'android', 'tizen', 'msys_nt', 'windows'] and libocsrm_env.get('SECURED') == '1':
        SConscript('provisioning/SConscript', 'libocsrm_env')