Changeset 6412 for code/branches/pickup2/src/orxonox/Test.h

Timestamp:

Dec 25, 2009, 1:18:03 PM (15 years ago)

Author:

dafrick

Message:

Merged presentation2 branch into pickup2 branch.

Location:

code/branches/pickup2

Files:

• . (modified) (1 prop)
• src/orxonox/Test.h (modified) (2 diffs)

code/branches/pickup2/src/orxonox/Test.h

@@ -76 +76 @@
       void checkS4();
 
+      void printPointer();
+
       static void printV1(){ instance_->checkU1(); }
       static void printV2(){ instance_->checkU2(); }
@@ -94 +96 @@
       TYPE s4;
 
+      Test* pointer_;
+
       static Test* instance_;
   };