From db4c8013f73fe0ea7a7cccefc774809f6daad65f Mon Sep 17 00:00:00 2001
From: Vladimir Prus <ghost@cs.msu.su>
Date: Mon, 21 Jun 2004 10:56:32 +0000
Subject: [PATCH] Add more std comformance options for intel when not in
 vc-compatible mode. The options were contributed by Jurgen.

[SVN r23139]
---
 src/tools/intel-win.jam | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/tools/intel-win.jam b/src/tools/intel-win.jam
index 22d0be0e7..2e191a572 100644
--- a/src/tools/intel-win.jam
+++ b/src/tools/intel-win.jam
@@ -25,7 +25,7 @@ toolset.inherit-rules intel-win : msvc ;
 rule init ( version ? :     # the compiler version
             command ? :     # the command to invoke the compiler itself
             compatibility ? # Compatibility mode: either 'vc6', 'vc7', 'vc7.1'
-                            # or 'native'.
+                            # or 'native'(default).
           )
 {           
     local condition = [  common.check-init-parameters intel-win
@@ -110,6 +110,18 @@ rule init ( version ? :     # the compiler version
     {        
         C++FLAGS += /Q$(base-vc) ;
     }
+    else        
+    {
+        C++FLAGS += 
+          -Qoption,cpp,--arg_dep_lookup
+          -Qoption,cpp,--const_string_literals
+          -Qoption,cpp,--new_for_init
+          -Qoption,cpp,--no_implicit_typename
+          -Qoption,cpp,--no_friend_injection
+          -Qoption,cpp,--no_microsoft_bugs
+          ;
+    }
+    
     flags intel-win CFLAGS $(condition) : $(C++FLAGS) ;
     
 }