Skip to content

Commit

Permalink
Linux compilation fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
biodranik committed Oct 20, 2016
1 parent 7a7c47a commit 643c5cf
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 7 deletions.
7 changes: 5 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ build/
*.pyc
.idea
*.iml
*.o
Makefile
.qmake.stash

project.xcworkspace
xcuserdata
Expand All @@ -19,6 +22,8 @@ data/thumb/
data/index.dat
data/header_images/

env/env_tests

builder/genindex/genindex

builder/wikivoyage/*.redirect.txt
Expand All @@ -31,5 +36,3 @@ builder/wikivoyage/Countries

# This is separate git repository with MWM API
android/3rdparty/api-android
builder/genindex/.qmake.stash
builder/genindex/Makefile
2 changes: 1 addition & 1 deletion env/file_system.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "file_system.hpp"

#include "../std/cstdio.hpp"

namespace fs
{
Expand Down
2 changes: 1 addition & 1 deletion storage/article_info.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "../std/cmath.hpp"
#include "../std/static_assert.hpp"
#include "../std/array.hpp"

#include "../std/cstring.hpp"

namespace
{
Expand Down
2 changes: 1 addition & 1 deletion storage/article_info.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include "../std/string.hpp"
#include "../std/algorithm.hpp"

#include "../std/stdint.hpp"

namespace wr { class Writer; }
namespace rd { class Reader; }
Expand Down
2 changes: 1 addition & 1 deletion storage/storage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "../std/algorithm.hpp"
#include "../std/utility.hpp"
#include "../std/iterator.hpp"

#include "../std/stdint.hpp"

void Storage::Load(rd::Reader & reader)
{
Expand Down
2 changes: 1 addition & 1 deletion storage/storage_builder.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "article_info.hpp"

#include "../std/map.hpp"

#include "../std/stdint.hpp"

class ArticleInfoBuilder : public ArticleInfo
{
Expand Down

0 comments on commit 643c5cf

Please sign in to comment.