Merge branch 'xcode_fix' into develop

.cproject

@@ -20,7 +20,7 @@
 					<folderInfo id="cdt.managedbuild.toolchain.gnu.macosx.base.45089428.834509647" name="/" resourcePath="">
 						<toolChain id="cdt.managedbuild.toolchain.gnu.macosx.base.329208693" name="cdt.managedbuild.toolchain.gnu.macosx.base" superClass="cdt.managedbuild.toolchain.gnu.macosx.base">
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.MachO64" id="cdt.managedbuild.target.gnu.platform.macosx.base.35496915" name="Debug Platform" osList="macosx" superClass="cdt.managedbuild.target.gnu.platform.macosx.base"/>
-							<builder buildPath="${workspace_loc:/BornAgain}" cleanBuildTarget="distclean" command="make" id="cdt.managedbuild.target.gnu.builder.macosx.base.1780058782" incrementalBuildTarget="" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="cdt.managedbuild.target.gnu.builder.macosx.base"/>
+							<builder arguments="" buildPath="${workspace_loc:/BornAgain}" cleanBuildTarget="distclean" command="make" id="cdt.managedbuild.target.gnu.builder.macosx.base.1780058782" incrementalBuildTarget="" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="cdt.managedbuild.target.gnu.builder.macosx.base"/>
 							<tool id="cdt.managedbuild.tool.macosx.c.linker.macosx.base.2076947871" name="MacOS X C Linker" superClass="cdt.managedbuild.tool.macosx.c.linker.macosx.base"/>
 							<tool id="cdt.managedbuild.tool.macosx.cpp.linker.macosx.base.2050732830" name="MacOS X C++ Linker" superClass="cdt.managedbuild.tool.macosx.cpp.linker.macosx.base">
 								<option id="macosx.cpp.link.option.paths.102310300" name="Library search path (-L)" superClass="macosx.cpp.link.option.paths"/>

Core/Fitting/inc/FitSuitePrintObserver.h

@@ -20,7 +20,6 @@ public:
 
 private:
     int m_print_every_nth;
-    double m_wall_time;
     clock_t m_last_call_clock;
     timeval m_last_call_time;
 };

Core/Fitting/inc/MinimizerScan.h

@@ -25,7 +25,7 @@
 class MinimizerScan : public IMinimizer
 {
  public:
-    MinimizerScan(int nbins = 10) : m_fcnvalues_map(0), m_nbins(nbins), m_ncall(0) { }
+    MinimizerScan(int nbins = 10) : m_fcnvalues_map(0), m_nbins(nbins) { }
     virtual ~MinimizerScan() { delete m_fcnvalues_map; }
 
     virtual void minimize();
@@ -61,8 +61,6 @@ class MinimizerScan : public IMinimizer
     size_t m_nbins; //! number of bins per one parameter
     FitSuiteParameters m_parameters; //! minimizer parameters
     function_chi2_t m_fcn;
-
-    size_t m_ncall;
 };
 
 #endif // MINIMIZERSCAN_H

Core/Fitting/src/FitSuitePrintObserver.cpp

@@ -4,7 +4,6 @@
 
 FitSuitePrintObserver::FitSuitePrintObserver(int print_every_nth)
     : m_print_every_nth(print_every_nth)
-    , m_wall_time(0.0)
     , m_last_call_clock(clock())
     , m_last_call_time()
 {

Core/Fitting/src/IFitSuiteStrategy.cpp

@@ -134,6 +134,7 @@ void FitSuiteStrategyAdjustParameters::execute()
 //! Helps minimizer get out of local minima by disturbing real data
 void FitSuiteStrategyBootstrap::execute()
 {
+    (void)m_n_iterations;
     throw NotImplementedException("FitSuiteStrategyBootstrap::execute()");
 
 //    if( !m_fit_suite ) throw NullPointerException("FitSuiteStrategyBootsrap::execute() -> FitSuite doesn't exists");

Core/Samples/inc/InterferenceFunction2DLattice.h

@@ -65,7 +65,6 @@ class InterferenceFunction2DLattice : public IInterferenceFunction
 
     double m_asx, m_asy; //!< x,y coordinates of a*
     double m_bsx, m_bsy; //!< x,y coordinates of b*
-    int m_n_a, m_n_b; //!< limits for reciprocal lattice sum
     double m_prefactor; //!< fixed prefactor for normalization
     int m_na, m_nb; //!< determines the number of reciprocal lattice points to use
 };

Core/Samples/src/IMaterial.cpp

-// ************************************************************************** //
-//
-//  BornAgain: simulate and fit scattering at grazing incidence
-//
-//! @file      Samples/src/IMaterial.cpp
-//! @brief     Implements class IMaterial.
-//!
-//! @homepage  http://apps.jcns.fz-juelich.de/BornAgain
-//! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2013
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, G. Pospelov, W. Van Herck, J. Wuttke
-//
-// ************************************************************************** //
-
-#include "IMaterial.h"
-
-//! TODO: try without
-IMaterial& IMaterial::operator=(const IMaterial& other)
-{
-}
-
-

Core/Tools/src/fp_exception_glibc_extension.c

@@ -167,8 +167,8 @@ feenableexcept (unsigned int excepts)
   old_excepts = fenv.__control&  FE_ALL_EXCEPT;
 
   // unmask
-  fenv.__control& = ~new_excepts;
-  fenv.__mxcsr  & = ~(new_excepts << 7);
+  fenv.__control &= ~new_excepts;
+  fenv.__mxcsr   &= ~(new_excepts << 7);
 
   return ( fesetenv (&fenv) ? -1 : old_excepts );
 }