Merge branch 'nostencil'

Conflicts:
	macosx/main.mm
	src/map/map.cpp

1 files changed, 2 insertions, 2 deletions

diff --git a/macosx/main.mm b/macosx/main.mm
index bed18013cb..8e9ec099a2 100644
--- a/macosx/main.mm
+++ b/macosx/main.mm
@@ -228,7 +228,6 @@ public:
 };
 
 MapView *mapView;
-NSOperationQueue *queue;
 
 namespace llmr {
 namespace platform {
@@ -240,7 +239,8 @@ void restart() {
     [[NSApplication sharedApplication] postEvent: [NSEvent eventWithCGEvent:event] atStart:NO];
 }
 
-struct Request {
+class Request {
+public:
     int16_t identifier;
     std::string original_url;
 };