mozilla-gcc46.patch
author Wolfgang Rosenauer <wr@rosenauer.org>
Fri, 12 Aug 2011 12:07:31 +0200
branchmozilla-1.9.2
changeset 300 dff60ff6dfce
parent 274 e86384773149
permissions -rw-r--r--
recognize linux3 as platform for symbolstore.py
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
274
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     1
# HG changeset patch
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     2
# Parent 8bb5926317b6f1e7c9291c8e7079b0c51ccc4615
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     3
From: Christophe Giboudeaux
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     4
Subject: gcc 4.6 build fixes.
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     5
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     6
diff --git a/embedding/browser/gtk/src/EmbedPrivate.cpp b/embedding/browser/gtk/src/EmbedPrivate.cpp
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     7
--- a/embedding/browser/gtk/src/EmbedPrivate.cpp
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     8
+++ b/embedding/browser/gtk/src/EmbedPrivate.cpp
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     9
@@ -99,16 +99,17 @@ nsISupports             *EmbedPrivate::s
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    10
 GtkWidget               *EmbedPrivate::sOffscreenWindow = 0;
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    11
 GtkWidget               *EmbedPrivate::sOffscreenFixed  = 0;
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    12
 
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    13
 nsIDirectoryServiceProvider *EmbedPrivate::sAppFileLocProvider = nsnull;
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    14
 
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    15
 class GTKEmbedDirectoryProvider : public nsIDirectoryServiceProvider2
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    16
 {
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    17
 public:
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    18
+  GTKEmbedDirectoryProvider() {}
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    19
   NS_DECL_ISUPPORTS_INHERITED
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    20
   NS_DECL_NSIDIRECTORYSERVICEPROVIDER
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    21
   NS_DECL_NSIDIRECTORYSERVICEPROVIDER2
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    22
 };
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    23
 
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    24
 static const GTKEmbedDirectoryProvider kDirectoryProvider;
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    25
 
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    26
 NS_IMPL_QUERY_INTERFACE2(GTKEmbedDirectoryProvider,
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    27
diff --git a/gfx/ots/src/os2.cc b/gfx/ots/src/os2.cc
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    28
--- a/gfx/ots/src/os2.cc
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    29
+++ b/gfx/ots/src/os2.cc
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    30
@@ -1,12 +1,14 @@
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    31
 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    32
 // Use of this source code is governed by a BSD-style license that can be
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    33
 // found in the LICENSE file.
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    34
 
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    35
+#include <cstddef>
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    36
+
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    37
 #include "os2.h"
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    38
 
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    39
 #include "head.h"
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    40
 
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    41
 // OS/2 - OS/2 and Windows Metrics
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    42
 // http://www.microsoft.com/opentype/otspec/os2.htm
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    43
 
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    44
 namespace ots {
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    45
diff --git a/intl/unicharutil/util/nsUnicharUtils.h b/intl/unicharutil/util/nsUnicharUtils.h
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    46
--- a/intl/unicharutil/util/nsUnicharUtils.h
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    47
+++ b/intl/unicharutil/util/nsUnicharUtils.h
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    48
@@ -67,16 +67,18 @@ inline PRBool IsLowerCase(PRUnichar c) {
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    49
   return ToUpperCase(c) != c;
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    50
 }
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    51
 
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    52
 #ifdef MOZILLA_INTERNAL_API
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    53
 
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    54
 class nsCaseInsensitiveStringComparator : public nsStringComparator
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    55
 {
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    56
 public:
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    57
+  nsCaseInsensitiveStringComparator() {
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    58
+  }
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    59
   virtual int operator() (const PRUnichar*,
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    60
                           const PRUnichar*,
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    61
                           PRUint32 aLength) const;
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    62
   virtual int operator() (PRUnichar,
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    63
                           PRUnichar) const;
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    64
 };
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    65
 
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    66
 class nsCaseInsensitiveStringArrayComparator
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    67
diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/language.cc b/toolkit/crashreporter/google-breakpad/src/common/linux/language.cc
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    68
--- a/toolkit/crashreporter/google-breakpad/src/common/linux/language.cc
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    69
+++ b/toolkit/crashreporter/google-breakpad/src/common/linux/language.cc
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    70
@@ -34,16 +34,17 @@
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    71
 
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    72
 #include "common/linux/language.h"
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    73
 
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    74
 namespace google_breakpad {
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    75
 
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    76
 // C++ language-specific operations.
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    77
 class CPPLanguage: public Language {
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    78
  public:
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    79
+  CPPLanguage() {}
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    80
   string MakeQualifiedName(const string &parent_name,
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    81
                            const string &name) const {
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    82
     if (parent_name.empty())
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    83
       return name;
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    84
     else
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    85
       return parent_name + "::" + name;
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    86
   }
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    87
 };
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    88
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    89
--- a/toolkit/xre/nsAppRunner.cpp
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    90
+++ b/toolkit/xre/nsAppRunner.cpp
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    91
@@ -635,16 +635,17 @@ class nsXULAppInfo : public nsIXULAppInf
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    92
 #endif
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    93
 #ifdef MOZ_CRASHREPORTER
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    94
                      public nsICrashReporter_MOZILLA_1_9_2_BRANCH,
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    95
 #endif
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    96
                      public nsIXULRuntime
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    97
 
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    98
 {
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    99
 public:
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   100
+  nsXULAppInfo() {}
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   101
   NS_DECL_ISUPPORTS_INHERITED
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   102
   NS_DECL_NSIXULAPPINFO
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   103
   NS_DECL_NSIXULRUNTIME
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   104
 #ifdef MOZ_CRASHREPORTER
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   105
   NS_DECL_NSICRASHREPORTER
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   106
   NS_DECL_NSICRASHREPORTER_MOZILLA_1_9_2_BRANCH
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   107
 #endif
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   108
 #ifdef XP_WIN
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   109
diff --git a/xpcom/base/nsDebugImpl.h b/xpcom/base/nsDebugImpl.h
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   110
--- a/xpcom/base/nsDebugImpl.h
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   111
+++ b/xpcom/base/nsDebugImpl.h
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   112
@@ -35,16 +35,17 @@
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   113
  * ***** END LICENSE BLOCK ***** */
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   114
 
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   115
 #include "nsIDebug.h"
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   116
 #include "nsIDebug2.h"
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   117
 
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   118
 class nsDebugImpl : public nsIDebug2
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   119
 {
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   120
 public:
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   121
+  nsDebugImpl() {}
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   122
     NS_DECL_ISUPPORTS
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   123
     NS_DECL_NSIDEBUG
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   124
     NS_DECL_NSIDEBUG2
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   125
     
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   126
     static NS_METHOD Create(nsISupports* outer, const nsIID& aIID, void* *aInstancePtr);
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   127
 };
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   128
 
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   129
 
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   130
diff --git a/xpcom/base/nsTraceRefcntImpl.h b/xpcom/base/nsTraceRefcntImpl.h
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   131
--- a/xpcom/base/nsTraceRefcntImpl.h
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   132
+++ b/xpcom/base/nsTraceRefcntImpl.h
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   133
@@ -39,16 +39,17 @@
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   134
 #define nsTraceRefcntImpl_h___
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   135
 
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   136
 #include <stdio.h> // for FILE
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   137
 #include "nsITraceRefcnt.h"
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   138
 
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   139
 class nsTraceRefcntImpl : public nsITraceRefcnt
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   140
 {
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   141
 public:
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   142
+  nsTraceRefcntImpl() {}
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   143
   NS_DECL_ISUPPORTS
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   144
   NS_DECL_NSITRACEREFCNT
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   145
 
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   146
   static NS_COM void Startup();
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   147
   static NS_COM void Shutdown();
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   148
 
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   149
   enum StatisticsType {
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   150
     ALL_STATS,
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   151
diff --git a/xpcom/glue/nsEnumeratorUtils.cpp b/xpcom/glue/nsEnumeratorUtils.cpp
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   152
--- a/xpcom/glue/nsEnumeratorUtils.cpp
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   153
+++ b/xpcom/glue/nsEnumeratorUtils.cpp
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   154
@@ -47,16 +47,17 @@
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   155
 
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   156
 #include "nsCOMPtr.h"
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   157
 
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   158
 class EmptyEnumeratorImpl : public nsISimpleEnumerator,
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   159
                             public nsIUTF8StringEnumerator,
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   160
                             public nsIStringEnumerator
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   161
 {
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   162
 public:
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   163
+  EmptyEnumeratorImpl() {}
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   164
     // nsISupports interface
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   165
     NS_DECL_ISUPPORTS_INHERITED  // not really inherited, but no mRefCnt
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   166
 
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   167
     // nsISimpleEnumerator
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   168
     NS_DECL_NSISIMPLEENUMERATOR
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   169
     NS_DECL_NSIUTF8STRINGENUMERATOR
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   170
     // can't use NS_DECL_NSISTRINGENUMERATOR because they share the
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   171
     // HasMore() signature
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   172
diff --git a/xpcom/io/nsUnicharInputStream.h b/xpcom/io/nsUnicharInputStream.h
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   173
--- a/xpcom/io/nsUnicharInputStream.h
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   174
+++ b/xpcom/io/nsUnicharInputStream.h
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   175
@@ -46,16 +46,17 @@
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   176
 #define NS_SIMPLE_UNICHAR_STREAM_FACTORY_CID \
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   177
 { 0x428dca6f, 0x1a0f, 0x4cda, { 0xb5, 0x16, 0xd, 0x52, 0x44, 0x74, 0x5a, 0x6a } }
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   178
 
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   179
 class nsSimpleUnicharStreamFactory :
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   180
   public nsIFactory, 
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   181
   private nsISimpleUnicharStreamFactory
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   182
 {
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   183
 public:
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   184
+  nsSimpleUnicharStreamFactory() {}
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   185
   NS_DECL_ISUPPORTS_INHERITED
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   186
   NS_DECL_NSIFACTORY
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   187
   NS_DECL_NSISIMPLEUNICHARSTREAMFACTORY
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   188
 
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   189
   static NS_COM nsSimpleUnicharStreamFactory* GetInstance();
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   190
 
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   191
 private:
e86384773149 gcc 4.6 buildfixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   192
   static const nsSimpleUnicharStreamFactory kInstance;