clang warnings

xm1233 · Feb 22, 2016 · b56a0a1 · b56a0a1
1 parent 2c0be5b
commit b56a0a1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/lm/interpolate/normalize.cc b/lm/interpolate/normalize.cc
@@ -165,8 +165,6 @@ class BackoffManager {
     // Indexed by order then just all the matching models.
     util::FixedArray<util::FixedArray<BackoffQueueEntry*> > entered_;
 
-    std::size_t order_;
-
     BackoffMatrix matrix_;
 
     std::vector<util::stream::Stream*> skip_write_;

diff --git a/lm/interpolate/tune_weights.hh b/lm/interpolate/tune_weights.hh
@@ -6,7 +6,7 @@
 #include <vector>
 
 namespace lm { namespace interpolate {
-class InstancesConfig;
+struct InstancesConfig;
 
 // Run a tuning loop, producing weights as output.
 void TuneWeights(int tune_file, const std::vector<StringPiece> &model_names, const InstancesConfig &config, std::vector<float> &weights);

diff --git a/lm/trie_sort.cc b/lm/trie_sort.cc
@@ -52,9 +52,7 @@ class PartialViewProxy {
     const void *Data() const { return inner_.Data(); }
     void *Data() { return inner_.Data(); }
 
-    friend void swap(PartialViewProxy first, PartialViewProxy second) {
-      std::swap_ranges(reinterpret_cast<char*>(first.Data()), reinterpret_cast<char*>(first.Data()) + first.attention_size_, reinterpret_cast<char*>(second.Data()));
-    }
+    friend void swap(PartialViewProxy first, PartialViewProxy second);
 
   private:
     friend class util::ProxyIterator<PartialViewProxy>;
@@ -71,6 +69,17 @@ class PartialViewProxy {
     util::FreePool *pool_;
 };
 
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-function"
+#endif
+void swap(PartialViewProxy first, PartialViewProxy second) {
+  std::swap_ranges(reinterpret_cast<char*>(first.Data()), reinterpret_cast<char*>(first.Data()) + first.attention_size_, reinterpret_cast<char*>(second.Data()));
+}
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
 typedef util::ProxyIterator<PartialViewProxy> PartialIter;
 
 FILE *DiskFlush(const void *mem_begin, const void *mem_end, const std::string &temp_prefix) {