Changeset 161793 in webkit for trunk/Source/JavaScriptCore

Timestamp:

Jan 11, 2014, 7:23:25 PM (11 years ago)

Author:

[email protected]

Message:

Try again to fix the build.

• inspector/InspectorAgentRegistry.cpp:
• inspector/InspectorAgentRegistry.h:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorAgentRegistry.cpp (modified) (1 diff)
• inspector/InspectorAgentRegistry.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-01-11  Anders Carlsson  <[email protected]>
+
+        Try again to fix the build.
+
+        * inspector/InspectorAgentRegistry.cpp:
+        * inspector/InspectorAgentRegistry.h:
+
 2014-01-11  Anders Carlsson  <[email protected]>
 

trunk/Source/JavaScriptCore/inspector/InspectorAgentRegistry.cpp

@@ -38 +38 @@
 }
 
-InspectorAgentRegistry::InspectorAgentRegistry(const InspectorAgentRegistry&)
-{
-}
-
-InspectorAgentRegistry::~InspectorAgentRegistry()
-{
-}
-
 void InspectorAgentRegistry::append(std::unique_ptr<InspectorAgentBase> agent)
 {

trunk/Source/JavaScriptCore/inspector/InspectorAgentRegistry.h

@@ -39 +39 @@
 public:
     InspectorAgentRegistry();
-    ~InspectorAgentRegistry();
-
-    InspectorAgentRegistry(const InspectorAgentRegistry&);
 
     void append(std::unique_ptr<InspectorAgentBase>);
@@ -50 +47 @@
 
 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;
 };