[aimc] r288 committed - Update build to work with older versions of gcc (4.6)....

[ai...@googlecode.com]

Revision: 288
Author: ro...@google.com
Date: Tue May 28 10:54:18 2013
Log: Update build to work with older versions of gcc (4.6).

Also includes some minor cosmetic whitespace changes to the C++ source.


http://code.google.com/p/aimc/source/detail?r=288

Modified:
/trunk/carfac/SConstruct
/trunk/carfac/agc_params.h
/trunk/carfac/carfac.cc
/trunk/carfac/carfac.h
/trunk/carfac/carfac_output.h
/trunk/carfac/ear.h

=======================================
--- /trunk/carfac/SConstruct Tue May 28 08:54:54 2013
+++ /trunk/carfac/SConstruct Tue May 28 10:54:18 2013
@@ -40,13 +40,14 @@
scons --clean
"""

+import commands
import os

carfac_sources = [
'carfac_common.cc',
'agc_params.h',
'agc_coeffs.h',
- 'agc_state.h',
+ 'agc_state.h',
'carfac_output.cc',
'car_params.h',
'car_coeffs.h',
@@ -59,8 +60,12 @@
]

env = Environment(CPPPATH=[os.environ['EIGEN_PATH']])
-# Needed to support std::vector initialization lists.
-env.MergeFlags(['-std=c++11'])
+GCC_VERSION = commands.getoutput(env['CXX'] + ' -dumpversion')
+if GCC_VERSION.startswith('4.6'):
+ env.MergeFlags(['-std=c++0x'])
+else:
+ env.MergeFlags(['-std=c++11x'])
+
env.Library(target = 'carfac', source = carfac_sources)

env.Command('tmp/libgtest.a', [],
=======================================
--- /trunk/carfac/carfac_output.h Tue May 28 08:54:54 2013
+++ /trunk/carfac/carfac_output.h Tue May 28 10:54:18 2013
@@ -46,11 +46,11 @@
const bool store_bm, const bool store_ohc, const bool
store_agc);
void StoreOutput(const std::vector<Ear>& ears);
// Here we define several acessors for the data members.
- const std::deque<std::vector<FloatArray>>& nap() { return nap_;}
+ const std::deque<std::vector<FloatArray>>& nap() { return nap_; }
const std::deque<std::vector<FloatArray>>& bm() { return bm_; }
- const std::deque<std::vector<FloatArray>>& nap_decim() { return
nap_decim_;}
+ const std::deque<std::vector<FloatArray>>& nap_decim() { return
nap_decim_; }
const std::deque<std::vector<FloatArray>>& ohc() { return ohc_; }
- const std::deque<std::vector<FloatArray>>& agc() { return agc_;}
+ const std::deque<std::vector<FloatArray>>& agc() { return agc_; }

private:
int n_ears_;
=======================================
--- /trunk/carfac/ear.h Tue May 28 08:54:54 2013
+++ /trunk/carfac/ear.h Tue May 28 10:54:18 2013
@@ -33,7 +33,7 @@
// Ear object in the CARFAC 'Design' method.
void InitEar(const int n_ch, const FPType fs,
const CARCoeffs& car_params, const IHCCoeffs& ihc_params,
- const std::vector<AGCCoeffs>& agc_params);
+ const std::vector<AGCCoeffs>& agc_params);
// These three methods apply the different stages of the model in
sequence
// to individual audio samples.
void CARStep(const FPType input);