Successfull Linux build

CreatedGrpc/CreatedGrpc.vcxitems

@@ -4,6 +4,7 @@
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
     <HasSharedItems>true</HasSharedItems>
     <ItemsProjectGuid>{9c78546c-04b5-45bb-99c4-9ffbaf846bfe}</ItemsProjectGuid>
+    <ItemsProjectName>CreatedGrpc_Windows</ItemsProjectName>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>

CreatedGrpc_Linux/CreatedGrpc_Linux.vcxitems

+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <ItemsProjectGuid>{82c215f4-a8fa-4dd0-9a5c-27de9b07d0f1}</ItemsProjectGuid>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectCapability Include="SourceItemsFromImports" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="$(MSBuildThisFileDirectory)ModeliRpc.grpc.pb.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)ModeliRpc.pb.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="$(MSBuildThisFileDirectory)ModeliRpc.grpc.pb.cc" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)ModeliRpc.pb.cc" />
+  </ItemGroup>
+</Project>
\ No newline at end of file

MC_BackEnd.sln

 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.27130.2010
+VisualStudioVersion = 15.0.27130.2020
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MC_Backend_Linux", "MC_Backend_Linux\MC_Backend_Linux.vcxproj", "{661905CE-1EFD-4D2B-8CC8-0A8BAFB5242F}"
 EndProject
@@ -18,10 +18,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Main", "Main\Main.vcxitems"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BackendTests", "BackendTests\BackendTests.vcxproj", "{500F1104-28C6-4BE4-A180-8028843972AC}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CreatedGrpc", "CreatedGrpc\CreatedGrpc.vcxitems", "{9C78546C-04B5-45BB-99C4-9FFBAF846BFE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CreatedGrpc_Windows", "CreatedGrpc\CreatedGrpc.vcxitems", "{9C78546C-04B5-45BB-99C4-9FFBAF846BFE}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Utility", "UtilityClasses\UtilityClasses.vcxitems", "{FD95EBAC-8E33-43D3-88BA-04A2B02D7D9E}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CreatedGrpc_Linux", "CreatedGrpc_Linux\CreatedGrpc_Linux.vcxitems", "{82C215F4-A8FA-4DD0-9A5C-27DE9B07D0F1}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		CreatedGrpc\CreatedGrpc.vcxitems*{500f1104-28c6-4be4-a180-8028843972ac}*SharedItemsImports = 4
@@ -30,6 +32,13 @@ Global
 		Simulation\Simulation.vcxitems*{500f1104-28c6-4be4-a180-8028843972ac}*SharedItemsImports = 4
 		UtilityClasses\UtilityClasses.vcxitems*{500f1104-28c6-4be4-a180-8028843972ac}*SharedItemsImports = 4
 		Files\Files.vcxitems*{600c8d4e-39a2-40dd-b779-ac823cd2f5cc}*SharedItemsImports = 9
+		CreatedGrpc_Linux\CreatedGrpc_Linux.vcxitems*{661905ce-1efd-4d2b-8cc8-0a8bafb5242f}*SharedItemsImports = 4
+		Files\Files.vcxitems*{661905ce-1efd-4d2b-8cc8-0a8bafb5242f}*SharedItemsImports = 4
+		FMU-Core\NativeFmuShared\NativeFmuShared.vcxitems*{661905ce-1efd-4d2b-8cc8-0a8bafb5242f}*SharedItemsImports = 4
+		Main\Main.vcxitems*{661905ce-1efd-4d2b-8cc8-0a8bafb5242f}*SharedItemsImports = 4
+		Simulation\Simulation.vcxitems*{661905ce-1efd-4d2b-8cc8-0a8bafb5242f}*SharedItemsImports = 4
+		UtilityClasses\UtilityClasses.vcxitems*{661905ce-1efd-4d2b-8cc8-0a8bafb5242f}*SharedItemsImports = 4
+		CreatedGrpc_Linux\CreatedGrpc_Linux.vcxitems*{82c215f4-a8fa-4dd0-9a5c-27de9b07d0f1}*SharedItemsImports = 9
 		Simulation\Simulation.vcxitems*{8510328c-8540-419b-96d9-1e5ff396366f}*SharedItemsImports = 9
 		CreatedGrpc\CreatedGrpc.vcxitems*{87f7a408-7c05-47a8-a1d7-4a53ca350666}*SharedItemsImports = 4
 		Files\Files.vcxitems*{87f7a408-7c05-47a8-a1d7-4a53ca350666}*SharedItemsImports = 4

MC_Backend_Linux/MC_Backend_Linux.vcxproj

@@ -66,11 +66,10 @@
   <ImportGroup Label="Shared">
     <Import Project="..\Files\Files.vcxitems" Label="Shared" />
     <Import Project="..\FMU-Core\NativeFmuShared\NativeFmuShared.vcxitems" Label="Shared" />
-    <Import Project="..\Network\Network.vcxitems" Label="Shared" />
     <Import Project="..\Simulation\Simulation.vcxitems" Label="Shared" />
     <Import Project="..\Main\Main.vcxitems" Label="Shared" />
     <Import Project="..\UtilityClasses\UtilityClasses.vcxitems" Label="Shared" />
-    <Import Project="..\CreatedGrpc\CreatedGrpc.vcxitems" Label="Shared" />
+    <Import Project="..\CreatedGrpc_Linux\CreatedGrpc_Linux.vcxitems" Label="Shared" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros" />
@@ -103,11 +102,11 @@
       <AdditionalLibraryDirectories>
       </AdditionalLibraryDirectories>
       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <LibraryDependencies>dl;pthread;boost_filesystem;boost_system;boost_program_options</LibraryDependencies>
+      <LibraryDependencies>dl;pthread;boost_filesystem;boost_system;boost_program_options;boost_timer;protobuf;grpc++</LibraryDependencies>
       <SharedLibrarySearchPath>%(SharedLibrarySearchPath)</SharedLibrarySearchPath>
     </Link>
     <ClCompile>
-      <AdditionalIncludeDirectories>../FMU-Core/NativeFmuShared;../Network;../Files;../Simulation</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>UtilityClasses;CreatedGrpc_Linux;FMU-Core/NativeFmuShared;Simulation;Files;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>-DBOOST_DATE_TIME_NO_LIB -DBOOST_REGEX_NO_LIB </AdditionalOptions>
       <CppLanguageStandard>c++1y</CppLanguageStandard>
     </ClCompile>
@@ -117,11 +116,11 @@
       <AdditionalLibraryDirectories>
       </AdditionalLibraryDirectories>
       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <LibraryDependencies>dl;pthread;boost_filesystem;boost_system;boost_program_options</LibraryDependencies>
+      <LibraryDependencies>dl;pthread;boost_filesystem;boost_system;boost_program_options;boost_timer;protobuf;grpc++</LibraryDependencies>
       <SharedLibrarySearchPath>%(SharedLibrarySearchPath)</SharedLibrarySearchPath>
     </Link>
     <ClCompile>
-      <AdditionalIncludeDirectories>../FMU-Core/NativeFmuShared;../Network;../Files;../Simulation</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>UtilityClasses;CreatedGrpc_Linux;FMU-Core/NativeFmuShared;Simulation;Files;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>-DBOOST_DATE_TIME_NO_LIB -DBOOST_REGEX_NO_LIB </AdditionalOptions>
       <CppLanguageStandard>c++1y</CppLanguageStandard>
     </ClCompile>
@@ -131,11 +130,11 @@
       <AdditionalLibraryDirectories>
       </AdditionalLibraryDirectories>
       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <LibraryDependencies>dl;pthread;boost_filesystem;boost_system;boost_program_options</LibraryDependencies>
+      <LibraryDependencies>dl;pthread;boost_filesystem;boost_system;boost_program_options;boost_timer;protobuf;grpc++</LibraryDependencies>
       <SharedLibrarySearchPath>%(SharedLibrarySearchPath)</SharedLibrarySearchPath>
     </Link>
     <ClCompile>
-      <AdditionalIncludeDirectories>../FMU-Core/NativeFmuShared;../Network;../Files;../Simulation</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>UtilityClasses;CreatedGrpc_Linux;FMU-Core/NativeFmuShared;Simulation;Files;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>-DBOOST_DATE_TIME_NO_LIB -DBOOST_REGEX_NO_LIB</AdditionalOptions>
       <CppLanguageStandard>c++1y</CppLanguageStandard>
     </ClCompile>
@@ -149,11 +148,11 @@
       <AdditionalLibraryDirectories>
       </AdditionalLibraryDirectories>
       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <LibraryDependencies>dl;pthread;boost_filesystem;boost_system;boost_program_options</LibraryDependencies>
+      <LibraryDependencies>dl;pthread;boost_filesystem;boost_system;boost_program_options;boost_timer;protobuf;grpc++</LibraryDependencies>
       <SharedLibrarySearchPath>%(SharedLibrarySearchPath)</SharedLibrarySearchPath>
     </Link>
     <ClCompile>
-      <AdditionalIncludeDirectories>../FMU-Core/NativeFmuShared;../Network;../Files;../Simulation</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>UtilityClasses;CreatedGrpc_Linux;FMU-Core/NativeFmuShared;Simulation;Files;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>-DBOOST_DATE_TIME_NO_LIB -DBOOST_REGEX_NO_LIB</AdditionalOptions>
       <CppLanguageStandard>c++1y</CppLanguageStandard>
     </ClCompile>
@@ -167,11 +166,11 @@
       <AdditionalLibraryDirectories>
       </AdditionalLibraryDirectories>
       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <LibraryDependencies>dl;pthread;boost_filesystem;boost_system;boost_program_options</LibraryDependencies>
+      <LibraryDependencies>dl;pthread;boost_filesystem;boost_system;boost_program_options;boost_timer;protobuf;grpc++</LibraryDependencies>
       <SharedLibrarySearchPath>%(SharedLibrarySearchPath)</SharedLibrarySearchPath>
     </Link>
     <ClCompile>
-      <AdditionalIncludeDirectories>../FMU-Core/NativeFmuShared;../Network;../Files;../Simulation</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>UtilityClasses;CreatedGrpc_Linux;FMU-Core/NativeFmuShared;Simulation;Files;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>-DBOOST_DATE_TIME_NO_LIB -DBOOST_REGEX_NO_LIB</AdditionalOptions>
       <CppLanguageStandard>c++1y</CppLanguageStandard>
     </ClCompile>
@@ -181,11 +180,11 @@
       <AdditionalLibraryDirectories>
       </AdditionalLibraryDirectories>
       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <LibraryDependencies>dl;pthread;boost_filesystem;boost_system;boost_program_options</LibraryDependencies>
+      <LibraryDependencies>dl;pthread;boost_filesystem;boost_system;boost_program_options;boost_timer;protobuf;grpc++</LibraryDependencies>
       <SharedLibrarySearchPath>%(SharedLibrarySearchPath)</SharedLibrarySearchPath>
     </Link>
     <ClCompile>
-      <AdditionalIncludeDirectories>../FMU-Core/NativeFmuShared;../Network;../Files;../Simulation</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>UtilityClasses;CreatedGrpc_Linux;FMU-Core/NativeFmuShared;Simulation;Files;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>-DBOOST_DATE_TIME_NO_LIB -DBOOST_REGEX_NO_LIB</AdditionalOptions>
       <CppLanguageStandard>c++1y</CppLanguageStandard>
     </ClCompile>

UtilityClasses/ConcurrentQueue.h

 #pragma once
 #include "boost/optional.hpp"
-#include <atomic>
+#include <condition_variable>
 #include <functional>
 #include <queue>
 #include <mutex>
@@ -14,7 +14,7 @@ namespace Utility
     class ConcurrentQueue
     {
     private:
-        std::atomic_bool m_finished = false;
+        bool m_finished = false;
         std::queue<T> m_queue;
         std::mutex _mutex;
         std::condition_variable _cond_var;
@@ -123,9 +123,8 @@ namespace Utility
         /// Will finish the currently running pop request.
         void finish()
         {            
-            m_finished = true;
-            // Only notify
-            execute_and_notify([]() { ; });
+            // Notify to cancel pending wait_and_pop
+            execute_and_notify([&]() { m_finished = true; });
         }
     };
 }