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