diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2019-02-16 06:48:41 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2019-02-16 06:48:41 +0000 |
| commit | e33d94fecd272db4bf542541c069e9e2c168c1d5 (patch) | |
| tree | c4c33fe97b817ed67fc505059a6323336660311f /Tests/TestApp/src | |
| parent | Updated samples (fixed linux/max build error) (diff) | |
| download | DiligentEngine-e33d94fecd272db4bf542541c069e9e2c168c1d5.tar.gz DiligentEngine-e33d94fecd272db4bf542541c069e9e2c168c1d5.zip | |
Moved NativeApp to Diligent namespace
Diffstat (limited to 'Tests/TestApp/src')
| -rw-r--r-- | Tests/TestApp/src/Android/TestAppAndroid.cpp | 5 | ||||
| -rw-r--r-- | Tests/TestApp/src/IOS/TestAppIOS.cpp | 5 | ||||
| -rw-r--r-- | Tests/TestApp/src/Linux/TestAppLinux.cpp | 6 | ||||
| -rw-r--r-- | Tests/TestApp/src/MacOS/TestAppMacOS.cpp | 5 | ||||
| -rw-r--r-- | Tests/TestApp/src/TestApp.cpp | 5 | ||||
| -rw-r--r-- | Tests/TestApp/src/UWP/TestAppUWP.cpp | 5 | ||||
| -rw-r--r-- | Tests/TestApp/src/Win32/TestAppWin32.cpp | 5 |
7 files changed, 30 insertions, 6 deletions
diff --git a/Tests/TestApp/src/Android/TestAppAndroid.cpp b/Tests/TestApp/src/Android/TestAppAndroid.cpp index 222081a..fe1c86a 100644 --- a/Tests/TestApp/src/Android/TestAppAndroid.cpp +++ b/Tests/TestApp/src/Android/TestAppAndroid.cpp @@ -24,7 +24,8 @@ #include "TestApp.h" #include "RenderDeviceGLES.h" -using namespace Diligent; +namespace Diligent +{ class TestAppAndroid final : public TestApp { @@ -67,3 +68,5 @@ NativeAppBase* CreateApplication() { return new TestAppAndroid; } + +} diff --git a/Tests/TestApp/src/IOS/TestAppIOS.cpp b/Tests/TestApp/src/IOS/TestAppIOS.cpp index d71ca5a..70bb6de 100644 --- a/Tests/TestApp/src/IOS/TestAppIOS.cpp +++ b/Tests/TestApp/src/IOS/TestAppIOS.cpp @@ -24,7 +24,8 @@ #include <queue> #include "TestApp.h" -using namespace Diligent; +namespace Diligent +{ class TestAppIOS final : public TestApp { @@ -47,3 +48,5 @@ NativeAppBase* CreateApplication() { return new TestAppIOS; } + +} diff --git a/Tests/TestApp/src/Linux/TestAppLinux.cpp b/Tests/TestApp/src/Linux/TestAppLinux.cpp index 1393714..9ce02b9 100644 --- a/Tests/TestApp/src/Linux/TestAppLinux.cpp +++ b/Tests/TestApp/src/Linux/TestAppLinux.cpp @@ -22,7 +22,9 @@ */ #include "TestApp.h" -using namespace Diligent; + +namespace Diligent +{ class TestAppLinux final : public TestApp { @@ -57,3 +59,5 @@ NativeAppBase* CreateApplication() { return new TestAppLinux; } + +} diff --git a/Tests/TestApp/src/MacOS/TestAppMacOS.cpp b/Tests/TestApp/src/MacOS/TestAppMacOS.cpp index e902dd8..3542251 100644 --- a/Tests/TestApp/src/MacOS/TestAppMacOS.cpp +++ b/Tests/TestApp/src/MacOS/TestAppMacOS.cpp @@ -24,7 +24,8 @@ #include <queue> #include "TestApp.h" -using namespace Diligent; +namespace Diligent +{ class TestAppMacOS final : public TestApp { @@ -46,3 +47,5 @@ NativeAppBase* CreateApplication() { return new TestAppMacOS; } + +} diff --git a/Tests/TestApp/src/TestApp.cpp b/Tests/TestApp/src/TestApp.cpp index 7e6479c..4b072a3 100644 --- a/Tests/TestApp/src/TestApp.cpp +++ b/Tests/TestApp/src/TestApp.cpp @@ -73,7 +73,8 @@ #include "TestSeparateTextureSampler.h" #include "StringTools.h" -using namespace Diligent; +namespace Diligent +{ TestApp::TestApp() : m_AppTitle("Test app") @@ -720,3 +721,5 @@ void TestApp::Present() { m_pSwapChain->Present(0); } + +} diff --git a/Tests/TestApp/src/UWP/TestAppUWP.cpp b/Tests/TestApp/src/UWP/TestAppUWP.cpp index d7158f8..a3e40b5 100644 --- a/Tests/TestApp/src/UWP/TestAppUWP.cpp +++ b/Tests/TestApp/src/UWP/TestAppUWP.cpp @@ -29,7 +29,8 @@ #include "RenderDeviceFactoryD3D11.h" #include "RenderDeviceFactoryD3D12.h" -using namespace Diligent; +namespace Diligent +{ class TestAppUWP final : public TestApp { @@ -207,3 +208,5 @@ NativeAppBase* CreateApplication() { return new TestAppUWP; } + +} diff --git a/Tests/TestApp/src/Win32/TestAppWin32.cpp b/Tests/TestApp/src/Win32/TestAppWin32.cpp index 969bfb1..40ed6ed 100644 --- a/Tests/TestApp/src/Win32/TestAppWin32.cpp +++ b/Tests/TestApp/src/Win32/TestAppWin32.cpp @@ -23,6 +23,9 @@ #include "TestApp.h" +namespace Diligent +{ + class TestAppWin32 final : public TestApp { public: @@ -37,3 +40,5 @@ NativeAppBase* CreateApplication() { return new TestAppWin32; } + +} |
