Changeset 8245 for trunk

Timestamp:

28/11/11 18:55:14 (6 months ago)

Author:

westram

Message:

• fix tests (static initialization in tests is undefined, since test itself starts via static initialization)
  • TEST_BI_ecoli_ref
  • TEST_plugin_found

Location:

trunk

Files:

• EDIT4/ED4_plugins.cxx (modified) (1 diff)
• SL/HELIX/BI_basepos.cxx (modified) (2 diffs)

trunk/EDIT4/ED4_plugins.cxx

@@ -113 +113 @@
 };
 
+static const PlugIn *findPlugin(const char *name) {
+    static PlugIn registered[] = { // register plugins here
+        PlugIn("SECEDIT", start_SECEDIT_plugin),
+#if defined(ARB_OPENGL)
+        PlugIn("RNA3D", start_RNA3D_plugin),
+#endif // ARB_OPENGL
+    };
 
-static PlugIn registered[] = { // register plugins here
-    PlugIn("SECEDIT", start_SECEDIT_plugin),
-#if defined(ARB_OPENGL)
-    PlugIn("RNA3D", start_RNA3D_plugin),
-#endif // ARB_OPENGL
-};
-
-static const PlugIn *findPlugin(const char *name) {
     for (size_t plug = 0; plug<ARRAY_ELEMS(registered); ++plug) {
         if (registered[plug].has_name(name)) {

trunk/SL/HELIX/BI_basepos.cxx

@@ -15 +15 @@
 
 static bool is_Gap(char c) { return c == '-' || c == '.'; }
-static CharPredicate pred_is_gap(is_Gap);
 
 // ---------------------
@@ -21 +20 @@
 
 void BasePosition::initialize(const char *seq, int size) {
+    static CharPredicate pred_is_gap(is_Gap);
     initialize(seq, size, pred_is_gap);
 }