summaryrefslogtreecommitdiff
path: root/louloulibs
diff options
context:
space:
mode:
Diffstat (limited to 'louloulibs')
-rw-r--r--louloulibs/config/config.hpp6
-rw-r--r--louloulibs/logger/logger.hpp6
-rw-r--r--louloulibs/network/credentials_manager.hpp5
-rw-r--r--louloulibs/network/dns_handler.hpp4
-rw-r--r--louloulibs/network/dns_socket_handler.hpp4
-rw-r--r--louloulibs/network/poller.hpp6
-rw-r--r--louloulibs/network/resolver.hpp6
-rw-r--r--louloulibs/network/socket_handler.hpp4
-rw-r--r--louloulibs/network/tcp_socket_handler.hpp6
-rw-r--r--louloulibs/utils/encoding.hpp6
-rw-r--r--louloulibs/utils/reload.hpp6
-rw-r--r--louloulibs/utils/revstr.hpp6
-rw-r--r--louloulibs/utils/scopeguard.hpp4
-rw-r--r--louloulibs/utils/split.hpp6
-rw-r--r--louloulibs/utils/string.hpp6
-rw-r--r--louloulibs/utils/timed_events.hpp5
-rw-r--r--louloulibs/utils/tolower.hpp6
-rw-r--r--louloulibs/utils/xdg.hpp6
-rw-r--r--louloulibs/xmpp/adhoc_command.hpp5
-rw-r--r--louloulibs/xmpp/adhoc_commands_handler.hpp5
-rw-r--r--louloulibs/xmpp/adhoc_session.hpp5
-rw-r--r--louloulibs/xmpp/body.hpp6
-rw-r--r--louloulibs/xmpp/jid.hpp6
-rw-r--r--louloulibs/xmpp/roster.hpp6
-rw-r--r--louloulibs/xmpp/xmpp_component.hpp6
-rw-r--r--louloulibs/xmpp/xmpp_parser.hpp6
-rw-r--r--louloulibs/xmpp/xmpp_stanza.hpp6
27 files changed, 64 insertions, 85 deletions
diff --git a/louloulibs/config/config.hpp b/louloulibs/config/config.hpp
index b46768e..6728df8 100644
--- a/louloulibs/config/config.hpp
+++ b/louloulibs/config/config.hpp
@@ -13,8 +13,8 @@
* save the config into the file.
*/
-#ifndef CONFIG_INCLUDED
-# define CONFIG_INCLUDED
+#pragma once
+
#include <functional>
#include <fstream>
@@ -91,4 +91,4 @@ private:
};
-#endif // CONFIG_INCLUDED
+
diff --git a/louloulibs/logger/logger.hpp b/louloulibs/logger/logger.hpp
index 8ff4dcd..0893c77 100644
--- a/louloulibs/logger/logger.hpp
+++ b/louloulibs/logger/logger.hpp
@@ -1,5 +1,5 @@
-#ifndef LOGGER_INCLUDED
-# define LOGGER_INCLUDED
+#pragma once
+
/**
* Singleton used in logger macros to write into files or stdout, with
@@ -123,4 +123,4 @@ namespace logging_details
#define log_debug(...) logging_details::log_debug(WHERE, __VA_ARGS__)
-#endif // LOGGER_INCLUDED
+
diff --git a/louloulibs/network/credentials_manager.hpp b/louloulibs/network/credentials_manager.hpp
index c0d23ae..0fc4b89 100644
--- a/louloulibs/network/credentials_manager.hpp
+++ b/louloulibs/network/credentials_manager.hpp
@@ -1,5 +1,4 @@
-#ifndef BIBOUMI_CREDENTIALS_MANAGER_HPP
-#define BIBOUMI_CREDENTIALS_MANAGER_HPP
+#pragma once
#include "louloulibs.h"
@@ -37,4 +36,4 @@ private:
};
#endif //BOTAN_FOUND
-#endif //BIBOUMI_CREDENTIALS_MANAGER_HPP
+
diff --git a/louloulibs/network/dns_handler.hpp b/louloulibs/network/dns_handler.hpp
index d2b48d2..e0feb11 100644
--- a/louloulibs/network/dns_handler.hpp
+++ b/louloulibs/network/dns_handler.hpp
@@ -1,5 +1,4 @@
-#ifndef DNS_HANDLER_HPP_INCLUDED
-#define DNS_HANDLER_HPP_INCLUDED
+#pragma once
#include <louloulibs.h>
#ifdef CARES_FOUND
@@ -56,4 +55,3 @@ private:
};
#endif /* CARES_FOUND */
-#endif /* DNS_HANDLER_HPP_INCLUDED */
diff --git a/louloulibs/network/dns_socket_handler.hpp b/louloulibs/network/dns_socket_handler.hpp
index 5ea9846..dba2f26 100644
--- a/louloulibs/network/dns_socket_handler.hpp
+++ b/louloulibs/network/dns_socket_handler.hpp
@@ -1,5 +1,4 @@
-#ifndef DNS_SOCKET_HANDLER_HPP
-# define DNS_SOCKET_HANDLER_HPP
+#pragma once
#include <louloulibs.h>
#ifdef CARES_FOUND
@@ -44,4 +43,3 @@ private:
};
#endif // CARES_FOUND
-#endif // DNS_SOCKET_HANDLER_HPP
diff --git a/louloulibs/network/poller.hpp b/louloulibs/network/poller.hpp
index 4bf7432..fc1a1a1 100644
--- a/louloulibs/network/poller.hpp
+++ b/louloulibs/network/poller.hpp
@@ -1,5 +1,5 @@
-#ifndef POLLER_INCLUDED
-# define POLLER_INCLUDED
+#pragma once
+
#include <network/socket_handler.hpp>
@@ -91,4 +91,4 @@ private:
#endif
};
-#endif // POLLER_INCLUDED
+
diff --git a/louloulibs/network/resolver.hpp b/louloulibs/network/resolver.hpp
index fd57e25..afe6e2b 100644
--- a/louloulibs/network/resolver.hpp
+++ b/louloulibs/network/resolver.hpp
@@ -1,5 +1,5 @@
-#ifndef RESOLVER_HPP_INCLUDED
-#define RESOLVER_HPP_INCLUDED
+#pragma once
+
#include "louloulibs.h"
@@ -125,4 +125,4 @@ private:
std::string addr_to_string(const struct addrinfo* rp);
-#endif /* RESOLVER_HPP_INCLUDED */
+
diff --git a/louloulibs/network/socket_handler.hpp b/louloulibs/network/socket_handler.hpp
index feabcf1..eeb41fe 100644
--- a/louloulibs/network/socket_handler.hpp
+++ b/louloulibs/network/socket_handler.hpp
@@ -1,5 +1,4 @@
-#ifndef SOCKET_HANDLER_HPP
-# define SOCKET_HANDLER_HPP
+#pragma once
#include <louloulibs.h>
#include <memory>
@@ -41,4 +40,3 @@ protected:
socket_t socket;
};
-#endif // SOCKET_HANDLER_HPP
diff --git a/louloulibs/network/tcp_socket_handler.hpp b/louloulibs/network/tcp_socket_handler.hpp
index 91fa7a8..b0ba493 100644
--- a/louloulibs/network/tcp_socket_handler.hpp
+++ b/louloulibs/network/tcp_socket_handler.hpp
@@ -1,5 +1,5 @@
-#ifndef SOCKET_HANDLER_INCLUDED
-# define SOCKET_HANDLER_INCLUDED
+#pragma once
+
#include "louloulibs.h"
@@ -270,5 +270,5 @@ private:
#endif // BOTAN_FOUND
};
-#endif // SOCKET_HANDLER_INCLUDED
+
diff --git a/louloulibs/utils/encoding.hpp b/louloulibs/utils/encoding.hpp
index 3f55055..586edd8 100644
--- a/louloulibs/utils/encoding.hpp
+++ b/louloulibs/utils/encoding.hpp
@@ -1,5 +1,5 @@
-#ifndef ENCODING_INCLUDED
-# define ENCODING_INCLUDED
+#pragma once
+
#include <string>
@@ -40,4 +40,4 @@ namespace xep0106
void encode(std::string&);
}
-#endif // ENCODING_INCLUDED
+
diff --git a/louloulibs/utils/reload.hpp b/louloulibs/utils/reload.hpp
index 16d64f7..6a56acd 100644
--- a/louloulibs/utils/reload.hpp
+++ b/louloulibs/utils/reload.hpp
@@ -1,5 +1,5 @@
-#ifndef RELOAD_HPP_INCLUDED
-#define RELOAD_HPP_INCLUDED
+#pragma once
+
/**
* Reload the server's configuration, and close the logger (so that it
@@ -7,4 +7,4 @@
*/
void reload_process();
-#endif /* RELOAD_HPP_INCLUDED */
+
diff --git a/louloulibs/utils/revstr.hpp b/louloulibs/utils/revstr.hpp
index 27c9e3e..8e521ea 100644
--- a/louloulibs/utils/revstr.hpp
+++ b/louloulibs/utils/revstr.hpp
@@ -1,5 +1,5 @@
-#ifndef REVSTR_HPP_INCLUDED
-# define REVSTR_HPP_INCLUDED
+#pragma once
+
#include <string>
@@ -8,4 +8,4 @@ namespace utils
std::string revstr(const std::string& original);
}
-#endif // REVSTR_HPP_INCLUDED
+
diff --git a/louloulibs/utils/scopeguard.hpp b/louloulibs/utils/scopeguard.hpp
index fed40ff..ee1e2ef 100644
--- a/louloulibs/utils/scopeguard.hpp
+++ b/louloulibs/utils/scopeguard.hpp
@@ -1,5 +1,4 @@
-#ifndef SCOPEGUARD_HPP
-#define SCOPEGUARD_HPP
+#pragma once
#include <functional>
#include <vector>
@@ -88,4 +87,3 @@ private:
}
-#endif
diff --git a/louloulibs/utils/split.hpp b/louloulibs/utils/split.hpp
index 6b487a9..3755ef8 100644
--- a/louloulibs/utils/split.hpp
+++ b/louloulibs/utils/split.hpp
@@ -1,5 +1,5 @@
-#ifndef SPLIT_INCLUDED
-# define SPLIT_INCLUDED
+#pragma once
+
#include <string>
#include <vector>
@@ -9,4 +9,4 @@ namespace utils
std::vector<std::string> split(const std::string &s, const char delim, const bool allow_empty=true);
}
-#endif // SPLIT_INCLUDED
+
diff --git a/louloulibs/utils/string.hpp b/louloulibs/utils/string.hpp
index 1c8f001..84ba101 100644
--- a/louloulibs/utils/string.hpp
+++ b/louloulibs/utils/string.hpp
@@ -1,5 +1,5 @@
-#ifndef STRING_UTILS_HPP_INCLUDED
-#define STRING_UTILS_HPP_INCLUDED
+#pragma once
+
#include <vector>
#include <string>
@@ -7,4 +7,4 @@
bool to_bool(const std::string& val);
std::vector<std::string> cut(const std::string& val, const std::size_t size);
-#endif /* STRING_UTILS_HPP_INCLUDED */
+
diff --git a/louloulibs/utils/timed_events.hpp b/louloulibs/utils/timed_events.hpp
index 70e2eff..6e28206 100644
--- a/louloulibs/utils/timed_events.hpp
+++ b/louloulibs/utils/timed_events.hpp
@@ -1,5 +1,4 @@
-#ifndef TIMED_EVENTS_HPP
-# define TIMED_EVENTS_HPP
+#pragma once
#include <functional>
#include <string>
@@ -131,5 +130,3 @@ private:
std::vector<TimedEvent> events;
explicit TimedEventsManager() = default;
};
-
-#endif // TIMED_EVENTS_HPP
diff --git a/louloulibs/utils/tolower.hpp b/louloulibs/utils/tolower.hpp
index 0019182..650e05d 100644
--- a/louloulibs/utils/tolower.hpp
+++ b/louloulibs/utils/tolower.hpp
@@ -1,5 +1,5 @@
-#ifndef TOLOWER_INCLUDED
-# define TOLOWER_INCLUDED
+#pragma once
+
#include <string>
@@ -8,4 +8,4 @@ namespace utils
std::string tolower(const std::string& original);
}
-#endif // SPLIT_INCLUDED
+
diff --git a/louloulibs/utils/xdg.hpp b/louloulibs/utils/xdg.hpp
index 15f3d0b..56e11da 100644
--- a/louloulibs/utils/xdg.hpp
+++ b/louloulibs/utils/xdg.hpp
@@ -1,5 +1,5 @@
-#ifndef XDG_HPP_INCLUDED
-#define XDG_HPP_INCLUDED
+#pragma once
+
#include <string>
@@ -11,4 +11,4 @@
std::string xdg_config_path(const std::string& filename);
std::string xdg_data_path(const std::string& filename);
-#endif /* XDG_HPP_INCLUDED */
+
diff --git a/louloulibs/xmpp/adhoc_command.hpp b/louloulibs/xmpp/adhoc_command.hpp
index 1c4e4de..7c4de47 100644
--- a/louloulibs/xmpp/adhoc_command.hpp
+++ b/louloulibs/xmpp/adhoc_command.hpp
@@ -1,5 +1,4 @@
-#ifndef ADHOC_COMMAND_HPP
-# define ADHOC_COMMAND_HPP
+#pragma once
/**
* Describe an ad-hoc command.
@@ -43,5 +42,3 @@ void PingStep1(XmppComponent&, AdhocSession& session, XmlNode& command_node);
void HelloStep1(XmppComponent&, AdhocSession& session, XmlNode& command_node);
void HelloStep2(XmppComponent&, AdhocSession& session, XmlNode& command_node);
void Reload(XmppComponent&, AdhocSession& session, XmlNode& command_node);
-
-#endif // ADHOC_COMMAND_HPP
diff --git a/louloulibs/xmpp/adhoc_commands_handler.hpp b/louloulibs/xmpp/adhoc_commands_handler.hpp
index 65b094d..91eb5bd 100644
--- a/louloulibs/xmpp/adhoc_commands_handler.hpp
+++ b/louloulibs/xmpp/adhoc_commands_handler.hpp
@@ -1,5 +1,4 @@
-#ifndef ADHOC_COMMANDS_HANDLER_HPP
-# define ADHOC_COMMANDS_HANDLER_HPP
+#pragma once
/**
* Manage a list of available AdhocCommands and the list of ongoing
@@ -70,5 +69,3 @@ private:
*/
std::map<std::pair<const std::string, const std::string>, AdhocSession> sessions;
};
-
-#endif // ADHOC_COMMANDS_HANDLER_HPP
diff --git a/louloulibs/xmpp/adhoc_session.hpp b/louloulibs/xmpp/adhoc_session.hpp
index 0966c4e..0de8d13 100644
--- a/louloulibs/xmpp/adhoc_session.hpp
+++ b/louloulibs/xmpp/adhoc_session.hpp
@@ -1,5 +1,4 @@
-#ifndef ADHOC_SESSION_HPP
-# define ADHOC_SESSION_HPP
+#pragma once
#include <xmpp/xmpp_stanza.hpp>
@@ -87,5 +86,3 @@ public:
*/
std::map<std::string, std::string> vars;
};
-
-#endif // ADHOC_SESSION_HPP
diff --git a/louloulibs/xmpp/body.hpp b/louloulibs/xmpp/body.hpp
index df86feb..068d1a4 100644
--- a/louloulibs/xmpp/body.hpp
+++ b/louloulibs/xmpp/body.hpp
@@ -1,5 +1,5 @@
-#ifndef XMPP_BODY_HPP_INCLUDED
-#define XMPP_BODY_HPP_INCLUDED
+#pragma once
+
namespace Xmpp
{
@@ -9,4 +9,4 @@ namespace Xmpp
using body = std::tuple<const std::string, std::unique_ptr<XmlNode>>;
}
-#endif /* XMPP_BODY_HPP_INCLUDED */
+
diff --git a/louloulibs/xmpp/jid.hpp b/louloulibs/xmpp/jid.hpp
index 5ff5a4f..08327ef 100644
--- a/louloulibs/xmpp/jid.hpp
+++ b/louloulibs/xmpp/jid.hpp
@@ -1,5 +1,5 @@
-#ifndef JID_INCLUDED
-# define JID_INCLUDED
+#pragma once
+
#include <string>
@@ -41,4 +41,4 @@ public:
*/
std::string jidprep(const std::string& original);
-#endif // JID_INCLUDED
+
diff --git a/louloulibs/xmpp/roster.hpp b/louloulibs/xmpp/roster.hpp
index 0aebca5..aa1b449 100644
--- a/louloulibs/xmpp/roster.hpp
+++ b/louloulibs/xmpp/roster.hpp
@@ -1,5 +1,5 @@
-#ifndef ROSTER_HPP_INCLUDED
-#define ROSTER_HPP_INCLUDED
+#pragma once
+
#include <algorithm>
#include <string>
@@ -68,4 +68,4 @@ private:
Roster& operator=(Roster&&) = delete;
};
-#endif /* ROSTER_HPP_INCLUDED */
+
diff --git a/louloulibs/xmpp/xmpp_component.hpp b/louloulibs/xmpp/xmpp_component.hpp
index ae4d76b..5fc6d2e 100644
--- a/louloulibs/xmpp/xmpp_component.hpp
+++ b/louloulibs/xmpp/xmpp_component.hpp
@@ -1,5 +1,5 @@
-#ifndef XMPP_COMPONENT_INCLUDED
-# define XMPP_COMPONENT_INCLUDED
+#pragma once
+
#include <xmpp/adhoc_commands_handler.hpp>
#include <network/tcp_socket_handler.hpp>
@@ -240,4 +240,4 @@ protected:
AdhocCommandsHandler adhoc_commands_handler;
};
-#endif // XMPP_COMPONENT_INCLUDED
+
diff --git a/louloulibs/xmpp/xmpp_parser.hpp b/louloulibs/xmpp/xmpp_parser.hpp
index 93c6c53..9d67228 100644
--- a/louloulibs/xmpp/xmpp_parser.hpp
+++ b/louloulibs/xmpp/xmpp_parser.hpp
@@ -1,5 +1,5 @@
-#ifndef XMPP_PARSER_INCLUDED
-# define XMPP_PARSER_INCLUDED
+#pragma once
+
#include <xmpp/xmpp_stanza.hpp>
@@ -130,4 +130,4 @@ private:
std::vector<std::function<void(const XmlNode&)>> stream_close_callbacks;
};
-#endif // XMPP_PARSER_INCLUDED
+
diff --git a/louloulibs/xmpp/xmpp_stanza.hpp b/louloulibs/xmpp/xmpp_stanza.hpp
index 28b8414..4ca758e 100644
--- a/louloulibs/xmpp/xmpp_stanza.hpp
+++ b/louloulibs/xmpp/xmpp_stanza.hpp
@@ -1,5 +1,5 @@
-#ifndef XMPP_STANZA_INCLUDED
-# define XMPP_STANZA_INCLUDED
+#pragma once
+
#include <map>
#include <string>
@@ -143,4 +143,4 @@ std::ostream& operator<<(std::ostream& os, const XmlNode& node);
*/
using Stanza = XmlNode;
-#endif // XMPP_STANZA_INCLUDED
+