Bug 1288924 - Remove __func__ polyfill for VS2013. r=froydnj
authorChris Peterson <cpeterson@mozilla.com>
Mon, 25 Jul 2016 01:14:31 -0700
changeset 331539 19920a6cf0f8e5663667d17b0440ecc0f79624df
parent 331538 5c9d37d6c9ffc0f4ed446e3fab6cfb95e04ed425
child 331540 1870dfec5cb00b6bcdec167eb44ae628ae7812f2
push id9858
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 14:37:10 +0000
treeherdermozilla-aurora@203106ef6cb6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1288924
milestone50.0a1
Bug 1288924 - Remove __func__ polyfill for VS2013. r=froydnj
dom/devicestorage/nsDeviceStorage.h
xpcom/base/Logging.h
--- a/dom/devicestorage/nsDeviceStorage.h
+++ b/dom/devicestorage/nsDeviceStorage.h
@@ -4,17 +4,16 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef nsDeviceStorage_h
 #define nsDeviceStorage_h
 
 #include "mozilla/Atomics.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/Logging.h"
 #include "mozilla/dom/devicestorage/DeviceStorageRequestChild.h"
 
 #include "DOMRequest.h"
 #include "DOMCursor.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsDOMClassInfoID.h"
 #include "nsIClassInfo.h"
 #include "nsIDOMWindow.h"
--- a/xpcom/base/Logging.h
+++ b/xpcom/base/Logging.h
@@ -220,24 +220,13 @@ void log_print(const LogModule* aModule,
     if (MOZ_LOG_TEST(_module,_level)) { \
       mozilla::detail::log_print(_module, _level, MOZ_LOG_EXPAND_ARGS _args);         \
     }                     \
   PR_END_MACRO
 
 #undef PR_LOG
 #undef PR_LOG_TEST
 
-/*
- * __func__ was standardized in C++11 and is supported by clang, gcc, and MSVC
- * 2015. Here we polyfill __func__ for earlier versions of MSVC.
- * http://blogs.msdn.com/b/vcblog/archive/2015/06/19/c-11-14-17-features-in-vs-2015-rtm.aspx
- */
-#ifdef _MSC_VER
-#  if _MSC_VER < 1900
-#    define __func__ __FUNCTION__
-#  endif
-#endif
-
 // This #define is a Logging.h-only knob!  Don't encourage people to get fancy
 // with their log definitions by exporting it outside of Logging.h.
 #undef MOZ_LOGGING_ENABLED
 
 #endif // mozilla_logging_h