Changeset 1502 for code/trunk/src/core/XMLPort.h

Timestamp:

Jun 1, 2008, 3:54:20 PM (16 years ago)

Author:

rgrieder

Message:

• @everyone: Do not create a branch until I've added the svn:eol-style property correctly. Otherwise this would cost me another 4 hours or so when we want to merge back.
• merged network branch back to trunk
• I had to omit the changes from last evening concerning the line endings
• might not work yet because of the line endings
• @beni: script branch is the only branch still open. you probably will have to apply a patch because of inconsistent new lines

File:

• code/trunk/src/core/XMLPort.h (modified) (3 diffs)

code/trunk/src/core/XMLPort.h

@@ -78 +78 @@
 namespace orxonox
 {
-
-#ifndef _XMLPort_Mode__
-#define _XMLPort_Mode__
-    namespace XMLPort
-    {
-        enum Mode
-        {
-            LoadObject,
-            SaveObject
-        };
-    }
-#endif
-
     // ###############################
     // ###  XMLPortParamContainer  ###
@@ -166 +153 @@
                         }
                     }
-                    catch(ticpp::Exception& ex)
+                    catch (ticpp::Exception& ex)
                     {
                         COUT(1) << std::endl;
@@ -344 +331 @@
                         }
                     }
-                    catch(ticpp::Exception& ex)
+                    catch (ticpp::Exception& ex)
                     {
                         COUT(1) << std::endl;