Moving header to include folder

next/IMultiverso.vcxproj

@@ -71,10 +71,10 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <IncludePath>$(MSMPI_INC);$(ProjectDir)\include;$(ProjectDir)\src;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
+    <IncludePath>$(MSMPI_INC);$(ProjectDir)\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IncludePath>$(MSMPI_INC);$(ProjectDir)\include;$(ProjectDir)\src;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
+    <IncludePath>$(MSMPI_INC);$(ProjectDir)\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -143,24 +143,24 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="include\multiverso\actor.h" />
+    <ClInclude Include="include\multiverso\blob.h" />
+    <ClInclude Include="include\multiverso\communicator.h" />
+    <ClInclude Include="include\multiverso\controller.h" />
+    <ClInclude Include="include\multiverso\message.h" />
     <ClInclude Include="include\multiverso\multiverso.h" />
+    <ClInclude Include="include\multiverso\net.h" />
+    <ClInclude Include="include\multiverso\node.h" />
+    <ClInclude Include="include\multiverso\server.h" />
     <ClInclude Include="include\multiverso\table\array_table.h" />
     <ClInclude Include="include\multiverso\table\kv_table.h" />
     <ClInclude Include="include\multiverso\table_interface.h" />
-    <ClInclude Include="src\actor.h" />
-    <ClInclude Include="src\blob.h" />
-    <ClInclude Include="src\communicator.h" />
-    <ClInclude Include="src\controller.h" />
-    <ClInclude Include="src\message.h" />
-    <ClInclude Include="src\net.h" />
-    <ClInclude Include="src\node.h" />
-    <ClInclude Include="src\server.h" />
+    <ClInclude Include="include\multiverso\worker.h" />
+    <ClInclude Include="include\multiverso\zoo.h" />
     <ClInclude Include="src\util\double_buffer.h" />
     <ClInclude Include="src\util\log.h" />
     <ClInclude Include="src\util\mt_queue.h" />
     <ClInclude Include="src\util\waiter.h" />
-    <ClInclude Include="src\worker.h" />
-    <ClInclude Include="src\zoo.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\actor.cpp" />

next/IMultiverso.vcxproj.filters

@@ -1,33 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClInclude Include="src\actor.h">
-      <Filter>system</Filter>
-    </ClInclude>
-    <ClInclude Include="src\blob.h">
-      <Filter>system</Filter>
-    </ClInclude>
-    <ClInclude Include="src\communicator.h">
-      <Filter>system</Filter>
-    </ClInclude>
-    <ClInclude Include="src\controller.h">
-      <Filter>system</Filter>
-    </ClInclude>
-    <ClInclude Include="src\message.h">
-      <Filter>system</Filter>
-    </ClInclude>
-    <ClInclude Include="src\net.h">
-      <Filter>system</Filter>
-    </ClInclude>
-    <ClInclude Include="src\server.h">
-      <Filter>system</Filter>
-    </ClInclude>
-    <ClInclude Include="src\worker.h">
-      <Filter>system</Filter>
-    </ClInclude>
-    <ClInclude Include="src\zoo.h">
-      <Filter>system</Filter>
-    </ClInclude>
     <ClInclude Include="src\util\double_buffer.h">
       <Filter>util</Filter>
     </ClInclude>
@@ -52,7 +25,34 @@
     <ClInclude Include="include\multiverso\table\kv_table.h">
       <Filter>include\table</Filter>
     </ClInclude>
-    <ClInclude Include="src\node.h">
+    <ClInclude Include="include\multiverso\actor.h">
+      <Filter>system</Filter>
+    </ClInclude>
+    <ClInclude Include="include\multiverso\blob.h">
+      <Filter>system</Filter>
+    </ClInclude>
+    <ClInclude Include="include\multiverso\communicator.h">
+      <Filter>system</Filter>
+    </ClInclude>
+    <ClInclude Include="include\multiverso\controller.h">
+      <Filter>system</Filter>
+    </ClInclude>
+    <ClInclude Include="include\multiverso\message.h">
+      <Filter>system</Filter>
+    </ClInclude>
+    <ClInclude Include="include\multiverso\net.h">
+      <Filter>system</Filter>
+    </ClInclude>
+    <ClInclude Include="include\multiverso\node.h">
+      <Filter>system</Filter>
+    </ClInclude>
+    <ClInclude Include="include\multiverso\server.h">
+      <Filter>system</Filter>
+    </ClInclude>
+    <ClInclude Include="include\multiverso\worker.h">
+      <Filter>system</Filter>
+    </ClInclude>
+    <ClInclude Include="include\multiverso\zoo.h">
       <Filter>system</Filter>
     </ClInclude>
   </ItemGroup>

next/Test/main.cpp

@@ -1,11 +1,11 @@
 #include <iostream>
 
 #include <multiverso/multiverso.h>
-#include <util/log.h>
+#include <multiverso/util/log.h>
 
 #include <multiverso/table/array_table.h>
 #include <multiverso/table/kv_table.h>
-#include <net.h>
+#include <multiverso/net.h>
 
 using namespace multiverso;
 

next/include/multiverso/actor.h

@@ -7,7 +7,7 @@
 #include <thread>
 #include <unordered_map>
 
-#include "message.h"
+#include "multiverso/message.h"
 
 namespace multiverso {
 

next/include/multiverso/blob.h

@@ -4,7 +4,7 @@
 #include <memory>
 #include <string>
 
-#include "util/log.h"
+#include "multiverso/util/log.h"
 
 namespace multiverso {
 

next/include/multiverso/communicator.h

@@ -1,8 +1,8 @@
 #ifndef MULTIVERSO_COMMUNICATION_H_
 #define MULTIVERSO_COMMUNICATION_H_
 
-#include "actor.h"
-#include "message.h"
+#include "multiverso/actor.h"
+#include "multiverso/message.h"
 
 namespace multiverso {
 

next/include/multiverso/controller.h

@@ -1,8 +1,8 @@
 #ifndef MULTIVERSO_CONTROLLER_H_
 #define MULTIVERSO_CONTROLLER_H_
 
-#include "actor.h"
-#include "message.h"
+#include "multiverso/actor.h"
+#include "multiverso/message.h"
 
 namespace multiverso {
 

next/include/multiverso/message.h

@@ -6,8 +6,8 @@
 #include <string>
 #include <vector>
 
-#include "blob.h"
-#include "util/log.h"
+#include "multiverso/blob.h"
+#include "multiverso/util/log.h"
 
 namespace multiverso {
 

next/include/multiverso/net.h

@@ -3,7 +3,7 @@
 
 
 #include <string>
-#include "message.h"
+#include "multiverso/message.h"
 
 namespace multiverso {
 // Interface of inter process communication method

next/include/multiverso/server.h

@@ -1,7 +1,7 @@
 #ifndef MULTIVERSO_SERVER_H_
 #define MULTIVERSO_SERVER_H_
 
-#include "actor.h"
+#include "multiverso/actor.h"
 #include <vector>
 
 namespace multiverso {

next/include/multiverso/table/kv_table.h

@@ -2,8 +2,8 @@
 #define MULTIVERSO_KV_TABLE_H_
 
 #include "multiverso/table_interface.h"
-#include "util/log.h"
-#include "zoo.h"
+#include "multiverso/util/log.h"
+#include "multiverso/zoo.h"
 
 #include <unordered_map>
 #include <vector>

next/include/multiverso/table_interface.h

@@ -5,10 +5,10 @@
 #include <string>
 #include <unordered_map>
 
-#include "blob.h"
-#include "util/log.h"
-#include "util/waiter.h"
-#include "message.h"
+#include "multiverso/blob.h"
+#include "multiverso/util/log.h"
+#include "multiverso/util/waiter.h"
+#include "multiverso/message.h"
 
 namespace multiverso {
 

next/include/multiverso/worker.h

@@ -1,7 +1,7 @@
 #ifndef MULTIVERSO_WORKER_H_
 #define MULTIVERSO_WORKER_H_
 
-#include "actor.h"
+#include "multiverso/actor.h"
 
 namespace multiverso {
 

next/include/multiverso/zoo.h

@@ -5,8 +5,8 @@
 #include <string>
 #include <unordered_map>
 
-#include "actor.h"
-#include "node.h"
+#include "multiverso/actor.h"
+#include "multiverso/node.h"
 #include "multiverso/table_interface.h"
 
 namespace multiverso {

next/src/actor.cpp

@@ -1,8 +1,8 @@
-#include "actor.h"
-#include "message.h"
-#include "util/mt_queue.h"
-#include "zoo.h"
-#include "util/log.h"
+#include "multiverso/actor.h"
+#include "multiverso/message.h"
+#include "multiverso/util/mt_queue.h"
+#include "multiverso/zoo.h"
+#include "multiverso/util/log.h"
 
 namespace multiverso {
 

next/src/communicator.cpp

@@ -1,7 +1,7 @@
-#include "communicator.h"
-#include "zoo.h"
-#include "net.h"
-#include "util/log.h"
+#include "multiverso/communicator.h"
+#include "multiverso/zoo.h"
+#include "multiverso/net.h"
+#include "multiverso/util/log.h"
 
 namespace multiverso {
 

next/src/controller.cpp

@@ -1,8 +1,8 @@
-#include "controller.h"
+#include "multiverso/controller.h"
 
-#include "message.h"
-#include "node.h"
-#include "zoo.h"
+#include "multiverso/message.h"
+#include "multiverso/node.h"
+#include "multiverso/zoo.h"
 
 namespace multiverso {
 

next/src/multiverso.cpp

@@ -1,6 +1,6 @@
 #include "multiverso/multiverso.h"
 
-#include "zoo.h"
+#include "multiverso/zoo.h"
 
 namespace multiverso {
 

next/src/net.cpp

@@ -1,7 +1,7 @@
-#include "net.h"
+#include "multiverso/net.h"
 
-#include "util/log.h"
-#include "message.h"
+#include "multiverso/util/log.h"
+#include "multiverso/message.h"
 
 // TODO(feiga) remove this 
 #define MULTIVERSO_USE_MPI

next/src/node.cpp

@@ -1,4 +1,4 @@
-#include "node.h"
+#include "multiverso/node.h"
 
 namespace multiverso {
 

next/src/server.cpp

@@ -1,8 +1,8 @@
-#include "server.h"
+#include "multiverso/server.h"
 
-#include "actor.h"
+#include "multiverso/actor.h"
 #include "multiverso/table_interface.h" 
-#include "zoo.h"
+#include "multiverso/zoo.h"
 
 namespace multiverso {
 

next/src/table.cpp

@@ -1,5 +1,5 @@
 #include "multiverso/table_interface.h"
-#include "zoo.h"
+#include "multiverso/zoo.h"
 
 namespace multiverso {
 

next/src/util/log.cpp

@@ -1,7 +1,7 @@
 #include <ctime>
 #include <cstdarg>
 
-#include "log.h"
+#include "multiverso/util/log.h"
 
 namespace multiverso
 {

next/src/worker.cpp

@@ -1,6 +1,6 @@
-#include "worker.h"
-#include "util/mt_queue.h"
-#include "zoo.h"
+#include "multiverso/worker.h"
+#include "multiverso/util/mt_queue.h"
+#include "multiverso/zoo.h"
 
 namespace multiverso {
 

next/src/zoo.cpp

@@ -1,13 +1,13 @@
-#include "communicator.h"
-#include "zoo.h"
-#include "message.h"
-#include "actor.h"
-#include "util/mt_queue.h"
-#include "net.h"
-#include "util/log.h"
-#include "worker.h"
-#include "server.h"
-#include "controller.h"
+#include "multiverso/communicator.h"
+#include "multiverso/zoo.h"
+#include "multiverso/message.h"
+#include "multiverso/actor.h"
+#include "multiverso/util/mt_queue.h"
+#include "multiverso/net.h"
+#include "multiverso/util/log.h"
+#include "multiverso/worker.h"
+#include "multiverso/server.h"
+#include "multiverso/controller.h"
 
 namespace multiverso {