Various changes to reduce fish's compiled code size

OS X release build executable size dropped from 672k to 511k

1 files changed, 2 insertions, 3 deletions

diff --git a/history.h b/history.h
index 856c008c..fe700f42 100644
--- a/history.h
+++ b/history.h
@@ -9,7 +9,6 @@
 #include "common.h"
 #include "pthread.h"
 #include <vector>
-#include <deque>
 #include <utility>
 #include <list>
 #include <tr1/memory>
@@ -123,7 +122,7 @@ private:
     void populate_from_mmap(void);
     
     /** List of old items, as offsets into out mmap data */
-    std::deque<size_t> old_item_offsets;
+    std::vector<size_t> old_item_offsets;
     
     /** Whether we've loaded old items */
     bool loaded_old;
@@ -186,7 +185,7 @@ class history_search_t {
     
     /** Our list of previous matches as index, value. The end is the current match. */
     typedef std::pair<size_t, history_item_t> prev_match_t;
-    std::deque<prev_match_t> prev_matches;
+    std::vector<prev_match_t> prev_matches;
 
     /** Returns yes if a given term is in prev_matches. */
     bool match_already_made(const wcstring &match) const;