pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Fixed Visual Studio compilation errors

Browse source
This commit is contained in:
Alex Zolotarev 2011-03-07 05:38:18 +00:00 • committed by Alex Zolotarev
parent 554f773259
commit 76ce74a6fb
5 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
3party/jansson/src/error.c
View file

@ -18,10 +18,12 @@ void jsonp_error_init(json_error_t *error, const char *source)
void jsonp_error_set_source(json_error_t *error, const char *source)
{
size_t length;
if(!error || !source)
return;
size_t length = strlen(source);
length = strlen(source);
if(length < JSON_ERROR_SOURCE_LENGTH)
strcpy(error->source, source);
else {

4
3party/jansson/src/hashtable.c
View file

@ -16,6 +16,10 @@ typedef struct hashtable_bucket bucket_t;
#define list_to_pair(list_) container_of(list_, pair_t, list)
#if defined(_MSC_VER) && !defined(__cplusplus)
#define inline __inline
#endif
static inline void list_init(list_t *list)
{
list->next = list;

8
3party/jansson/src/jansson.h
View file

@ -14,6 +14,10 @@
//#include <jansson_config.h>
#if defined(_MSC_VER) && !defined(__cplusplus)
#define inline __inline
#endif
#ifdef __cplusplus
extern "C" {
#endif
@ -242,4 +246,8 @@ void json_set_alloc_funcs(json_malloc_t malloc_fn, json_free_t free_fn);
}
#endif
#if defined(_MSC_VER) && !defined(__cplusplus)
#undef inline
#endif
#endif

3
3party/jansson/src/value.c
View file

@ -16,6 +16,9 @@
#include "jansson_private.h"
#include "utf.h"
#if defined(_MSC_VER) && !defined(__cplusplus)
#define inline __inline
#endif
static inline void json_init(json_t *json, json_type type)
{

6
words/sloynik_index.hpp
View file

@ -15,6 +15,10 @@ class Writer;
namespace sl
{
namespace impl
{ // needed for friend declaration
template <class T> struct LessRefProxy;
}
// Sorted index of keys.
// Two locale-aware comparators are used: primary and secondary.
@ -62,7 +66,7 @@ private:
uint8_t m_Lo, m_Mi, m_Hi;
};
#pragma pack(pop)
friend class LessRefProxy;
template <class T> friend struct impl::LessRefProxy;
typedef DDVector<DicId, PolymorphReader> DDVectorType;