Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Pisarchik <pisarchik@mapswithme.com>2014-04-17 16:30:52 +0400
committerAlex Zolotarev <alex@maps.me>2015-09-23 02:14:57 +0300
commit4668e84483ba91e2f79fabef98b5baebea73731f (patch)
treea42414426671e3d108f80cf77471b1b9c4c7d54f
parent03f8dd2bb4ccbc38f0fe6675975fff7b8eed8914 (diff)
Compile errors fixes
-rw-r--r--graphics/render_context.hpp6
-rw-r--r--indexer/index.hpp2
-rw-r--r--std/shared_ptr.hpp2
-rw-r--r--storage/guides.hpp2
4 files changed, 7 insertions, 5 deletions
diff --git a/graphics/render_context.hpp b/graphics/render_context.hpp
index 0df84cbab1..08356fd1f5 100644
--- a/graphics/render_context.hpp
+++ b/graphics/render_context.hpp
@@ -1,8 +1,8 @@
#pragma once
-#include "../../std/shared_ptr.hpp"
-#include "../../std/map.hpp"
-#include "../../base/matrix.hpp"
+#include "../std/shared_ptr.hpp"
+#include "../std/map.hpp"
+#include "../base/matrix.hpp"
#include "defines.hpp"
namespace graphics
diff --git a/indexer/index.hpp b/indexer/index.hpp
index 38a4c2688e..0a8ae9e74e 100644
--- a/indexer/index.hpp
+++ b/indexer/index.hpp
@@ -8,7 +8,7 @@
#include "../coding/file_container.hpp"
-#include "../../defines.hpp"
+#include "../defines.hpp"
#include "../std/vector.hpp"
#include "../std/unordered_set.hpp"
diff --git a/std/shared_ptr.hpp b/std/shared_ptr.hpp
index 6a7dcf7590..23b69a1921 100644
--- a/std/shared_ptr.hpp
+++ b/std/shared_ptr.hpp
@@ -8,6 +8,8 @@
#include <boost/shared_ptr.hpp>
using boost::shared_ptr;
+using boost::static_pointer_cast;
+
template <typename T>
inline shared_ptr<T> make_shared_ptr(T * t)
{
diff --git a/storage/guides.hpp b/storage/guides.hpp
index a0a5b4de59..7c8f946f1d 100644
--- a/storage/guides.hpp
+++ b/storage/guides.hpp
@@ -8,7 +8,7 @@
#include "../std/scoped_ptr.hpp"
#include "../std/noncopyable.hpp"
-#include "../../3party/jansson/jansson_handle.hpp"
+#include "../3party/jansson/jansson_handle.hpp"
namespace guides
{