fix merge issues

src/network-workloads/model-net-mpi-replay.c

@@ -695,16 +695,16 @@ static void gen_synthetic_tr(nw_state * s, tw_bf * bf, nw_message * m, tw_lp * l
             remote_m.fwd.sim_start_time = tw_now(lp);
             remote_m.fwd.dest_rank = dest_svr[i];
             remote_m.msg_type = CLI_BCKGND_ARRIVE;
-            remote_m.fwd.num_bytes = payload;
+            remote_m.fwd.num_bytes = PAYLOAD_SZ;
             remote_m.fwd.app_id = s->app_id;
             remote_m.fwd.src_rank = s->local_rank;
 
-            m->event_rc = model_net_event(net_id, "synthetic-tr", global_dest_id, payload, 0.0, 
+            m->event_rc = model_net_event(net_id, "synthetic-tr", global_dest_id, PAYLOAD_SZ, 0.0, 
                     sizeof(nw_message), (const void*)&remote_m, 
                     0, NULL, lp);
             
-            s->gen_data += payload;
-            num_syn_bytes_sent += payload; 
+            s->gen_data += PAYLOAD_SZ;
+            num_syn_bytes_sent += PAYLOAD_SZ; 
         }
 
         /* New event after MEAN_INTERVAL */  

src/workload/methods/codes-dumpi-trace-nw-wrkld.c

@@ -24,7 +24,7 @@
 #ifdef ENABLE_CORTEX_PYTHON
 #include <cortex/cortex-python.h>
 #endif
-#define PROFILE_TYPE cortex_dumpi_profile*
+#define PROFILE_TYPE struct cortex_dumpi_profile*
 //#define UNDUMPI_OPEN cortex_undumpi_open
 #define DUMPI_START_STREAM_READ cortex_dumpi_start_stream_read
 #define UNDUMPI_CLOSE cortex_undumpi_close