mirror of https://github.com/mosra/magnum.git
Browse Source
Due to it being global it was severely limiting multithreaded applications and removing it was the path of least resistance. Good riddance.dpi-change-events
Vladimír Vondruš
6 years ago
12 changed files with 15 additions and 315 deletions
@ -1,56 +0,0 @@
|
||||
#ifndef Magnum_ResourceManager_hpp |
||||
#define Magnum_ResourceManager_hpp |
||||
/*
|
||||
This file is part of Magnum. |
||||
|
||||
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 |
||||
Vladimír Vondruš <mosra@centrum.cz> |
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a |
||||
copy of this software and associated documentation files (the "Software"), |
||||
to deal in the Software without restriction, including without limitation |
||||
the rights to use, copy, modify, merge, publish, distribute, sublicense, |
||||
and/or sell copies of the Software, and to permit persons to whom the |
||||
Software is furnished to do so, subject to the following conditions: |
||||
|
||||
The above copyright notice and this permission notice shall be included |
||||
in all copies or substantial portions of the Software. |
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL |
||||
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
||||
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
||||
DEALINGS IN THE SOFTWARE. |
||||
*/ |
||||
|
||||
#include "ResourceManager.h" |
||||
|
||||
/*
|
||||
File-local definition of ResourceManager instance holder for use in cases |
||||
where the class is used across library boundaries, in which case additional |
||||
care must be done to ensure a single static instance. |
||||
|
||||
Usage: typedef the resource manager with Implementation::ResourceManagerLocalInstance |
||||
as a first type and then include this file in a _single_ *.cpp file. |
||||
|
||||
This symbol is always exported. |
||||
*/ |
||||
|
||||
namespace Magnum { namespace Implementation { |
||||
|
||||
#ifdef MAGNUM_BUILD_DEPRECATED |
||||
template<class ...Types> |
||||
#ifndef _MSC_VER |
||||
CORRADE_VISIBILITY_EXPORT |
||||
#endif |
||||
ResourceManager<Types...>*& ResourceManagerLocalInstanceImplementation<Types...>::internalInstance() { |
||||
static ResourceManager<Types...>* _instance(nullptr); |
||||
return _instance; |
||||
} |
||||
#endif |
||||
|
||||
}} |
||||
|
||||
#endif |
||||
@ -1,55 +0,0 @@
|
||||
/*
|
||||
This file is part of Magnum. |
||||
|
||||
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 |
||||
Vladimír Vondruš <mosra@centrum.cz> |
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a |
||||
copy of this software and associated documentation files (the "Software"), |
||||
to deal in the Software without restriction, including without limitation |
||||
the rights to use, copy, modify, merge, publish, distribute, sublicense, |
||||
and/or sell copies of the Software, and to permit persons to whom the |
||||
Software is furnished to do so, subject to the following conditions: |
||||
|
||||
The above copyright notice and this permission notice shall be included |
||||
in all copies or substantial portions of the Software. |
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL |
||||
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
||||
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
||||
DEALINGS IN THE SOFTWARE. |
||||
*/ |
||||
|
||||
#include <Corrade/TestSuite/Tester.h> |
||||
|
||||
#include "ResourceManagerLocalInstanceTestLib.h" |
||||
|
||||
namespace Magnum { namespace Test { namespace { |
||||
|
||||
struct ResourceManagerLocalInstanceTest: TestSuite::Tester { |
||||
explicit ResourceManagerLocalInstanceTest(); |
||||
|
||||
void instance(); |
||||
|
||||
ResourceManagerWithLocalInstance manager; |
||||
}; |
||||
|
||||
ResourceManagerLocalInstanceTest::ResourceManagerLocalInstanceTest() { |
||||
addTests({&ResourceManagerLocalInstanceTest::instance}); |
||||
} |
||||
|
||||
void ResourceManagerLocalInstanceTest::instance() { |
||||
CORRADE_IGNORE_DEPRECATED_PUSH |
||||
ResourceManagerWithLocalInstance::instance().set("another", 13); |
||||
CORRADE_COMPARE(&manager.staticInstance, &manager.instance()); |
||||
CORRADE_IGNORE_DEPRECATED_POP |
||||
CORRADE_COMPARE(manager.count<Int>(), 2); |
||||
CORRADE_COMPARE(manager.state<Int>("integer"), ResourceState::Final); |
||||
} |
||||
|
||||
}}} |
||||
|
||||
CORRADE_TEST_MAIN(Magnum::Test::ResourceManagerLocalInstanceTest) |
||||
@ -1,45 +0,0 @@
|
||||
/*
|
||||
This file is part of Magnum. |
||||
|
||||
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 |
||||
Vladimír Vondruš <mosra@centrum.cz> |
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a |
||||
copy of this software and associated documentation files (the "Software"), |
||||
to deal in the Software without restriction, including without limitation |
||||
the rights to use, copy, modify, merge, publish, distribute, sublicense, |
||||
and/or sell copies of the Software, and to permit persons to whom the |
||||
Software is furnished to do so, subject to the following conditions: |
||||
|
||||
The above copyright notice and this permission notice shall be included |
||||
in all copies or substantial portions of the Software. |
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL |
||||
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
||||
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
||||
DEALINGS IN THE SOFTWARE. |
||||
*/ |
||||
|
||||
#include "ResourceManagerLocalInstanceTestLib.h" |
||||
|
||||
#include "Magnum/ResourceManager.hpp" |
||||
|
||||
namespace Magnum { |
||||
|
||||
namespace Implementation { |
||||
template struct CORRADE_VISIBILITY_EXPORT ResourceManagerLocalInstanceImplementation<ResourceManagerLocalInstance, Int>; |
||||
} |
||||
|
||||
namespace Test { |
||||
|
||||
CORRADE_IGNORE_DEPRECATED_PUSH |
||||
ResourceManagerWithLocalInstance::ResourceManagerWithLocalInstance(): staticInstance(static_cast<ResourceManagerWithLocalInstance&>(instance())) { |
||||
/* Add some stuff */ |
||||
set("integer", 42); |
||||
} |
||||
CORRADE_IGNORE_DEPRECATED_POP |
||||
|
||||
}} |
||||
@ -1,50 +0,0 @@
|
||||
#ifndef Magnum_Test_ResourceManagerLocalInstanceTestLib_h |
||||
#define Magnum_Test_ResourceManagerLocalInstanceTestLib_h |
||||
/*
|
||||
This file is part of Magnum. |
||||
|
||||
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 |
||||
Vladimír Vondruš <mosra@centrum.cz> |
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a |
||||
copy of this software and associated documentation files (the "Software"), |
||||
to deal in the Software without restriction, including without limitation |
||||
the rights to use, copy, modify, merge, publish, distribute, sublicense, |
||||
and/or sell copies of the Software, and to permit persons to whom the |
||||
Software is furnished to do so, subject to the following conditions: |
||||
|
||||
The above copyright notice and this permission notice shall be included |
||||
in all copies or substantial portions of the Software. |
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL |
||||
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
||||
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
||||
DEALINGS IN THE SOFTWARE. |
||||
*/ |
||||
|
||||
#include "Magnum/ResourceManager.h" |
||||
|
||||
#ifndef MAGNUM_BUILD_STATIC |
||||
#if defined(ResourceManagerLocalInstanceTestLib_EXPORTS) |
||||
#define MAGNUM_RESOURCEMANAGERLOCALINSTANCETESTLIB_EXPORT CORRADE_VISIBILITY_EXPORT |
||||
#else |
||||
#define MAGNUM_RESOURCEMANAGERLOCALINSTANCETESTLIB_EXPORT CORRADE_VISIBILITY_IMPORT |
||||
#endif |
||||
#else |
||||
#define MAGNUM_RESOURCEMANAGERLOCALINSTANCETESTLIB_EXPORT CORRADE_VISIBILITY_STATIC |
||||
#endif |
||||
|
||||
namespace Magnum { namespace Test { |
||||
|
||||
struct MAGNUM_RESOURCEMANAGERLOCALINSTANCETESTLIB_EXPORT ResourceManagerWithLocalInstance: ResourceManager<Implementation::ResourceManagerLocalInstance, Int> { |
||||
explicit ResourceManagerWithLocalInstance(); |
||||
|
||||
ResourceManagerWithLocalInstance& staticInstance; |
||||
}; |
||||
|
||||
}} |
||||
|
||||
#endif |
||||
Loading…
Reference in new issue