[lmi-commits] [4916] Make 'input_test' succeed with como

[Greg Chicares]

Revision: 4916
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=4916
Author:   chicares
Date:     2010-05-06 21:11:49 +0000 (Thu, 06 May 2010)
Log Message:
-----------
Make 'input_test' succeed with como

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/config.hpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2010-05-06 18:21:02 UTC (rev 4915)
+++ lmi/trunk/ChangeLog 2010-05-06 21:11:49 UTC (rev 4916)
@@ -25473,7 +25473,6 @@
   input_test.cpp
 Demonstrate a problem. See:
   http://lists.nongnu.org/archive/html/lmi/2010-05/msg00004.html
-or thereabouts.
 
 20100506T1324Z <address@hidden> [718]
 
@@ -25502,3 +25501,18 @@
   input_test.cpp
 Simplify.
 
+20100506T1821Z <address@hidden> [718]
+
+  objects.make
+  tn_range.hpp
+Make 'input_test' compile with como.
+
+20100506T2111Z <address@hidden> [718]
+
+  config.hpp
+Make 'input_test' succeed with como. The msvc workaround added on
+20090226T1557Z and discussed here:
+  http://lists.nongnu.org/archive/html/lmi/2009-02/msg00074.html
+unintentionally applied to como as well, presumably because como
+defines the macro used to identify msvc.
+

Modified: lmi/trunk/config.hpp
===================================================================
--- lmi/trunk/config.hpp        2010-05-06 18:21:02 UTC (rev 4915)
+++ lmi/trunk/config.hpp        2010-05-06 21:11:49 UTC (rev 4916)
@@ -123,9 +123,9 @@
 // Give this toolchain its own lmi-specific macro. Rationale:
 //   http://boost.cvs.sf.net/boost/boost/boost/config.hpp?annotate=1.1
 //   Many other "compilers define _MSC_VER. Thus BOOST_MSVC."
-#if defined _MSC_VER
+#if defined _MSC_VER && !defined LMI_GCC_VERSION && !defined 
LMI_COMO_WITH_MINGW
 #    define LMI_MSC
-#endif // defined _MSC_VER
+#endif // defined _MSC_VER && !defined LMI_GCC_VERSION && !defined 
LMI_COMO_WITH_MINGW
 
 #if defined HAVE_CONFIG_H // Using autoconf.
 #   include "config.h"