summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgor Pugin <egor.pugin@gmail.com>2020-03-22 20:19:51 +0300
committerEgor Pugin <egor.pugin@gmail.com>2020-03-22 20:19:51 +0300
commit0777be1e0568377893d638f7015edc330602c8e5 (patch)
tree8446df5b4ebcd6e3823aa3ee50286d6c6d31a4a8
parent0e9a5bb427757b8b6ecb2734e602fe5bc7e6354b (diff)
parenta2ea1d3c9df1718cafaf0e51d19c73e0ced903e5 (diff)
Merge branch 'master' of github.com-egorpugin:reo7sp/tgbot-cpp
-rw-r--r--README.md2
-rw-r--r--include/tgbot/Api.h1
-rw-r--r--include/tgbot/EventBroadcaster.h1
-rw-r--r--include/tgbot/TgTypeParser.h4
-rw-r--r--include/tgbot/net/BoostHttpOnlySslClient.h1
-rw-r--r--include/tgbot/net/CurlHttpClient.h1
-rw-r--r--include/tgbot/net/HttpClient.h1
-rw-r--r--include/tgbot/net/HttpReqArg.h1
-rw-r--r--include/tgbot/net/HttpServer.h4
-rw-r--r--include/tgbot/net/TgWebhookLocalServer.h2
-rw-r--r--include/tgbot/net/TgWebhookServer.h2
-rw-r--r--include/tgbot/net/TgWebhookTcpServer.h2
-rw-r--r--samples/echobot-curl-client/src/main.cpp1
-rw-r--r--samples/echobot-submodule/src/main.cpp1
-rw-r--r--samples/echobot-webhook-server/src/main.cpp1
-rw-r--r--samples/echobot/src/main.cpp1
-rw-r--r--samples/inline-keyboard/src/main.cpp1
-rw-r--r--samples/photo/src/main.cpp1
-rw-r--r--src/Api.cpp5
-rw-r--r--src/Bot.cpp3
-rw-r--r--src/EventHandler.cpp1
-rw-r--r--src/TgException.cpp2
-rw-r--r--src/TgTypeParser.cpp3
-rw-r--r--src/net/BoostHttpOnlySslClient.cpp1
-rw-r--r--src/net/CurlHttpClient.cpp1
-rw-r--r--src/net/HttpParser.cpp4
-rw-r--r--src/net/TgLongPoll.cpp2
-rw-r--r--src/net/Url.cpp1
-rw-r--r--src/tools/FileTools.cpp1
-rw-r--r--src/tools/StringTools.cpp2
-rw-r--r--src/types/InlineQueryResult.cpp2
-rw-r--r--src/types/InputFile.cpp3
32 files changed, 54 insertions, 5 deletions
diff --git a/README.md b/README.md
index 1661372..4143d88 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
<br>
[![GitHub contributors](https://img.shields.io/github/contributors/reo7sp/tgbot-cpp.svg)](https://github.com/reo7sp/tgbot-cpp/graphs/contributors)
-C++ library for Telegram bot API.
+C++14 library for Telegram bot API.
Documentation is located [here](http://reo7sp.github.io/tgbot-cpp).
diff --git a/include/tgbot/Api.h b/include/tgbot/Api.h
index 04238ff..eddbe50 100644
--- a/include/tgbot/Api.h
+++ b/include/tgbot/Api.h
@@ -25,6 +25,7 @@
#include <boost/variant.hpp>
#include <cstdint>
+#include <memory>
#include <string>
#include <vector>
diff --git a/include/tgbot/EventBroadcaster.h b/include/tgbot/EventBroadcaster.h
index 8d0d319..44cad96 100644
--- a/include/tgbot/EventBroadcaster.h
+++ b/include/tgbot/EventBroadcaster.h
@@ -7,6 +7,7 @@
#include "tgbot/types/ChosenInlineResult.h"
#include "tgbot/types/CallbackQuery.h"
+#include <initializer_list>
#include <string>
#include <functional>
#include <vector>
diff --git a/include/tgbot/TgTypeParser.h b/include/tgbot/TgTypeParser.h
index 63ed1ca..b080bc4 100644
--- a/include/tgbot/TgTypeParser.h
+++ b/include/tgbot/TgTypeParser.h
@@ -84,7 +84,11 @@
#include <boost/property_tree/ptree.hpp>
#include <boost/property_tree/json_parser.hpp>
+#include <memory>
+#include <sstream>
#include <string>
+#include <vector>
+#include <utility>
namespace TgBot {
diff --git a/include/tgbot/net/BoostHttpOnlySslClient.h b/include/tgbot/net/BoostHttpOnlySslClient.h
index a047fea..dbe0c96 100644
--- a/include/tgbot/net/BoostHttpOnlySslClient.h
+++ b/include/tgbot/net/BoostHttpOnlySslClient.h
@@ -9,6 +9,7 @@
#include <boost/asio.hpp>
#include <string>
+#include <vector>
namespace TgBot {
diff --git a/include/tgbot/net/CurlHttpClient.h b/include/tgbot/net/CurlHttpClient.h
index 30e72ba..0f93937 100644
--- a/include/tgbot/net/CurlHttpClient.h
+++ b/include/tgbot/net/CurlHttpClient.h
@@ -11,6 +11,7 @@
#include <curl/curl.h>
#include <string>
+#include <vector>
namespace TgBot {
diff --git a/include/tgbot/net/HttpClient.h b/include/tgbot/net/HttpClient.h
index 9b452d8..a35dd7d 100644
--- a/include/tgbot/net/HttpClient.h
+++ b/include/tgbot/net/HttpClient.h
@@ -5,6 +5,7 @@
#include "tgbot/net/HttpReqArg.h"
#include <string>
+#include <vector>
namespace TgBot {
diff --git a/include/tgbot/net/HttpReqArg.h b/include/tgbot/net/HttpReqArg.h
index 7c23eab..fcdd424 100644
--- a/include/tgbot/net/HttpReqArg.h
+++ b/include/tgbot/net/HttpReqArg.h
@@ -6,7 +6,6 @@
#include <boost/lexical_cast.hpp>
#include <string>
-#include <utility>
#include <vector>
#include <functional>
diff --git a/include/tgbot/net/HttpServer.h b/include/tgbot/net/HttpServer.h
index 51210d7..2c94dcf 100644
--- a/include/tgbot/net/HttpServer.h
+++ b/include/tgbot/net/HttpServer.h
@@ -6,8 +6,12 @@
#include <boost/asio.hpp>
#include <cstddef>
+#include <exception>
+#include <functional>
#include <iostream>
+#include <memory>
#include <string>
+#include <unordered_map>
#include <utility>
namespace TgBot {
diff --git a/include/tgbot/net/TgWebhookLocalServer.h b/include/tgbot/net/TgWebhookLocalServer.h
index 2a64374..25efa66 100644
--- a/include/tgbot/net/TgWebhookLocalServer.h
+++ b/include/tgbot/net/TgWebhookLocalServer.h
@@ -5,6 +5,8 @@
#include "tgbot/net/TgWebhookServer.h"
+#include <string>
+
namespace TgBot {
/**
diff --git a/include/tgbot/net/TgWebhookServer.h b/include/tgbot/net/TgWebhookServer.h
index 85b2934..8e89765 100644
--- a/include/tgbot/net/TgWebhookServer.h
+++ b/include/tgbot/net/TgWebhookServer.h
@@ -6,6 +6,8 @@
#include "tgbot/TgTypeParser.h"
#include "tgbot/net/HttpServer.h"
+#include <string>
+#include <unordered_map>
#include <utility>
namespace TgBot {
diff --git a/include/tgbot/net/TgWebhookTcpServer.h b/include/tgbot/net/TgWebhookTcpServer.h
index 28ae8aa..c812abe 100644
--- a/include/tgbot/net/TgWebhookTcpServer.h
+++ b/include/tgbot/net/TgWebhookTcpServer.h
@@ -3,6 +3,8 @@
#include "tgbot/net/TgWebhookServer.h"
+#include <string>
+
namespace TgBot {
/**
diff --git a/samples/echobot-curl-client/src/main.cpp b/samples/echobot-curl-client/src/main.cpp
index 630dad8..a957011 100644
--- a/samples/echobot-curl-client/src/main.cpp
+++ b/samples/echobot-curl-client/src/main.cpp
@@ -2,6 +2,7 @@
#include <cstdio>
#include <cstdlib>
#include <exception>
+#include <string>
#include <tgbot/tgbot.h>
diff --git a/samples/echobot-submodule/src/main.cpp b/samples/echobot-submodule/src/main.cpp
index 966ae6f..c26cbdf 100644
--- a/samples/echobot-submodule/src/main.cpp
+++ b/samples/echobot-submodule/src/main.cpp
@@ -2,6 +2,7 @@
#include <cstdio>
#include <cstdlib>
#include <exception>
+#include <string>
#include <tgbot/tgbot.h>
diff --git a/samples/echobot-webhook-server/src/main.cpp b/samples/echobot-webhook-server/src/main.cpp
index d51246d..2919c2e 100644
--- a/samples/echobot-webhook-server/src/main.cpp
+++ b/samples/echobot-webhook-server/src/main.cpp
@@ -2,6 +2,7 @@
#include <cstdio>
#include <cstdlib>
#include <exception>
+#include <string>
#include <tgbot/tgbot.h>
diff --git a/samples/echobot/src/main.cpp b/samples/echobot/src/main.cpp
index 966ae6f..c26cbdf 100644
--- a/samples/echobot/src/main.cpp
+++ b/samples/echobot/src/main.cpp
@@ -2,6 +2,7 @@
#include <cstdio>
#include <cstdlib>
#include <exception>
+#include <string>
#include <tgbot/tgbot.h>
diff --git a/samples/inline-keyboard/src/main.cpp b/samples/inline-keyboard/src/main.cpp
index 70cf7c7..2e3ec68 100644
--- a/samples/inline-keyboard/src/main.cpp
+++ b/samples/inline-keyboard/src/main.cpp
@@ -2,6 +2,7 @@
#include <cstdio>
#include <cstdlib>
#include <exception>
+#include <string>
#include <tgbot/tgbot.h>
diff --git a/samples/photo/src/main.cpp b/samples/photo/src/main.cpp
index cca31f0..d6bfe83 100644
--- a/samples/photo/src/main.cpp
+++ b/samples/photo/src/main.cpp
@@ -2,6 +2,7 @@
#include <cstdio>
#include <cstdlib>
#include <exception>
+#include <string>
#include <tgbot/tgbot.h>
diff --git a/src/Api.cpp b/src/Api.cpp
index 0f443b3..6e01807 100644
--- a/src/Api.cpp
+++ b/src/Api.cpp
@@ -1,10 +1,13 @@
#include "tgbot/Api.h"
-#include <tgbot/tools/StringTools.h>
+#include "tgbot/tools/StringTools.h"
+
#include "tgbot/TgException.h"
#include "tgbot/TgTypeParser.h"
#include <cstdint>
+#include <string>
+#include <vector>
#include <utility>
using namespace std;
diff --git a/src/Bot.cpp b/src/Bot.cpp
index b1e1ea5..e0acbdb 100644
--- a/src/Bot.cpp
+++ b/src/Bot.cpp
@@ -2,6 +2,9 @@
#include "tgbot/EventBroadcaster.h"
+#include <memory>
+#include <string>
+
namespace TgBot {
Bot::Bot(std::string token, const HttpClient& httpClient)
diff --git a/src/EventHandler.cpp b/src/EventHandler.cpp
index 43f2eb1..cad3e4f 100644
--- a/src/EventHandler.cpp
+++ b/src/EventHandler.cpp
@@ -2,6 +2,7 @@
#include <algorithm>
#include <cstddef>
+#include <string>
using namespace std;
diff --git a/src/TgException.cpp b/src/TgException.cpp
index 03a942c..e61e09c 100644
--- a/src/TgException.cpp
+++ b/src/TgException.cpp
@@ -1,5 +1,7 @@
#include "tgbot/TgException.h"
+#include <string>
+
namespace TgBot {
TgBot::TgException::TgException(const std::string& description) : runtime_error(description) {
diff --git a/src/TgTypeParser.cpp b/src/TgTypeParser.cpp
index 4d91d28..06a2b2a 100644
--- a/src/TgTypeParser.cpp
+++ b/src/TgTypeParser.cpp
@@ -1,5 +1,8 @@
#include "tgbot/TgTypeParser.h"
+#include <memory>
+#include <string>
+
using namespace std;
using namespace boost::property_tree;
diff --git a/src/net/BoostHttpOnlySslClient.cpp b/src/net/BoostHttpOnlySslClient.cpp
index bc541ed..301d0c8 100644
--- a/src/net/BoostHttpOnlySslClient.cpp
+++ b/src/net/BoostHttpOnlySslClient.cpp
@@ -3,6 +3,7 @@
#include <boost/asio/ssl.hpp>
#include <cstddef>
+#include <vector>
using namespace std;
using namespace boost::asio;
diff --git a/src/net/CurlHttpClient.cpp b/src/net/CurlHttpClient.cpp
index d56f87f..6dc43f8 100644
--- a/src/net/CurlHttpClient.cpp
+++ b/src/net/CurlHttpClient.cpp
@@ -5,6 +5,7 @@
#include <boost/asio/ssl.hpp>
#include <cstddef>
+#include <string>
namespace TgBot {
diff --git a/src/net/HttpParser.cpp b/src/net/HttpParser.cpp
index a1cafeb..cc9b84b 100644
--- a/src/net/HttpParser.cpp
+++ b/src/net/HttpParser.cpp
@@ -5,7 +5,9 @@
#include <boost/algorithm/string.hpp>
#include <cstddef>
-#include <cstdint>
+#include <string>
+#include <vector>
+#include <unordered_map>
using namespace std;
using namespace boost;
diff --git a/src/net/TgLongPoll.cpp b/src/net/TgLongPoll.cpp
index 98575de..a7b4fcb 100644
--- a/src/net/TgLongPoll.cpp
+++ b/src/net/TgLongPoll.cpp
@@ -5,6 +5,8 @@
#include "tgbot/EventHandler.h"
#include <cstdint>
+#include <memory>
+#include <vector>
#include <utility>
namespace TgBot {
diff --git a/src/net/Url.cpp b/src/net/Url.cpp
index 95e31c7..4b46f41 100644
--- a/src/net/Url.cpp
+++ b/src/net/Url.cpp
@@ -1,6 +1,7 @@
#include "tgbot/net/Url.h"
#include <cstddef>
+#include <string>
using namespace std;
diff --git a/src/tools/FileTools.cpp b/src/tools/FileTools.cpp
index d2c303c..bb5b7b5 100644
--- a/src/tools/FileTools.cpp
+++ b/src/tools/FileTools.cpp
@@ -2,6 +2,7 @@
#include <fstream>
#include <sstream>
+#include <string>
using namespace std;
diff --git a/src/tools/StringTools.cpp b/src/tools/StringTools.cpp
index f49a78e..8b8f4da 100644
--- a/src/tools/StringTools.cpp
+++ b/src/tools/StringTools.cpp
@@ -1,9 +1,9 @@
#include "tgbot/tools/StringTools.h"
-#include <cstdlib>
#include <iomanip>
#include <cstdio>
#include <random>
+#include <string>
using namespace std;
diff --git a/src/types/InlineQueryResult.cpp b/src/types/InlineQueryResult.cpp
index 3d4ea6e..0993ec2 100644
--- a/src/types/InlineQueryResult.cpp
+++ b/src/types/InlineQueryResult.cpp
@@ -19,6 +19,8 @@
#include "tgbot/types/InlineQueryResultPhoto.h"
#include "tgbot/types/InlineQueryResultVideo.h"
+#include <string>
+
using namespace TgBot;
const std::string InlineQueryResultCachedAudio::TYPE = "audio";
diff --git a/src/types/InputFile.cpp b/src/types/InputFile.cpp
index 0ca1991..c74c73e 100644
--- a/src/types/InputFile.cpp
+++ b/src/types/InputFile.cpp
@@ -2,6 +2,9 @@
#include "tgbot/tools/StringTools.h"
#include "tgbot/tools/FileTools.h"
+#include <memory>
+#include <string>
+
using namespace std;
namespace TgBot {