Changeset 1914

Timestamp:

04/03/08 18:09:17 (9 months ago)

Author:

rporter

Message:

trunk/source/cddefines.h
trunk/source/container_classes.h
-pragma to disable MS VS warning 4231 doesn't work in cddefines.h; move to container_classes.h

trunk/source/init_sim_postparse.cpp - change %4i to %4li

trunk/source/prt_met.cpp - comment out unused variables.

Location:

trunk/source

Files:

• cddefines.h (modified) (1 diff)
• container_classes.h (modified) (1 diff)
• init_sim_postparse.cpp (modified) (1 diff)
• prt_met.cpp (modified) (1 diff)

trunk/source/cddefines.h

@@ -1566 +1566 @@
          * line 126 */
 #       pragma warning( disable : 4512 )
-        /* disable "'extern' before template explicit instantiation" */
-#       pragma warning( disable : 4231 )
 #endif
 #ifdef __INTEL_COMPILER

trunk/source/container_classes.h

@@ -1713 +1713 @@
 #endif
 
+#ifdef _MSC_VER
+/* disable "'extern' before template explicit instantiation" */
+#       pragma warning( disable : 4231 )
+#endif
+
 // on Mac systems these instantiations need to be extern in order to avoid duplicate symbols
 #define INSTANTIATE_MULTI_ARR( TYPE, LAYOUT, BC ) \

trunk/source/init_sim_postparse.cpp

@@ -89 +89 @@
                         {
                                 /* print number of levels */
-                                fprintf(ioQQQ," %s  %s    %4i            %4i           %4i \n",
+                                fprintf(ioQQQ," %s  %s    %4li            %4li           %4li \n",
                                         iso.chISO[ipISO] ,
                                         elementnames.chElementSym[nelem],

trunk/source/prt_met.cpp

@@ -115 +115 @@
 {
         static char chLsav[NLIM][11];
-        char chAtMolWL[20],chAtMol[35];
+        //char chAtMolWL[20],chAtMol[35];
         long int i;
         static long int n;