Moved the IdentifierMap from global to into osg namespace and changed to static

This commit is contained in:
Robert Osfield
2016-04-27 14:21:11 +01:00
parent cba48de3d3
commit 6cfbaa61c0

View File

@@ -7,7 +7,8 @@
#include <map>
using namespace osg;
namespace osg
{
struct IdentifierKey
{
@@ -42,8 +43,8 @@ struct IdentifierKey
typedef std::map<IdentifierKey, osg::ref_ptr<Identifier> > IdentifierMap;
IdentifierMap s_IdentifierMap;
OpenThreads::Mutex s_IdentifierMapMutex;
static IdentifierMap s_IdentifierMap;
static OpenThreads::Mutex s_IdentifierMapMutex;
Identifier::Identifier(const std::string& name, int number, osg::Referenced* f, osg::Referenced* s):
_name(name),
@@ -121,3 +122,5 @@ Identifier* osg::Identifier::get(osg::Referenced* first, osg::Referenced* second
{
return get("", 0, first, second);
}
}