rexy712/frnetlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Moved URL class into fr namespace

Browse Source 
It should not have been in the global namespace, as it's a part of the library.
This commit is contained in:
Fred Nicolson 2017-05-24 09:54:19 +01:00
parent c110fb6c81
commit 431f646bae
2 changed files with 215 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/frnetlib/URL.h
View File

@ -8,7 +8,8 @@
#include <unordered_map> #include <unordered_map>
//Note, a URL looks like this: scheme:[//host[:port]][/path][?query][#fragment] //Note, a URL looks like this: scheme:[//host[:port]][/path][?query][#fragment]
namespace fr
{
class URL class URL
{ {
public: public:
@ -27,6 +28,7 @@ public:
* Constructors * Constructors
*/ */
URL() = default; URL() = default;
URL(const std::string &url); URL(const std::string &url);
/*! /*!
@ -118,6 +120,6 @@ private:
std::string fragment; std::string fragment;
static std::unordered_map<std::string, URL::Scheme> scheme_string_map; static std::unordered_map<std::string, URL::Scheme> scheme_string_map;
}; };
}
#endif //FRNETLIB_URLPARSER_H #endif //FRNETLIB_URLPARSER_H

7
src/URL.cpp
View File

@ -7,6 +7,9 @@
#include <iostream> #include <iostream>
#include "frnetlib/URL.h" #include "frnetlib/URL.h"
namespace fr
{
std::unordered_map<std::string, URL::Scheme> URL::scheme_string_map = { std::unordered_map<std::string, URL::Scheme> URL::scheme_string_map = {
{"http", URL::HTTP}, {"http", URL::HTTP},
{"https", URL::HTTPS}, {"https", URL::HTTPS},
@ -117,7 +120,8 @@ std::string URL::to_lower(const std::string &str)
const std::string &URL::scheme_to_string(URL::Scheme scheme) const std::string &URL::scheme_to_string(URL::Scheme scheme)
{ {
auto iter = std::find_if(scheme_string_map.begin(), scheme_string_map.end(), [&](const auto &i){ auto iter = std::find_if(scheme_string_map.begin(), scheme_string_map.end(), [&](const auto &i)
{
return i.second == scheme; return i.second == scheme;
}); });
@ -125,3 +129,4 @@ const std::string &URL::scheme_to_string(URL::Scheme scheme)
throw std::logic_error("Unknown URL::Scheme value " + std::to_string(scheme)); throw std::logic_error("Unknown URL::Scheme value " + std::to_string(scheme));
return iter->first; return iter->first;
} }
}