Merge branch 'master' of github.com:adamlsd/cshenv
Conflicts: vim/after/syntax/cpp.vim
This commit is contained in:
@ -59,7 +59,7 @@ syn keyword cxxStlKeywords contained containedin=cxxAttribute noreturn carries_d
|
||||
syn keyword cxxStlKeywords contained containedin=cxxStlLibrary,cxxBoostLibrary mutex condition_variable condition_variable_any thread lock_guard scoped_lock unique_lock
|
||||
|
||||
" Strings
|
||||
syn keyword cxxStlKeywords containedin=cxxStlLibrary string contained
|
||||
syn keyword cxxStlKeywords containedin=cxxStlLibrary wstring string contained
|
||||
syn keyword cxxStlKeywords contained containedin=cxxStlLibrary byte
|
||||
syn keyword cxxStlKeywords contained containedin=cxxStlLibrary,cxxBoostLibrary string_view
|
||||
|
||||
@ -68,7 +68,8 @@ syn keyword cxxStlKeywords containedin=cxxStlLibrary,cxxBoostLibrary function co
|
||||
syn keyword cxxStlTypes containedin=cxxStlLibrary exception_ptr contained
|
||||
syn keyword cxxStlTypes containedin=cxxStlLibrary iostream istream ostream fstream ifstream ofstream contained
|
||||
syn keyword cxxStlTypes containedin=cxxStlLibrary stringstream istringstream ostringstream contained
|
||||
syn keyword cxxStlTypes containedin=cxxStlLibrary iostream basic_string vector deque list pair queue priority_queue stack contained
|
||||
syn keyword cxxStlTypes containedin=cxxStlLibrary iostream basic_string vector deque pair queue priority_queue stack contained
|
||||
syn keyword cxxStlTypes containedin=cxxStlLibrary list forward_list
|
||||
syn keyword cxxStlTypes containedin=cxxStlLibrary map multimap set multiset contained
|
||||
syn keyword cxxStlTypes containedin=cxxStlLibrary istream_iterator ostream_iterator contained
|
||||
syn keyword cxxStlTypes containedin=cxxStlLibrary iterator contained
|
||||
|
||||
Reference in New Issue
Block a user