Browse Source

a few typos, but this compiles now

tristangurtler 3 years ago
parent
commit
982be98f96

+ 1 - 0
prsona/inc/networkOrchestrator.hpp

@@ -17,6 +17,7 @@ int start_remote_actor(
     bool server,
     const std::string& id,
     const std::string& output,
+    size_t lambda,
     bool maliciousServers);
 
 void shut_down_remote_actors(

+ 2 - 2
prsona/src/clientMain.cpp

@@ -97,10 +97,10 @@ int main(int argc, char *argv[])
     string configDir = "cfg/" + output;
 
     // Read in from config files the server locations
-    load_multiple_instances_config(serverIPs, serverPorts, configDir + "/serverIPs.cfg");
+    load_multiple_instances_config(serverIPs, serverPorts, (configDir + "/serverIPs.cfg").c_str());
 
     // And now the client locations
-    load_multiple_instances_config(clientIPs, clientPorts, configDir + "/clientIPs.cfg");
+    load_multiple_instances_config(clientIPs, clientPorts, (configDir + "/clientIPs.cfg").c_str());
 
     // Finally, read in the ip/port corresponding to the id that this instance was given
     string selfConfigFilename = configDir + "/selfIP";

+ 3 - 3
prsona/src/orchestratorMain.cpp

@@ -64,13 +64,13 @@ int main(int argc, char* argv[])
     string configDir = "cfg/" + output;
 
     // Read in from config files the server locations
-    load_multiple_instances_config(serverIPs, serverPorts, configDir + "/serverIPs.cfg");
+    load_multiple_instances_config(serverIPs, serverPorts, (configDir + "/serverIPs.cfg").c_str());
 
     // And now the client locations
-    load_multiple_instances_config(clientIPs, clientPorts, configDir + "/clientIPs.cfg");
+    load_multiple_instances_config(clientIPs, clientPorts, (configDir + "/clientIPs.cfg").c_str());
 
     // And finally the dealer location
-    load_single_instance_config(dealerIP, dealerPortStr, dealerPort, configDir + "/dealerIP.cfg");
+    load_single_instance_config(dealerIP, dealerPortStr, dealerPort, (configDir + "/dealerIP.cfg").c_str());
 
     size_t numServers = serverIPs.size();
     size_t numClients = clientIPs.size();

+ 2 - 2
prsona/src/serverMain.cpp

@@ -102,7 +102,7 @@ int main(int argc, char *argv[])
     string configDir = "cfg/" + output;
 
     // Read in from config files the server locations
-    load_multiple_instances_config(serverIPs, serverPorts, configDir + "/serverIPs.cfg");
+    load_multiple_instances_config(serverIPs, serverPorts, (configDir + "/serverIPs.cfg").c_str());
 
     // Read in the ip/port corresponding to the id that this instance was given
     string selfConfigFilename = configDir + "/selfIP";
@@ -115,7 +115,7 @@ int main(int argc, char *argv[])
     load_single_instance_config(selfIP, selfPortStr, selfPort, selfConfigFilename.c_str());
 
     // And finally the dealer location
-    load_single_instance_config(dealerIP, dealerPortStr, dealerPort, configDir + "/dealerIP.cfg");
+    load_single_instance_config(dealerIP, dealerPortStr, dealerPort, (configDir + "/dealerIP.cfg").c_str());
 
     size_t numServers = serverIPs.size();
     bool bgnDealer = selfIP == dealerIP && selfPort == dealerPort;