"wrappers/vscode:/vscode.git/clone" did not exist on "7df74a1c093d09e9b609d8ea684e1d83d08e9667"
Commit 60968dff authored by Peter Eastman's avatar Peter Eastman
Browse files

Fixed compilation errors and warnings

parent 73f5921c
......@@ -52,7 +52,7 @@ void SerializationProxy::registerProxy(const type_info& type, const Serializatio
}
const SerializationProxy& SerializationProxy::getProxy(const string& typeName) {
map<string, const SerializationProxy*>::const_iterator iter = proxiesByName.find(typeName);
map<const string, const SerializationProxy*>::const_iterator iter = proxiesByName.find(typeName);
if (iter == proxiesByName.end())
throw OpenMMException("There is no serialization proxy registered for type '"+string(typeName)+"'");
return *iter->second;
......
......@@ -57,7 +57,7 @@
#if defined(WIN32)
#include <windows.h>
extern "C" void initOpenMMPlugin();
extern "C" void registerSerializationProxies();
BOOL WINAPI DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) {
if (ul_reason_for_call == DLL_PROCESS_ATTACH)
registerSerializationProxies();
......
......@@ -84,7 +84,7 @@ void* SystemProxy::deserialize(const SerializationNode& node) const {
const SerializationNode& constraints = node.getChildNode("Constraints");
for (int i = 0; i < (int) constraints.getChildren().size(); i++) {
const SerializationNode& constraint = constraints.getChildren()[i];
system->addConstraint(constraint.getDoubleProperty("p1"), constraint.getDoubleProperty("p2"), constraint.getDoubleProperty("d"));
system->addConstraint(constraint.getIntProperty("p1"), constraint.getIntProperty("p2"), constraint.getIntProperty("d"));
}
const SerializationNode& forces = node.getChildNode("Forces");
for (int i = 0; i < (int) forces.getChildren().size(); i++) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment