[asterisk-scf-commits] asterisk-scf/integration/logger.git branch "retry_deux" updated.

[Commits to the Asterisk SCF project code repositories]

branch "retry_deux" has been updated
       via  b019658a8b42efa9e03e39d4966d5d255de364f2 (commit)
       via  2082a5fbb9352dfd5dab3f60677af42c81c47765 (commit)
      from  935484940af57ddb0d6996eacc83f490c220e022 (commit)

Summary of changes:
 client/src/IceConfigurator.cpp |    4 ++--
 server/src/CMakeLists.txt      |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit b019658a8b42efa9e03e39d4966d5d255de364f2
Merge: 9354849 2082a5f
Author: David M. Lee <dlee at digium.com>
Date:   Tue Apr 10 16:42:23 2012 -0500

    Merge branch 'master' into retry_deux


commit 2082a5fbb9352dfd5dab3f60677af42c81c47765
Author: David M. Lee <dlee at digium.com>
Date:   Fri Apr 6 13:25:49 2012 -0500

    Fixed sort bug found by Clang.
    
    It wasn't clear that my sort function was doing its job, so I made it
    explicit.

diff --git a/client/src/IceConfigurator.cpp b/client/src/IceConfigurator.cpp
index 85c30cf..4f6e6ec 100644
--- a/client/src/IceConfigurator.cpp
+++ b/client/src/IceConfigurator.cpp
@@ -29,7 +29,7 @@ namespace
  * @param rhs Right hand side.
  * @return True, if lhs < rhs.
  */
-bool operator<(const SourceConfiguration& lhs, const SourceConfiguration& rhs)
+bool sortByName(const SourceConfiguration& lhs, const SourceConfiguration& rhs)
 {
     return lhs.name < rhs.name;
 }
@@ -48,7 +48,7 @@ void IceConfigurator::configured(const Configuration& logConfiguration)
 
     // processing is easier if lists are sorted
     std::sort(oldConfig.begin(), oldConfig.end());
-    std::sort(newConfig.begin(), newConfig.end());
+    std::sort(newConfig.begin(), newConfig.end(), sortByName);
 
     SourceConfigurationSeq::const_iterator newConfigIter = newConfig.begin();
     std::vector<std::string>::const_iterator oldConfigIter = oldConfig.begin();
diff --git a/server/src/CMakeLists.txt b/server/src/CMakeLists.txt
index 21dbd45..88c21df 100644
--- a/server/src/CMakeLists.txt
+++ b/server/src/CMakeLists.txt
@@ -29,7 +29,7 @@ astscf_component_add_slice_collection_libraries(LoggingServiceLib ASTSCF)
 astscf_component_build_library(LoggingServiceLib STATIC)
 
 # This lib is compiled into a .so, so it needs -fPIC set
-if(CMAKE_COMPILER_IS_GNUCXX)
+if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGCXX)
   set_target_properties(LoggingServiceLib PROPERTIES COMPILE_FLAGS -fPIC)
 endif()
 

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/logger.git