Renamed timer.hpp to loos_timer.hpp to avoid filename conflicts

ChangeLog

@@ -1,3 +1,7 @@
+2018-10-15  Tod Romo  <tromo>
+
+	* Changed src/timers.hpp to be src/loos_timers.hpp in order to avoid filename conflicts
+
 2018-05-17 <tromo>
   * Changed PSF code to accept hybrid-36 encoding for atomid's and resid's
 

src/ProgressCounters.hpp

@@ -33,7 +33,7 @@
 #include <vector>
 
 #include <loos_defs.hpp>
-#include <timer.hpp>
+#include <loos_timer.hpp>
 
 namespace loos {
 

src/SConscript

@@ -64,7 +64,7 @@ hdr = hdr + ' KernelValue.hpp loos_defs.hpp loos.hpp LoosLexer.hpp Matrix44.hpp'
 hdr = hdr + ' Matrix.hpp MatrixImpl.hpp MatrixIO.hpp MatrixOrder.hpp MatrixRead.hpp'
 hdr = hdr + ' MatrixStorage.hpp MatrixUtils.hpp MatrixWrite.hpp ParserDriver.hpp'
 hdr = hdr + ' Parser.hpp pdb.hpp pdb_remarks.hpp pdbtraj.hpp PeriodicBox.hpp psf.hpp'
-hdr = hdr + ' Selectors.hpp sfactories.hpp StreamWrapper.hpp timer.hpp'
+hdr = hdr + ' Selectors.hpp sfactories.hpp StreamWrapper.hpp loos_timer.hpp'
 hdr = hdr + ' TimeSeries.hpp tinker_arc.hpp tinkerxyz.hpp Trajectory.hpp'
 hdr = hdr + ' UniqueStrings.hpp utils.hpp XForm.hpp ProgressCounters.hpp ProgressTriggers.hpp'
 hdr = hdr + ' grammar.hh location.hh position.hh stack.hh FlexLexer.h'

src/loos.hpp

@@ -105,7 +105,7 @@
 
 #include <sfactories.hpp>
 
-#include <timer.hpp>
+#include <loos_timer.hpp>
 #include <ProgressCounters.hpp>
 #include <ProgressTriggers.hpp>