Title: [161793] trunk/Source/_javascript_Core
- Revision
- 161793
- Author
- ander...@apple.com
- Date
- 2014-01-11 19:23:25 -0800 (Sat, 11 Jan 2014)
Log Message
Try again to fix the build.
* inspector/InspectorAgentRegistry.cpp:
* inspector/InspectorAgentRegistry.h:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (161792 => 161793)
--- trunk/Source/_javascript_Core/ChangeLog 2014-01-12 03:00:51 UTC (rev 161792)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-01-12 03:23:25 UTC (rev 161793)
@@ -1,5 +1,12 @@
2014-01-11 Anders Carlsson <ander...@apple.com>
+ Try again to fix the build.
+
+ * inspector/InspectorAgentRegistry.cpp:
+ * inspector/InspectorAgentRegistry.h:
+
+2014-01-11 Anders Carlsson <ander...@apple.com>
+
Try to prevent the Vector copy constructor from being instantiated.
* inspector/InspectorAgentRegistry.cpp:
Modified: trunk/Source/_javascript_Core/inspector/InspectorAgentRegistry.cpp (161792 => 161793)
--- trunk/Source/_javascript_Core/inspector/InspectorAgentRegistry.cpp 2014-01-12 03:00:51 UTC (rev 161792)
+++ trunk/Source/_javascript_Core/inspector/InspectorAgentRegistry.cpp 2014-01-12 03:23:25 UTC (rev 161793)
@@ -37,14 +37,6 @@
{
}
-InspectorAgentRegistry::InspectorAgentRegistry(const InspectorAgentRegistry&)
-{
-}
-
-InspectorAgentRegistry::~InspectorAgentRegistry()
-{
-}
-
void InspectorAgentRegistry::append(std::unique_ptr<InspectorAgentBase> agent)
{
m_agents.append(std::move(agent));
Modified: trunk/Source/_javascript_Core/inspector/InspectorAgentRegistry.h (161792 => 161793)
--- trunk/Source/_javascript_Core/inspector/InspectorAgentRegistry.h 2014-01-12 03:00:51 UTC (rev 161792)
+++ trunk/Source/_javascript_Core/inspector/InspectorAgentRegistry.h 2014-01-12 03:23:25 UTC (rev 161793)
@@ -38,10 +38,7 @@
class JS_EXPORT_PRIVATE InspectorAgentRegistry {
public:
InspectorAgentRegistry();
- ~InspectorAgentRegistry();
- InspectorAgentRegistry(const InspectorAgentRegistry&);
-
void append(std::unique_ptr<InspectorAgentBase>);
void didCreateFrontendAndBackend(InspectorFrontendChannel*, InspectorBackendDispatcher*);
@@ -49,6 +46,11 @@
void discardAgents();
private:
+ // These are declared here to avoid MSVC from trying to create default iplementations which would
+ // involve generating a copy constructor and copy assignment operator for the Vector of std::unique_ptrs.
+ InspectorAgentRegistry(const InspectorAgentRegistry&) WTF_DELETED_FUNCTION;
+ InspectorAgentRegistry& operator=(const InspectorAgentRegistry&) WTF_DELETED_FUNCTION;
+
Vector<std::unique_ptr<InspectorAgentBase>> m_agents;
};
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
