comparison trunk/carfac/carfac_output.h @ 681:7def70bdd6b6

Update build to work with older versions of gcc (4.6). Also includes some minor cosmetic whitespace changes to the C++ source.
author ronw@google.com
date Tue, 28 May 2013 17:54:18 +0000
parents 594b410c2aed
children 10dc41e4d2f2
comparison
equal deleted inserted replaced
680:be55786eeb04 681:7def70bdd6b6
44 public: 44 public:
45 void Init(const int n_ears, const bool store_nap, const bool store_nap_decim, 45 void Init(const int n_ears, const bool store_nap, const bool store_nap_decim,
46 const bool store_bm, const bool store_ohc, const bool store_agc); 46 const bool store_bm, const bool store_ohc, const bool store_agc);
47 void StoreOutput(const std::vector<Ear>& ears); 47 void StoreOutput(const std::vector<Ear>& ears);
48 // Here we define several acessors for the data members. 48 // Here we define several acessors for the data members.
49 const std::deque<std::vector<FloatArray>>& nap() { return nap_;} 49 const std::deque<std::vector<FloatArray>>& nap() { return nap_; }
50 const std::deque<std::vector<FloatArray>>& bm() { return bm_; } 50 const std::deque<std::vector<FloatArray>>& bm() { return bm_; }
51 const std::deque<std::vector<FloatArray>>& nap_decim() { return nap_decim_;} 51 const std::deque<std::vector<FloatArray>>& nap_decim() { return nap_decim_; }
52 const std::deque<std::vector<FloatArray>>& ohc() { return ohc_; } 52 const std::deque<std::vector<FloatArray>>& ohc() { return ohc_; }
53 const std::deque<std::vector<FloatArray>>& agc() { return agc_;} 53 const std::deque<std::vector<FloatArray>>& agc() { return agc_; }
54 54
55 private: 55 private:
56 int n_ears_; 56 int n_ears_;
57 bool store_nap_; 57 bool store_nap_;
58 bool store_nap_decim_; 58 bool store_nap_decim_;