← Back to branch summary

~ubuntu-branches/ubuntu/raring/virtualbox-ose/raring

« back to all changes in this revision

Viewing changes to src/VBox/HostServices/GuestProperties/service.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-01-30 23:27:25 UTC
  • mfrom: (0.3.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20110130232725-2ouajjd2ggdet0zd
Tags: 4.0.2-dfsg-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - Add Apport hook.
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Drop *-source packages.
* Drop ubuntu-01-fix-build-gcc45.patch, fixed upstream.
* Drop ubuntu-02-as-needed.patch, added to the Debian package.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/HostServices/GuestProperties/service.cpp
1
 
/* $Id: service.cpp $ */
 
1
/* $Id: service.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */
2
2
/** @file
3
3
 * Guest Property Service: Host service entry points.
4
4
 */
134
134
 
135
135
    /** The standard constructor */
136
136
    GuestCall() : mFunction(0) {}
137
 
    /** The normal contructor */
 
137
    /** The normal constructor */
138
138
    GuestCall(VBOXHGCMCALLHANDLE aHandle, uint32_t aFunction,
139
139
              VBOXHGCMSVCPARM aParms[], int aRc)
140
140
              : mHandle(aHandle), mFunction(aFunction), mParms(aParms),
146
146
/**
147
147
 * Class containing the shared information service functionality.
148
148
 */
149
 
class Service : public stdx::non_copyable
 
149
class Service : public iprt::non_copyable
150
150
{
151
151
private:
152
152
    /** Type definition for use in callback functions */
1287
1287
        else
1288
1288
        {
1289
1289
            std::auto_ptr<Service> apService;
1290
 
            /* No exceptions may propogate outside. */
 
1290
            /* No exceptions may propagate outside. */
1291
1291
            try {
1292
1292
                apService = std::auto_ptr<Service>(new Service(ptable->pHelpers));
1293
1293
            } catch (int rcThrown) {