Changeset 51489 in vbox for trunk/src/VBox

Timestamp:

Jun 2, 2014 3:28:06 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

94098

Message:

DnD: Solaris build fix; no C++11 features available (yet).

Location:

trunk/src/VBox/Main/src-client

Files:

• GuestDnDSourceImpl.cpp (modified) (2 diffs)
• GuestDnDTargetImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-client/GuestDnDSourceImpl.cpp

@@ -270 +270 @@
 
                         aData.resize(cbURIs + 1 /* Include termination */);
-                        memcpy(aData.data(), strURIs.c_str(), cbURIs);
+                        memcpy((void *)aData.front(), strURIs.c_str(), cbURIs);
                     }
                     else
@@ -279 +279 @@
                     /* Copy the data into a safe array of bytes. */
                     aData.resize(cbData);
-                    memcpy(aData.data(), pvData, cbData);
+                    memcpy((void *)aData.front(), pvData, cbData);
                 }
             }

trunk/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp

@@ -353 +353 @@
     int i = 0;
     paParms[i++].setUInt32(aScreenId);
-    paParms[i++].setPointer((void*)aFormat.c_str(), (uint32_t)aFormat.length() + 1);
+    paParms[i++].setPointer((void *)aFormat.c_str(), (uint32_t)aFormat.length() + 1);
     paParms[i++].setUInt32((uint32_t)aFormat.length() + 1);
-    paParms[i++].setPointer((void*)aData.data(), (uint32_t)aData.size());
+    paParms[i++].setPointer((void *)aData.front(), (uint32_t)aData.size());
     paParms[i++].setUInt32((uint32_t)aData.size());