Browse Source

Sync changes.

pull/1029/head
XMRig 5 years ago
parent
commit
e759ccf385
  1. 2
      src/App_unix.cpp
  2. 5
      src/api/Api.cpp
  3. 3
      src/api/v1/ApiRouter.h
  4. 3
      src/base/net/http/HttpResponse.cpp
  5. 2
      src/core/Controller.cpp
  6. 3
      src/core/Controller.h
  7. 2
      src/workers/Workers.cpp

2
src/App_unix.cpp

@ -31,7 +31,7 @@
#include "App.h"
#include "base/io/log/Log.h"
#include "core/Config.h"
#include "core/config/Config.h"
#include "core/Controller.h"

5
src/api/Api.cpp

@ -26,6 +26,11 @@
#include <uv.h>
#ifndef _WIN32
# include <unistd.h>
#endif
#include "3rdparty/http-parser/http_parser.h"
#include "api/Api.h"
#include "api/interfaces/IApiListener.h"

3
src/api/v1/ApiRouter.h

@ -26,7 +26,6 @@
#define XMRIG_APIROUTER_H
#include "net/NetworkState.h"
#include "api/interfaces/IApiListener.h"
#include "rapidjson/fwd.h"
@ -43,7 +42,7 @@ class Controller;
class ApiRouter : public xmrig::IApiListener
{
public:
ApiRouter(xmrig::Controller *controller);
ApiRouter(Controller *controller);
~ApiRouter() override;
protected:

3
src/base/net/http/HttpResponse.cpp

@ -24,8 +24,9 @@
*/
#include <uv.h>
#include <sstream>
#include <string.h>
#include <uv.h>
#include "3rdparty/http-parser/http_parser.h"

2
src/core/Controller.cpp

@ -195,6 +195,8 @@ void xmrig::Controller::start()
# ifdef XMRIG_FEATURE_API
api()->start();
# endif
save();
}

3
src/core/Controller.h

@ -29,9 +29,6 @@
#include "base/kernel/interfaces/IConfigListener.h"
class StatsData;
namespace xmrig {

2
src/workers/Workers.cpp

@ -207,8 +207,6 @@ void Workers::start(xmrig::Controller *controller)
m_workers.push_back(handle);
handle->start(Workers::onReady);
}
controller->save();
}

Loading…
Cancel
Save