| Geant4 Cross Reference |
1 // 1 //
2 // ******************************************* 2 // ********************************************************************
3 // * License and Disclaimer 3 // * License and Disclaimer *
4 // * 4 // * *
5 // * The Geant4 software is copyright of th 5 // * The Geant4 software is copyright of the Copyright Holders of *
6 // * the Geant4 Collaboration. It is provided 6 // * the Geant4 Collaboration. It is provided under the terms and *
7 // * conditions of the Geant4 Software License 7 // * conditions of the Geant4 Software License, included in the file *
8 // * LICENSE and available at http://cern.ch/ 8 // * LICENSE and available at http://cern.ch/geant4/license . These *
9 // * include a list of copyright holders. 9 // * include a list of copyright holders. *
10 // * 10 // * *
11 // * Neither the authors of this software syst 11 // * Neither the authors of this software system, nor their employing *
12 // * institutes,nor the agencies providing fin 12 // * institutes,nor the agencies providing financial support for this *
13 // * work make any representation or warran 13 // * work make any representation or warranty, express or implied, *
14 // * regarding this software system or assum 14 // * regarding this software system or assume any liability for its *
15 // * use. Please see the license in the file 15 // * use. Please see the license in the file LICENSE and URL above *
16 // * for the full disclaimer and the limitatio 16 // * for the full disclaimer and the limitation of liability. *
17 // * 17 // * *
18 // * This code implementation is the result 18 // * This code implementation is the result of the scientific and *
19 // * technical work of the GEANT4 collaboratio 19 // * technical work of the GEANT4 collaboration. *
20 // * By using, copying, modifying or distri 20 // * By using, copying, modifying or distributing the software (or *
21 // * any work based on the software) you ag 21 // * any work based on the software) you agree to acknowledge its *
22 // * use in resulting scientific publicati 22 // * use in resulting scientific publications, and indicate your *
23 // * acceptance of all terms of the Geant4 Sof 23 // * acceptance of all terms of the Geant4 Software license. *
24 // ******************************************* 24 // ********************************************************************
25 // 25 //
26 // 26 //
27 27
28 #include "G4AttDefStore.hh" 28 #include "G4AttDefStore.hh"
29 29
30 #include "G4AttDef.hh" 30 #include "G4AttDef.hh"
31 #include "G4AutoLock.hh" 31 #include "G4AutoLock.hh"
32 32
33 namespace G4AttDefStore { 33 namespace G4AttDefStore {
34 34
35 std::map<G4String,std::map<G4String,G4AttDef>* << 35 std::map<G4String,std::map<G4String,G4AttDef>*> *m_defsmaps = 0;
36 36
37 G4Mutex mutex = G4MUTEX_INITIALIZER; 37 G4Mutex mutex = G4MUTEX_INITIALIZER;
38 38
39 std::map<G4String,G4AttDef>* 39 std::map<G4String,G4AttDef>*
40 GetInstance(const G4String& storeKey, G4bool& 40 GetInstance(const G4String& storeKey, G4bool& isNew)
41 { 41 {
42 G4AutoLock al(&mutex); 42 G4AutoLock al(&mutex);
43 43
44 if (m_defsmaps == nullptr) << 44 if (!m_defsmaps)
45 m_defsmaps = new std::map<G4String,std::ma 45 m_defsmaps = new std::map<G4String,std::map<G4String,G4AttDef>*>;
46 46
47 // Allocate the new map if not existing alre 47 // Allocate the new map if not existing already
48 // and return it to the caller 48 // and return it to the caller
49 // 49 //
50 std::map<G4String,G4AttDef>* definitions; 50 std::map<G4String,G4AttDef>* definitions;
51 << 51 std::map<G4String,std::map<G4String,G4AttDef>*>::iterator iDefinitions =
52 // NOLINTNEXTLINE(modernize-use-auto): Expli <<
53 std::map<G4String,std::map<G4String,G4AttDef <<
54 m_defsmaps->find(storeKey); 52 m_defsmaps->find(storeKey);
55 53
56 if (iDefinitions == m_defsmaps->end()) 54 if (iDefinitions == m_defsmaps->end())
57 { 55 {
58 isNew = true; 56 isNew = true;
59 definitions = new std::map<G4String,G4AttD 57 definitions = new std::map<G4String,G4AttDef>;
60 (*m_defsmaps)[storeKey] = definitions; 58 (*m_defsmaps)[storeKey] = definitions;
61 } 59 }
62 else 60 else
63 { 61 {
64 isNew = false; 62 isNew = false;
65 definitions = iDefinitions->second; 63 definitions = iDefinitions->second;
66 } 64 }
67 return definitions; 65 return definitions;
68 } 66 }
69 67
70 G4bool GetStoreKey 68 G4bool GetStoreKey
71 (const std::map<G4String,G4AttDef>* definition 69 (const std::map<G4String,G4AttDef>* definitions, G4String& key)
72 { 70 {
73 G4AutoLock al(&mutex); 71 G4AutoLock al(&mutex);
74 72
75 if (m_defsmaps == nullptr) << 73 if (!m_defsmaps)
76 m_defsmaps = new std::map<G4String,std::ma 74 m_defsmaps = new std::map<G4String,std::map<G4String,G4AttDef>*>;
77 std::map<G4String,std::map<G4String,G4AttDef 75 std::map<G4String,std::map<G4String,G4AttDef>*>::const_iterator i;
78 for (i = m_defsmaps->begin(); i != m_defsmap 76 for (i = m_defsmaps->begin(); i != m_defsmaps->end(); ++i)
79 { 77 {
80 if (i->second == definitions) 78 if (i->second == definitions)
81 { 79 {
82 key = i->first; 80 key = i->first;
83 return true; 81 return true;
84 } 82 }
85 } 83 }
86 84
87 return false; 85 return false;
88 } 86 }
89 87
90 } // End namespace G4AttDefStore. 88 } // End namespace G4AttDefStore.
91 89