Changeset 844 for applications/doprava

Timestamp:

03/01/10 18:57:04 (14 years ago)

Author:

prikryl

Message:

Do not use ATL macros (ATL is not shipped with Visual Studio Express).

Location:

applications/doprava/aimsun_bdm

Files:

• aimsun_ds.cpp (modified) (4 diffs)
• aimsun_ds.h (modified) (1 diff)

applications/doprava/aimsun_bdm/aimsun_ds.cpp

@@ -12 +12 @@
 #include <io.h>
 
-#include <atlbase.h>
+//#include <atlbase.h>
 
 #define MAX_PATH_BYTES  (MAX_PATH*sizeof(TCHAR))
@@ -311 +311 @@
 void AimsunDS::initVGS (
         const vgs_headway_mode headway,
-        const TCHAR * entrancePath,
-        const TCHAR * sectionStatsPath,
-        const TCHAR * globalStatsPath
+        const string &entrancePath,
+        const string &sectionStatsPath,
+        const string &globalStatsPath
         )
 {
@@ -333 +333 @@
     /* Specify where to find the CSV with vehicle entrances and which
            headway mode to use for generating vehicle flows. */
-    CT2A ep_c(entrancePath);
-        vgs_generate_vehicles ( ep_c, headway );
+        vgs_generate_vehicles ( entrancePath.c_str(), headway );
     
     /* Pass to VGS API information about section identifiers we want to
@@ -342 +341 @@
     
     /* Specify where to store CSV files with statistical data. */
-    CT2A ss_c(sectionStatsPath);
-    CT2A gs_c(globalStatsPath);
-    vgs_set_stats_file_names ( ss_c, gs_c );
+        vgs_set_stats_file_names ( sectionStatsPath.c_str(), globalStatsPath.c_str() );
     
     /* Specify the maximum queuing speed in kmph. */

applications/doprava/aimsun_bdm/aimsun_ds.h

@@ -48 +48 @@
         void AimsunDS::initVGS (
                 const vgs_headway_mode headway,
-                const TCHAR * entrancePath,
-                const TCHAR * sectionStatsPath,
-                const TCHAR * globalStatsPath
+                const string &entrancePath,
+                const string &sectionStatsPath,
+                const string &globalStatsPath
         );
 };