Changeset 299 for cpp/frams/_demos

Timestamp:

01/17/15 02:43:46 (9 years ago)

Author:

Maciej Komosinski

Message:

Instead of linking with stdiofile-autoinit.cpp, create an object StdioFileSystem_autoselect stdiofilesys;

Location:

cpp/frams/_demos

Files:

• geometry/geometrytestutils.cpp (modified) (4 diffs)
• loader_test.cpp (modified) (2 diffs)

cpp/frams/_demos/geometry/geometrytestutils.cpp

@@ -6 +6 @@
 
 #include "../genotypeloader.h"
+#include <frams/virtfile/stdiofile.h>
 #include <math.h>
 #include <stdio.h>
@@ -119 +120 @@
 {
         srand(time(NULL));
+        StdioFileSystem_autoselect stdiofilesys;
         
         if ((argc == 3) && (strcmp("-l", argv[1]) == 0))
@@ -178 +180 @@
 {
         srand(time(NULL));
+        StdioFileSystem_autoselect stdiofilesys;
         
         if ((argc == 3) && (strcmp("-l", argv[1]) == 0))
@@ -215 +218 @@
                 "GENO_ID - either genotype name or index (1-based)\n"
                 "DENSITY - minimal number of samples per unit\n"
-                "SHAPE - 1=ellipsoid, 2=cuboid, 3=cylinder, others or none=random",
+                "SHAPE - 1=ellipsoid, 2=cuboid, 3=cylinder, others or none=random\n",
                 (const char*)header);
         return 1;

cpp/frams/_demos/loader_test.cpp

@@ -4 +4 @@
 
 #include "genotypeloader.h"
+#include <frams/virtfile/stdiofile.h>
 
 /**
@@ -24 +25 @@
 
 long count=0,totalsize=0;
+StdioFileSystem_autoselect stdiofilesys;
 MiniGenotypeLoader loader(argv[1]);
 const char* selected=(argc<3)?NULL:argv[2];