Skip to content

Commit

Permalink
Refs #3868. Kill the 3 new warnings on Linux platforms.
Browse files Browse the repository at this point in the history
  • Loading branch information
martyngigg committed Nov 29, 2011
1 parent 5d006b7 commit ff96a62
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions Code/Mantid/Framework/PythonAPI/src/boostpython.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#pragma GCC diagnostic ignored "-Wtype-limits"
#pragma GCC diagnostic ignored "-Wunused-value"
#pragma GCC diagnostic ignored "-Wstrict-aliasing"
#pragma GCC diagnostic ignored "-Wuninitialized"
#endif

#include "boostpython/converter/arg_to_python_base.cpp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ namespace
static PyTypeObject const* get_pytype() { return &PyFloat_Type;}
};

unaryfunc py_unicode_as_string_unaryfunc = PyUnicode_AsUTF8String;
//unaryfunc py_unicode_as_string_unaryfunc = PyUnicode_AsUTF8String;

// A SlotPolicy for extracting C++ strings from Python objects.
struct string_rvalue_from_python
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ void Muon_ExpDecayOscTest::functionLocal(double* out, const double* xValues, con
const double& gphi = getParameter("phi");


for (int i = 0; i < nData; i++)
for (size_t i = 0; i < nData; i++)
{
out[i] = gA0*exp(-gs*xValues[i])*cos(2*3.1415926536*gf*xValues[i]+gphi);
}
Expand Down

0 comments on commit ff96a62

Please sign in to comment.