tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use standard DEBUG macro rather than NDEBUG

Browse Source
This commit is contained in:
Konstantin Käfer
2015-01-23 18:52:29 +01:00
parent a67219ab8b
commit 704b3719f5
11 changed files with 42 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.gitmodules vendored
View File

@@ -1,5 +1,5 @@
[submodule "ios"]
path = ios
[submodule "ios/mapbox-gl-cocoa"]
path = ios/mapbox-gl-cocoa
url = https://github.com/mapbox/mapbox-gl-cocoa.git
[submodule "test/suite"]
@@ -13,6 +13,7 @@
[submodule "styles"]
path = styles
url = https://github.com/mapbox/mapbox-gl-styles.git
[submodule "app/ios"]
path = app/ios
url = https://github.com/mapbox/mapbox-gl-cocoa.git
url = https://github.com/mapbox/mapbox-gl-cocoa.git

1
app/ios

Submodule app/ios deleted from 2e5bfbdcd5

17
gyp/common.gypi
View File

@@ -29,9 +29,23 @@
'GCC_WARN_PEDANTIC': 'YES',
'GCC_WARN_UNINITIALIZED_AUTOS': 'YES_AGGRESSIVE',
},
}, {
'cflags_cc': [
'-std=c++11',
'-Werror',
'-Wall',
'-Wextra',
'-Wshadow',
'-Wno-variadic-macros',
'-Wno-error=unused-parameter',
'-Wno-unknown-warning-option',
'-frtti',
'-fexceptions',
],
}],
['OS=="linux"', {
'cflags_cc': ['-Wno-unknown-pragmas', # We are using '#pragma mark', but it is only available on Darwin.
'cflags_cc': [
'-Wno-unknown-pragmas', # We are using '#pragma mark', but it is only available on Darwin.
],
}],
],
@@ -66,7 +80,6 @@
],
}],
],
'cflags_cc': [ '-std=c++11', '-Werror', '-Wall', '-Wextra', '-Wshadow', '-frtti', '-fexceptions' ],
'configurations': {
'Debug': {
'cflags_cc': [ '-g', '-O0', '-fno-omit-frame-pointer','-fwrapv', '-fstack-protector-all', '-fno-common' ],

2
include/mbgl/map/map.hpp
View File

@@ -198,7 +198,7 @@ private:
View &view;
#ifndef NDEBUG
#ifdef DEBUG
const std::thread::id mainThread;
std::thread::id mapThread;
#endif

6
include/mbgl/util/util.hpp
View File

@@ -1,15 +1,17 @@
#ifndef MBGL_UTIL_UTIL
#define MBGL_UTIL_UTIL
#include <thread>
#ifdef DEBUG
#ifndef NDEBUG
#include <thread>
#define MBGL_STORE_THREAD(tid) const std::thread::id tid = std::this_thread::get_id();
#define MBGL_VERIFY_THREAD(tid) assert(tid == std::this_thread::get_id());
#else
#define MBGL_STORE_THREAD(tid)
#define MBGL_VERIFY_THREAD(tid)
#endif
#endif

6
linux/mapboxgl-app.gyp
View File

@@ -23,7 +23,7 @@
],
'variables' : {
'cxxflags': [
'cflags_cc': [
'<@(glfw3_cflags)',
],
'ldflags': [
@@ -38,11 +38,11 @@
'conditions': [
['OS == "mac"', {
'xcode_settings': {
'OTHER_CPLUSPLUSFLAGS': [ '<@(cxxflags)' ],
'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ],
'OTHER_LDFLAGS': [ '<@(ldflags)' ],
}
}, {
'cxxflags': [ '<@(cxxflags)' ],
'cflags_cc': [ '<@(cflags_cc)' ],
'ldflags': [ '<@(ldflags)' ],
}]
],

4
macosx/mapboxgl-app.gyp
View File

@@ -29,7 +29,7 @@
],
'variables' : {
'cxxflags': [
'cflags_cc': [
'<@(glfw3_cflags)',
],
'ldflags': [
@@ -48,7 +48,7 @@
'xcode_settings': {
'SDKROOT': 'macosx',
'SUPPORTED_PLATFORMS':'macosx',
'OTHER_CPLUSPLUSFLAGS': [ '<@(cxxflags)' ],
'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ],
'OTHER_LDFLAGS': [ '<@(ldflags)' ],
'SDKROOT': 'macosx',
'INFOPLIST_FILE': 'Info.plist',

10
src/mbgl/map/map.cpp
View File

@@ -59,7 +59,7 @@ using namespace mbgl;
Map::Map(View& view_, FileSource& fileSource_)
: loop(util::make_unique<uv::loop>()),
view(view_),
#ifndef NDEBUG
#ifdef DEBUG
mainThread(std::this_thread::get_id()),
mapThread(mainThread),
#endif
@@ -152,7 +152,7 @@ void Map::start(bool startPaused) {
}
thread = std::thread([this]() {
#ifndef NDEBUG
#ifdef DEBUG
mapThread = std::this_thread::get_id();
#endif
@@ -162,7 +162,7 @@ void Map::start(bool startPaused) {
run();
#ifndef NDEBUG
#ifdef DEBUG
mapThread = std::thread::id();
#endif
@@ -230,7 +230,7 @@ void Map::resume() {
void Map::run() {
if (mode == Mode::None) {
#ifndef NDEBUG
#ifdef DEBUG
mapThread = mainThread;
#endif
mode = Mode::Static;
@@ -265,7 +265,7 @@ void Map::run() {
// *after* all events have been processed.
if (mode == Mode::Static) {
render();
#ifndef NDEBUG
#ifdef DEBUG
mapThread = std::thread::id();
#endif
mode = Mode::None;

8
src/mbgl/util/uv-worker.c
View File

@@ -25,7 +25,7 @@ void uv__worker_free_messenger(uv_messenger_t *msgr) {
void uv__worker_thread_finished(uv__worker_thread_t *worker_thread) {
uv_worker_t *worker = worker_thread->worker;
#ifndef NDEBUG
#ifdef DEBUG
assert(uv_thread_self() == worker->thread_id);
#endif
@@ -101,7 +101,7 @@ void uv__worker_thread_loop(void *ptr) {
}
int uv_worker_init(uv_worker_t *worker, uv_loop_t *loop, int count, const char *name) {
#ifndef NDEBUG
#ifdef DEBUG
worker->thread_id = uv_thread_self();
#endif
worker->loop = loop;
@@ -134,7 +134,7 @@ int uv_worker_init(uv_worker_t *worker, uv_loop_t *loop, int count, const char *
void uv_worker_send(uv_worker_t *worker, void *data, uv_worker_cb work_cb,
uv_worker_after_cb after_work_cb) {
#ifndef NDEBUG
#ifdef DEBUG
assert(uv_thread_self() == worker->thread_id);
#endif
@@ -155,7 +155,7 @@ void uv_worker_send(uv_worker_t *worker, void *data, uv_worker_cb work_cb,
}
void uv_worker_close(uv_worker_t *worker, uv_worker_close_cb close_cb) {
#ifndef NDEBUG
#ifdef DEBUG
assert(uv_thread_self() == worker->thread_id);
#endif

2
src/mbgl/util/uv-worker.h
View File

@@ -17,7 +17,7 @@ typedef void (*uv_worker_after_cb)(void *data);
typedef void (*uv_worker_close_cb)(uv_worker_t *worker);
struct uv_worker_s {
#ifndef NDEBUG
#ifdef DEBUG
unsigned long thread_id;
#endif
uv_loop_t *loop;

8
test/test.gyp
View File

@@ -69,7 +69,7 @@
'<@(curl_static_libs)',
],
'variables': {
'cxxflags': [
'cflags_cc': [
'<@(uv_cflags)',
'-I<(boost_root)/include',
],
@@ -84,13 +84,11 @@
'conditions': [
['OS == "mac"', {
'xcode_settings': {
'OTHER_CFLAGS': [ '<@(cxxflags)' ],
'OTHER_CPLUSPLUSFLAGS': [ '<@(cxxflags)' ],
'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ],
'OTHER_LDFLAGS': [ '<@(ldflags)' ],
},
}, {
'cflags': [ '<@(cxxflags)' ],
'cxxflags': [ '<@(cxxflags)' ],
'cflags_cc': [ '<@(cflags_cc)' ],
'libraries': [ '<@(ldflags)' ],
}],
],