From 0eae9d1504ea7c4864e98f28ff5b48f2f5d4e1c0 Mon Sep 17 00:00:00 2001 From: Nicolay Korslund Date: Fri, 10 Sep 2010 19:34:38 +0200 Subject: [PATCH] Removed -Werror again --- CMakeLists.txt | 3 ++- components/nif/data.hpp | 2 +- components/nif/nif_file.cpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5df6ad5c6..742b56287 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -251,7 +251,8 @@ endif (APPLE) # Compiler settings if (CMAKE_COMPILER_IS_GNUCC) - add_definitions (-Wall -Werror) + #add_definitions (-Wall -Werror) + add_definitions (-Wall) endif (CMAKE_COMPILER_IS_GNUCC) # Apple bundling diff --git a/components/nif/data.hpp b/components/nif/data.hpp index 18e78b7ab..6fc2c4b82 100644 --- a/components/nif/data.hpp +++ b/components/nif/data.hpp @@ -486,7 +486,7 @@ public: { int type = nif->getInt(); - int size; + int size = 0; if(type == 1) size = 2; // time+scale else if(type == 2) size = 4; // 1 + forward + backward (floats) else if(type == 3) size = 5; // 1 + tbc diff --git a/components/nif/nif_file.cpp b/components/nif/nif_file.cpp index 12845e617..fb1b988a7 100644 --- a/components/nif/nif_file.cpp +++ b/components/nif/nif_file.cpp @@ -72,7 +72,7 @@ void NIFFile::parse() SString rec = getString(); //cout << i << ": " << rec.toString() << endl; - Record *r; + Record *r = NULL; /* These are all the record types we know how to read.