diff options
| author | Jens Lorenz <jlorenz@de.adit-jv.com> | 2014-06-11 18:14:58 +0200 |
|---|---|---|
| committer | Christian Linke <christian.linke@bmw.de> | 2014-06-23 14:05:37 +0200 |
| commit | 20491c0f31d70e254c56f171c69b95f3d4ad2813 (patch) | |
| tree | 5409ce980ecf4285a21cf0f1b38ba19dafe3129a /AudioManagerDaemon/test/CAmCommonFunctions.h | |
| parent | b0bc6ede2d23dde9a177483aa9470871422fe9aa (diff) | |
| download | audiomanager-20491c0f31d70e254c56f171c69b95f3d4ad2813.tar.gz | |
* Bug #100 - removed projecttypes.h which causes compiling conflicts5.1
Signed-off-by: Jens Lorenz <jlorenz@de.adit-jv.com>
Diffstat (limited to 'AudioManagerDaemon/test/CAmCommonFunctions.h')
| -rw-r--r-- | AudioManagerDaemon/test/CAmCommonFunctions.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/AudioManagerDaemon/test/CAmCommonFunctions.h b/AudioManagerDaemon/test/CAmCommonFunctions.h index 0c9e362..345d178 100644 --- a/AudioManagerDaemon/test/CAmCommonFunctions.h +++ b/AudioManagerDaemon/test/CAmCommonFunctions.h @@ -30,7 +30,7 @@ class CAmCommonFunctions { public: - static std::vector<am_ConnectionFormat_e> getStandardConnectionFormatList(); + static std::vector<am_CustomAvailabilityReason_t> getStandardConnectionFormatList(); static std::vector<am_SoundProperty_s> getStandardSoundPropertyList(); static std::vector<am_MainSoundProperty_s> getStandardMainSoundPropertyList(); static std::vector<bool> getStandardConvertionMatrix(); @@ -59,7 +59,7 @@ public: struct sortByConnectionFormat { - bool operator()(const am_ConnectionFormat_e & a, const am_ConnectionFormat_e & b) const + bool operator()(const am_CustomAvailabilityReason_t & a, const am_CustomAvailabilityReason_t & b) const { return (a < b); } |