diff options
| author |  Siteshwar Vashisht <siteshwar@gmail.com> | 2012-01-16 22:27:55 +0530 |
|---|---|---|
| committer | Siteshwar Vashisht <siteshwar@gmail.com> | 2012-01-16 22:27:55 +0530 |
| commit | 6f330f961b0186aa4d5f2f3f45b19b84ec7b3516 (patch) | |
| tree | 82c440bcac0156d620c63b4d358c7d5542e0546e /wildcard.cpp | |
| parent | 140ead65b6a7051a8737623b7201f5b5a07d55d9 (diff) | |
| parent | 55091d9deb19a1018a1740f0fff3ae1751248f65 (diff) | |
Merge branch 'CPlusPlus' of gitorious.org:~ridiculousfish/fish-shell/fishfish into CPlusPlus
Diffstat (limited to 'wildcard.cpp')
| -rw-r--r-- | wildcard.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wildcard.cpp b/wildcard.cpp index a53e4798..a23294a2 100644 --- a/wildcard.cpp +++ b/wildcard.cpp @@ -1092,10 +1092,10 @@ static int wildcard_expand_internal( const wchar_t *wc, */ if( whole_match ) { - wchar_t *new_wc = L""; + const wchar_t *new_wc = L""; if( wc_end ) { - new_wc=const_cast<wchar_t*>(wc_end+1); + new_wc=wc_end+1; /* Accept multiple '/' as a single direcotry separator */ |