making gcc happy

putraxor · Apr 13, 2016 · b382694 · b382694
1 parent a8cf487
commit b382694
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/Source/Readers/Kaldi2Reader/HTKMLFReader.cpp b/Source/Readers/Kaldi2Reader/HTKMLFReader.cpp
@@ -2055,4 +2055,5 @@ void HTKMLFReader<ElemType>::GetDataNamesFromConfig(const ConfigRecordType& read
 
 template class HTKMLFReader<float>;
 template class HTKMLFReader<double>;
-} } }
+
+}}}
diff --git a/Source/Readers/Kaldi2Reader/HTKMLFReader.h b/Source/Readers/Kaldi2Reader/HTKMLFReader.h
@@ -38,10 +38,10 @@ class HTKMLFReader : public IDataReader
         MBLayoutPtr pMBLayout;
         std::vector<std::vector<std::pair<wstring, size_t>>> minibatchUttInfo;
         size_t currentMBSize;
-        MinibatchBufferUnit()
-            : pMBLayout(make_shared<MBLayout>()), currentMBSize(0)
+        MinibatchBufferUnit() :
+            pMBLayout(make_shared<MBLayout>()), currentMBSize(0)
         {
-            m_pMBLayout->SetUniqueAxisName(L"HTKMLFReader");
+            pMBLayout->SetUniqueAxisName(L"HTKMLFReader");
         }
     };
     bool m_doMinibatchBuffering;
@@ -164,8 +164,8 @@ class HTKMLFReader : public IDataReader
     // set to true so that a current minibatch can uses state activities from the previous minibatch.
     // default will have truncated BPTT, which only does BPTT inside a minibatch
     bool mIgnoreSentenceBeginTag;
-    HTKMLFReader()
-        : m_pMBLayout(make_shared<MBLayout>())
+    HTKMLFReader() :
+        m_pMBLayout(make_shared<MBLayout>())
     {
         m_pMBLayout->SetUniqueAxisName(L"HTKMLFReader");
     }

diff --git a/Source/SGDLib/SGD.cpp b/Source/SGDLib/SGD.cpp
@@ -9,6 +9,8 @@
 #include "DataReaderHelpers.h"
 #include "MatrixQuantizerImpl.h"
 #ifdef QUANTIZED_GRADIENT_AGGREGATION
+static inline bool operator==(const std::pair<double,size_t>& a, size_t b) { assert(b==0); return a.first == b; }
+// ^^ workaround until this line in AggregateGradientsImpl() gets updated: assert(headerCPU->evalErrors[i] == 0);
 #include "AllReduceDistGradAggregator.h"
 #endif
 #include "SimpleDistGradAggregator.h"
-Original file line number
+Diff line change
@@ Expand Up @@
     template class HTKMLFReader<float>;
     template class HTKMLFReader<double>;
-    } } }
+    }}}