Merge branch 'thread.ToyConversion-20170904' into 'master'

ToyConversion: Enable thread-safety checker. See merge request !4411

Merge branch 'thread.ToyConversion-20170904' into 'master'
cf09a0b7 · Adam Edward Barton · f32f6d09 · 17d14f23 · cf09a0b7 · cf09a0b7
Commit cf09a0b7 authored 7 years ago by Adam Edward Barton
--- a/Control/AthenaExamples/ToyConversion/ToyConversion/ATLAS_CHECK_THREAD_SAFETY
+++ b/Control/AthenaExamples/ToyConversion/ToyConversion/ATLAS_CHECK_THREAD_SAFETY
--- a/Control/AthenaExamples/ToyConversion/src/ToyConversionSvc.cxx
+++ b/Control/AthenaExamples/ToyConversion/src/ToyConversionSvc.cxx
@@ -5,8 +5,7 @@
 #include "ToyConversion/ToyConversionSvc.h"
 long int
 ToyConversionSvc::storageType() {
-  static long type(0xFF);
-  return type;
+  return 0xff;
 }

 long int ToyConversionSvc::repSvcType() const {