about summary refs log tree commit diff
path: root/src/libstore
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-05-26T15·53+0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-05-26T15·53+0200
commit54a34119f349d531557af9e90d21d04d689ee817 (patch)
tree2c3d392d1db4c6e420f5473b3eaab16b9822fbd4 /src/libstore
parenta457d5ad4d7f6cd4f817581de1b4f70cdad9c617 (diff)
Use std::unordered_set
Diffstat (limited to 'src/libstore')
-rw-r--r--src/libstore/local-store.hh12
-rw-r--r--src/libstore/local.mk3
2 files changed, 3 insertions, 12 deletions
diff --git a/src/libstore/local-store.hh b/src/libstore/local-store.hh
index 54331e448a94..e58e6563f1cf 100644
--- a/src/libstore/local-store.hh
+++ b/src/libstore/local-store.hh
@@ -1,16 +1,12 @@
 #pragma once
 
 #include <string>
+#include <unordered_set>
 
 #include "store-api.hh"
 #include "util.hh"
 #include "pathlocks.hh"
 
-#if HAVE_TR1_UNORDERED_SET
-#include <tr1/unordered_set>
-#endif
-
-
 
 class sqlite3;
 class sqlite3_stmt;
@@ -306,11 +302,7 @@ private:
 
     void checkDerivationOutputs(const Path & drvPath, const Derivation & drv);
 
-#if HAVE_TR1_UNORDERED_SET
-    typedef std::tr1::unordered_set<ino_t> InodeHash;
-#else
-    typedef std::set<ino_t> InodeHash;
-#endif
+    typedef std::unordered_set<ino_t> InodeHash;
 
     InodeHash loadInodeHash();
     Strings readDirectoryIgnoringInodes(const Path & path, const InodeHash & inodeHash);
diff --git a/src/libstore/local.mk b/src/libstore/local.mk
index 40cb25dc5fb3..64dbfa3c5b0e 100644
--- a/src/libstore/local.mk
+++ b/src/libstore/local.mk
@@ -21,8 +21,7 @@ libstore_CXXFLAGS = \
  -DNIX_LOG_DIR=\"$(localstatedir)/log/nix\" \
  -DNIX_CONF_DIR=\"$(sysconfdir)/nix\" \
  -DNIX_LIBEXEC_DIR=\"$(libexecdir)\" \
- -DNIX_BIN_DIR=\"$(bindir)\" \
- -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\"
+ -DNIX_BIN_DIR=\"$(bindir)\"
 
 $(d)/local-store.cc: $(d)/schema.sql.hh