Changeset 2217 for trunk/source/punch_fits.cpp

Timestamp:

07/15/08 13:40:53 (6 months ago)

Author:

peter

Message:

source/service.cpp:
source/punch_fits.cpp:
source/grains_mie.cpp:
source/assert_results.cpp:
source/parse_punch.cpp:
source/optimize_phymir.cpp:
source/version.h:
source/parse_commands.cpp:
source/prt_final.cpp:
source/grid_do.cpp:
source/parse_print.cpp:
source/cddrive.cpp:
source/prt_comment.cpp:
source/maincl.cpp:
tsuite/programs/template.cpp:
tsuite/programs/comp4/comp4.cpp:
tsuite/programs/mpi/mpi.cpp:
tsuite/programs/hazy_kmt/hazy_kmt.cpp:
tsuite/programs/hazy_coolingcurve/hazy_coolingcurve.cpp:
tsuite/programs/vary_nete/vary_nete.cpp:
tsuite/programs/collion/collion.cpp:
tsuite/programs/hizlte/hizlte.cpp:
tsuite/programs/varyn/varyn.cpp:

Avoid name collisions with the Sun Studio 12 compiler on Ultrasparc/Solaris.

Files:

• trunk/source/punch_fits.cpp (modified) (1 diff)

trunk/source/punch_fits.cpp

@@ -738 +738 @@
         strcpy( tempString, "Generated by Cloudy " );
         // strncat guarantees that terminating 0 byte will always be written...
-        strncat( tempString, version::Inst().chVersion, sizeof(tempString)-strlen(tempString) );
+        strncat( tempString, t_version::Inst().chVersion, sizeof(tempString)-strlen(tempString) );
         bytesAdded += addComment( tempString );
-        bytesAdded += addComment( version::Inst().chInfo );
+        bytesAdded += addComment( t_version::Inst().chInfo );
         strcpy( tempString, "--- " );
         strcat( tempString, timeString );