[lmi-commits] [6225] Fix defect introduced 20090730T2312Z: logical operator on bitfield

[Greg Chicares]

Revision: 6225
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=6225
Author:   chicares
Date:     2015-07-31 00:13:17 +0000 (Fri, 31 Jul 2015)
Log Message:
-----------
Fix defect introduced 20090730T2312Z: logical operator on bitfield

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/gpt_server.cpp
    lmi/trunk/mec_server.cpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2015-07-29 14:36:51 UTC (rev 6224)
+++ lmi/trunk/ChangeLog 2015-07-31 00:13:17 UTC (rev 6225)
@@ -36437,3 +36437,11 @@
 Silently ignore any 'tags' file. See:
   http://lists.nongnu.org/archive/html/lmi/2015-07/msg00009.html
 
+20150731T0013Z <address@hidden> [508]
+
+  gpt_server.cpp
+  mec_server.cpp
+Fix defect introduced 20090730T2312Z: logical operator on bitfield.
+See:
+  http://lists.nongnu.org/archive/html/lmi/2015-07/msg00029.html
+

Modified: lmi/trunk/gpt_server.cpp
===================================================================
--- lmi/trunk/gpt_server.cpp    2015-07-29 14:36:51 UTC (rev 6224)
+++ lmi/trunk/gpt_server.cpp    2015-07-31 00:13:17 UTC (rev 6225)
@@ -557,7 +557,7 @@
     state_ = test_one_days_gpt_transactions(file_path, z);
     seconds_for_calculations_ = timer.stop().elapsed_seconds();
     timer.restart();
-    if(mce_emit_test_data && emission_)
+    if(mce_emit_test_data & emission_)
         {
         state_.save(fs::change_extension(file_path, ".gpt.xml"));
         }

Modified: lmi/trunk/mec_server.cpp
===================================================================
--- lmi/trunk/mec_server.cpp    2015-07-29 14:36:51 UTC (rev 6224)
+++ lmi/trunk/mec_server.cpp    2015-07-31 00:13:17 UTC (rev 6225)
@@ -539,7 +539,7 @@
     state_ = test_one_days_7702A_transactions(file_path, z);
     seconds_for_calculations_ = timer.stop().elapsed_seconds();
     timer.restart();
-    if(mce_emit_test_data && emission_)
+    if(mce_emit_test_data & emission_)
         {
         state_.save(fs::change_extension(file_path, ".mec.xml"));
         }