Merge pull request #86 from rmathar/master

Using #pragma once to reduced CPP pollution with ifndef ... endif brackets

src/assoc.h

@@ -1,3 +1,4 @@
+#pragma once
 /*
 *				assoc.h
 *
@@ -26,9 +27,7 @@
 *
 *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#ifndef _FITSWCS_H_
 #include        "fitswcs.h"
-#endif
 
 #define		ASSOC_BUFINC	131072	/* Assoc buffer increment (bytes) */
 

src/astrom.h

@@ -1,3 +1,4 @@
+#pragma once
 /*
 *				astrom.h
 *
@@ -26,9 +27,7 @@
 *
 *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#ifndef _FITSWCS_H_
 #include "fitswcs.h"
-#endif
 
 /*----------------------------- Internal constants --------------------------*/
 

src/back.h

@@ -1,3 +1,4 @@
+#pragma once
 /*
 *				back.h
 *

src/bpro.h

@@ -1,3 +1,4 @@
+#pragma once
 /*
 *				bpro.h
 *

src/check.h

@@ -1,3 +1,4 @@
+#pragma once
 /*
 *				check.h
 *
@@ -26,9 +27,7 @@
 *
 *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#ifndef _FITSCAT_H_
 #include "fits/fitscat.h"
-#endif
 
 /*----------------------------- Internal constants --------------------------*/
 

src/clean.h

@@ -1,3 +1,4 @@
+#pragma once
 /*
 *				clean.h
 *

src/define.h

@@ -1,3 +1,4 @@
+#pragma once
 /*
 *				define.h
 *

src/dgeo.h

@@ -1,3 +1,4 @@
+#pragma once
 /**
 * @file         dgeo.h
 * @brief        Include file for dgeo.c.
@@ -24,12 +25,7 @@
 *
 *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#ifndef _DGEO_H_
-#define _DGEO_H_
-
 //----------------------------- Internal constants ----------------------------
 //------------------------------- functions -----------------------------------
 extern int	dgeo_copy(picstruct *dgeofield, PIXTYPE *destx, PIXTYPE *desty,
 		int w,int h, int ix,int iy);
-
-#endif

src/extract.h

@@ -1,3 +1,4 @@
+#pragma once
 /*
 *				extract.h
 *

src/fft.h

@@ -1,3 +1,4 @@
+#pragma once
 /*
 *				fft.h
 *
@@ -26,13 +27,9 @@
 *
 *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#ifndef _FITSCAT_H_
 #include "fits/fitscat.h"
-#endif
 
-#ifndef FFTW3_H
-#include FFTW_H
-#endif
+#include <fftw3.h>
 
 /*---------------------------- Internal constants ---------------------------*/
 

src/field.h

@@ -1,3 +1,4 @@
+#pragma once
 /*
 *				field.h
 *

src/filter.h

@@ -1,3 +1,4 @@
+#pragma once
 /*
 *				filter.h
 *

src/fits/fitscat.h

@@ -1,3 +1,4 @@
+#pragma once
 /*
 *				fitscat.h
 *
@@ -27,9 +28,6 @@
 *
 *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#ifndef _FITSCAT_H_
-#define _FITSCAT_H_
-
 #include <stdio.h>
 
 #ifdef HAVE_SYS_TYPES_H
@@ -345,5 +343,3 @@ extern FLAGTYPE	*alloc_ibody(tabstruct *tab,
 			void (*func)(FLAGTYPE *ptr, int npix));
 
 extern t_type	ttypeof(char *str);
-
-#endif

src/fits/fitscat_defs.h

@@ -1,3 +1,4 @@
+#pragma once
 /*
 *				fitscat_defs.h
 *

src/fitswcs.h

@@ -1,3 +1,4 @@
+#pragma once
 /*
 *				fitswcs.h
 *
@@ -27,9 +28,6 @@
 *
 *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#ifndef _FITSWCS_H_
-#define _FITSWCS_H_
-
 /*-------------------------------- macros -----------------------------------*/
 
 /*----------------------------- Internal constants --------------------------*/
@@ -168,5 +166,3 @@ extern void		b2j(double yearobs, double alphain, double deltain,
 			range_wcs(wcsstruct *wcs),
 			wipe_wcs(tabstruct *tab),
 			write_wcs(tabstruct *tab, wcsstruct *wcs);
-
-#endif

src/flag.h

@@ -1,3 +1,4 @@
+#pragma once
 /*
 *				flag.h
 *

src/globals.h

@@ -1,3 +1,4 @@
+#pragma once
 /*
 *				globals.h
 *

src/growth.h

@@ -1,3 +1,4 @@
+#pragma once
 /*
 *				growth.h
 *

src/header.h

@@ -1,3 +1,4 @@
+#pragma once
 /*
 *				header.h
 *
@@ -26,9 +27,7 @@
 *
 *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#ifndef _FITSCAT_H_
 #include "fits/fitscat.h"
-#endif
 
 /*------------------------------- functions ---------------------------------*/
 extern int		read_aschead(char *filename, int frameno,

src/image.h

@@ -1,3 +1,4 @@
+#pragma once
 /*
 *				image.h
 *

src/interpolate.h

@@ -1,3 +1,4 @@
+#pragma once
 /*
 *				interpolate.h
 *

src/key.h

@@ -1,3 +1,4 @@
+#pragma once
 /*
 *				key.h
 *

src/ldactoasc.h

@@ -1,3 +1,4 @@
+#pragma once
 /*
 *				ldactoasc.h
 *

src/levmar/compiler.h

@@ -1,3 +1,4 @@
+#pragma once
 /*
 *				compiler.h
 *
@@ -44,9 +45,6 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#ifndef _COMPILER_H_
-#define _COMPILER_H_
-
 /* note: intel's icc defines both __ICC & __INTEL_COMPILER.
  * Also, some compilers other than gcc define __GNUC__,
  * therefore gcc should be checked last
@@ -77,5 +75,3 @@
 #else
 #define LM_ISINF(x) isinf(x) // other than MSVC, ICC, GCC, let's hope this will work
 #endif
-
-#endif /* _COMPILER_H_ */

src/levmar/levmar.h

@@ -1,3 +1,4 @@
+#pragma once
 /*
 *				levmar.h
 *
@@ -46,9 +47,6 @@
 ////////////////////////////////////////////////////////////////////////////////////
 */
 
-#ifndef _LEVMAR_H_
-#define _LEVMAR_H_
-
 /* Added by EB */
 #ifdef HAVE_CONFIG_H
 #include        "config.h"
@@ -431,5 +429,3 @@ extern int slevmar_outlid(float *r, int n, float thresh, float ls[2], char *outl
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* _LEVMAR_H_ */

src/levmar/lm.h

@@ -1,3 +1,4 @@
+#pragma once
 /*
 *				lm.h
 *
@@ -25,14 +26,9 @@
 *	Last modified:		09/07/2012
 *
 *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-#ifndef _DEPR_LM_H_
-#define _DEPR_LM_H_
 
 #ifdef _MSC_VER
 #pragma message("lm.h is deprecated, please use levmar.h instead!")
 #else
 #error lm.h is deprecated, please use levmar.h instead!
 #endif /* _MSC_VER */
-
-#endif /* _DEPR_LM_H_ */
-

src/levmar/misc.h

@@ -1,3 +1,4 @@
+#pragma once
 /*
 *				misc.h
 *
@@ -44,9 +45,6 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#ifndef _MISC_H_
-#define _MISC_H_
-
 /* common suffix for LAPACK subroutines. Define empty in case of no prefix. */
 #define LM_LAPACK_SUFFIX _
 //#define LM_LAPACK_SUFFIX  // define empty
@@ -137,5 +135,3 @@ extern int dlevmar_chol(double *C, double *W, int m);
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* _MISC_H_ */

src/neurro.h

@@ -1,3 +1,4 @@
+#pragma once
 /*
 *				neurro.h
 *

src/param.h

@@ -1,3 +1,4 @@
+#pragma once
 /*
 *				param.h
 *

src/paramprofit.h

@@ -1,3 +1,4 @@
+#pragma once
 /*
 *				paramprofit.h
 *

src/pattern.h

@@ -1,3 +1,4 @@
+#pragma once
 /*
 *				pattern.h
 *
@@ -26,12 +27,7 @@
 *
 *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#ifndef _PROFIT_H_
 #include "profit.h"
-#endif
-
-#ifndef _PATTERN_H_
-#define _PATTERN_H_
 
 /*-------------------------------- flags ------------------------------------*/
 /*-------------------------------- macros -----------------------------------*/
@@ -87,6 +83,3 @@ void		pattern_compmodarg(patternstruct *pattern,profitstruct *profit),
 		pattern_create(patternstruct *pattern, profitstruct *profit),
 		pattern_end(patternstruct *pattern),
 		pattern_fit(patternstruct *pattern, profitstruct *profit);
-
-#endif
-

src/photom.h

@@ -1,3 +1,4 @@
+#pragma once
 /*
 *				photom.h
 *

src/plist.h

@@ -1,3 +1,4 @@
+#pragma once
 /*
 *				plist.h
 *

src/preflist.h

@@ -1,3 +1,4 @@
+#pragma once
 /*
 *				preflist.h
 *
@@ -28,9 +29,7 @@
 
 #include "key.h"
 
-#ifndef _XML_H_
 #include "xml.h"
-#endif
 
 #ifdef  USE_THREADS
 #define THREADS_PREFMAX THREADS_NMAX

src/prefs.h

@@ -1,3 +1,4 @@
+#pragma once
 /*
 *				prefs.h
 *
@@ -26,16 +27,9 @@
 *
 *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#ifndef _PROFIT_H_
 #include        "profit.h"
-#endif
 
-#ifndef _PATTERN_H_
 #include        "pattern.h"
-#endif
-
-#ifndef _PREFS_H_
-#define _PREFS_H_
 
 /*----------------------------- Internal constants --------------------------*/
 
@@ -265,4 +259,3 @@ extern void	dumpprefs(int state),
 		preprefs(void),
 		readprefs(char *filename,char **argkey,char **argval,int narg),
 		useprefs(void);
-#endif