[opengm] 317/386: fix problems with VS 2010

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/master
in repository opengm.

commit c318a21a3ad30ffe360f2d758450dd730d318a63
Author: Joerg Kappes <joerg.kappes at gmail.com>
Date:   Mon Jan 18 11:31:48 2016 +0100

    fix problems with VS 2010
---
 include/opengm/inference/auxiliary/minstcutboost.hxx    | 2 +-
 include/opengm/inference/trws/smoothing_strategy.hxx    | 1 +
 include/opengm/inference/trws/trws_subproblemsolver.hxx | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/opengm/inference/auxiliary/minstcutboost.hxx b/include/opengm/inference/auxiliary/minstcutboost.hxx
index b5171eb..aec0256 100644
--- a/include/opengm/inference/auxiliary/minstcutboost.hxx
+++ b/include/opengm/inference/auxiliary/minstcutboost.hxx
@@ -143,7 +143,7 @@ namespace opengm {
          q.push(*(vertices(graph_).first)); // source
          while (!q.empty()) {
             out_edge_iterator current, end;
-            tie(current, end) = out_edges(q.front(), graph_);
+            std::tr1::tie(current, end) = out_edges(q.front(), graph_);
             q.pop();
             while (current != end) {
                if (graph_[*current].residual > 0) {
diff --git a/include/opengm/inference/trws/smoothing_strategy.hxx b/include/opengm/inference/trws/smoothing_strategy.hxx
index af4df26..4ce5e8d 100644
--- a/include/opengm/inference/trws/smoothing_strategy.hxx
+++ b/include/opengm/inference/trws/smoothing_strategy.hxx
@@ -637,6 +637,7 @@ public:
 		  out.assign(graphicalModel(), &varID, &varID+1, ACC::template neutral<ValueType>());
 		  for (LabelType i=0;i<out.size();++i)
 			  out(i)=_marginalsTemp[i];
+          return NORMAL;
 	  }
 protected:
 	  template<class VISITOR>
diff --git a/include/opengm/inference/trws/trws_subproblemsolver.hxx b/include/opengm/inference/trws/trws_subproblemsolver.hxx
index 5cb58bd..4e35ccb 100755
--- a/include/opengm/inference/trws/trws_subproblemsolver.hxx
+++ b/include/opengm/inference/trws/trws_subproblemsolver.hxx
@@ -1156,7 +1156,7 @@ SumProdSolver<GM,ACC,InputIterator>::_GetAveragedUnaryFactors(ValueType& derivat
 		///std::cout << "uf:"<<i <<", acc=" << acc <<", _unaryBuffer="<< _unaryBuffer;//BSD
 
 		//derivativeBound+=log(acc);
-		derivativeBound+=log(_unaryBuffer.size()-std::count(_unaryBuffer.begin(),_unaryBuffer.end(),(ValueType)0.0));
+		derivativeBound+= std::log((ValueType)(_unaryBuffer.size()-std::count(_unaryBuffer.begin(),_unaryBuffer.end(),(ValueType)0.0)));
 
 		acc=1.0/acc;
 		unaryAverage+=acc*std::inner_product(_unaryBuffer.begin(),_unaryBuffer.end(),parent::_storage.unaryFactors(i).begin(),(ValueType)0.0);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opengm.git