Merge 1735635 into 96f193e

eranpeer · Nov 18, 2022 · 5036bb4 · 5036bb4
2 parents 96f193e + 1735635
commit 5036bb4
Show file tree

Hide file tree

Showing 24 changed files with 73 additions and 73 deletions.
diff --git a/config/standalone/StandaloneFakeit.hpp b/config/standalone/StandaloneFakeit.hpp
@@ -6,7 +6,7 @@
 namespace fakeit {
 
     struct VerificationException : public std::exception {
-        virtual ~VerificationException() NO_THROWS{};
+        virtual ~VerificationException() FAKEIT_NO_THROWS{};
 
         VerificationException(std::string format) : //
             _format(format) { //
@@ -33,7 +33,7 @@ namespace fakeit {
             return _callingMethod;
         }
 
-        const char* what() const NO_THROWS override{
+        const char* what() const FAKEIT_NO_THROWS override{
             return _format.c_str();
         }
     private:

diff --git a/config/tpunit/TpUnitFakeit.hpp b/config/tpunit/TpUnitFakeit.hpp
@@ -27,11 +27,11 @@ class TpUnitAdapter: public EventHandler {
 				: _msg(msg) {
 		}
 
-        const char* what() const NO_THROWS override{
+        const char* what() const FAKEIT_NO_THROWS override{
             return _msg.c_str();
         }
 
-        virtual ~AssertionException() NO_THROWS {}
+        virtual ~AssertionException() FAKEIT_NO_THROWS {}
 	};
 
 	virtual ~TpUnitAdapter() = default;

diff --git a/include/fakeit/ActualInvocationsSource.hpp b/include/fakeit/ActualInvocationsSource.hpp
@@ -10,13 +10,13 @@ namespace fakeit {
 	struct ActualInvocationsContainer {
 		virtual void clear() = 0;
 
-		virtual ~ActualInvocationsContainer() NO_THROWS { }
+		virtual ~ActualInvocationsContainer() FAKEIT_NO_THROWS { }
 	};
 
     struct ActualInvocationsSource {
         virtual void getActualInvocations(std::unordered_set<fakeit::Invocation *> &into) const = 0;
 
-        virtual ~ActualInvocationsSource() NO_THROWS { }
+        virtual ~ActualInvocationsSource() FAKEIT_NO_THROWS { }
     };
 
     struct InvocationsSourceProxy : public ActualInvocationsSource {

diff --git a/include/fakeit/DomainObjects.hpp b/include/fakeit/DomainObjects.hpp
@@ -15,7 +15,7 @@ namespace fakeit {
 
     template<typename C>
     struct MockObject {
-        virtual ~MockObject() THROWS { };
+        virtual ~MockObject() FAKEIT_THROWS { };
 
         virtual C &get() = 0;
 

diff --git a/include/fakeit/Invocation.hpp b/include/fakeit/Invocation.hpp
@@ -27,7 +27,7 @@ namespace fakeit {
 
         struct Matcher {
 
-            virtual ~Matcher() THROWS {
+            virtual ~Matcher() FAKEIT_THROWS {
             }
 
             virtual bool matches(Invocation &invocation) = 0;

diff --git a/include/fakeit/MethodMockingContext.hpp b/include/fakeit/MethodMockingContext.hpp
@@ -182,7 +182,7 @@ namespace fakeit {
                 : _impl(std::move(other._impl)) {
         }
 
-        virtual ~MethodMockingContext() NO_THROWS { }
+        virtual ~MethodMockingContext() FAKEIT_NO_THROWS { }
 
         std::string format() const override {
             return _impl->format();

diff --git a/include/fakeit/Mock.hpp b/include/fakeit/Mock.hpp
@@ -51,9 +51,9 @@ namespace fakeit {
 			impl.clear();
 		}
 
-        template<class DATA_TYPE, typename ... arglist,
-                class = typename std::enable_if<std::is_member_object_pointer<DATA_TYPE C::*>::value>::type>
-        DataMemberStubbingRoot<C, DATA_TYPE> Stub(DATA_TYPE C::* member, const arglist &... ctorargs) {
+        template<class DataType, typename ... arglist,
+                class = typename std::enable_if<std::is_member_object_pointer<DataType C::*>::value>::type>
+        DataMemberStubbingRoot<C, DataType> Stub(DataType C::* member, const arglist &... ctorargs) {
             return impl.stubDataMember(member, ctorargs...);
         }
 

diff --git a/include/fakeit/MockImpl.hpp b/include/fakeit/MockImpl.hpp
@@ -37,7 +37,7 @@ namespace fakeit {
             fake->getVirtualTable().setCookie(1, this);
         }
 
-        virtual ~MockImpl() NO_THROWS {
+        virtual ~MockImpl() FAKEIT_NO_THROWS {
             _proxy.detach();
         }
 
@@ -83,10 +83,10 @@ namespace fakeit {
             return _fakeit;
         }
 
-        template<class DATA_TYPE, typename T, typename ... arglist, class = typename std::enable_if<std::is_base_of<T, C>::value>::type>
-        DataMemberStubbingRoot<C, DATA_TYPE> stubDataMember(DATA_TYPE T::*member, const arglist &... ctorargs) {
+        template<class DataType, typename T, typename ... arglist, class = typename std::enable_if<std::is_base_of<T, C>::value>::type>
+        DataMemberStubbingRoot<C, DataType> stubDataMember(DataType T::*member, const arglist &... ctorargs) {
             _proxy.stubDataMember(member, ctorargs...);
-            return DataMemberStubbingRoot<T, DATA_TYPE>();
+            return DataMemberStubbingRoot<T, DataType>();
         }
 
         template<int id, typename R, typename T, typename ... arglist, class = typename std::enable_if<std::is_base_of<T, C>::value>::type>

diff --git a/include/fakeit/RecordedMethodBody.hpp b/include/fakeit/RecordedMethodBody.hpp
@@ -95,7 +95,7 @@ namespace fakeit {
         RecordedMethodBody(FakeitContext &fakeit, std::string name) :
                 _fakeit(fakeit), _method{MethodInfo::nextMethodOrdinal(), name} { }
 
-        virtual ~RecordedMethodBody() NO_THROWS {
+        virtual ~RecordedMethodBody() FAKEIT_NO_THROWS {
         }
 
         MethodInfo &getMethod() {

diff --git a/include/fakeit/Sequence.hpp b/include/fakeit/Sequence.hpp
@@ -25,7 +25,7 @@ namespace fakeit {
         Sequence() {
         }
 
-        virtual ~Sequence() THROWS {
+        virtual ~Sequence() FAKEIT_THROWS {
         }
 
     public:

diff --git a/include/fakeit/SequenceVerificationExpectation.hpp b/include/fakeit/SequenceVerificationExpectation.hpp
@@ -12,7 +12,7 @@ namespace fakeit {
 
         friend class SequenceVerificationProgress;
 
-        ~SequenceVerificationExpectation() THROWS {
+        ~SequenceVerificationExpectation() FAKEIT_THROWS {
             if (UncaughtException()) {
                 return;
             }

diff --git a/include/fakeit/SequenceVerificationProgress.hpp b/include/fakeit/SequenceVerificationProgress.hpp
@@ -62,7 +62,7 @@ namespace fakeit {
 
     public:
 
-        ~SequenceVerificationProgress() THROWS { };
+        ~SequenceVerificationProgress() FAKEIT_THROWS { };
 
         operator bool() const {
             return Terminator(_expectationPtr);

diff --git a/include/fakeit/StubbingImpl.hpp b/include/fakeit/StubbingImpl.hpp
@@ -21,7 +21,7 @@
 
 namespace fakeit {
 
-    template<typename C, typename DATA_TYPE>
+    template<typename C, typename DataType>
     class DataMemberStubbingRoot {
     private:
         //DataMemberStubbingRoot & operator= (const DataMemberStubbingRoot & other) = delete;
@@ -30,7 +30,7 @@ namespace fakeit {
 
         DataMemberStubbingRoot() = default;
 
-        void operator=(const DATA_TYPE&) {
+        void operator=(const DataType&) {
         }
     };
 

diff --git a/include/fakeit/StubbingProgress.hpp b/include/fakeit/StubbingProgress.hpp
@@ -44,7 +44,7 @@ namespace fakeit {
     template<typename R, typename ... arglist>
     struct MethodStubbingProgress {
 
-        virtual ~MethodStubbingProgress() THROWS {
+        virtual ~MethodStubbingProgress() FAKEIT_THROWS {
         }
 
         template<typename U = R>
@@ -229,7 +229,7 @@ namespace fakeit {
     template<typename ... arglist>
     struct MethodStubbingProgress<void, arglist...> {
 
-        virtual ~MethodStubbingProgress() THROWS {
+        virtual ~MethodStubbingProgress() FAKEIT_THROWS {
         }
 
         MethodStubbingProgress<void, arglist...> &Return() {

diff --git a/include/fakeit/VerifyNoOtherInvocationsVerificationProgress.hpp b/include/fakeit/VerifyNoOtherInvocationsVerificationProgress.hpp
@@ -22,7 +22,7 @@ namespace fakeit {
 
             friend class VerifyNoOtherInvocationsVerificationProgress;
 
-            ~VerifyNoOtherInvocationsExpectation() THROWS {
+            ~VerifyNoOtherInvocationsExpectation() FAKEIT_THROWS {
                 if (UncaughtException()) {
                     return;
                 }
@@ -109,7 +109,7 @@ namespace fakeit {
     public:
 
 
-        ~VerifyNoOtherInvocationsVerificationProgress() THROWS {
+        ~VerifyNoOtherInvocationsVerificationProgress() FAKEIT_THROWS {
         };
 
         VerifyNoOtherInvocationsVerificationProgress setFileInfo(const char * file, int line,

diff --git a/include/fakeit/WhenFunctor.hpp b/include/fakeit/WhenFunctor.hpp
@@ -24,7 +24,7 @@ namespace fakeit {
 
             friend class WhenFunctor;
 
-            virtual ~StubbingChange() THROWS {
+            virtual ~StubbingChange() FAKEIT_THROWS {
 
                 if (UncaughtException()) {
                     return;

diff --git a/include/mockutils/DynamicProxy.hpp b/include/mockutils/DynamicProxy.hpp
@@ -71,7 +71,7 @@ namespace fakeit {
                 _offsets(VTUtils::getVTSize<C>()),
                 _invocationHandlers(_methodMocks, _offsets) {
             _cloneVt.copyFrom(originalVtHandle.restore());
-            _cloneVt.setCookie(InvocationHandlerCollection::VT_COOKIE_INDEX, &_invocationHandlers);
+            _cloneVt.setCookie(InvocationHandlerCollection::VtCookieIndex, &_invocationHandlers);
             getFake().setVirtualTable(_cloneVt);
         }
 
@@ -137,21 +137,21 @@ namespace fakeit {
             return ptr.get();
         }
 
-        template<typename DATA_TYPE, typename ... arglist>
-        void stubDataMember(DATA_TYPE C::*member, const arglist &... initargs) {
-            DATA_TYPE C::*theMember = (DATA_TYPE C::*) member;
+        template<typename DataType, typename ... arglist>
+        void stubDataMember(DataType C::*member, const arglist &... initargs) {
+            DataType C::*theMember = (DataType C::*) member;
             C &mock = get();
-            DATA_TYPE *memberPtr = &(mock.*theMember);
+            DataType *memberPtr = &(mock.*theMember);
             _members.push_back(
-                    std::shared_ptr<DataMemeberWrapper < DATA_TYPE, arglist...> >
-                    {new DataMemeberWrapper < DATA_TYPE, arglist...>(memberPtr,
+                    std::shared_ptr<DataMemeberWrapper < DataType, arglist...> >
+                    {new DataMemeberWrapper < DataType, arglist...>(memberPtr,
                     initargs...)});
         }
 
-        template<typename DATA_TYPE>
-        void getMethodMocks(std::vector<DATA_TYPE> &into) const {
+        template<typename DataType>
+        void getMethodMocks(std::vector<DataType> &into) const {
             for (std::shared_ptr<Destructible> ptr : _methodMocks) {
-                DATA_TYPE p = dynamic_cast<DATA_TYPE>(ptr.get());
+                DataType p = dynamic_cast<DataType>(ptr.get());
                 if (p) {
                     into.push_back(p);
                 }
@@ -165,19 +165,19 @@ namespace fakeit {
 
     private:
 
-        template<typename DATA_TYPE, typename ... arglist>
+        template<typename DataType, typename ... arglist>
         class DataMemeberWrapper : public Destructible {
         private:
-            DATA_TYPE *dataMember;
+            DataType *dataMember;
         public:
-            DataMemeberWrapper(DATA_TYPE *dataMem, const arglist &... initargs) :
+            DataMemeberWrapper(DataType *dataMem, const arglist &... initargs) :
                     dataMember(dataMem) {
-                new(dataMember) DATA_TYPE{initargs ...};
+                new(dataMember) DataType{initargs ...};
             }
 
             ~DataMemeberWrapper() override
             {
-                dataMember->~DATA_TYPE();
+                dataMember->~DataType();
             }
         };
 
@@ -208,10 +208,10 @@ namespace fakeit {
             _offsets[methodProxy.getOffset()] = methodProxy.getId();
         }
 
-        template<typename DATA_TYPE>
-        DATA_TYPE getMethodMock(unsigned int offset) {
+        template<typename DataType>
+        DataType getMethodMock(unsigned int offset) {
             std::shared_ptr<Destructible> ptr = _methodMocks[offset];
-            return dynamic_cast<DATA_TYPE>(ptr.get());
+            return dynamic_cast<DataType>(ptr.get());
         }
 
         template<typename BaseClass>

diff --git a/include/mockutils/Macros.hpp b/include/mockutils/Macros.hpp
@@ -8,9 +8,9 @@
 #pragma once
 
 #if defined (__GNUG__) || _MSC_VER >= 1900
-#define THROWS noexcept(false)
-#define NO_THROWS noexcept(true)
+#define FAKEIT_THROWS noexcept(false)
+#define FAKEIT_NO_THROWS noexcept(true)
 #elif defined (_MSC_VER)
-#define THROWS throw(...)
-#define NO_THROWS
+#define FAKEIT_THROWS throw(...)
+#define FAKEIT_NO_THROWS
 #endif
diff --git a/include/mockutils/MethodProxyCreator.hpp b/include/mockutils/MethodProxyCreator.hpp
@@ -9,14 +9,14 @@
 namespace fakeit {
 
     struct InvocationHandlerCollection {
-        static const unsigned int VT_COOKIE_INDEX = 0;
+        static const unsigned int VtCookieIndex = 0;
 
         virtual Destructible *getInvocatoinHandlerPtrById(unsigned int index) = 0;
 
         static InvocationHandlerCollection *getInvocationHandlerCollection(void *instance) {
             VirtualTableBase &vt = VirtualTableBase::getVTable(instance);
             InvocationHandlerCollection *invocationHandlerCollection = (InvocationHandlerCollection *) vt.getCookie(
-                    InvocationHandlerCollection::VT_COOKIE_INDEX);
+                    InvocationHandlerCollection::VtCookieIndex);
             return invocationHandlerCollection;
         }
     };

diff --git a/include/mockutils/gcc/is_simple_inheritance_layout.hpp b/include/mockutils/gcc/is_simple_inheritance_layout.hpp
@@ -11,17 +11,17 @@
 #include <tr2/type_traits>
 
 namespace fakeit {
-    template<typename ... T1>
+    template<typename ... Type1>
     class has_one_base {
     };
 
-    template<typename T1, typename T2, typename ... types>
-    class has_one_base<std::tr2::__reflection_typelist<T1, T2, types...>> : public std::false_type {
+    template<typename Type1, typename Type2, typename ... types>
+    class has_one_base<std::tr2::__reflection_typelist<Type1, Type2, types...>> : public std::false_type {
     };
 
-    template<typename T1>
-    class has_one_base<std::tr2::__reflection_typelist<T1>>
-            : public has_one_base<typename std::tr2::direct_bases<T1>::type> {
+    template<typename Type1>
+    class has_one_base<std::tr2::__reflection_typelist<Type1>>
+            : public has_one_base<typename std::tr2::direct_bases<Type1>::type> {
     };
 
     template<>

diff --git a/include/mockutils/mscpp/VirtualTable.hpp b/include/mockutils/mscpp/VirtualTable.hpp
@@ -26,7 +26,7 @@ namespace fakeit {
         char name[8];
     };
 
-    struct PMD {
+    struct PmdInfo {
 
         /************************************************************************/
         /* member displacement.
@@ -39,7 +39,7 @@ namespace fakeit {
         int pdisp;  // vtable displacement
         int vdisp;  //displacement inside vtable
 
-        PMD() :
+        PmdInfo() :
                 mdisp(0), pdisp(-1), vdisp(0) {
         }
     };
@@ -51,7 +51,7 @@ namespace fakeit {
 
         const std::type_info *pTypeDescriptor; //type descriptor of the class
         dword_ numContainedBases; //number of nested classes following in the Base Class Array
-        struct PMD where;        //pointer-to-member displacement info
+        struct PmdInfo where;        //pointer-to-member displacement info
         dword_ attributes;        //flags, usually 0
     };
 
@@ -91,11 +91,11 @@ namespace fakeit {
             numBaseClasses++;
         }
 
-        template<typename head, typename B1, typename... tail>
+        template<typename head, typename Base1, typename... tail>
         void addBaseClass() {
-            static_assert(std::is_base_of<B1, head>::value, "invalid inheritance list");
+            static_assert(std::is_base_of<Base1, head>::value, "invalid inheritance list");
             addBaseClass<head>();
-            addBaseClass<B1, tail...>();
+            addBaseClass<Base1, tail...>();
         }
 
     };

diff --git a/include/mockutils/smart_ptr.hpp b/include/mockutils/smart_ptr.hpp
@@ -48,7 +48,7 @@ namespace fakeit {
             reference->AddRef();
         }
 
-        ~smart_ptr() THROWS {
+        ~smart_ptr() FAKEIT_THROWS {
             if (reference->Release() == 0) {
                 delete reference;
                 delete pData;