Replace use of __null with NULL and bitwise xor was replaced using lo…

…gical xor and fixed edgRose.C to comile when configured using --enable-microsoft-extensions configure option.

README.git

@@ -992,3 +992,7 @@ Compiling ROSE with Intel compiler:
 After new desktop machine:
    smgit commit -am "Fixes for Intel compiler and GNU g++ version 4.8.3, also fixed to pass policy tests."
    smgit push origin HEAD:dquinlan/dq-development-dev
+
+Debugging ROSE Matrix Testing errors using rmc build VMs:
+   "rmc" to testup the environment
+   "rmc config" to kick-off the configure, make, make check process.

src/frontend/SageIII/fixupCopy_scopes.C

@@ -143,7 +143,10 @@ SgInitializedName::fixupCopy_scopes(SgNode* copy, SgCopyHelp & help) const
   // Need to fixup the scope and perhaps build the SgVariableDefinition object!
      SgInitializedName* initializedName_copy = isSgInitializedName(copy);
      ROSE_ASSERT(initializedName_copy != NULL);
-     ROSE_ASSERT (initializedName_copy->get_declptr() != __null);
+
+  // DQ (4/21/2016): Replacing "__null" with more portable (non-gnu specific) use using "NULL".
+  // ROSE_ASSERT (initializedName_copy->get_declptr() != __null);
+     ROSE_ASSERT (initializedName_copy->get_declptr() != NULL);
 
      // fprintf(stderr, "SgInitializedName::fixupCopy_scopes(%p) this=%p\n", copy, this);
      // fprintf(stderr, "Copy's scope is %p, my scope is %p\n", initializedName_copy->get_scope(), this->get_scope());

src/frontend/SageIII/sageInterface/sageInterface.C

@@ -19443,7 +19443,13 @@ bool SageInterface::getForLoopInformations(
   SgVarRefExp * rhs_var_ref = isSgVarRefExp(rhs_exp);
   bool rhs_it = (rhs_var_ref != NULL) && (rhs_var_ref->get_symbol() == iterator);
 
-  assert(lhs_it xor rhs_it);
+// DQ (4/21/2016): Replacing use of bitwise xor with something more approriate for logical types.
+// Note that the xor logica operator does not exist in C/C++ and that this is a case of using the
+// bitwise xor operator on boolean values (not a great idea).  Note that logical "a xor b" is 
+// equivalent to "!a != !b"  the use of "!" only make sure that the "!=" is applied to a boolean 
+// value.  Since these are boolean typed values we can use "a != b", directly.
+// assert(lhs_it xor rhs_it);
+  assert(lhs_it != rhs_it);
 
   upper_bound = lhs_it ? bin_test->get_rhs_operand_i() : bin_test->get_lhs_operand_i();