buggy-auto-complete is not so buggy now. Merged branch 'buggy-auto-complete' into CPlusPlus

1 files changed, 3 insertions, 1 deletions

diff --git a/expand.h b/expand.h
index c9c3f138..0d235ea5 100644
--- a/expand.h
+++ b/expand.h
@@ -65,6 +65,8 @@
  */
 #define EXPAND_RESERVED_END 0xf000f
 
+struct completion_t;
+
 enum
 {
 	/** Character represeting a home directory */
@@ -147,7 +149,7 @@ class parser_t;
    \return One of EXPAND_OK, EXPAND_ERROR, EXPAND_WILDCARD_MATCH and EXPAND_WILDCARD_NO_MATCH. EXPAND_WILDCARD_NO_MATCH and EXPAND_WILDCARD_MATCH are normal exit conditions used only on strings containing wildcards to tell if the wildcard produced any matches.
 */
 __warn_unused int expand_string( void *context, wchar_t *in, array_list_t *out, int flag );
-__warn_unused int expand_string2( const wcstring &input, std::list<wcstring> &output, int flag );
+__warn_unused int expand_string2( const wcstring &input, std::vector<completion_t> &output, int flag );
 
 
 /**