Browse Source

Implement further tests for namespaces

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

21
tests/NamespacesBase/NamespacesBase.h

@ -1,5 +1,26 @@ @@ -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:

8
tests/NamespacesDerived/NamespacesDerived.cpp

@ -1,6 +1,12 @@ @@ -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)
{
}

18
tests/NamespacesDerived/NamespacesDerived.h

@ -1,12 +1,28 @@ @@ -1,12 +1,28 @@
#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;

Loading…
Cancel
Save