Use git diff instead of diff-index for setlocalversion.

[loba.git] / messages.cpp

diff --git a/messages.cpp b/messages.cpp
index 70e2236198839f8d53a56b918483646658b7fe66..e20c4cac306c95c8fb0557ccf8937579b924f25a 100644 (file)
--- a/messages.cpp
+++ b/messages.cpp
@@ -14,10 +14,10 @@ message::message(message_type t, double a, double c)
     // compute message size
     // arbitrary: 8 for type, and 8 for each double
     switch (type) {
     // compute message size
     // arbitrary: 8 for type, and 8 for each double
     switch (type) {

-    case CTRL:
+    case message_type::CTRL:

         size = opt::bookkeeping ? 24 : 16; // type + amount + (credit)?
         break;
         size = opt::bookkeeping ? 24 : 16; // type + amount + (credit)?
         break;

-    case DATA:
+    case message_type::DATA:

         size = 16 + opt::comm_cost(amount); // type + amount + data size
         break;
     default:
         size = 16 + opt::comm_cost(amount); // type + amount + data size
         break;
     default:


@@ -30,22 +30,22 @@ std::string message::to_string()
 {
     std::ostringstream oss;
     switch (type) {
 {
     std::ostringstream oss;
     switch (type) {

-    case CTRL:
+    case message_type::CTRL:

         oss << "CTRL: " << amount << " (info)";
         if (opt::bookkeeping)
             oss << "; " << credit << " (credit)";
         break;
         oss << "CTRL: " << amount << " (info)";
         if (opt::bookkeeping)
             oss << "; " << credit << " (credit)";
         break;

-    case DATA:
+    case message_type::DATA:

         oss << "DATA: " << amount << " (load)";
         break;
         oss << "DATA: " << amount << " (load)";
         break;

-    case CTRL_CLOSE:
+    case message_type::CTRL_CLOSE:

         oss << "CTRL_CLOSE";
         break;
         oss << "CTRL_CLOSE";
         break;

-    case DATA_CLOSE:
+    case message_type::DATA_CLOSE:

         oss << "DATA_CLOSE";
         break;
     default:
         oss << "DATA_CLOSE";
         break;
     default:

-        oss << "UNKNOWN MESSAGE TYPE: " << type;
+        oss << "UNKNOWN MESSAGE TYPE: " << static_cast<int>(type);

         break;
     }
     return oss.str();
         break;
     }
     return oss.str();