Re #6550. Really fix on windows so that I can push stuff.

BTW - this test takes WAY too long to run.
mantidproject · Feb 11, 2013 · 742042b · 742042b
1 parent e8f7629
commit 742042b
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/Code/Mantid/Framework/Crystal/test/PeakhklErrorsTest.h b/Code/Mantid/Framework/Crystal/test/PeakhklErrorsTest.h
@@ -100,11 +100,11 @@ class Jacob: public API::Jacobian
         const int NPeaks(peaks->getNumberPeaks());
         std::vector<double>out(NPeaks);
         std::vector<double>out1(NPeaks);
-        double xValues[NPeaks];
+        std::vector<double> xValues(NPeaks);
         for( int i=0; i<peaks->getNumberPeaks();i++)
           xValues[i]=i;
 
-        peakErrs.function1D( out.data(),xValues,(size_t) peaks->getNumberPeaks());
+        peakErrs.function1D( out.data(),xValues.data(),(size_t) peaks->getNumberPeaks());
 
         //std::cout<<out[0]<<","<<out[1]<<","<<out[2]<<","<<out[3]<<","<<out[4]<<std::endl;
         TS_ASSERT_DELTA( -0.021081,   out[0], .01 );
@@ -114,18 +114,18 @@ class Jacob: public API::Jacobian
         TS_ASSERT_DELTA( -0.0277816, out[4], .01 );
 
         boost::shared_ptr<Jacob>Jac(new Jacob ((int)peakErrs.nParams(), (int)peaks->getNumberPeaks()));
-        peakErrs.functionDeriv1D(Jac.get(),xValues,(size_t)peaks->getNumberPeaks());
+        peakErrs.functionDeriv1D(Jac.get(),xValues.data(),(size_t)peaks->getNumberPeaks());
 
         double offset =.0001;
         for( size_t param=1; param < peakErrs.nParams(); param+=2)
         {
          //std::cout<<"Result for param="<<param<<std::endl;
           double paramValSav= peakErrs.getParameter(param);
           peakErrs.setParameter(param, paramValSav+offset);
-          peakErrs.function1D( out.data(),xValues,(size_t) peaks->getNumberPeaks());
+          peakErrs.function1D( out.data(),xValues.data(),(size_t) peaks->getNumberPeaks());
 
           peakErrs.setParameter(param, paramValSav-offset);
-          peakErrs.function1D( out1.data(),xValues,(size_t) peaks->getNumberPeaks());
+          peakErrs.function1D( out1.data(),xValues.data(),(size_t) peaks->getNumberPeaks());
 
           peakErrs.setParameter(param, paramValSav);
           for( int p = 0; p <= peaks->getNumberPeaks(); p += 40 )