Mercurial > hg > aimc

diff trunk/carfac/carfac_output.h @ 682:10dc41e4d2f2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More small style revisions to C++ CARFAC, adjusted struct member variable naming, header guards and #include structure.
author alexbrandmeyer
date Wed, 29 May 2013 15:37:28 +0000
parents 7def70bdd6b6
children d0612798f6de
line wrap: on
line diff
--- a/trunk/carfac/carfac_output.h	Tue May 28 17:54:18 2013 +0000
+++ b/trunk/carfac/carfac_output.h	Wed May 29 15:37:28 2013 +0000
@@ -34,10 +34,12 @@
 // EarOutput sub-objects once the target data dimensions ears (n_ears), channels
 // (n_ch) and timepoints (n_tp) are known.
 
-#ifndef CARFAC_Open_Source_C__Library_carfac_output_h
-#define CARFAC_Open_Source_C__Library_carfac_output_h
+#ifndef CARFAC_CARFAC_OUTPUT_H
+#define CARFAC_CARFAC_OUTPUT_H
 
 #include <deque>
+#include <vector>
+#include "carfac_common.h"
 #include "ear.h"
 
 class CARFACOutput {
@@ -66,4 +68,4 @@
   std::deque<std::vector<FloatArray>> agc_;
 };
 
-#endif
+#endif  // CARFAC_CARFAC_OUTPUT_H
\ No newline at end of file