Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/graphics_reps/src/G4AttDefStore.cc

Version: [ ReleaseNotes ] [ 1.0 ] [ 1.1 ] [ 2.0 ] [ 3.0 ] [ 3.1 ] [ 3.2 ] [ 4.0 ] [ 4.0.p1 ] [ 4.0.p2 ] [ 4.1 ] [ 4.1.p1 ] [ 5.0 ] [ 5.0.p1 ] [ 5.1 ] [ 5.1.p1 ] [ 5.2 ] [ 5.2.p1 ] [ 5.2.p2 ] [ 6.0 ] [ 6.0.p1 ] [ 6.1 ] [ 6.2 ] [ 6.2.p1 ] [ 6.2.p2 ] [ 7.0 ] [ 7.0.p1 ] [ 7.1 ] [ 7.1.p1 ] [ 8.0 ] [ 8.0.p1 ] [ 8.1 ] [ 8.1.p1 ] [ 8.1.p2 ] [ 8.2 ] [ 8.2.p1 ] [ 8.3 ] [ 8.3.p1 ] [ 8.3.p2 ] [ 9.0 ] [ 9.0.p1 ] [ 9.0.p2 ] [ 9.1 ] [ 9.1.p1 ] [ 9.1.p2 ] [ 9.1.p3 ] [ 9.2 ] [ 9.2.p1 ] [ 9.2.p2 ] [ 9.2.p3 ] [ 9.2.p4 ] [ 9.3 ] [ 9.3.p1 ] [ 9.3.p2 ] [ 9.4 ] [ 9.4.p1 ] [ 9.4.p2 ] [ 9.4.p3 ] [ 9.4.p4 ] [ 9.5 ] [ 9.5.p1 ] [ 9.5.p2 ] [ 9.6 ] [ 9.6.p1 ] [ 9.6.p2 ] [ 9.6.p3 ] [ 9.6.p4 ] [ 10.0 ] [ 10.0.p1 ] [ 10.0.p2 ] [ 10.0.p3 ] [ 10.0.p4 ] [ 10.1 ] [ 10.1.p1 ] [ 10.1.p2 ] [ 10.1.p3 ] [ 10.2 ] [ 10.2.p1 ] [ 10.2.p2 ] [ 10.2.p3 ] [ 10.3 ] [ 10.3.p1 ] [ 10.3.p2 ] [ 10.3.p3 ] [ 10.4 ] [ 10.4.p1 ] [ 10.4.p2 ] [ 10.4.p3 ] [ 10.5 ] [ 10.5.p1 ] [ 10.6 ] [ 10.6.p1 ] [ 10.6.p2 ] [ 10.6.p3 ] [ 10.7 ] [ 10.7.p1 ] [ 10.7.p2 ] [ 10.7.p3 ] [ 10.7.p4 ] [ 11.0 ] [ 11.0.p1 ] [ 11.0.p2 ] [ 11.0.p3, ] [ 11.0.p4 ] [ 11.1 ] [ 11.1.1 ] [ 11.1.2 ] [ 11.1.3 ] [ 11.2 ] [ 11.2.1 ] [ 11.2.2 ] [ 11.3.0 ]

Diff markup

Differences between /graphics_reps/src/G4AttDefStore.cc (Version 11.3.0) and /graphics_reps/src/G4AttDefStore.cc (Version 8.1.p2)


  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 // $Id: G4AttDefStore.cc,v 1.6 2006/06/29 19:06:36 gunter Exp $
                                                   >>  28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
 27                                                    29 
 28 #include "G4AttDefStore.hh"                        30 #include "G4AttDefStore.hh"
 29                                                    31 
 30 #include "G4AttDef.hh"                             32 #include "G4AttDef.hh"
 31 #include "G4AutoLock.hh"                       << 
 32                                                    33 
 33 namespace G4AttDefStore {                      <<  34 G4AttDefStore* G4AttDefStore::theInstance = 0;
 34                                                <<  35 std::map<G4String,std::map<G4String,G4AttDef>*> G4AttDefStore::m_stores;
 35 std::map<G4String,std::map<G4String,G4AttDef>* << 
 36                                                << 
 37 G4Mutex mutex = G4MUTEX_INITIALIZER;           << 
 38                                                    36 
 39 std::map<G4String,G4AttDef>*                       37 std::map<G4String,G4AttDef>*
 40 GetInstance(const G4String& storeKey, G4bool&  <<  38 G4AttDefStore::GetInstance(G4String storeName, G4bool& isNew)
 41 {                                                  39 {
 42   G4AutoLock al(&mutex);                       <<  40   // Create the private static instance first to allow for
 43                                                <<  41   // the deletion of the allocated attributes in the map store
 44   if (m_defsmaps == nullptr)                   <<  42   //
 45     m_defsmaps = new std::map<G4String,std::ma <<  43   static G4AttDefStore theStore;
                                                   >>  44   if (!theInstance)
                                                   >>  45   {
                                                   >>  46     theInstance = &theStore;
                                                   >>  47   }
 46                                                    48 
 47   // Allocate the new map if not existing alre     49   // Allocate the new map if not existing already
 48   // and return it to the caller                   50   // and return it to the caller
 49   //                                               51   //
 50   std::map<G4String,G4AttDef>* definitions;    <<  52   std::map<G4String,G4AttDef>* store;
 51                                                <<  53   std::map<G4String,std::map<G4String,G4AttDef>*>::iterator iStore =
 52   // NOLINTNEXTLINE(modernize-use-auto): Expli <<  54     m_stores.find(storeName);
 53   std::map<G4String,std::map<G4String,G4AttDef << 
 54     m_defsmaps->find(storeKey);                << 
 55                                                    55 
 56   if (iDefinitions == m_defsmaps->end())       <<  56   if (iStore == m_stores.end())
 57   {                                                57   {
 58     isNew = true;                                  58     isNew = true;
 59     definitions = new std::map<G4String,G4AttD <<  59     store = new std::map<G4String,G4AttDef>;
 60     (*m_defsmaps)[storeKey] = definitions;     <<  60     m_stores[storeName] = store;
 61   }                                                61   }
 62   else                                             62   else
 63   {                                                63   {
 64     isNew = false;                                 64     isNew = false;
 65     definitions = iDefinitions->second;        <<  65     store = iStore->second;
 66   }                                                66   }
 67   return definitions;                          <<  67   return store;
 68 }                                                  68 }
 69                                                    69 
 70 G4bool GetStoreKey                             <<  70 G4AttDefStore::G4AttDefStore()
 71 (const std::map<G4String,G4AttDef>* definition << 
 72 {                                                  71 {
 73   G4AutoLock al(&mutex);                       <<  72 }
 74                                                    73 
 75   if (m_defsmaps == nullptr)                   <<  74 G4AttDefStore::~G4AttDefStore()
 76     m_defsmaps = new std::map<G4String,std::ma <<  75 {
 77   std::map<G4String,std::map<G4String,G4AttDef <<  76   std::map<G4String,std::map<G4String,G4AttDef>*>::iterator iStore, iStore_tmp;
 78   for (i = m_defsmaps->begin(); i != m_defsmap <<  77   for ( iStore = m_stores.begin(); iStore != m_stores.end(); )
                                                   >>  78   {
                                                   >>  79     if (iStore->second)
 79     {                                              80     {
 80       if (i->second == definitions)            <<  81       delete iStore->second;
 81         {                                      <<  82       iStore_tmp = iStore++;
 82           key = i->first;                      <<  83       m_stores.erase(iStore_tmp);
 83           return true;                         << 
 84         }                                      << 
 85     }                                              84     }
 86                                                <<  85     else
 87   return false;                                <<  86     {
                                                   >>  87       ++iStore;
                                                   >>  88     }
                                                   >>  89   }
 88 }                                                  90 }
 89                                                << 
 90 }  // End namespace G4AttDefStore.             << 
 91                                                    91