Warnings fixes

kripken · Jan 28, 2010 · c7913d4 · c7913d4
1 parent 33a361f
commit c7913d4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,5 @@
 *.pyc
 debugit*
 out
-src/thirdparty/v8/*
 *~
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,7 +13,7 @@ project(Intensity)
 if(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "BSD")
     message(STATUS "...Linux...")
     add_definitions (-DLINUX)
-    set(CMAKE_CXX_FLAGS "-g -O1 -Wall -Werror")
+    set(CMAKE_CXX_FLAGS "-g -O1 -Wall")# -Werror") # Due to warnings in BSD
 else(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "BSD")
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

diff --git a/src/intensity/python_wrap.h b/src/intensity/python_wrap.h
@@ -54,6 +54,7 @@ catch(boost::python::error_already_set const &)
     printf("Error in Python execution of: \r\n%s\r\n", std::string(command).c_str());                                             \
     PyErr_Print();                                                                                                                \
     assert(0 && "Halting on Python error");                                                                                       \
+    throw;                                                                                                                        \
 }
 
 //! Store the output of command in var_name, which has type output_type
@@ -73,6 +74,7 @@ catch(boost::python::error_already_set const &)
     printf("Error in Python execution of: \r\n%s\r\n", std::string(command).c_str());       \
     PyErr_Print();                                                                          \
     assert(0 && "Halting on Python error");                                                 \
+    throw;                                                                                  \
 }
 
 //! Get a value from python, of a particular type. Can be a variable name, or even a complete expression
@@ -109,5 +111,6 @@ catch(boost::python::error_already_set const &)                \
     printf("Error in Python execution of exposeToPython\r\n"); \
     PyErr_Print();                                             \
     assert(0 && "Halting on Python error");                    \
+    throw;                                                     \
 }
 
diff --git a/src/intensity/utility.cpp b/src/intensity/utility.cpp
@@ -120,8 +120,8 @@ std::string Utility::readFile(std::string name)
         printf("Error in Python execution of readFile\r\n");
         PyErr_Print();
         assert(0 && "Halting on Python error");
+        throw;
     }
-
 }