Ver Fonte

Move GHR outside of function and provide ctor to suppress compiler warning

Without ctor, compiler emits warning "unused variable ghr".
Tatsuhiro Tsujikawa há 12 anos atrás
pai
commit
c26c1e234a
1 ficheiros alterados com 12 adições e 7 exclusões
  1. 12 7
      src/DownloadEngine.cc

+ 12 - 7
src/DownloadEngine.cc

@@ -140,15 +140,20 @@ void executeCommand(std::deque<std::unique_ptr<Command>>& commands,
 }
 } // namespace
 
+namespace {
+class GHR {
+public:
+  GHR() {}
+  ~GHR()
+  {
+    global::globalHaltRequested = 5;
+  }
+};
+} // namespace
+
 int DownloadEngine::run(bool oneshot)
 {
-  class GHR {
-    public:
-      ~GHR() {
-        global::globalHaltRequested = 5;
-      }
-  } ghr;
-
+  GHR ghr;
   while(!commands_.empty() || !routineCommands_.empty()) {
     if(!commands_.empty()) {
       waitData();