imgtools/imglib/inc/h_utl.h
changeset 654 7c11c3d8d025
parent 626 ac03b93ca9c4
--- a/imgtools/imglib/inc/h_utl.h	Mon Oct 25 11:53:21 2010 +0800
+++ b/imgtools/imglib/inc/h_utl.h	Tue Oct 26 11:12:31 2010 +0800
@@ -21,10 +21,11 @@
 //
 #include <stdio.h>
 
-#ifdef __VC32__
- #ifdef __MSVCDOTNET__
+#ifdef _MSC_VER 
+ #if (_MSC_VER > 1200) //!__MSVCDOTNET__
+  #define __MSVCDOTNET__ 1
   #include <iostream>
-  #include <strstream>
+  #include <sstream>
   #include <fstream>
   using namespace std;
  #else //!__MSVCDOTNET__
@@ -151,7 +152,7 @@
 TAny *operator new(TUint aSize);
 void operator delete(TAny *aPtr);
 //
-#ifdef __TOOLS2__
+#if defined(__TOOLS2__) || defined(__MSVCDOTNET__)
 istringstream &operator>>(istringstream &is, TVersion &aVersion);
 #else
 istrstream &operator>>(istrstream &is, TVersion &aVersion);
@@ -173,12 +174,12 @@
 	{
 
 	T x;
-	#ifdef __TOOLS2__
+	#if defined(__TOOLS2__) || defined(__MSVCDOTNET__)
 	istringstream val(aStr);
 	#else
 	istrstream val((char*)aStr,strlen(aStr));
 	#endif
-	#if defined(__MSVCDOTNET__) || defined (__TOOLS2__) 
+	#if  defined (__TOOLS2__) || defined(__MSVCDOTNET__)
 		val >> setbase(0);
 	#endif //__MSVCDOTNET__                             
 	val >> x;