Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9406 in orxonox.OLD for trunk/src/lib/physics/physics_connection.cc


Ignore:
Timestamp:
Jul 24, 2006, 11:09:47 AM (18 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the proxy back

merged with commandsvn merge -r9346:HEAD https://svn.orxonox.net/orxonox/branches/proxy .

no conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/lib/physics/physics_connection.cc

    r7221 r9406  
    2727#include "util/loading/load_param.h"
    2828
    29 using namespace std;
     29
    3030
    3131CREATE_FACTORY(PhysicsConnection, CL_PHYSICS_CONNECTION);
     
    8181  }
    8282  else
    83     PRINTF(5)("subject::%s\n", this->subject->getName());
     83    PRINTF(5)("subject::%s\n", this->subject->getCName());
    8484}
    8585
     
    9595  }
    9696  else
    97     PRINTF(5)("field::%s\n", this->field->getName());
     97    PRINTF(5)("field::%s\n", this->field->getCName());
    9898
    9999}
Note: See TracChangeset for help on using the changeset viewer.