Browse Source

Fix compilation errors due to compiler change

Cheng Zhao 9 years ago
parent
commit
b1db947def

+ 1 - 1
atom/common/id_weak_map.cc

@@ -23,7 +23,7 @@ int32_t IDWeakMap::Add(v8::Isolate* isolate, v8::Local<v8::Object> object) {
 
   auto global = make_linked_ptr(new v8::Global<v8::Object>(isolate, object));
   global->SetWeak(this, &WeakCallback);
-  map_.emplace(id, global);
+  map_[id] = global;
   return id;
 }
 

+ 13 - 13
chromium_src/library_loaders/libspeechd.h

@@ -20,19 +20,19 @@ class LibSpeechdLoader {
 
   bool loaded() const { return loaded_; }
 
-  typeof(&::spd_open) spd_open;
-  typeof(&::spd_say) spd_say;
-  typeof(&::spd_stop) spd_stop;
-  typeof(&::spd_close) spd_close;
-  typeof(&::spd_pause) spd_pause;
-  typeof(&::spd_resume) spd_resume;
-  typeof(&::spd_set_notification_on) spd_set_notification_on;
-  typeof(&::spd_set_voice_rate) spd_set_voice_rate;
-  typeof(&::spd_set_voice_pitch) spd_set_voice_pitch;
-  typeof(&::spd_list_synthesis_voices) spd_list_synthesis_voices;
-  typeof(&::spd_set_synthesis_voice) spd_set_synthesis_voice;
-  typeof(&::spd_list_modules) spd_list_modules;
-  typeof(&::spd_set_output_module) spd_set_output_module;
+  decltype(&::spd_open) spd_open;
+  decltype(&::spd_say) spd_say;
+  decltype(&::spd_stop) spd_stop;
+  decltype(&::spd_close) spd_close;
+  decltype(&::spd_pause) spd_pause;
+  decltype(&::spd_resume) spd_resume;
+  decltype(&::spd_set_notification_on) spd_set_notification_on;
+  decltype(&::spd_set_voice_rate) spd_set_voice_rate;
+  decltype(&::spd_set_voice_pitch) spd_set_voice_pitch;
+  decltype(&::spd_list_synthesis_voices) spd_list_synthesis_voices;
+  decltype(&::spd_set_synthesis_voice) spd_set_synthesis_voice;
+  decltype(&::spd_list_modules) spd_list_modules;
+  decltype(&::spd_set_output_module) spd_set_output_module;
 
 
  private:

+ 13 - 13
chromium_src/library_loaders/libspeechd_loader.cc

@@ -34,7 +34,7 @@ bool LibSpeechdLoader::Load(const std::string& library_name) {
 
 #if defined(LIBRARY_LOADER_OUT_RELEASE_GEN_LIBRARY_LOADERS_LIBSPEECHD_H_DLOPEN)
   spd_open =
-      reinterpret_cast<typeof(this->spd_open)>(
+      reinterpret_cast<decltype(this->spd_open)>(
           dlsym(library_, "spd_open"));
 #endif
 #if defined(LIBRARY_LOADER_OUT_RELEASE_GEN_LIBRARY_LOADERS_LIBSPEECHD_H_DT_NEEDED)
@@ -47,7 +47,7 @@ bool LibSpeechdLoader::Load(const std::string& library_name) {
 
 #if defined(LIBRARY_LOADER_OUT_RELEASE_GEN_LIBRARY_LOADERS_LIBSPEECHD_H_DLOPEN)
   spd_say =
-      reinterpret_cast<typeof(this->spd_say)>(
+      reinterpret_cast<decltype(this->spd_say)>(
           dlsym(library_, "spd_say"));
 #endif
 #if defined(LIBRARY_LOADER_OUT_RELEASE_GEN_LIBRARY_LOADERS_LIBSPEECHD_H_DT_NEEDED)
@@ -60,7 +60,7 @@ bool LibSpeechdLoader::Load(const std::string& library_name) {
 
 #if defined(LIBRARY_LOADER_OUT_RELEASE_GEN_LIBRARY_LOADERS_LIBSPEECHD_H_DLOPEN)
   spd_stop =
-      reinterpret_cast<typeof(this->spd_stop)>(
+      reinterpret_cast<decltype(this->spd_stop)>(
           dlsym(library_, "spd_stop"));
 #endif
 #if defined(LIBRARY_LOADER_OUT_RELEASE_GEN_LIBRARY_LOADERS_LIBSPEECHD_H_DT_NEEDED)
@@ -73,7 +73,7 @@ bool LibSpeechdLoader::Load(const std::string& library_name) {
 
 #if defined(LIBRARY_LOADER_OUT_RELEASE_GEN_LIBRARY_LOADERS_LIBSPEECHD_H_DLOPEN)
   spd_close =
-      reinterpret_cast<typeof(this->spd_close)>(
+      reinterpret_cast<decltype(this->spd_close)>(
           dlsym(library_, "spd_close"));
 #endif
 #if defined(LIBRARY_LOADER_OUT_RELEASE_GEN_LIBRARY_LOADERS_LIBSPEECHD_H_DT_NEEDED)
@@ -86,7 +86,7 @@ bool LibSpeechdLoader::Load(const std::string& library_name) {
 
 #if defined(LIBRARY_LOADER_OUT_RELEASE_GEN_LIBRARY_LOADERS_LIBSPEECHD_H_DLOPEN)
   spd_pause =
-      reinterpret_cast<typeof(this->spd_pause)>(
+      reinterpret_cast<decltype(this->spd_pause)>(
           dlsym(library_, "spd_pause"));
 #endif
 #if defined(LIBRARY_LOADER_OUT_RELEASE_GEN_LIBRARY_LOADERS_LIBSPEECHD_H_DT_NEEDED)
@@ -99,7 +99,7 @@ bool LibSpeechdLoader::Load(const std::string& library_name) {
 
 #if defined(LIBRARY_LOADER_OUT_RELEASE_GEN_LIBRARY_LOADERS_LIBSPEECHD_H_DLOPEN)
   spd_resume =
-      reinterpret_cast<typeof(this->spd_resume)>(
+      reinterpret_cast<decltype(this->spd_resume)>(
           dlsym(library_, "spd_resume"));
 #endif
 #if defined(LIBRARY_LOADER_OUT_RELEASE_GEN_LIBRARY_LOADERS_LIBSPEECHD_H_DT_NEEDED)
@@ -112,7 +112,7 @@ bool LibSpeechdLoader::Load(const std::string& library_name) {
 
 #if defined(LIBRARY_LOADER_OUT_RELEASE_GEN_LIBRARY_LOADERS_LIBSPEECHD_H_DLOPEN)
   spd_set_notification_on =
-      reinterpret_cast<typeof(this->spd_set_notification_on)>(
+      reinterpret_cast<decltype(this->spd_set_notification_on)>(
           dlsym(library_, "spd_set_notification_on"));
 #endif
 #if defined(LIBRARY_LOADER_OUT_RELEASE_GEN_LIBRARY_LOADERS_LIBSPEECHD_H_DT_NEEDED)
@@ -125,7 +125,7 @@ bool LibSpeechdLoader::Load(const std::string& library_name) {
 
 #if defined(LIBRARY_LOADER_OUT_RELEASE_GEN_LIBRARY_LOADERS_LIBSPEECHD_H_DLOPEN)
   spd_set_voice_rate =
-      reinterpret_cast<typeof(this->spd_set_voice_rate)>(
+      reinterpret_cast<decltype(this->spd_set_voice_rate)>(
           dlsym(library_, "spd_set_voice_rate"));
 #endif
 #if defined(LIBRARY_LOADER_OUT_RELEASE_GEN_LIBRARY_LOADERS_LIBSPEECHD_H_DT_NEEDED)
@@ -138,7 +138,7 @@ bool LibSpeechdLoader::Load(const std::string& library_name) {
 
 #if defined(LIBRARY_LOADER_OUT_RELEASE_GEN_LIBRARY_LOADERS_LIBSPEECHD_H_DLOPEN)
   spd_set_voice_pitch =
-      reinterpret_cast<typeof(this->spd_set_voice_pitch)>(
+      reinterpret_cast<decltype(this->spd_set_voice_pitch)>(
           dlsym(library_, "spd_set_voice_pitch"));
 #endif
 #if defined(LIBRARY_LOADER_OUT_RELEASE_GEN_LIBRARY_LOADERS_LIBSPEECHD_H_DT_NEEDED)
@@ -151,7 +151,7 @@ bool LibSpeechdLoader::Load(const std::string& library_name) {
 
 #if defined(LIBRARY_LOADER_OUT_RELEASE_GEN_LIBRARY_LOADERS_LIBSPEECHD_H_DLOPEN)
   spd_list_synthesis_voices =
-      reinterpret_cast<typeof(this->spd_list_synthesis_voices)>(
+      reinterpret_cast<decltype(this->spd_list_synthesis_voices)>(
           dlsym(library_, "spd_list_synthesis_voices"));
 #endif
 #if defined(LIBRARY_LOADER_OUT_RELEASE_GEN_LIBRARY_LOADERS_LIBSPEECHD_H_DT_NEEDED)
@@ -164,7 +164,7 @@ bool LibSpeechdLoader::Load(const std::string& library_name) {
 
 #if defined(LIBRARY_LOADER_OUT_RELEASE_GEN_LIBRARY_LOADERS_LIBSPEECHD_H_DLOPEN)
   spd_set_synthesis_voice =
-      reinterpret_cast<typeof(this->spd_set_synthesis_voice)>(
+      reinterpret_cast<decltype(this->spd_set_synthesis_voice)>(
           dlsym(library_, "spd_set_synthesis_voice"));
 #endif
 #if defined(LIBRARY_LOADER_OUT_RELEASE_GEN_LIBRARY_LOADERS_LIBSPEECHD_H_DT_NEEDED)
@@ -177,7 +177,7 @@ bool LibSpeechdLoader::Load(const std::string& library_name) {
 
 #if defined(LIBRARY_LOADER_OUT_RELEASE_GEN_LIBRARY_LOADERS_LIBSPEECHD_H_DLOPEN)
   spd_list_modules =
-      reinterpret_cast<typeof(this->spd_list_modules)>(
+      reinterpret_cast<decltype(this->spd_list_modules)>(
           dlsym(library_, "spd_list_modules"));
 #endif
 #if defined(LIBRARY_LOADER_OUT_RELEASE_GEN_LIBRARY_LOADERS_LIBSPEECHD_H_DT_NEEDED)
@@ -190,7 +190,7 @@ bool LibSpeechdLoader::Load(const std::string& library_name) {
 
 #if defined(LIBRARY_LOADER_OUT_RELEASE_GEN_LIBRARY_LOADERS_LIBSPEECHD_H_DLOPEN)
   spd_set_output_module =
-      reinterpret_cast<typeof(this->spd_set_output_module)>(
+      reinterpret_cast<decltype(this->spd_set_output_module)>(
           dlsym(library_, "spd_set_output_module"));
 #endif
 #if defined(LIBRARY_LOADER_OUT_RELEASE_GEN_LIBRARY_LOADERS_LIBSPEECHD_H_DT_NEEDED)

+ 1 - 1
vendor/brightray

@@ -1 +1 @@
-Subproject commit 89f8190ea519181bbb276b2d0da2273345d3d406
+Subproject commit 713bc650744c3ed987499f64743977c739f11186