Документ взят из кэша поисковой машины. Адрес оригинального документа : http://kodomo.fbb.msu.ru/hg/allpy/raw-rev/a99f3b84067a Дата изменения: Unknown Дата индексирования: Tue Oct 2 07:18:36 2012 Кодировка:

# HG changeset patch
# User boris (netbook)
# Date 1288708124 -10800
# Node ID a99f3b84067aca5e0582837b6192b373bc0821be
# Parent 18aa6f4649e0e4015b93eaafb5a27246fb19a21d
wt: new way of consts

diff -r 18aa6f4649e0 -r a99f3b84067a blocks3d/wt/config.C
--- a/blocks3d/wt/config.C Sun Oct 31 18:04:29 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-
-#include "config.h"
-#include
-#include
-
-
-namespace Malakite
-{
-
-const char* python_path = "python";
-const char* blocks3d_path = "/home/boris/my-code/Blocks3D/Blocks3D_v5/Blocks3D.py";
-const char* temp_path = "/tmp";
-const char* temp_mkstemp_path = "/tmp/XXXXXX";
-
-const char* main_url = "/";
-
-//~ const char* tempfile_alignment = "in_aln.fasta";
-//~ const char* tempfile_conformity = "in_conf.fasta";
-//~ const char* tempfile_html = "out.html";
-//~ const char* tempfile_check = "check.lock";
-const char* tempfile_sh = "run.sh";
-
-namespace defaults
-{
-
-const char* delta = "2.0";
-const char* min_block_width = "3";
-const char* timeout = "10";
-const char* timeout2 = "10";
-
-}
-
-
-
-}
-
diff -r 18aa6f4649e0 -r a99f3b84067a blocks3d/wt/config.h
--- a/blocks3d/wt/config.h Sun Oct 31 18:04:29 2010 +0300
+++ b/blocks3d/wt/config.h Tue Nov 02 17:28:44 2010 +0300
@@ -3,36 +3,34 @@

namespace Malakite
{
-
+
const int refresh_period = 5*1000;
-
const unsigned int max_simultaneous_tasks = 100;

-extern const char* python_path;
-extern const char* blocks3d_path;
-extern const char* temp_path;
-extern const char* temp_mkstemp_path;
+const char* const python_path = "python";
+const char* const blocks3d_path = "/home/boris/my-code/Blocks3D/Blocks3D_v5/Blocks3D.py";
+const char* const temp_path = "/tmp";
+const char* const temp_mkstemp_path = "/tmp/XXXXXX";

-const char* const test = "123";
+const char* const main_url = "/";

-extern const char* main_url;
-
-//~ extern const char* tempfile_alignment;
-//~ extern const char* tempfile_conformity;
-//~ extern const char* tempfile_html;
-//~ extern const char* tempfile_check;
-extern const char* tempfile_sh;
+const char* const tempfile_sh = "run.sh";

namespace defaults
{

-extern const char* delta;
-extern const char* min_block_width;
-extern const char* timeout;
-extern const char* timeout2;
+const char* const delta = "2.0";
+const char* const min_block_width = "3";
+const char* const timeout = "10";
+const char* const timeout2 = "10";

}

+
+
}

+
+
+
#endif // MALAKITE_BLOCKS3D_CONFIG_H_s