We are no longer going to support proton version 0.5 which contained
compiler warnings within the header (see
https://issues.apache.org/jira/browse/PROTON-420) so we can re-enable
-Werror in the compiler to treate all warnings as errors.

Signed-off-by: Frank Quinn <fquinn.ni@...>
---
 mama/c_cpp/src/c/bridge/qpid/SConscript     | 5 +----
 mama/c_cpp/src/c/payload/qpidmsg/SConscript | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/mama/c_cpp/src/c/bridge/qpid/SConscript b/mama/c_cpp/src/c/bridge/qpid/SConscript
index 006b3f4..566867c 100644
--- a/mama/c_cpp/src/c/bridge/qpid/SConscript
+++ b/mama/c_cpp/src/c/bridge/qpid/SConscript
@@ -24,10 +24,7 @@ else:
     env.Append(LIBS=['qpid-proton', 'mama', 'm', 'wombatcommon', 'uuid', 'event'],
                LIBPATH=libPath, CPPPATH=incPath)
 
-''' Generally we would like to make use of -Werror, but unfortunately it causes
-    proton to choke during the build phase. Leaving the option here should we
-    find the proton issues resolved.'''
-#env.Append(CFLAGS=['-Werror'])
+env.Append(CFLAGS=['-Werror'])
 
 
 conf = Configure(env, config_h='./config.h', log_file='./config.log')
diff --git a/mama/c_cpp/src/c/payload/qpidmsg/SConscript b/mama/c_cpp/src/c/payload/qpidmsg/SConscript
index 77275a3..76e06e5 100644
--- a/mama/c_cpp/src/c/payload/qpidmsg/SConscript
+++ b/mama/c_cpp/src/c/payload/qpidmsg/SConscript
@@ -20,10 +20,7 @@ env['CCFLAGS'] = [x for x in env['CCFLAGS'] if x != '-pedantic-errors']
 
 env.Append(LIBS=['mama', 'qpid-proton', 'm'], LIBPATH=libPath,
            CPPPATH=[includePath])
-''' Generally we would like to make use of -Werror, but unfortunately it causes
-    proton to choke during the build phase. Leaving the option here should we
-    find the proton issues resolved.'''
-#env.Append(CFLAGS=['-Werror'])
+env.Append(CFLAGS=['-Werror'])
 
 sources = Glob('*.c')
 
--
1.9.3