From 7bc9ef0150a189c33b377b095673ba888eb0cceb Mon Sep 17 00:00:00 2001
From: Jon Trulson <jtrulson@ics.com>
Date: Fri, 11 Nov 2016 10:43:00 -0700
Subject: [PATCH] cmake: disable some other warnings seen with edison gcc 4.9.1

Also, fix possible uninitialized access in ds1808lc C++ example.

Signed-off-by: Jon Trulson <jtrulson@ics.com>
---
 CMakeLists.txt            |  2 +-
 examples/c++/ds1808lc.cxx | 14 +++++++-------
 src/CMakeLists.txt        |  4 +++-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 24a89ef4..e0a4cdb1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -92,7 +92,7 @@ endfunction ()
 # Compiler flags common to both C and CXX
 # Enable -Wall
 # GCC-6 added -Wmisleading-indentation to -Wall, skip these for now
-set (C_CXX_WARNING_FLAGS -Wall -Wno-misleading-indentation)
+set (C_CXX_WARNING_FLAGS -Wall -Wno-misleading-indentation -Wno-strict-aliasing)
 
 # Warnings as errors?
 if (WERROR)
diff --git a/examples/c++/ds1808lc.cxx b/examples/c++/ds1808lc.cxx
index 7326cea1..cd403c47 100644
--- a/examples/c++/ds1808lc.cxx
+++ b/examples/c++/ds1808lc.cxx
@@ -20,13 +20,13 @@ void printState(upm::ILightController *lightController)
    }
 }
 
-int main( int argc, char **argv )
-{
-   int status = 0;
-   upm::ILightController* lightController;
-
-   try {
-      lightController = new upm::DS1808LC(DS1808_GPIO_PWR, EDISON_I2C_BUS);
+int main( int argc, char **argv )
+{
+   int status = 0;
+   upm::ILightController* lightController = nullptr;
+
+   try {
+      lightController = new upm::DS1808LC(DS1808_GPIO_PWR, EDISON_I2C_BUS);
       std::cout <<  "Existing state: "; printState(lightController);
       if (argc == 2)
       {
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a3c343e6..560584ae 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,7 +1,9 @@
 # Selectively disable certain CXX warnings for SWIG wrappers
 # SWIG wrappers emit -Wdelete-non-virtual-dtor and -Wunused-function warnings
 set (SWIG_CXX_DISABLE_WARNINGS -Wno-delete-non-virtual-dtor
-                               -Wno-unused-function)
+                               -Wno-unused-function
+                               -Wno-maybe-uninitialized
+                               -Wno-strict-aliasing)
 
 macro (file_to_list readfile outlist)
   FILE(READ "${readfile}" contents)