[asterisk-scf-commits] asterisk-scf/integration/ice-util-cpp.git branch "retry_deux" updated.

[Commits to the Asterisk SCF project code repositories]

branch "retry_deux" has been updated
       via  d5eeba382f5c92e84e36bba38878224644aea2a1 (commit)
      from  60631167b05b1a4f7c8b6f6d315081ded4028f98 (commit)

Summary of changes:
 src/NAT/Candidates.cpp              |    2 +-
 src/Operations/OperationContext.cpp |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)
 mode change 100644 => 100755 src/Operations/OperationContext.cpp


- Log -----------------------------------------------------------------
commit d5eeba382f5c92e84e36bba38878224644aea2a1
Author: Brent Eagles <beagles at digium.com>
Date:   Mon Feb 20 14:05:39 2012 -0330

    Fix a couple of windows build issues:
    
     - Some versions of boost seem to interact poorly with other includes on
       Windows, so include order can sometimes be an issue.
    
     - Missing include in OperationContext.cpp resulted in improper DLL export.

diff --git a/src/NAT/Candidates.cpp b/src/NAT/Candidates.cpp
index 4c8174e..bb84fb9 100644
--- a/src/NAT/Candidates.cpp
+++ b/src/NAT/Candidates.cpp
@@ -14,9 +14,9 @@
  * at the top of the source tree.
  */
 
+#include <AsteriskSCF/Helpers/Network.h>
 #include <boost/asio/ip/address.hpp>
 #include <AsteriskSCF/NAT/Candidates.h>
-#include <AsteriskSCF/Helpers/Network.h>
 #include <sstream>
 #include <boost/functional/hash.hpp>
 
diff --git a/src/Operations/OperationContext.cpp b/src/Operations/OperationContext.cpp
old mode 100644
new mode 100755
index f8ab752..8a2c847
--- a/src/Operations/OperationContext.cpp
+++ b/src/Operations/OperationContext.cpp
@@ -17,6 +17,7 @@
 
 #include <IceUtil/UUID.h>
 #include <AsteriskSCF/System/OperationsIf.h>
+#include <AsteriskSCF/Operations/OperationContext.h>
 
 using namespace AsteriskSCF::System::V1;
 

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


-- 
asterisk-scf/integration/ice-util-cpp.git