diff --git a/tests/NamespacesBase/NamespacesBase.cpp b/tests/NamespacesBase/NamespacesBase.cpp index 07685d46..a91800f2 100644 --- a/tests/NamespacesBase/NamespacesBase.cpp +++ b/tests/NamespacesBase/NamespacesBase.cpp @@ -10,4 +10,4 @@ Base::Base(int i) Base::Base() { -} \ No newline at end of file +} diff --git a/tests/NamespacesBase/NamespacesBase.h b/tests/NamespacesBase/NamespacesBase.h index b431de6c..5459d8d3 100644 --- a/tests/NamespacesBase/NamespacesBase.h +++ b/tests/NamespacesBase/NamespacesBase.h @@ -1,5 +1,26 @@ #include "../Tests.h" + +namespace OverlappingNamespace +{ + enum Colors { + white, + black, + red, + blue, + green, + }; + + class InBaseLib + { + public: + InBaseLib() + { + + }; + }; +} + class DLL_API Base { public: diff --git a/tests/NamespacesDerived/NamespacesDerived.cpp b/tests/NamespacesDerived/NamespacesDerived.cpp index 4bb67564..209262cb 100644 --- a/tests/NamespacesDerived/NamespacesDerived.cpp +++ b/tests/NamespacesDerived/NamespacesDerived.cpp @@ -1,6 +1,12 @@ #include "NamespacesDerived.h" -Derived::Derived() : Base(10), component(5) +Derived::Derived() : Base(10), baseComponent(5), nestedNSComponent(), color(OverlappingNamespace::blue) { } + + +OverlappingNamespace::InDerivedLib::InDerivedLib() : parentNSComponent(), color(black) +{ + +} diff --git a/tests/NamespacesDerived/NamespacesDerived.h b/tests/NamespacesDerived/NamespacesDerived.h index 091fb7c4..13f0d96f 100644 --- a/tests/NamespacesDerived/NamespacesDerived.h +++ b/tests/NamespacesDerived/NamespacesDerived.h @@ -1,13 +1,29 @@ #include "../Tests.h" #include "../NamespacesBase/NamespacesBase.h" +namespace OverlappingNamespace +{ + + class InDerivedLib + { + public: + InDerivedLib(); + Base parentNSComponent; + Colors color; + }; +} + class DLL_API Derived : public Base { public: Derived(); - Base component; + Base baseComponent; + + OverlappingNamespace::InBaseLib nestedNSComponent; + + OverlappingNamespace::Colors color; private: int d; -}; \ No newline at end of file +};