fixing up compile errors in transport library and finishing up porting

lib/configuration.cc

@@ -29,9 +29,9 @@
  *
  **********************************************************************/
 
-#include "paxos-lib/lib/assert.h"
-#include "paxos-lib/lib/configuration.h"
-#include "paxos-lib/lib/message.h"
+#include "lib/assert.h"
+#include "lib/configuration.h"
+#include "lib/message.h"
 
 #include <iostream>
 #include <fstream>

lib/configuration.h

@@ -32,7 +32,7 @@
 #ifndef _LIB_CONFIGURATION_H_
 #define _LIB_CONFIGURATION_H_
 
-#include "paxos-lib/lib/viewstamp.h"
+#include "replication/vr/viewstamp.h"
 
 #include <fstream>
 #include <stdbool.h>

lib/latency.cc

@@ -4,7 +4,9 @@
  * latency.cc:
  *   latency profiling functions
  *
- * Copyright 2013 Dan R. K. Ports  <drkp@cs.washington.edu>
+ * Copyright 2013-2015 Irene Zhang <iyzhang@cs.washington.edu>
+ *                     Naveen Kr. Sharma <nksharma@cs.washington.edu>
+ *                     Dan R. K. Ports  <drkp@cs.washington.edu>
  * Copyright 2009-2012 Massachusetts Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person
@@ -40,8 +42,8 @@
 #include <iostream>
 #include <fstream>
 
-#include "paxos-lib/lib/message.h"
-#include "paxos-lib/lib/latency-format.pb.h"
+#include "lib/message.h"
+#include "lib/latency-format.pb.h"
 
 static struct Latency_t *latencyHead;
 

lib/simtransport.cc

@@ -4,7 +4,9 @@
  * simtransport.cc:
  *   simulated message-passing interface for testing use
  *
- * Copyright 2013 Dan R. K. Ports  <drkp@cs.washington.edu>
+ * Copyright 2013-2015 Irene Zhang <iyzhang@cs.washington.edu>
+ *                     Naveen Kr. Sharma <nksharma@cs.washington.edu>
+ *                     Dan R. K. Ports  <drkp@cs.washington.edu>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
@@ -28,9 +30,9 @@
  *
  **********************************************************************/
 
-#include "paxos-lib/lib/assert.h"
-#include "paxos-lib/lib/message.h"
-#include "paxos-lib/lib/simtransport.h"
+#include "lib/assert.h"
+#include "lib/message.h"
+#include "lib/simtransport.h"
 #include <google/protobuf/message.h>
 
 SimulatedTransportAddress::SimulatedTransportAddress(int addr)

lib/tests/configuration-test.cc

@@ -28,7 +28,7 @@
  *
  **********************************************************************/
 
-#include "paxos-lib/lib/configuration.h"
+#include "lib/configuration.h"
 
 #include <gtest/gtest.h>
 

lib/tests/simtransport-test.cc

@@ -28,10 +28,10 @@
  *
  **********************************************************************/
 
-#include "paxos-lib/lib/configuration.h"
-#include "paxos-lib/lib/message.h"
-#include "paxos-lib/lib/simtransport.h"
-#include "paxos-lib/lib/tests/simtransport-testmessage.pb.h"
+#include "lib/configuration.h"
+#include "lib/message.h"
+#include "lib/simtransport.h"
+#include "lib/tests/simtransport-testmessage.pb.h"
 
 #include <gtest/gtest.h>
 

lib/transport.cc

@@ -4,7 +4,9 @@
  * transport.cc:
  *   message-passing network interface; common definitions
  *
- * Copyright 2013 Dan R. K. Ports  <drkp@cs.washington.edu>
+ * Copyright 2013-2015 Irene Zhang <iyzhang@cs.washington.edu>
+ *                     Naveen Kr. Sharma <nksharma@cs.washington.edu>
+ *                     Dan R. K. Ports  <drkp@cs.washington.edu>
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
@@ -28,8 +30,8 @@
  *
  **********************************************************************/
 
-#include "paxos-lib/lib/assert.h"
-#include "paxos-lib/lib/transport.h"
+#include "lib/assert.h"
+#include "lib/transport.h"
 
 TransportReceiver::~TransportReceiver()
 {

lib/transport.h

@@ -31,7 +31,7 @@
 #ifndef _LIB_TRANSPORT_H_
 #define _LIB_TRANSPORT_H_
 
-#include "paxos-lib/lib/configuration.h"
+#include "lib/configuration.h"
 
 #include <google/protobuf/message.h>
 #include <functional>