StarMirror/xlnt
1
0
Fork 0
mirror of https://github.com/tfussell/xlnt.git synced 2024-03-22 13:11:17 +08:00
Code Issues Projects Releases Wiki Activity

fix linux build

Browse Source
This commit is contained in:
Thomas Fussell 2016-08-12 23:26:57 -04:00
parent 4baeeb824f
commit 29ef278779
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/xlnt/styles/border.hpp
View File

@ -26,6 +26,7 @@
#include <cstddef> #include <cstddef>
#include <functional> #include <functional>
#include <unordered_map> #include <unordered_map>
#include <vector>
#include <xlnt/xlnt_config.hpp> #include <xlnt/xlnt_config.hpp>
#include <xlnt/styles/border_style.hpp> #include <xlnt/styles/border_style.hpp>
@ -91,7 +92,7 @@ public:
border_style style_; border_style style_;
}; };
static const std::unordered_map<side, std::string> &get_side_names(); static const std::vector<std::pair<side, std::string>> &get_side_names();
border(); border();

4
source/styles/border.cpp
View File

@ -81,10 +81,10 @@ border::border()
}; };
} }
const std::unordered_map<xlnt::border::side, std::string> &border::get_side_names() const std::vector<std::pair<xlnt::border::side, std::string>> &border::get_side_names()
{ {
static auto *sides = static auto *sides =
new std::unordered_map<xlnt::border::side, std::string> new std::vector<std::pair<xlnt::border::side, std::string>>
{ {
{ xlnt::border::side::start, "left" }, { xlnt::border::side::start, "left" },
{ xlnt::border::side::end, "right" }, { xlnt::border::side::end, "right" },

6
source/utils/path.cpp
View File

@ -78,6 +78,12 @@ bool is_root(const std::string &part)
return part == "/"; return part == "/";
} }
bool is_absolute(const std::string &part)
{
return !part.empty() && part[0] == '/';
}
#endif #endif
std::vector<std::string> split_path(const std::string &path, char delim) std::vector<std::string> split_path(const std::string &path, char delim)