Browse Source

Implement further tests for namespaces

pull/406/head
Pyry Kontio 11 years ago
parent
commit
3693d991af
  1. 2
      tests/NamespacesBase/NamespacesBase.cpp
  2. 21
      tests/NamespacesBase/NamespacesBase.h
  3. 8
      tests/NamespacesDerived/NamespacesDerived.cpp
  4. 20
      tests/NamespacesDerived/NamespacesDerived.h

2
tests/NamespacesBase/NamespacesBase.cpp

@ -10,4 +10,4 @@ Base::Base(int i)
Base::Base() Base::Base()
{ {
} }

21
tests/NamespacesBase/NamespacesBase.h

@ -1,5 +1,26 @@
#include "../Tests.h" #include "../Tests.h"
namespace OverlappingNamespace
{
enum Colors {
white,
black,
red,
blue,
green,
};
class InBaseLib
{
public:
InBaseLib()
{
};
};
}
class DLL_API Base class DLL_API Base
{ {
public: public:

8
tests/NamespacesDerived/NamespacesDerived.cpp

@ -1,6 +1,12 @@
#include "NamespacesDerived.h" #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)
{
}

20
tests/NamespacesDerived/NamespacesDerived.h

@ -1,13 +1,29 @@
#include "../Tests.h" #include "../Tests.h"
#include "../NamespacesBase/NamespacesBase.h" #include "../NamespacesBase/NamespacesBase.h"
namespace OverlappingNamespace
{
class InDerivedLib
{
public:
InDerivedLib();
Base parentNSComponent;
Colors color;
};
}
class DLL_API Derived : public Base class DLL_API Derived : public Base
{ {
public: public:
Derived(); Derived();
Base component; Base baseComponent;
OverlappingNamespace::InBaseLib nestedNSComponent;
OverlappingNamespace::Colors color;
private: private:
int d; int d;
}; };

Loading…
Cancel
Save