Merge branch 'master' of ssh://localhost:8479/gitroot/eodev/eodev

Conflicts: edo/src/edoSamplerNormalMulti.h
2011-12-23 16:06:52 +01:00 · 2011-12-23 16:06:52 +01:00 · fdf3549b1c
commit fdf3549b1c
parent c4d2f8eaf9 164a81a10c
3 changed files with 7 additions and 4 deletions
--- a/edo/src/edoSamplerNormalMulti.h
+++ b/edo/src/edoSamplerNormalMulti.h
@ -29,6 +29,7 @@ Authors:
 #define _edoSamplerNormalMulti_h

 #include <cmath>
+#include <limits>

 #include <edoSampler.h>
 #include <boost/numeric/ublas/lu.hpp>
@ -47,8 +48,6 @@ class edoSamplerNormalMulti : public edoSampler< EOD >
 public:
    typedef typename EOT::AtomType AtomType;

-
-
    edoSamplerNormalMulti( edoRepairer<EOT> & repairer, typename Cholesky::Method use = Cholesky::absolute ) 
        : edoSampler< EOD >( repairer), _cholesky(use)
    {}