Skip to content

Commit

Permalink
fix lib header files
Browse files Browse the repository at this point in the history
  • Loading branch information
treangen committed Jul 18, 2014
1 parent 5831993 commit be3cb42
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 17 deletions.
6 changes: 3 additions & 3 deletions muscle/libMUSCLE/clustsetdf.h
@@ -1,9 +1,9 @@
#ifndef ClustSetDF_h
#define ClustSetDF_h

#include "libMUSCLE/clustset.h"
#include "libMUSCLE/distfunc.h"
#include "libMUSCLE/msa.h"
#include "clustset.h"
#include "distfunc.h"
#include "msa.h"

namespace muscle {

Expand Down
10 changes: 5 additions & 5 deletions muscle/libMUSCLE/muscle.h
Expand Up @@ -28,16 +28,16 @@
#include <ctype.h>
#include <stdarg.h>
#include <stdio.h>
#include "libMUSCLE/threadstorage.h"
#include "threadstorage.h"

#define DOUBLE_AFFINE 0
#define SINGLE_AFFINE 1
#define PAF 0

#include "libMUSCLE/types.h"
#include "libMUSCLE/intmath.h"
#include "libMUSCLE/alpha.h"
#include "libMUSCLE/params.h"
#include "types.h"
#include "intmath.h"
#include "alpha.h"
#include "params.h"

#ifndef _WIN32
#define stricmp strcasecmp
Expand Down
2 changes: 1 addition & 1 deletion muscle/libMUSCLE/params.h
@@ -1,6 +1,6 @@
#ifndef params_h
#define params_h
#include "libMUSCLE/threadstorage.h"
#include "threadstorage.h"

namespace muscle {

Expand Down
6 changes: 3 additions & 3 deletions muscle/libMUSCLE/profile.h
@@ -1,10 +1,10 @@
#ifndef FastProf2_h
#define FastProf2_h

#include "libMUSCLE/msa.h"
#include "libMUSCLE/pwpath.h"
#include "msa.h"
#include "pwpath.h"
#include <math.h> // for log function
#include "libMUSCLE/threadstorage.h"
#include "threadstorage.h"

namespace muscle {

Expand Down
2 changes: 1 addition & 1 deletion muscle/libMUSCLE/seqvect.h
Expand Up @@ -2,7 +2,7 @@
#define SeqVect_h

#include <vector>
#include "libMUSCLE/seq.h"
#include "seq.h"

namespace muscle {

Expand Down
8 changes: 4 additions & 4 deletions muscle/libMUSCLE/types.h
Expand Up @@ -94,25 +94,25 @@ enum NODECMP
NODECMP_Changed = 2 // no equivalent node in old tree
};

// Declare enums using macro hacks (see libMUSCLE/enums.h).
// Declare enums using macro hacks (see enums.h).
#define s(t) enum t { t##_Undefined = 0,
#define c(t, x) t##_##x,
#define e(t) };
#include "libMUSCLE/enums.h"
#include "enums.h"

// Declare conversion function XXXToStr(XXX x)
// for each enum type XXX.
#define s(t) const char *t##ToStr(t x);
#define c(t, x) /* empty */
#define e(t) /* empty */
#include "libMUSCLE/enums.h"
#include "enums.h"

// Declare conversion function StrToXXX(const char *Str)
// for each enum type XXX.
#define s(t) t StrTo##t(const char *Str);
#define c(t, x) /* empty */
#define e(t) /* empty */
#include "libMUSCLE/enums.h"
#include "enums.h"

const char *BoolToStr(bool b);
const char *SecsToStr(unsigned long Secs);
Expand Down

0 comments on commit be3cb42

Please sign in to comment.