[ViewVC] Diff of: OpenMD/branches/development/src/nonbonded/Sticky.hpp

Comparing branches/development/src/nonbonded/Sticky.hpp (file contents):
Revision 1544 by gezelter, Wed Jan 5 14:49:05 2011 UTC vs.
Revision 1545 by gezelter, Fri Apr 8 21:25:19 2011 UTC

#	Line 73 \| Line 73 \| namespace OpenMD {
73		void addType(AtomType* atomType);
74		virtual void calcForce(InteractionData &idat);
75		virtual string getName() { return name_; }
76	<	virtual RealType getSuggestedCutoffRadius(AtomType* at1, AtomType* at2);
76	>	virtual RealType getSuggestedCutoffRadius(pair<AtomType, AtomType> atypes);
77
78		private:
79		void initialize();

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines