Skip to content

Commit

Permalink
Merge pull request #946 from libcpr/fix/943_fix_cpr_include_statements
Browse files Browse the repository at this point in the history
Fix/943 Fix cpr Include Statements
  • Loading branch information
COM8 authored Aug 19, 2023
2 parents 9714117 + be00423 commit 1ead16b
Show file tree
Hide file tree
Showing 28 changed files with 36 additions and 36 deletions.
2 changes: 1 addition & 1 deletion cpr/callback.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <cpr/callback.h>
#include "cpr/callback.h"
#include <curl/curl.h>
#include <functional>

Expand Down
2 changes: 1 addition & 1 deletion include/cpr/api.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
#include "cpr/auth.h"
#include "cpr/bearer.h"
#include "cpr/cprtypes.h"
#include "cpr/filesystem.h"
#include "cpr/multipart.h"
#include "cpr/multiperform.h"
#include "cpr/payload.h"
#include "cpr/response.h"
#include "cpr/session.h"
#include <cpr/filesystem.h>

namespace cpr {

Expand Down
2 changes: 1 addition & 1 deletion include/cpr/buffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include <string>

#include <cpr/filesystem.h>
#include "cpr/filesystem.h"

namespace cpr {

Expand Down
2 changes: 1 addition & 1 deletion include/cpr/file.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <string>
#include <vector>

#include <cpr/filesystem.h>
#include "cpr/filesystem.h"

namespace cpr {

Expand Down
2 changes: 1 addition & 1 deletion include/cpr/ssl_options.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <string>
#include <vector>

#include <cpr/filesystem.h>
#include "cpr/filesystem.h"
#include <curl/curl.h>

#include "cpr/util.h"
Expand Down
2 changes: 1 addition & 1 deletion test/alternating_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <string>

#include <cpr/cpr.h>
#include "cpr/cpr.h"

#include "httpServer.hpp"

Expand Down
4 changes: 2 additions & 2 deletions test/async_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#include <string>
#include <vector>

#include <cpr/cpr.h>
#include <cpr/filesystem.h>
#include "cpr/cpr.h"
#include "cpr/filesystem.h"

#include "cpr/api.h"
#include "cpr/response.h"
Expand Down
2 changes: 1 addition & 1 deletion test/callback_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include <thread>
#include <vector>

#include <cpr/cpr.h>
#include "cpr/cpr.h"

#include "cpr/cprtypes.h"
#include "httpServer.hpp"
Expand Down
2 changes: 1 addition & 1 deletion test/delete_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <string>

#include <cpr/cpr.h>
#include "cpr/cpr.h"

#include "httpServer.hpp"

Expand Down
2 changes: 1 addition & 1 deletion test/download_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include <string>

#include <cpr/cpr.h>
#include "cpr/cpr.h"

#include "cpr/api.h"
#include "cpr/callback.h"
Expand Down
2 changes: 1 addition & 1 deletion test/encoded_auth_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <string>

#include <cpr/cpr.h>
#include "cpr/cpr.h"

using namespace cpr;

Expand Down
2 changes: 1 addition & 1 deletion test/error_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <chrono>
#include <string>

#include <cpr/cpr.h>
#include "cpr/cpr.h"
#include <curl/curl.h>

#include "httpServer.hpp"
Expand Down
2 changes: 1 addition & 1 deletion test/head_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include <string>

#include <cpr/cpr.h>
#include "cpr/cpr.h"

#include "httpServer.hpp"

Expand Down
2 changes: 1 addition & 1 deletion test/httpsServer.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

#include "abstractServer.hpp"
#include "cpr/cpr.h"
#include "cpr/filesystem.h"
#include "mongoose.h"
#include <cpr/filesystem.h>

namespace cpr {
class HttpsServer : public AbstractServer {
Expand Down
2 changes: 1 addition & 1 deletion test/multiasync_tests.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <string>
#include <vector>

#include <cpr/cpr.h>
#include "cpr/cpr.h"

#include "httpServer.hpp"
#include "multiasync_tests.hpp"
Expand Down
4 changes: 2 additions & 2 deletions test/multiperform_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#include <memory>
#include <string>

#include <cpr/api.h>
#include <cpr/cpr.h>
#include "cpr/api.h"
#include "cpr/cpr.h"
#include <curl/curl.h>

#include "httpServer.hpp"
Expand Down
2 changes: 1 addition & 1 deletion test/options_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <string>

#include <cpr/cpr.h>
#include "cpr/cpr.h"

#include "httpServer.hpp"

Expand Down
2 changes: 1 addition & 1 deletion test/patch_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <string>

#include <cpr/cpr.h>
#include "cpr/cpr.h"

#include "httpServer.hpp"

Expand Down
4 changes: 2 additions & 2 deletions test/post_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#include <fstream>
#include <string>

#include <cpr/cpr.h>
#include <cpr/multipart.h>
#include "cpr/cpr.h"
#include "cpr/multipart.h"

#include "httpServer.hpp"

Expand Down
2 changes: 1 addition & 1 deletion test/prepare_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <string>
#include <vector>

#include <cpr/cpr.h>
#include "cpr/cpr.h"

#include "httpServer.hpp"

Expand Down
2 changes: 1 addition & 1 deletion test/proxy_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <string>

#include <cpr/cpr.h>
#include "cpr/cpr.h"

// TODO: This uses public servers for proxies and endpoints. This should be replaced with a source
// code implementation inside server.cpp
Expand Down
2 changes: 1 addition & 1 deletion test/put_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <string>

#include <cpr/cpr.h>
#include "cpr/cpr.h"

#include "httpServer.hpp"

Expand Down
4 changes: 2 additions & 2 deletions test/raw_body_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#include <fstream>
#include <string>

#include <cpr/cpr.h>
#include <cpr/multipart.h>
#include "cpr/cpr.h"
#include "cpr/multipart.h"

#include "httpServer.hpp"

Expand Down
2 changes: 1 addition & 1 deletion test/session_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <stdexcept>
#include <string>

#include <cpr/cpr.h>
#include "cpr/cpr.h"
#include <curl/curl.h>
#include <vector>

Expand Down
6 changes: 3 additions & 3 deletions test/ssl_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
#include <thread>
#include <vector>

#include <cpr/cprtypes.h>
#include <cpr/filesystem.h>
#include <cpr/ssl_options.h>
#include "cpr/cprtypes.h"
#include "cpr/filesystem.h"
#include "cpr/ssl_options.h"

#include "httpsServer.hpp"

Expand Down
4 changes: 2 additions & 2 deletions test/structures_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

#include <string>

#include <cpr/parameters.h>
#include <cpr/payload.h>
#include "cpr/parameters.h"
#include "cpr/payload.h"

using namespace cpr;

Expand Down
4 changes: 2 additions & 2 deletions test/util_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

#include <string>

#include <cpr/cprtypes.h>
#include <cpr/util.h>
#include "cpr/cprtypes.h"
#include "cpr/util.h"

using namespace cpr;

Expand Down
2 changes: 1 addition & 1 deletion test/version_tests.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "cpr/cpr.h"
#include <cctype>
#include <cpr/cpr.h>
#include <cstddef>
#include <gtest/gtest.h>
#include <string>
Expand Down

0 comments on commit 1ead16b

Please sign in to comment.