Archives/ohwgiles_laminar
1
0
Fork 0
mirror of https://github.com/ohwgiles/laminar.git synced 2025-06-13 12:54:29 +00:00
Code Issues Projects Releases Wiki Activity

fix warnings under clang++

Browse Source
This commit is contained in:
Oliver Giles 2020-09-26 11:33:36 +12:00
parent 9974df21ce
commit 9862affd98
6 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/http.h
View File

@ -1,5 +1,5 @@
/// ///
/// Copyright 2019 Oliver Giles /// Copyright 2019-2020 Oliver Giles
/// ///
/// This file is part of Laminar /// This file is part of Laminar
/// ///
@ -28,8 +28,8 @@
typedef unsigned int uint; typedef unsigned int uint;
typedef unsigned long ulong; typedef unsigned long ulong;
struct Laminar; class Laminar;
struct Resources; class Resources;
struct LogWatcher; struct LogWatcher;
struct EventPeer; struct EventPeer;

1
src/laminar.cpp
View File

@ -67,7 +67,6 @@ inline kj::Path operator/(const std::string& p, const T& ext) {
typedef std::string str; typedef std::string str;
Laminar::Laminar(Server &server, Settings settings) : Laminar::Laminar(Server &server, Settings settings) :
settings(settings),
srv(server), srv(server),
homePath(kj::Path::parse(&settings.home[1])), homePath(kj::Path::parse(&settings.home[1])),
fsHome(kj::newDiskFilesystem()->getRoot().openSubdir(homePath, kj::WriteMode::MODIFY)), fsHome(kj::newDiskFilesystem()->getRoot().openSubdir(homePath, kj::WriteMode::MODIFY)),

5
src/laminar.h
View File

@ -1,5 +1,5 @@
/// ///
/// Copyright 2015-2019 Oliver Giles /// Copyright 2015-2020 Oliver Giles
/// ///
/// This file is part of Laminar /// This file is part of Laminar
/// ///
@ -31,7 +31,7 @@
// Context name to context object map // Context name to context object map
typedef std::unordered_map<std::string, std::shared_ptr<Context>> ContextMap; typedef std::unordered_map<std::string, std::shared_ptr<Context>> ContextMap;
struct Server; class Server;
class Json; class Json;
class Http; class Http;
@ -125,7 +125,6 @@ private:
std::unordered_map<std::string, std::string> jobGroups; std::unordered_map<std::string, std::string> jobGroups;
Settings settings;
RunSet activeJobs; RunSet activeJobs;
Database* db; Database* db;
Server& srv; Server& srv;

4
src/rpc.h
View File

@ -1,5 +1,5 @@
/// ///
/// Copyright 2019 Oliver Giles /// Copyright 2019-2020 Oliver Giles
/// ///
/// This file is part of Laminar /// This file is part of Laminar
/// ///
@ -23,7 +23,7 @@
#include <capnp/rpc-twoparty.h> #include <capnp/rpc-twoparty.h>
#include <capnp/rpc.capnp.h> #include <capnp/rpc.capnp.h>
struct Laminar; class Laminar;
class Rpc { class Rpc {
public: public:

2
src/server.cpp
View File

@ -95,7 +95,7 @@ kj::Promise<int> Server::onChildExit(kj::Maybe<pid_t> &pid) {
Server::PathWatcher& Server::watchPaths(std::function<void()> fn) Server::PathWatcher& Server::watchPaths(std::function<void()> fn)
{ {
struct PathWatcherImpl : public PathWatcher { struct PathWatcherImpl final : public PathWatcher {
PathWatcher& addPath(const char* path) override { PathWatcher& addPath(const char* path) override {
inotify_add_watch(fd, path, IN_ONLYDIR | IN_CLOSE_WRITE | IN_CREATE | IN_DELETE); inotify_add_watch(fd, path, IN_ONLYDIR | IN_CLOSE_WRITE | IN_CREATE | IN_DELETE);
return *this; return *this;

8
src/server.h
View File

@ -1,5 +1,5 @@
/// ///
/// Copyright 2015-2017 Oliver Giles /// Copyright 2015-2020 Oliver Giles
/// ///
/// This file is part of Laminar /// This file is part of Laminar
/// ///
@ -26,9 +26,9 @@
#include <functional> #include <functional>
#include <sys/types.h> #include <sys/types.h>
struct Laminar; class Laminar;
struct Http; class Http;
struct Rpc; class Rpc;
// This class manages the program's asynchronous event loop // This class manages the program's asynchronous event loop
class Server final : public kj::TaskSet::ErrorHandler { class Server final : public kj::TaskSet::ErrorHandler {