Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jgaa/restc-cpp
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: uralm1/restc-cpp
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 4 commits
  • 4 files changed
  • 1 contributor

Commits on Aug 22, 2023

  1. Copy the full SHA
    e85a043 View commit details
  2. Merge pull request #1 from uralm1/small_fixes

    Use new docker compose, small cleanups
    uralm1 authored Aug 22, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    fbf3933 View commit details

Commits on Aug 29, 2023

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    4cb62fb View commit details

Commits on Aug 30, 2023

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    e730858 View commit details
Showing with 6 additions and 10 deletions.
  1. +3 −3 create-and-run-containers.sh
  2. +0 −4 include/restc-cpp/logging.h
  3. +2 −2 include/restc-cpp/restc-cpp.h
  4. +1 −1 stop-containers.sh
6 changes: 3 additions & 3 deletions create-and-run-containers.sh
Original file line number Diff line number Diff line change
@@ -13,8 +13,8 @@ else
exit -1
fi

docker-compose stop
docker-compose build
docker-compose up -d
docker compose stop
docker compose build
docker compose up -d
docker ps
popd
4 changes: 0 additions & 4 deletions include/restc-cpp/logging.h
Original file line number Diff line number Diff line change
@@ -143,10 +143,6 @@ inline void RestcCppTestStartLogger(const std::string& level = "info") {

#elif defined RESTC_CPP_LOG_WITH_BOOST_LOG

#ifndef WIN32
# define BOOST_LOG_DYN_LINK 1
#endif

#include <iostream>
#include <boost/log/core.hpp>
#include <boost/log/trivial.hpp>
4 changes: 2 additions & 2 deletions include/restc-cpp/restc-cpp.h
Original file line number Diff line number Diff line change
@@ -160,7 +160,7 @@ class Request {
class Properties {
public:
using ptr_t = std::shared_ptr<Properties>;
using redirect_fn_t = std::function<void (int code, std::string& url,
using redirect_fn_t = std::function<void (int code, std::string& url,
const Reply& reply)>;
using general_callback_t = std::function<void()>;

@@ -417,7 +417,7 @@ class RestClient {
done_handler.reset();
});

return move(future);
return future;
}

/*! Process from within an existing coroutine */
2 changes: 1 addition & 1 deletion stop-containers.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash

pushd ci/mock-backends
docker-compose down
docker compose down
popd