Skip to content

To make the code compile on MacOS using Clang #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

To make the code compile on MacOS using Clang #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
96c0e5a
Making the HTTP client lite library compile on MacOS
ideras Apr 24, 2024
d57bf16
Remove some const modifier so the code compiles with clang
ideras Apr 24, 2024
77deead
Include stdexcept in family.h so the code compile in GCC > 13
ideras May 23, 2024
941ff08
Changed the case of some windows include files to make the code cross…
ideras Jun 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions 3rdpatry/http-client-lite/include/jdl/httpclientlite.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
# define PLATFORM_LINUX
#elif defined (_WIN32) || defined (_WIN64)
# define PLATFORM_WINDOWS
#elif defined (__APPLE__)
# define PLATFORM_APPLE
#else
/* TODO:
* - Added Apple OS */
Expand All @@ -51,15 +53,15 @@
#include <sys/types.h>

#if defined (PLATFORM_WINDOWS)
# include <WinSock2.h>
# include <WS2tcpip.h>
# include <winsock2.h>
# include <ws2tcpip.h>

typedef SOCKET socktype_t;
typedef int socklen_t;

# pragma comment(lib, "ws2_32.lib")

#elif defined (PLATFORM_LINUX)
#elif defined (PLATFORM_LINUX) || defined (PLATFORM_APPLE)
# include <unistd.h>
# include <sys/socket.h>
# include <netdb.h>
Expand Down
2 changes: 1 addition & 1 deletion core/include/prometheus/builder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace prometheus {
std::string help_;

public:
Builder& Labels(const std::map<const std::string, const std::string>& labels) {
Builder& Labels(const std::map<std::string, std::string>& labels) {
labels_ = labels;
return *this;
}
Expand Down
5 changes: 3 additions & 2 deletions core/include/prometheus/family.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <unordered_map>
#include <vector>
#include <cassert>
#include <stdexcept>

#include "prometheus/collectable.h"
#include "prometheus/metric.h"
Expand Down Expand Up @@ -56,8 +57,8 @@ namespace prometheus {
public:

using Hash = std::size_t;
using Label = std::pair<const std::string, const std::string>;
using Labels = std::map <const std::string, const std::string>;
using Label = std::pair<std::string, std::string>;
using Labels = std::map <std::string, std::string>;
using MetricPtr = std::unique_ptr<Metric>;

const Metric::Type type;
Expand Down