Print

Print


Commit in slic on MAIN
include/G4CmdQueue.hh+5-51.14 -> 1.15
src/G4CmdQueue.cc+9-91.15 -> 1.16
   /lStdHep.cc+2-21.4 -> 1.5
+16-16
3 modified files
JM: More fixes from Eric B. for gcc 3.4 compat.

slic/include
G4CmdQueue.hh 1.14 -> 1.15
diff -u -r1.14 -r1.15
--- G4CmdQueue.hh	18 May 2006 00:35:11 -0000	1.14
+++ G4CmdQueue.hh	6 Jun 2006 19:53:41 -0000	1.15
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/include/G4CmdQueue.hh,v 1.14 2006/05/18 00:35:11 jeremy Exp $
+// $Header: /cvs/lcd/slic/include/G4CmdQueue.hh,v 1.15 2006/06/06 19:53:41 jeremy Exp $
 
 #ifndef slic_G4CmdQueue_hh
 #define slic_G4CmdQueue_hh
@@ -43,12 +43,12 @@
       addCmd(std::string(cmdStr));
     }
 
-    CmdVecType::const_iterator cmdsBegin() const
+    CmdVecType::iterator cmdsBegin() const
     {
       return m_commands.begin();
     }
 
-    CmdVecType::const_iterator cmdsEnd() const
+    CmdVecType::iterator cmdsEnd() const
     {
       return m_commands.end();
     }
@@ -64,7 +64,7 @@
 
     void prepare();
 
-    CmdVecType::const_iterator find_cmd(const std::string& str);
+    CmdVecType::iterator find_cmd(const std::string& str);
 
   private:
 
@@ -72,7 +72,7 @@
     void setInitialize();
     void reorderBeamOn();
     void reorder_dumpGDML();
-    CmdVecType::const_iterator find_init();
+    CmdVecType::iterator find_init();
 
   private:
 

slic/src
G4CmdQueue.cc 1.15 -> 1.16
diff -u -r1.15 -r1.16
--- G4CmdQueue.cc	18 May 2006 00:35:12 -0000	1.15
+++ G4CmdQueue.cc	6 Jun 2006 19:53:41 -0000	1.16
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/G4CmdQueue.cc,v 1.15 2006/05/18 00:35:12 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/G4CmdQueue.cc,v 1.16 2006/06/06 19:53:41 jeremy Exp $
 #include "G4CmdQueue.hh"
 
 #include "G4UImanager.hh"
@@ -11,7 +11,7 @@
     os << "********************" << std::endl;
     os << "* G4 Command Queue *" << std::endl;
     os << "********************" << std::endl;
-    for ( CmdVecType::const_iterator iter = cmdsBegin();
+    for ( CmdVecType::iterator iter = cmdsBegin();
 	  iter != cmdsEnd();
 	  iter++ ) {
       os << *iter << std::endl;
@@ -21,7 +21,7 @@
 
   void G4CmdQueue::execCmds()
   {
-    for ( CmdVecType::const_iterator iter = cmdsBegin();
+    for ( CmdVecType::iterator iter = cmdsBegin();
 	  iter != cmdsEnd();
 	  iter++ ) {
       std::string cmd = *iter;
@@ -45,7 +45,7 @@
 
   void G4CmdQueue::reorderBeamOn()
   {
-    CmdVecType::const_iterator iter = find_cmd("/run/beamOn");
+    CmdVecType::iterator iter = find_cmd("/run/beamOn");
     if (iter != cmdsEnd() ) {
       std::string cmd = (*iter);
       m_commands.erase(iter);
@@ -55,10 +55,10 @@
 
   void G4CmdQueue::reorder_dumpGDML()
   {
-    CmdVecType::const_iterator iter = find_cmd("/lcdd/dumpGDML");
+    CmdVecType::iterator iter = find_cmd("/lcdd/dumpGDML");
 
     if (iter != cmdsEnd()) {
-      CmdVecType::const_iterator init = find_init();
+      CmdVecType::iterator init = find_init();
       std::string cmd = (*iter);
       if (init != cmdsEnd()) {
 	m_commands.erase(iter);
@@ -108,14 +108,14 @@
     }
   }
 
-  G4CmdQueue::CmdVecType::const_iterator G4CmdQueue::find_init()
+  G4CmdQueue::CmdVecType::iterator G4CmdQueue::find_init()
   {
     return find_cmd("/run/initialize");
   }
 
-  G4CmdQueue::CmdVecType::const_iterator G4CmdQueue::find_cmd(const std::string& str)
+  G4CmdQueue::CmdVecType::iterator G4CmdQueue::find_cmd(const std::string& str)
   {
-    CmdVecType::const_iterator iter = m_commands.begin();
+    CmdVecType::iterator iter = m_commands.begin();
     for ( ;
 	  iter != m_commands.end();
 	  iter++ ) {

slic/src
lStdHep.cc 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- lStdHep.cc	24 Jan 2006 18:39:27 -0000	1.4
+++ lStdHep.cc	6 Jun 2006 19:53:41 -0000	1.5
@@ -369,7 +369,7 @@
 lStdHep::Event::~Event()
 {
    cleanup();
-};
+}
 
 void lStdHep::Event::cleanup(void)
 {
@@ -515,7 +515,7 @@
       }
    }
    return(ls.getError());
-};
+}
 
 long lStdHep::Event::printHeader(FILE *fp)
 {
CVSspam 0.2.8