Commit Graph

9 Commits

Author SHA1 Message Date
Ehsan Akhgari
5ee21d6d3f Bug 895322 - Part 1: Replace the usages of MOZ_STATIC_ASSERT with C++11 static_assert; r=Waldo
This patch was mostly generated by running the following scripts on the codebase, with some
manual changes made afterwards:

# static_assert.sh
#!/bin/bash
# Command to convert an NSPR integer type to the equivalent standard integer type

function convert() {
echo "Converting $1 to $2..."
find . ! -wholename "*nsprpub*" \
       ! -wholename "*security/nss*" \
       ! -wholename "*/.hg*" \
       ! -wholename "obj-ff-dbg*" \
       ! -name nsXPCOMCID.h \
       ! -name prtypes.h \
         -type f \
      \( -iname "*.cpp" \
         -o -iname "*.h" \
         -o -iname "*.cc" \
         -o -iname "*.mm" \) | \
    xargs -n 1 `dirname $0`/assert_replacer.py #sed -i -e "s/\b$1\b/$2/g"
}

convert MOZ_STATIC_ASSERT static_assert
hg rev --no-backup mfbt/Assertions.h \
                   media/webrtc/signaling/src/sipcc/core/includes/ccapi.h \
                   modules/libmar/src/mar_private.h \
                   modules/libmar/src/mar.h


# assert_replacer.py
#!/usr/bin/python

import sys
import re

pattern = re.compile(r"\bMOZ_STATIC_ASSERT\b")

def replaceInPlace(fname):
  print fname
  f = open(fname, "rw+")
  lines = f.readlines()
  for i in range(0, len(lines)):
    while True:
      index = re.search(pattern, lines[i])
      if index != None:
        index = index.start()
        lines[i] = lines[i][0:index] + "static_assert" + lines[i][index+len("MOZ_STATIC_ASSERT"):]
        for j in range(i + 1, len(lines)):
          if lines[j].find("                 ", index) == index:
            lines[j] = lines[j][0:index] + lines[j][index+4:]
          else:
            break
      else:
        break
  f.seek(0, 0)
  f.truncate()
  f.write("".join(lines))
  f.close()

argc = len(sys.argv)
for i in range(1, argc):
  replaceInPlace(sys.argv[i])

--HG--
extra : rebase_source : 4b4a4047d82f2c205b9fad8d56dfc3f1afc0b045
2013-07-18 13:59:53 -04:00
Daniel Holbert
1d8144f611 Bug 857740: Use MOZ_STATIC_ASSERT instead of COMPILE_ASSERT in convolver.h. r=jrmuizel 2013-04-04 14:42:07 -07:00
Chris Peterson
34d009dfe8 Bug 829685 - Remove #include "prtypes.h" from some files that no longer use PR types. r=ehsan 2013-01-10 08:19:36 -08:00
Joe Drew
2ce483ef86 Bug 813090 - Fix license block on imported Chromium code. r=gerv 2012-12-03 18:04:22 -05:00
Joe Drew
86a50c618d Bug 486918. Part 1: Import Chromium's higher-quality image scalers, since we know those to be good and shippable. r=jrmuizel 2012-08-23 15:36:04 -04:00
Ms2ger
a72f8370a2 Bug 795862 - Back out bug 486918 for build bustage in unreviewed code. 2012-10-01 14:16:03 +02:00
Joe Drew
0877c3403b Bug 486918. Part 1: Import Chromium's higher-quality image scalers, since we know those to be good and shippable. r=jrmuizel 2012-08-23 15:36:04 -04:00
Ed Morley
722b933229 Backout 92530b29ac24, 42e659956dc6 & 38277196c099 (bug 486918), d3b69fe15ac3 & b2dba2108722 (bug 786444), e7381ac9e30a (bug 786449) on suspicion of causing Android reftest failures on a CLOSED TREE 2012-09-28 23:00:28 +01:00
Joe Drew
7ba5def5a6 Bug 486918. Part 1: Import Chromium's higher-quality image scalers, since we know those to be good and shippable. r=jrmuizel
--HG--
extra : rebase_source : afcbe4f2b8fac985d836b038fb42156d27dc1c29
2012-08-23 15:36:04 -04:00