Mercurial Mercurial > ns-3.9 / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
authorMathieu Lacage <mathieu.lacage@sophia.inria.fr>
Wed, 01 Aug 2007 17:24:55 +0200
changeset 1263 7f18229bae34
parent 1262 8e3d39fa3565 (current diff)
parent 1197 e5719ed7c7d5 (diff)
child 1264 577875bb5a65
merge
--- a/src/core/assert.h	Wed Aug 01 17:22:10 2007 +0200
+++ b/src/core/assert.h	Wed Aug 01 17:24:55 2007 +0200
@@ -65,7 +65,7 @@
     {                                                           \
       if (!(condition))                                         \
         {                                                       \
-          std::cout << "assert failed. file=" << __FILE__ <<    \
+          std::cerr << "assert failed. file=" << __FILE__ <<    \
             ", line=" << __LINE__ << ", cond=\""#condition <<   \
             "\"" << std::endl;                                  \
           ns3::AssertBreakpoint ();                             \
@@ -88,7 +88,7 @@
     {                                           \
       if (!(condition))                         \
         {                                       \
-          std::cout << message << std::endl;    \
+          std::cerr << message << std::endl;    \
           ns3::AssertBreakpoint ();             \
         }                                       \
     }                                           \
--- a/src/core/debug.h	Wed Aug 01 17:22:10 2007 +0200
+++ b/src/core/debug.h	Wed Aug 01 17:24:55 2007 +0200
@@ -110,7 +110,7 @@
     {                                           \
       if (g_debug.IsEnabled ())			\
         {                                       \
-          std::cout << msg << std::endl;        \
+          std::cerr << msg << std::endl;        \
         }                                       \
     }                                           \
   while (false)
@@ -125,7 +125,7 @@
 #define NS_DEBUG_UNCOND(msg)         \
   do                                 \
     {                                \
-      std::cout << msg << std::endl; \
+      std::cerr << msg << std::endl; \
     }                                \
   while (false)
 
--- a/src/mobility/position.h	Wed Aug 01 17:22:10 2007 +0200
+++ b/src/mobility/position.h	Wed Aug 01 17:24:55 2007 +0200
@@ -1,3 +1,4 @@
+/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
 #ifndef POSITION_H
 #define POSITION_H
 
--- a/src/mobility/random-position.h	Wed Aug 01 17:22:10 2007 +0200
+++ b/src/mobility/random-position.h	Wed Aug 01 17:24:55 2007 +0200
@@ -1,3 +1,4 @@
+/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
 #ifndef RANDOM_POSITION_H
 #define RANDOM_POSITION_H
 
--- a/src/mobility/speed.h	Wed Aug 01 17:22:10 2007 +0200
+++ b/src/mobility/speed.h	Wed Aug 01 17:24:55 2007 +0200
@@ -1,3 +1,4 @@
+/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
 #ifndef SPEED_H
 #define SPEED_H
 
--- a/src/mobility/static-speed-helper.h	Wed Aug 01 17:22:10 2007 +0200
+++ b/src/mobility/static-speed-helper.h	Wed Aug 01 17:24:55 2007 +0200
@@ -1,3 +1,4 @@
+/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
 #ifndef STATIC_SPEED_HELPER_H
 #define STATIC_SPEED_HELPER_H
ns-3.9