Merged origin/beta

src/modules/navigator/navigator_main.cpp

@@ -1,6 +1,10 @@
 /****************************************************************************
  *
  *   Copyright (c) 2013, 2014 PX4 Development Team. All rights reserved.
+ *   Author: @author Lorenz Meier <lm@inf.ethz.ch>
+ *           @author Jean Cyr <jean.m.cyr@gmail.com>
+ *           @author Julian Oes <joes@student.ethz.ch>
+ *           @author Anton Babushkin <anton.babushkin@me.com>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -31,18 +35,16 @@
  *
  ****************************************************************************/
 /**
- * @file navigator_main.cpp
+ * @file navigator_main.c
  * Implementation of the main navigation state machine.
  *
  * Handles missions, geo fencing and failsafe navigation behavior.
  * Published the mission item triplet for the position controller.
  *
- * @author Julian Oes <joes@student.ethz.ch>
- * @author Jean Cyr <jean.m.cyr@gmail.com>
- * @author Anton Babushkin <anton.babushkin@me.com>
- * @author Thomas Gubler <thomasgubler@gmail.com>
  * @author Lorenz Meier <lm@inf.ethz.ch>
- * 
+ * @author Jean Cyr <jean.m.cyr@gmail.com>
+ * @author Julian Oes <joes@student.ethz.ch>
+ * @author Anton Babushkin <anton.babushkin@me.com>
  */
 
 #include <nuttx/config.h>
@@ -349,11 +351,11 @@ private:
 namespace navigator
 {
 
-// /* oddly, ERROR is not defined for c++ */
-// #ifdef ERROR
-// # undef ERROR
-// #endif
-// static const int ERROR = -1;
+/* oddly, ERROR is not defined for c++ */
+#ifdef ERROR
+# undef ERROR
+#endif
+static const int ERROR = -1;
 
 Navigator	*g_navigator;
 }