Small tweaks

.gitignore

@@ -3,7 +3,7 @@ Debug
 x64
 build
 libcxx
-CACHE
+CACHE*
 waf-*
 .lock-waf*
 .waf*

src/command_line.cc

@@ -1234,7 +1234,7 @@ void QueryDbMainLoop(
 
 
       std::cerr << "- Considering " << db->qualified_names.size()
-        << " candidates " << std::endl;
+        << " candidates for query " << msg->params.query << std::endl;
 
       std::string query = msg->params.query;
       for (int i = 0; i < db->qualified_names.size(); ++i) {

src/indexer.h

@@ -14,11 +14,12 @@
 #include <rapidjson/document.h>
 
 #include <algorithm>
-#include <iostream>
 #include <cstdint>
 #include <cassert>
 #include <fstream>
+#include <iostream>
 #include <unordered_map>
+#include <vector>
 
 struct IndexedTypeDef;
 struct IndexedFuncDef;
@@ -84,7 +85,7 @@ struct Ref {
   }
   bool operator!=(const Ref<T>& other) { return !(*this == other); }
   bool operator<(const Ref<T>& other) const {
-    return id < other.id && loc < other.loc;
+    return id_ < other.id && loc < other.loc;
   }
 };
 

src/project.cc

@@ -172,10 +172,14 @@ std::vector<CompilationEntry> LoadCompilationEntriesFromDirectory(const std::str
       }
 
       entry.args.push_back(arg);
-
       //if (StartsWith(arg, "-I") || StartsWith(arg, "-D") || StartsWith(arg, "-std"))
     }
 
+    // TODO/fixme
+    entry.args.push_back("-xc++");
+    entry.args.push_back("-std=c++11");
+
+
 
     result.push_back(entry);
   }

src/threaded_queue.h

@@ -44,7 +44,7 @@ public:
 
     auto val = std::move(queue_.front());
     queue_.pop();
-    return val;
+    return std::move(val);
   }
 
  private:

src/utils.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <algorithm>
 #include <functional>
 #include <memory>
 #include <queue>

wscript

@@ -85,7 +85,10 @@ def build(bld):
   print('CLANG_LIB_DIR:     {0}'.format(CLANG_LIB_DIR))
 
   cc_files = bld.path.ant_glob(['**/*.cpp', '**/*.cc'],
-                               excl=['libcxx/*', '*tests/*', 'third_party/*'])
+                               excl=['foo/*',
+                                     'libcxx/*',
+                                     '*tests/*',
+                                     'third_party/*'])
 
   lib = ['clang']
   if sys.platform == 'linux' or sys.platform == 'linux2':
@@ -96,7 +99,7 @@ def build(bld):
 
   bld.program(
       source=cc_files,
-      cxxflags=['-O3', '-std=c++11', '-Wall'],
+      cxxflags=['-g', '-O3', '-std=c++11', '-Wall'],
       includes=[
         'third_party/',
         'third_party/doctest/',