Commit c281088c authored by Harris Hancock's avatar Harris Hancock

Use gcc 5.0 for better C++14 compliance

parent 3c7748b7
...@@ -24,10 +24,10 @@ matrix: ...@@ -24,10 +24,10 @@ matrix:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
packages: packages:
- g++-4.9 - g++-5
env: env:
- MATRIX_CC=gcc-4.9 - MATRIX_CC=gcc-5
- MATRIX_CXX=g++-4.9 - MATRIX_CXX=g++-5
# New GCC # New GCC
- os: linux - os: linux
......
...@@ -37,12 +37,6 @@ struct UrlOptions { ...@@ -37,12 +37,6 @@ struct UrlOptions {
bool percentDecode = true; bool percentDecode = true;
// True if URL components should be automatically percent-decoded during parsing, and // True if URL components should be automatically percent-decoded during parsing, and
// percent-encoded during serialization. // percent-encoded during serialization.
#if __cplusplus < 201402L
inline constexpr UrlOptions(bool percentDecode = true): percentDecode(percentDecode) {}
// TODO(cleanup): This constructor is only here to support brace initialization in C++11. It
// should be removed once we upgrade to C++14.
#endif
}; };
struct Url { struct Url {
...@@ -103,17 +97,6 @@ struct Url { ...@@ -103,17 +97,6 @@ struct Url {
~Url() noexcept(false); ~Url() noexcept(false);
Url& operator=(Url&&) = default; Url& operator=(Url&&) = default;
#if __cplusplus < 201402L
inline Url(String&& scheme, Maybe<UserInfo>&& userInfo, String&& host, Vector<String>&& path,
bool hasTrailingSlash, Vector<QueryParam>&& query, Maybe<String>&& fragment,
UrlOptions options)
: scheme(kj::mv(scheme)), userInfo(kj::mv(userInfo)), host(kj::mv(host)), path(kj::mv(path)),
hasTrailingSlash(hasTrailingSlash), query(kj::mv(query)), fragment(kj::mv(fragment)),
options(options) {}
// TODO(cleanup): This constructor is only here to support brace initialization in C++11. It
// should be removed once we upgrade to C++14.
#endif
Url clone() const; Url clone() const;
enum Context { enum Context {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment