Fix Linux build problems

dedmen · Feb 27, 2019 · 361f830 · 361f830
1 parent b17fcaf
commit 361f830
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/EngineProfiling.cpp b/src/EngineProfiling.cpp
@@ -52,7 +52,7 @@ extern "C" {
 
         if (sdp.content.length() < 64 || !x || !*x || x->get()->size() < 16) return;
 
-        r_string name = getScriptName(sdp.content, sdp.sourcefile, 32);
+        r_string name(getScriptName(sdp.content, sdp.sourcefile, 32));
         if (!name.empty() && name != "<unknown>"sv)
             addScopeInstruction(*x, name);
     }

diff --git a/src/SignalSlot.hpp b/src/SignalSlot.hpp
@@ -21,7 +21,7 @@ class Signal<ReturnType(Args...)> {
     std::vector<ReturnType> emit(Args... args) const {
         std::vector<ReturnType> returnData;
         if (slots.empty())
-            return;
+            return {};
         for (auto& slot : slots) {
             returnData.push_back(slot(args...));
         }

diff --git a/src/scriptProfiler.cpp b/src/scriptProfiler.cpp
@@ -10,8 +10,10 @@
 #endif
 #include "ProfilerAdapter.hpp"
 #include "AdapterArmaDiag.hpp"
+#ifdef WITH_BROFILER
 #include "AdapterBrofiler.hpp"
 #include "Event.h"
+#endif
 #include "AdapterChrome.hpp"
 #include "AdapterTracy.hpp"
 #include <memory>
@@ -669,7 +671,7 @@ game_value compileRedirect2(game_state& state, game_value_parameter message) {
 
     auto& funcPath = bodyCode->instructions->front()->sdp.sourcefile;
     //#TODO pass instructions to getScriptName and check if there is a "scriptName" or "scopeName" unary command call
-    r_string scriptName = getScriptName(str, funcPath, 32);
+    r_string scriptName(getScriptName(str, funcPath, 32));
 
     //if (scriptName.empty()) scriptName = "<unknown>";