Merge pull request #1248 from swails/warnings

Fix a handful of compiler warnings

plugins/amoeba/openmmapi/include/openmm/AmoebaMultipoleForce.h

@@ -415,8 +415,8 @@ public:
 
     MultipoleInfo(double charge, const std::vector<double>& inputMolecularDipole, const std::vector<double>& inputMolecularQuadrupole,
                    int axisType, int multipoleAtomZ, int multipoleAtomX, int multipoleAtomY, double thole, double dampingFactor, double polarity) :
-        charge(charge), axisType(axisType), multipoleAtomZ(multipoleAtomZ), multipoleAtomX(multipoleAtomX), multipoleAtomY(multipoleAtomY),
-        thole(thole), dampingFactor(dampingFactor), polarity(polarity) {
+        axisType(axisType), multipoleAtomZ(multipoleAtomZ), multipoleAtomX(multipoleAtomX), multipoleAtomY(multipoleAtomY),
+        charge(charge), thole(thole), dampingFactor(dampingFactor), polarity(polarity) {
 
        covalentInfo.resize(CovalentEnd);
 

plugins/amoeba/openmmapi/include/openmm/AmoebaTorsionTorsionForce.h

@@ -172,7 +172,7 @@ public:
     }
     TorsionTorsionInfo(int particle1, int particle2, int particle3, int particle4, int particle5, int chiralCheckAtomIndex, int gridIndex) :
                        particle1(particle1), particle2(particle2), particle3(particle3),
-                       particle4(particle4), particle5(particle5), gridIndex(gridIndex), chiralCheckAtomIndex(chiralCheckAtomIndex) {
+                       particle4(particle4), particle5(particle5), chiralCheckAtomIndex(chiralCheckAtomIndex), gridIndex(gridIndex) {
 
     }
 };