Title: [100628] trunk/Source/WebCore
- Revision
- 100628
- Author
- [email protected]
- Date
- 2011-11-17 08:32:22 -0800 (Thu, 17 Nov 2011)
Log Message
Unreviewed WinCE build fix for r94119.
MSVC throws multiply defined symbols linker error when using local class in inline function.
* bindings/js/JSDictionary.h:
(WebCore::JSDictionary::IdentitySetter::identitySetter):
(WebCore::JSDictionary::tryGetProperty):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (100627 => 100628)
--- trunk/Source/WebCore/ChangeLog 2011-11-17 16:27:53 UTC (rev 100627)
+++ trunk/Source/WebCore/ChangeLog 2011-11-17 16:32:22 UTC (rev 100628)
@@ -1,3 +1,13 @@
+2011-11-17 Patrick Gansterer <[email protected]>
+
+ Unreviewed WinCE build fix for r94119.
+
+ MSVC throws multiply defined symbols linker error when using local class in inline function.
+
+ * bindings/js/JSDictionary.h:
+ (WebCore::JSDictionary::IdentitySetter::identitySetter):
+ (WebCore::JSDictionary::tryGetProperty):
+
2011-11-17 Eric Carlson <[email protected]>
TextTrackList not sorted correctly
Modified: trunk/Source/WebCore/bindings/js/JSDictionary.h (100627 => 100628)
--- trunk/Source/WebCore/bindings/js/JSDictionary.h 2011-11-17 16:27:53 UTC (rev 100627)
+++ trunk/Source/WebCore/bindings/js/JSDictionary.h 2011-11-17 16:32:22 UTC (rev 100628)
@@ -54,6 +54,14 @@
bool tryGetProperty(const char* propertyName, T* context, void (*setter)(T* context, const Result&));
private:
+ template <typename Result>
+ struct IdentitySetter {
+ static void identitySetter(Result* context, const Result& result)
+ {
+ *context = result;
+ }
+ };
+
enum GetPropertyResult {
ExceptionThrown,
NoPropertyFound,
@@ -110,14 +118,7 @@
template <typename Result>
bool JSDictionary::tryGetProperty(const char* propertyName, Result& finalResult)
{
- struct IdentitySetter {
- static void identitySetter(Result* context, const Result& result)
- {
- *context = result;
- }
- };
-
- return tryGetProperty(propertyName, &finalResult, IdentitySetter::identitySetter);
+ return tryGetProperty(propertyName, &finalResult, IdentitySetter<Result>::identitySetter);
}
} // namespace WebCore
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
