From e3d879e43d232a2351c0aaa56c09e513a9a6f99b Mon Sep 17 00:00:00 2001
From: orbitcowboy <ettl.martin78@gmail.com>
Date: Mon, 6 Mar 2017 16:40:49 +0100
Subject: [PATCH] std.cfg: Improved support for some std::wstring functions.

---
 cfg/std.cfg      | 8 ++++----
 test/cfg/std.cpp | 6 ++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/cfg/std.cfg b/cfg/std.cfg
index ce27cef23..de7db0892 100644
--- a/cfg/std.cfg
+++ b/cfg/std.cfg
@@ -4038,10 +4038,10 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <not-uninit/>
     </arg>
   </function>
-  <function name="std::deque::clear,std::list::clear,std::map::clear,std::queue::clear,std::set::clear,std::stack::clear,std::string::clear,std::vector::clear">
+  <function name="std::deque::clear,std::list::clear,std::map::clear,std::queue::clear,std::set::clear,std::stack::clear,std::string::clear,std::wstring::clear,std::vector::clear">
     <noreturn>false</noreturn>
   </function>
-  <function name="std::deque::empty,std::list::empty,std::map::empty,std::queue::empty,std::set::empty,std::stack::empty,std::string::empty,std::vector::empty">
+  <function name="std::deque::empty,std::list::empty,std::map::empty,std::queue::empty,std::set::empty,std::stack::empty,std::string::empty,std::wstring::empty,std::vector::empty">
     <noreturn>false</noreturn>
     <returnValue type="bool"/>
     <use-retval/>
@@ -4052,7 +4052,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <not-uninit/>
     </arg>
   </function>
-  <function name="std::deque::size,std::list::size,std::map::size,std::queue::size,std::set::size,std::stack::size,std::string::size,std::vector::size">
+  <function name="std::deque::size,std::list::size,std::map::size,std::queue::size,std::set::size,std::stack::size,std::string::size,std::wstring::size,std::vector::size">
     <noreturn>false</noreturn>
     <returnValue type="std::size_t"/>
     <use-retval/>
@@ -4106,7 +4106,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   <!-- size_t find (const char* s, size_t pos, size_t n) const; -->
   <!-- size_t find (char c, size_t pos = 0) const;-->
   <!-- size_t find (const char* s, size_t pos = 0) const; -->
-  <function name="std::string::find">
+  <function name="std::string::find,std::wstring::find">
     <noreturn>false</noreturn>
     <leak-ignore/>
     <arg nr="1">
diff --git a/test/cfg/std.cpp b/test/cfg/std.cpp
index d4a99c6d3..21e6dd310 100644
--- a/test/cfg/std.cpp
+++ b/test/cfg/std.cpp
@@ -3245,13 +3245,15 @@ void getline()
     in.close();
 }
 
-void stdstring() {
+void stdstring()
+{
     std::string s;
     // cppcheck-suppress ignoredReturnValue
     s.size();
 }
 
-void stdvector() {
+void stdvector()
+{
     std::vector<int> v;
     // cppcheck-suppress ignoredReturnValue
     v.size();