Merge remote-tracking branch 'origin/master'

2020-06-15 18:38:40 +03:00
parent 3298a86bd9 419ebd74fe
commit 622db7053e
5526 changed files with 479177 additions and 2216677 deletions
--- a/lib/gpu/lal_lj_tip4p_long.cpp
+++ b/lib/gpu/lal_lj_tip4p_long.cpp
@ -23,7 +23,7 @@ const char *lj_tip4p=0;

 #include "lal_lj_tip4p_long.h"
 #include <cassert>
-using namespace LAMMPS_AL;
+namespace LAMMPS_AL {
 #define LJTIP4PLongT LJ_TIP4PLong<numtyp, acctyp>

 extern Device<PRECISION,ACC_PRECISION> device;
@ -381,6 +381,5 @@ int** LJTIP4PLongT::compute(const int ago, const int inum_full,
 }


-
-
 template class LJ_TIP4PLong<PRECISION,ACC_PRECISION>;
+}