Bug 898263 (part 15) - Remove jsutil.h from EXPORTS. r=jorendorff.
authorNicholas Nethercote <nnethercote@mozilla.com>
Fri, 26 Jul 2013 00:57:03 -0700
changeset 142137 7adfc69597d1b8f0aeeb19be0411be264e481e26
parent 142136 96f5e26e3e25872eaff5155bbdf42a9d9a6a8849
child 142138 7d9d0f51250d04036dda2ca42e9bdb9e5efe4497
push id25084
push usercbook@mozilla.com
push dateMon, 12 Aug 2013 09:28:56 +0000
treeherdermozilla-central@f057fca09627 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjorendorff
bugs898263
milestone26.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 898263 (part 15) - Remove jsutil.h from EXPORTS. r=jorendorff.
js/jsd/jsd.h
js/jsd/jshash.cpp
js/src/moz.build
js/xpconnect/src/XPCInlines.h
--- a/js/jsd/jsd.h
+++ b/js/jsd/jsd.h
@@ -26,17 +26,16 @@
 #ifdef MOZILLA_CLIENT
 #define JSD_THREADSAFE 1
 /* define JSD_HAS_DANGEROUS_THREAD 1 */
 #define JSD_USE_NSPR_LOCKS 1
 #endif /* MOZILLA_CLIENT */
 
 #include "jstypes.h"
 #include "jsprf.h"
-#include "jsutil.h" /* Added by JSIFY */
 #include "jshash.h" /* Added by JSIFY */
 #include "jsclist.h"
 #include "jsdebug.h"
 #include "jsapi.h"
 #include "jsdbgapi.h"
 #include "jsd_lock.h"
 
 #include <stdio.h>
--- a/js/jsd/jshash.cpp
+++ b/js/jsd/jshash.cpp
@@ -9,18 +9,20 @@
  */
 
 #include "jshash.h"
 
 #include "mozilla/MathAlgorithms.h"
 
 #include <stdlib.h>
 #include <string.h>
+
 #include "jstypes.h"
-#include "jsutil.h"
+
+#include "js/Utility.h"
 
 using namespace js;
 
 using mozilla::CeilingLog2Size;
 
 /* Compute the number of buckets in ht */
 #define NBUCKETS(ht)    JS_BIT(JS_HASH_BITS - (ht)->shift)
 
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -41,17 +41,16 @@ EXPORTS += [
     'jsdbgapi.h',
     'jsfriendapi.h',
     'jslock.h',
     'jsprf.h',
     'jsprototypes.h',
     'jsproxy.h',
     'jspubtd.h',
     'jstypes.h',
-    'jsutil.h',
     'jsversion.h',
     'jswrapper.h',
     'perf/jsperf.h',
 ]
 
 if CONFIG['HAVE_DTRACE']:
     EXPORTS += [
         '$(CURDIR)/javascript-trace.h',
--- a/js/xpconnect/src/XPCInlines.h
+++ b/js/xpconnect/src/XPCInlines.h
@@ -5,18 +5,19 @@
  * 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/. */
 
 /* private inline methods (#include'd by xpcprivate.h). */
 
 #ifndef xpcinlines_h___
 #define xpcinlines_h___
 
+#include <algorithm>
+
 #include "jsfriendapi.h"
-#include "jsutil.h"
 
 /***************************************************************************/
 
 inline void
 XPCJSRuntime::AddVariantRoot(XPCTraceableVariant* variant)
 {
     variant->AddToRootSet(GetMapLock(), &mVariantRoots);
 }
@@ -432,17 +433,17 @@ XPCNativeSet::HasInterfaceWithAncestor(c
 
     return false;
 }
 
 inline bool
 XPCNativeSet::MatchesSetUpToInterface(const XPCNativeSet* other,
                                       XPCNativeInterface* iface) const
 {
-    int count = js::Min(int(mInterfaceCount), int(other->mInterfaceCount));
+    int count = std::min(int(mInterfaceCount), int(other->mInterfaceCount));
 
     XPCNativeInterface* const * pp1 = mInterfaces;
     XPCNativeInterface* const * pp2 = other->mInterfaces;
 
     for (int i = (int) count; i > 0; i--, pp1++, pp2++) {
         XPCNativeInterface* cur = (*pp1);
         if (cur != (*pp2))
             return false;