Fix stubs to add std::set back, and std::less

Author: MichaelRFairhurst

cpp/common/test/includes/standard-library/deque.h

@@ -2,6 +2,7 @@
 #define _GHLIBCPP_DEQUE
 #include <iterator>
 #include <string>
+#include "memory.h"
 
 namespace std {
 template <class T, class Allocator = std::allocator<T>> class deque {

cpp/common/test/includes/standard-library/functional.h

@@ -90,5 +90,21 @@ template <class R, class... Args> class function<R(Args...)> {
   template <class F> function(F &&);
   template <class F> function &operator=(F &&);
 };
+
+template <typename T>
+struct less {
+  bool operator()(const T &x, const T &y) const;
+  typedef T first_argument_type;
+  typedef T second_argument_type;
+  typedef bool result_type;
+};
+
+template <typename T>
+struct greater {
+  bool operator()(const T &x, const T &y) const;
+  typedef T first_argument_type;
+  typedef T second_argument_type;
+  typedef bool result_type;
+};
 } // namespace std
 #endif

cpp/common/test/includes/standard-library/iosfwd.h

@@ -1,5 +1,6 @@
 #ifndef _GHLIBCPP_IOSFWD
 #define _GHLIBCPP_IOSFWD
+#include "memory.h"
 namespace std {
 template <class charT> class char_traits;
 template <> class char_traits<char>;

cpp/common/test/includes/standard-library/map

@@ -1,5 +1,6 @@
 #include "iterator.h"
-#include <bits/stl_function.h>
+#include "memory.h"
+#include "functional.h"
 
 namespace std {
 

cpp/common/test/includes/standard-library/memory.h

@@ -128,6 +128,12 @@ class bad_alloc : public exception {
   bad_alloc &operator=(const bad_alloc &) noexcept;
   virtual const char *what() const noexcept;
 };
+
+template <class T> class allocator {
+public:
+  allocator() throw();
+  typedef size_t size_type;
+};
 } // namespace std
 
 #endif // _GHLIBCPP_MEMORY

cpp/common/test/includes/standard-library/set

@@ -1,5 +1,6 @@
 #include "iterator.h"
-#include <bits/stl_function.h>
+#include "memory.h"
+#include "functional.h"
 
 namespace std {
 template <typename _Key, typename _Compare = std::less<_Key>,

cpp/common/test/includes/standard-library/string

@@ -1,6 +1,7 @@
 #ifndef _GHLIBCPP_STRING
 #define _GHLIBCPP_STRING
 #include "cwchar"
+#include "memory.h"
 #include "initializer_list"
 #include "ios.h"
 #include "iosfwd.h"
@@ -88,12 +89,6 @@ template <> struct char_traits<wchar_t> {
   static int_type eof();
 };
 
-template <class T> class allocator {
-public:
-  allocator() throw();
-  typedef size_t size_type;
-};
-
 template <class charT, class traits = char_traits<charT>,
           class Allocator = allocator<charT>>
 class basic_string {

cpp/common/test/includes/standard-library/vector.h

@@ -2,6 +2,7 @@
 #define _GHLIBCPP_VECTOR
 #include <iterator>
 #include <string>
+#include "memory.h"
 
 namespace std {
 

cpp/misra/test/rules/RULE-28-3-1/NonConstPredicateFunctionObject.expected

@@ -1 +1,2 @@
-| test.cpp:21:3:21:11 | call to sort | Predicate usage of $@ has $@ | test.cpp:10:8:10:9 | F1 | callable object F1 | test.cpp:11:8:11:17 | operator() | non const operator(). |
+| test.cpp:15:8:15:10 | type mention | Predicate usage of $@ has $@ | test.cpp:10:8:10:9 | F1 | callable object F1 | test.cpp:11:8:11:17 | operator() | non const operator(). |
+| test.cpp:20:3:20:11 | call to sort | Predicate usage of $@ has $@ | test.cpp:10:8:10:9 | F1 | callable object F1 | test.cpp:11:8:11:17 | operator() | non const operator(). |

cpp/misra/test/rules/RULE-28-3-1/PredicateWithPersistentSideEffects.expected

@@ -1,3 +1,3 @@
-| test.cpp:60:35:60:49 | cmp_with_static | Predicate $@ has a $@. | test.cpp:52:6:52:20 | cmp_with_static | cmp_with_static | test.cpp:54:3:54:11 | ++ ... | persistent side effect |
-| test.cpp:73:35:73:49 | cmp_with_global | Predicate $@ has a $@. | test.cpp:66:6:66:20 | cmp_with_global | cmp_with_global | test.cpp:67:3:67:26 | ++ ... | persistent side effect |
-| test.cpp:86:3:86:11 | call to sort | Predicate $@ has a $@. | test.cpp:78:8:78:17 | operator() | operator() | test.cpp:79:5:79:28 | ++ ... | persistent side effect |
+| test.cpp:51:35:51:49 | cmp_with_static | Predicate $@ has a $@. | test.cpp:43:6:43:20 | cmp_with_static | cmp_with_static | test.cpp:45:3:45:11 | ++ ... | persistent side effect |
+| test.cpp:64:35:64:49 | cmp_with_global | Predicate $@ has a $@. | test.cpp:57:6:57:20 | cmp_with_global | cmp_with_global | test.cpp:58:3:58:26 | ++ ... | persistent side effect |
+| test.cpp:77:3:77:11 | call to sort | Predicate $@ has a $@. | test.cpp:69:8:69:17 | operator() | operator() | test.cpp:70:5:70:28 | ++ ... | persistent side effect |