fix compile issues with external libarries

121 files changed, 19 insertions, 16 deletions

diff --git a/yaml-cpp/CMakeLists.txt b/external_libs/cpp/yaml-cpp/CMakeLists.txt
index 823ce201..823ce201 100755
--- a/yaml-cpp/CMakeLists.txt
+++ b/external_libs/cpp/yaml-cpp/CMakeLists.txt
diff --git a/yaml-cpp/include/yaml-cpp/aliasmanager.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/aliasmanager.h
index e90c93dd..e90c93dd 100755
--- a/yaml-cpp/include/yaml-cpp/aliasmanager.h
+++ b/external_libs/cpp/yaml-cpp/include/yaml-cpp/aliasmanager.h
diff --git a/yaml-cpp/include/yaml-cpp/anchor.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/anchor.h
index 433f2fa5..433f2fa5 100755
--- a/yaml-cpp/include/yaml-cpp/anchor.h
+++ b/external_libs/cpp/yaml-cpp/include/yaml-cpp/anchor.h
diff --git a/yaml-cpp/include/yaml-cpp/binary.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/binary.h
index 8504ebeb..8504ebeb 100755
--- a/yaml-cpp/include/yaml-cpp/binary.h
+++ b/external_libs/cpp/yaml-cpp/include/yaml-cpp/binary.h
diff --git a/yaml-cpp/include/yaml-cpp/contrib/anchordict.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/contrib/anchordict.h
index e483dc4b..e483dc4b 100755
--- a/yaml-cpp/include/yaml-cpp/contrib/anchordict.h
+++ b/external_libs/cpp/yaml-cpp/include/yaml-cpp/contrib/anchordict.h
diff --git a/yaml-cpp/include/yaml-cpp/contrib/graphbuilder.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/contrib/graphbuilder.h
index 6739a12b..6739a12b 100755
--- a/yaml-cpp/include/yaml-cpp/contrib/graphbuilder.h
+++ b/external_libs/cpp/yaml-cpp/include/yaml-cpp/contrib/graphbuilder.h
diff --git a/yaml-cpp/include/yaml-cpp/conversion.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/conversion.h
index 1b557b56..1b557b56 100755
--- a/yaml-cpp/include/yaml-cpp/conversion.h
+++ b/external_libs/cpp/yaml-cpp/include/yaml-cpp/conversion.h
diff --git a/yaml-cpp/include/yaml-cpp/dll.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/dll.h
index ea138401..ea138401 100755
--- a/yaml-cpp/include/yaml-cpp/dll.h
+++ b/external_libs/cpp/yaml-cpp/include/yaml-cpp/dll.h
diff --git a/yaml-cpp/include/yaml-cpp/emitfromevents.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/emitfromevents.h
index e11ae640..e11ae640 100755
--- a/yaml-cpp/include/yaml-cpp/emitfromevents.h
+++ b/external_libs/cpp/yaml-cpp/include/yaml-cpp/emitfromevents.h
diff --git a/yaml-cpp/include/yaml-cpp/emitter.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/emitter.h
index 1d7edf2f..1d7edf2f 100755
--- a/yaml-cpp/include/yaml-cpp/emitter.h
+++ b/external_libs/cpp/yaml-cpp/include/yaml-cpp/emitter.h
diff --git a/yaml-cpp/include/yaml-cpp/emittermanip.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/emittermanip.h
index a8ec64a4..a8ec64a4 100755
--- a/yaml-cpp/include/yaml-cpp/emittermanip.h
+++ b/external_libs/cpp/yaml-cpp/include/yaml-cpp/emittermanip.h
diff --git a/yaml-cpp/include/yaml-cpp/eventhandler.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/eventhandler.h
index 3173a1fb..3173a1fb 100755
--- a/yaml-cpp/include/yaml-cpp/eventhandler.h
+++ b/external_libs/cpp/yaml-cpp/include/yaml-cpp/eventhandler.h
diff --git a/yaml-cpp/include/yaml-cpp/exceptions.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/exceptions.h
index 394d5868..394d5868 100755
--- a/yaml-cpp/include/yaml-cpp/exceptions.h
+++ b/external_libs/cpp/yaml-cpp/include/yaml-cpp/exceptions.h
diff --git a/yaml-cpp/include/yaml-cpp/iterator.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/iterator.h
index 400ee340..400ee340 100755
--- a/yaml-cpp/include/yaml-cpp/iterator.h
+++ b/external_libs/cpp/yaml-cpp/include/yaml-cpp/iterator.h
diff --git a/yaml-cpp/include/yaml-cpp/ltnode.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/ltnode.h
index 30b4f950..30b4f950 100755
--- a/yaml-cpp/include/yaml-cpp/ltnode.h
+++ b/external_libs/cpp/yaml-cpp/include/yaml-cpp/ltnode.h
diff --git a/yaml-cpp/include/yaml-cpp/mark.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/mark.h
index 7c80fbcb..7c80fbcb 100755
--- a/yaml-cpp/include/yaml-cpp/mark.h
+++ b/external_libs/cpp/yaml-cpp/include/yaml-cpp/mark.h
diff --git a/yaml-cpp/include/yaml-cpp/node.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/node.h
index e78190e0..e78190e0 100755
--- a/yaml-cpp/include/yaml-cpp/node.h
+++ b/external_libs/cpp/yaml-cpp/include/yaml-cpp/node.h
diff --git a/yaml-cpp/include/yaml-cpp/nodeimpl.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/nodeimpl.h
index 5ca7ddba..5ca7ddba 100755
--- a/yaml-cpp/include/yaml-cpp/nodeimpl.h
+++ b/external_libs/cpp/yaml-cpp/include/yaml-cpp/nodeimpl.h
diff --git a/yaml-cpp/include/yaml-cpp/nodereadimpl.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/nodereadimpl.h
index 6838dc5a..6838dc5a 100755
--- a/yaml-cpp/include/yaml-cpp/nodereadimpl.h
+++ b/external_libs/cpp/yaml-cpp/include/yaml-cpp/nodereadimpl.h
diff --git a/yaml-cpp/include/yaml-cpp/nodeutil.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/nodeutil.h
index d0c01d27..d0c01d27 100755
--- a/yaml-cpp/include/yaml-cpp/nodeutil.h
+++ b/external_libs/cpp/yaml-cpp/include/yaml-cpp/nodeutil.h
diff --git a/yaml-cpp/include/yaml-cpp/noncopyable.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/noncopyable.h
index 8e61e433..8e61e433 100755
--- a/yaml-cpp/include/yaml-cpp/noncopyable.h
+++ b/external_libs/cpp/yaml-cpp/include/yaml-cpp/noncopyable.h
diff --git a/yaml-cpp/include/yaml-cpp/null.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/null.h
index 711f18c3..711f18c3 100755
--- a/yaml-cpp/include/yaml-cpp/null.h
+++ b/external_libs/cpp/yaml-cpp/include/yaml-cpp/null.h
diff --git a/yaml-cpp/include/yaml-cpp/ostream.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/ostream.h
index 65839b1b..65839b1b 100755
--- a/yaml-cpp/include/yaml-cpp/ostream.h
+++ b/external_libs/cpp/yaml-cpp/include/yaml-cpp/ostream.h
diff --git a/yaml-cpp/include/yaml-cpp/parser.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/parser.h
index f71cdff4..f71cdff4 100755
--- a/yaml-cpp/include/yaml-cpp/parser.h
+++ b/external_libs/cpp/yaml-cpp/include/yaml-cpp/parser.h
diff --git a/yaml-cpp/include/yaml-cpp/stlemitter.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/stlemitter.h
index f8ff20ea..f8ff20ea 100755
--- a/yaml-cpp/include/yaml-cpp/stlemitter.h
+++ b/external_libs/cpp/yaml-cpp/include/yaml-cpp/stlemitter.h
diff --git a/yaml-cpp/include/yaml-cpp/stlnode.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/stlnode.h
index 40d4ae79..40d4ae79 100755
--- a/yaml-cpp/include/yaml-cpp/stlnode.h
+++ b/external_libs/cpp/yaml-cpp/include/yaml-cpp/stlnode.h
diff --git a/yaml-cpp/include/yaml-cpp/traits.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/traits.h
index 09eead44..09eead44 100755
--- a/yaml-cpp/include/yaml-cpp/traits.h
+++ b/external_libs/cpp/yaml-cpp/include/yaml-cpp/traits.h
diff --git a/yaml-cpp/include/yaml-cpp/yaml.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/yaml.h
index 29595553..29595553 100755
--- a/yaml-cpp/include/yaml-cpp/yaml.h
+++ b/external_libs/cpp/yaml-cpp/include/yaml-cpp/yaml.h
diff --git a/yaml-cpp/install.txt b/external_libs/cpp/yaml-cpp/install.txt
index 93923624..93923624 100755
--- a/yaml-cpp/install.txt
+++ b/external_libs/cpp/yaml-cpp/install.txt
diff --git a/yaml-cpp/license.txt b/external_libs/cpp/yaml-cpp/license.txt
index 5bd9e1a1..5bd9e1a1 100755
--- a/yaml-cpp/license.txt
+++ b/external_libs/cpp/yaml-cpp/license.txt
diff --git a/yaml-cpp/src/aliasmanager.cpp b/external_libs/cpp/yaml-cpp/src/aliasmanager.cpp
index ed4d3b5a..ed4d3b5a 100755
--- a/yaml-cpp/src/aliasmanager.cpp
+++ b/external_libs/cpp/yaml-cpp/src/aliasmanager.cpp
diff --git a/yaml-cpp/src/binary.cpp b/external_libs/cpp/yaml-cpp/src/binary.cpp
index 589eb089..589eb089 100755
--- a/yaml-cpp/src/binary.cpp
+++ b/external_libs/cpp/yaml-cpp/src/binary.cpp
diff --git a/yaml-cpp/src/collectionstack.h b/external_libs/cpp/yaml-cpp/src/collectionstack.h
index 4a986bc9..4a986bc9 100755
--- a/yaml-cpp/src/collectionstack.h
+++ b/external_libs/cpp/yaml-cpp/src/collectionstack.h
diff --git a/yaml-cpp/src/contrib/graphbuilder.cpp b/external_libs/cpp/yaml-cpp/src/contrib/graphbuilder.cpp
index ab5159cc..ab5159cc 100755
--- a/yaml-cpp/src/contrib/graphbuilder.cpp
+++ b/external_libs/cpp/yaml-cpp/src/contrib/graphbuilder.cpp
diff --git a/yaml-cpp/src/contrib/graphbuilderadapter.cpp b/external_libs/cpp/yaml-cpp/src/contrib/graphbuilderadapter.cpp
index 557e97c8..557e97c8 100755
--- a/yaml-cpp/src/contrib/graphbuilderadapter.cpp
+++ b/external_libs/cpp/yaml-cpp/src/contrib/graphbuilderadapter.cpp
diff --git a/yaml-cpp/src/contrib/graphbuilderadapter.h b/external_libs/cpp/yaml-cpp/src/contrib/graphbuilderadapter.h
index 3ef8ab6c..3ef8ab6c 100755
--- a/yaml-cpp/src/contrib/graphbuilderadapter.h
+++ b/external_libs/cpp/yaml-cpp/src/contrib/graphbuilderadapter.h
diff --git a/yaml-cpp/src/conversion.cpp b/external_libs/cpp/yaml-cpp/src/conversion.cpp
index f81e1a0b..f81e1a0b 100755
--- a/yaml-cpp/src/conversion.cpp
+++ b/external_libs/cpp/yaml-cpp/src/conversion.cpp
diff --git a/yaml-cpp/src/directives.cpp b/external_libs/cpp/yaml-cpp/src/directives.cpp
index faf1483b..faf1483b 100755
--- a/yaml-cpp/src/directives.cpp
+++ b/external_libs/cpp/yaml-cpp/src/directives.cpp
diff --git a/yaml-cpp/src/directives.h b/external_libs/cpp/yaml-cpp/src/directives.h
index a3308f72..a3308f72 100755
--- a/yaml-cpp/src/directives.h
+++ b/external_libs/cpp/yaml-cpp/src/directives.h
diff --git a/yaml-cpp/src/emitfromevents.cpp b/external_libs/cpp/yaml-cpp/src/emitfromevents.cpp
index 49fc10b2..49fc10b2 100755
--- a/yaml-cpp/src/emitfromevents.cpp
+++ b/external_libs/cpp/yaml-cpp/src/emitfromevents.cpp
diff --git a/yaml-cpp/src/emitter.cpp b/external_libs/cpp/yaml-cpp/src/emitter.cpp
index 91f48da7..91f48da7 100755
--- a/yaml-cpp/src/emitter.cpp
+++ b/external_libs/cpp/yaml-cpp/src/emitter.cpp
diff --git a/yaml-cpp/src/emitterstate.cpp b/external_libs/cpp/yaml-cpp/src/emitterstate.cpp
index 562e82c9..562e82c9 100755
--- a/yaml-cpp/src/emitterstate.cpp
+++ b/external_libs/cpp/yaml-cpp/src/emitterstate.cpp
diff --git a/yaml-cpp/src/emitterstate.h b/external_libs/cpp/yaml-cpp/src/emitterstate.h
index 5698e325..5698e325 100755
--- a/yaml-cpp/src/emitterstate.h
+++ b/external_libs/cpp/yaml-cpp/src/emitterstate.h
diff --git a/yaml-cpp/src/emitterutils.cpp b/external_libs/cpp/yaml-cpp/src/emitterutils.cpp
index 3d184d6c..3d184d6c 100755
--- a/yaml-cpp/src/emitterutils.cpp
+++ b/external_libs/cpp/yaml-cpp/src/emitterutils.cpp
diff --git a/yaml-cpp/src/emitterutils.h b/external_libs/cpp/yaml-cpp/src/emitterutils.h
index 0e270d69..0e270d69 100755
--- a/yaml-cpp/src/emitterutils.h
+++ b/external_libs/cpp/yaml-cpp/src/emitterutils.h
diff --git a/yaml-cpp/src/exp.cpp b/external_libs/cpp/yaml-cpp/src/exp.cpp
index 7bc54546..7bc54546 100755
--- a/yaml-cpp/src/exp.cpp
+++ b/external_libs/cpp/yaml-cpp/src/exp.cpp
diff --git a/yaml-cpp/src/exp.h b/external_libs/cpp/yaml-cpp/src/exp.h
index 3e12aba4..3e12aba4 100755
--- a/yaml-cpp/src/exp.h
+++ b/external_libs/cpp/yaml-cpp/src/exp.h
diff --git a/yaml-cpp/src/indentation.h b/external_libs/cpp/yaml-cpp/src/indentation.h
index 25f684f8..25f684f8 100755
--- a/yaml-cpp/src/indentation.h
+++ b/external_libs/cpp/yaml-cpp/src/indentation.h
diff --git a/yaml-cpp/src/iterator.cpp b/external_libs/cpp/yaml-cpp/src/iterator.cpp
index f4159e32..f4159e32 100755
--- a/yaml-cpp/src/iterator.cpp
+++ b/external_libs/cpp/yaml-cpp/src/iterator.cpp
diff --git a/yaml-cpp/src/iterpriv.h b/external_libs/cpp/yaml-cpp/src/iterpriv.h
index c511e8ac..c511e8ac 100755
--- a/yaml-cpp/src/iterpriv.h
+++ b/external_libs/cpp/yaml-cpp/src/iterpriv.h
diff --git a/yaml-cpp/src/node.cpp b/external_libs/cpp/yaml-cpp/src/node.cpp
index 360b4ad9..360b4ad9 100755
--- a/yaml-cpp/src/node.cpp
+++ b/external_libs/cpp/yaml-cpp/src/node.cpp
diff --git a/yaml-cpp/src/nodebuilder.cpp b/external_libs/cpp/yaml-cpp/src/nodebuilder.cpp
index 13a70326..13a70326 100755
--- a/yaml-cpp/src/nodebuilder.cpp
+++ b/external_libs/cpp/yaml-cpp/src/nodebuilder.cpp
diff --git a/yaml-cpp/src/nodebuilder.h b/external_libs/cpp/yaml-cpp/src/nodebuilder.h
index 9c1d16a0..9c1d16a0 100755
--- a/yaml-cpp/src/nodebuilder.h
+++ b/external_libs/cpp/yaml-cpp/src/nodebuilder.h
diff --git a/yaml-cpp/src/nodeownership.cpp b/external_libs/cpp/yaml-cpp/src/nodeownership.cpp
index 118edbc8..118edbc8 100755
--- a/yaml-cpp/src/nodeownership.cpp
+++ b/external_libs/cpp/yaml-cpp/src/nodeownership.cpp
diff --git a/yaml-cpp/src/nodeownership.h b/external_libs/cpp/yaml-cpp/src/nodeownership.h
index 69870814..69870814 100755
--- a/yaml-cpp/src/nodeownership.h
+++ b/external_libs/cpp/yaml-cpp/src/nodeownership.h
diff --git a/yaml-cpp/src/null.cpp b/external_libs/cpp/yaml-cpp/src/null.cpp
index 08fa9aae..08fa9aae 100755
--- a/yaml-cpp/src/null.cpp
+++ b/external_libs/cpp/yaml-cpp/src/null.cpp
diff --git a/yaml-cpp/src/ostream.cpp b/external_libs/cpp/yaml-cpp/src/ostream.cpp
index a7f1e14b..a7f1e14b 100755
--- a/yaml-cpp/src/ostream.cpp
+++ b/external_libs/cpp/yaml-cpp/src/ostream.cpp
diff --git a/yaml-cpp/src/parser.cpp b/external_libs/cpp/yaml-cpp/src/parser.cpp
index b836823f..b836823f 100755
--- a/yaml-cpp/src/parser.cpp
+++ b/external_libs/cpp/yaml-cpp/src/parser.cpp
diff --git a/yaml-cpp/src/ptr_stack.h b/external_libs/cpp/yaml-cpp/src/ptr_stack.h
index bf454fb3..bf454fb3 100755
--- a/yaml-cpp/src/ptr_stack.h
+++ b/external_libs/cpp/yaml-cpp/src/ptr_stack.h
diff --git a/yaml-cpp/src/ptr_vector.h b/external_libs/cpp/yaml-cpp/src/ptr_vector.h
index 7b936cb5..7b936cb5 100755
--- a/yaml-cpp/src/ptr_vector.h
+++ b/external_libs/cpp/yaml-cpp/src/ptr_vector.h
diff --git a/yaml-cpp/src/regex.cpp b/external_libs/cpp/yaml-cpp/src/regex.cpp
index b35b1f43..b35b1f43 100755
--- a/yaml-cpp/src/regex.cpp
+++ b/external_libs/cpp/yaml-cpp/src/regex.cpp
diff --git a/yaml-cpp/src/regex.h b/external_libs/cpp/yaml-cpp/src/regex.h
index 8722e626..8722e626 100755
--- a/yaml-cpp/src/regex.h
+++ b/external_libs/cpp/yaml-cpp/src/regex.h
diff --git a/yaml-cpp/src/regeximpl.h b/external_libs/cpp/yaml-cpp/src/regeximpl.h
index d5c20d74..d5c20d74 100755
--- a/yaml-cpp/src/regeximpl.h
+++ b/external_libs/cpp/yaml-cpp/src/regeximpl.h
diff --git a/yaml-cpp/src/scanner.cpp b/external_libs/cpp/yaml-cpp/src/scanner.cpp
index 199ef25a..199ef25a 100755
--- a/yaml-cpp/src/scanner.cpp
+++ b/external_libs/cpp/yaml-cpp/src/scanner.cpp
diff --git a/yaml-cpp/src/scanner.h b/external_libs/cpp/yaml-cpp/src/scanner.h
index bc8dcbe5..bc8dcbe5 100755
--- a/yaml-cpp/src/scanner.h
+++ b/external_libs/cpp/yaml-cpp/src/scanner.h
diff --git a/yaml-cpp/src/scanscalar.cpp b/external_libs/cpp/yaml-cpp/src/scanscalar.cpp
index 064c0867..064c0867 100755
--- a/yaml-cpp/src/scanscalar.cpp
+++ b/external_libs/cpp/yaml-cpp/src/scanscalar.cpp
diff --git a/yaml-cpp/src/scanscalar.h b/external_libs/cpp/yaml-cpp/src/scanscalar.h
index c198cb18..c198cb18 100755
--- a/yaml-cpp/src/scanscalar.h
+++ b/external_libs/cpp/yaml-cpp/src/scanscalar.h
diff --git a/yaml-cpp/src/scantag.cpp b/external_libs/cpp/yaml-cpp/src/scantag.cpp
index b71cbcc4..b71cbcc4 100755
--- a/yaml-cpp/src/scantag.cpp
+++ b/external_libs/cpp/yaml-cpp/src/scantag.cpp
diff --git a/yaml-cpp/src/scantag.h b/external_libs/cpp/yaml-cpp/src/scantag.h
index 38437c03..38437c03 100755
--- a/yaml-cpp/src/scantag.h
+++ b/external_libs/cpp/yaml-cpp/src/scantag.h
diff --git a/yaml-cpp/src/scantoken.cpp b/external_libs/cpp/yaml-cpp/src/scantoken.cpp
index 06d9cd62..06d9cd62 100755
--- a/yaml-cpp/src/scantoken.cpp
+++ b/external_libs/cpp/yaml-cpp/src/scantoken.cpp
diff --git a/yaml-cpp/src/setting.h b/external_libs/cpp/yaml-cpp/src/setting.h
index 806ccdae..806ccdae 100755
--- a/yaml-cpp/src/setting.h
+++ b/external_libs/cpp/yaml-cpp/src/setting.h
diff --git a/yaml-cpp/src/simplekey.cpp b/external_libs/cpp/yaml-cpp/src/simplekey.cpp
index 857a9e0b..857a9e0b 100755
--- a/yaml-cpp/src/simplekey.cpp
+++ b/external_libs/cpp/yaml-cpp/src/simplekey.cpp
diff --git a/yaml-cpp/src/singledocparser.cpp b/external_libs/cpp/yaml-cpp/src/singledocparser.cpp
index 47759c32..47759c32 100755
--- a/yaml-cpp/src/singledocparser.cpp
+++ b/external_libs/cpp/yaml-cpp/src/singledocparser.cpp
diff --git a/yaml-cpp/src/singledocparser.h b/external_libs/cpp/yaml-cpp/src/singledocparser.h
index 3798dccf..3798dccf 100755
--- a/yaml-cpp/src/singledocparser.h
+++ b/external_libs/cpp/yaml-cpp/src/singledocparser.h
diff --git a/yaml-cpp/src/stream.cpp b/external_libs/cpp/yaml-cpp/src/stream.cpp
index 447b67c1..447b67c1 100755
--- a/yaml-cpp/src/stream.cpp
+++ b/external_libs/cpp/yaml-cpp/src/stream.cpp
diff --git a/yaml-cpp/src/stream.h b/external_libs/cpp/yaml-cpp/src/stream.h
index 87f48dc8..87f48dc8 100755
--- a/yaml-cpp/src/stream.h
+++ b/external_libs/cpp/yaml-cpp/src/stream.h
diff --git a/yaml-cpp/src/streamcharsource.h b/external_libs/cpp/yaml-cpp/src/streamcharsource.h
index 21fae4e1..21fae4e1 100755
--- a/yaml-cpp/src/streamcharsource.h
+++ b/external_libs/cpp/yaml-cpp/src/streamcharsource.h
diff --git a/yaml-cpp/src/stringsource.h b/external_libs/cpp/yaml-cpp/src/stringsource.h
index 21be3c9a..21be3c9a 100755
--- a/yaml-cpp/src/stringsource.h
+++ b/external_libs/cpp/yaml-cpp/src/stringsource.h
diff --git a/yaml-cpp/src/tag.cpp b/external_libs/cpp/yaml-cpp/src/tag.cpp
index 82a47047..82a47047 100755
--- a/yaml-cpp/src/tag.cpp
+++ b/external_libs/cpp/yaml-cpp/src/tag.cpp
diff --git a/yaml-cpp/src/tag.h b/external_libs/cpp/yaml-cpp/src/tag.h
index 5f77548d..5f77548d 100755
--- a/yaml-cpp/src/tag.h
+++ b/external_libs/cpp/yaml-cpp/src/tag.h
diff --git a/yaml-cpp/src/token.h b/external_libs/cpp/yaml-cpp/src/token.h
index 9807e258..9807e258 100755
--- a/yaml-cpp/src/token.h
+++ b/external_libs/cpp/yaml-cpp/src/token.h
diff --git a/yaml-cpp/test/CMakeLists.txt b/external_libs/cpp/yaml-cpp/test/CMakeLists.txt
index 241c19ef..241c19ef 100755
--- a/yaml-cpp/test/CMakeLists.txt
+++ b/external_libs/cpp/yaml-cpp/test/CMakeLists.txt
diff --git a/yaml-cpp/test/emittertests.cpp b/external_libs/cpp/yaml-cpp/test/emittertests.cpp
index a7fdab67..a7fdab67 100755
--- a/yaml-cpp/test/emittertests.cpp
+++ b/external_libs/cpp/yaml-cpp/test/emittertests.cpp
diff --git a/yaml-cpp/test/emittertests.h b/external_libs/cpp/yaml-cpp/test/emittertests.h
index e7c6ac50..e7c6ac50 100755
--- a/yaml-cpp/test/emittertests.h
+++ b/external_libs/cpp/yaml-cpp/test/emittertests.h
diff --git a/yaml-cpp/test/main.cpp b/external_libs/cpp/yaml-cpp/test/main.cpp
index 64c69f10..64c69f10 100755
--- a/yaml-cpp/test/main.cpp
+++ b/external_libs/cpp/yaml-cpp/test/main.cpp
diff --git a/yaml-cpp/test/nodetests.h b/external_libs/cpp/yaml-cpp/test/nodetests.h
index 733e782e..733e782e 100755
--- a/yaml-cpp/test/nodetests.h
+++ b/external_libs/cpp/yaml-cpp/test/nodetests.h
diff --git a/yaml-cpp/test/old-api/parsertests.cpp b/external_libs/cpp/yaml-cpp/test/old-api/parsertests.cpp
index de7f1238..de7f1238 100755
--- a/yaml-cpp/test/old-api/parsertests.cpp
+++ b/external_libs/cpp/yaml-cpp/test/old-api/parsertests.cpp
diff --git a/yaml-cpp/test/old-api/spectests.cpp b/external_libs/cpp/yaml-cpp/test/old-api/spectests.cpp
index fb5505be..fb5505be 100755
--- a/yaml-cpp/test/old-api/spectests.cpp
+++ b/external_libs/cpp/yaml-cpp/test/old-api/spectests.cpp
diff --git a/yaml-cpp/test/parsertests.h b/external_libs/cpp/yaml-cpp/test/parsertests.h
index f3de1b8c..f3de1b8c 100755
--- a/yaml-cpp/test/parsertests.h
+++ b/external_libs/cpp/yaml-cpp/test/parsertests.h
diff --git a/yaml-cpp/test/specexamples.h b/external_libs/cpp/yaml-cpp/test/specexamples.h
index 4688bdcf..4688bdcf 100755
--- a/yaml-cpp/test/specexamples.h
+++ b/external_libs/cpp/yaml-cpp/test/specexamples.h
diff --git a/yaml-cpp/test/spectests.cpp b/external_libs/cpp/yaml-cpp/test/spectests.cpp
index bffc5062..bffc5062 100755
--- a/yaml-cpp/test/spectests.cpp
+++ b/external_libs/cpp/yaml-cpp/test/spectests.cpp
diff --git a/yaml-cpp/test/spectests.h b/external_libs/cpp/yaml-cpp/test/spectests.h
index 5246df58..5246df58 100755
--- a/yaml-cpp/test/spectests.h
+++ b/external_libs/cpp/yaml-cpp/test/spectests.h
diff --git a/yaml-cpp/test/tests.cpp b/external_libs/cpp/yaml-cpp/test/tests.cpp
index 2dff6eeb..2dff6eeb 100755
--- a/yaml-cpp/test/tests.cpp
+++ b/external_libs/cpp/yaml-cpp/test/tests.cpp
diff --git a/yaml-cpp/test/tests.h b/external_libs/cpp/yaml-cpp/test/tests.h
index 757dbc53..757dbc53 100755
--- a/yaml-cpp/test/tests.h
+++ b/external_libs/cpp/yaml-cpp/test/tests.h
diff --git a/yaml-cpp/util/CMakeLists.txt b/external_libs/cpp/yaml-cpp/util/CMakeLists.txt
index 22339f02..22339f02 100755
--- a/yaml-cpp/util/CMakeLists.txt
+++ b/external_libs/cpp/yaml-cpp/util/CMakeLists.txt
diff --git a/yaml-cpp/util/api.cpp b/external_libs/cpp/yaml-cpp/util/api.cpp
index e5180a8a..e5180a8a 100755
--- a/yaml-cpp/util/api.cpp
+++ b/external_libs/cpp/yaml-cpp/util/api.cpp
diff --git a/yaml-cpp/util/parse.cpp b/external_libs/cpp/yaml-cpp/util/parse.cpp
index d02a76a7..d02a76a7 100755
--- a/yaml-cpp/util/parse.cpp
+++ b/external_libs/cpp/yaml-cpp/util/parse.cpp
diff --git a/yaml-cpp/yaml-cpp.pc.cmake b/external_libs/cpp/yaml-cpp/yaml-cpp.pc.cmake
index 04d343f6..04d343f6 100755
--- a/yaml-cpp/yaml-cpp.pc.cmake
+++ b/external_libs/cpp/yaml-cpp/yaml-cpp.pc.cmake
diff --git a/src/zmq/include/zmq.h b/external_libs/cpp/zmq/include/zmq.h
index f7b10db6..f7b10db6 100755
--- a/src/zmq/include/zmq.h
+++ b/external_libs/cpp/zmq/include/zmq.h
diff --git a/src/zmq/include/zmq_utils.h b/external_libs/cpp/zmq/include/zmq_utils.h
index 9b14aa72..9b14aa72 100755
--- a/src/zmq/include/zmq_utils.h
+++ b/external_libs/cpp/zmq/include/zmq_utils.h
diff --git a/src/zmq/libzmq.a b/external_libs/cpp/zmq/libzmq.a
index 8c994993..8c994993 100755
--- a/src/zmq/libzmq.a
+++ b/external_libs/cpp/zmq/libzmq.a
diff --git a/src/zmq/libzmq.la b/external_libs/cpp/zmq/libzmq.la
index 2e5f984d..2e5f984d 100755
--- a/src/zmq/libzmq.la
+++ b/external_libs/cpp/zmq/libzmq.la
diff --git a/src/zmq/libzmq.lai b/external_libs/cpp/zmq/libzmq.lai
index 126d3d5e..126d3d5e 100755
--- a/src/zmq/libzmq.lai
+++ b/external_libs/cpp/zmq/libzmq.lai
diff --git a/src/zmq/libzmq.so b/external_libs/cpp/zmq/libzmq.so
index 16980c27..16980c27 100755
--- a/src/zmq/libzmq.so
+++ b/external_libs/cpp/zmq/libzmq.so
diff --git a/scripts/libzmq.so.3 b/external_libs/cpp/zmq/libzmq.so.3
index 16980c27..16980c27 100755
--- a/scripts/libzmq.so.3
+++ b/external_libs/cpp/zmq/libzmq.so.3
diff --git a/scripts/libzmq.so.3.1.0 b/external_libs/cpp/zmq/libzmq.so.3.1.0
index 16980c27..16980c27 100755
--- a/scripts/libzmq.so.3.1.0
+++ b/external_libs/cpp/zmq/libzmq.so.3.1.0
diff --git a/external_libs/python/zmq/backend/cython/_device.so b/external_libs/python/zmq/backend/cython/_device.so
new file mode 100644
index 00000000..5957f8e0
--- /dev/null
+++ b/external_libs/python/zmq/backend/cython/_device.so
diff --git a/external_libs/python/zmq/backend/cython/_poll.so b/external_libs/python/zmq/backend/cython/_poll.so
new file mode 100644
index 00000000..d93d0f10
--- /dev/null
+++ b/external_libs/python/zmq/backend/cython/_poll.so
diff --git a/external_libs/python/zmq/backend/cython/_version.so b/external_libs/python/zmq/backend/cython/_version.so
new file mode 100644
index 00000000..40dd3dc8
--- /dev/null
+++ b/external_libs/python/zmq/backend/cython/_version.so
diff --git a/external_libs/python/zmq/backend/cython/constants.so b/external_libs/python/zmq/backend/cython/constants.so
new file mode 100644
index 00000000..cf44c07e
--- /dev/null
+++ b/external_libs/python/zmq/backend/cython/constants.so
diff --git a/external_libs/python/zmq/backend/cython/context.so b/external_libs/python/zmq/backend/cython/context.so
new file mode 100644
index 00000000..ef9b9699
--- /dev/null
+++ b/external_libs/python/zmq/backend/cython/context.so
diff --git a/external_libs/python/zmq/backend/cython/error.so b/external_libs/python/zmq/backend/cython/error.so
new file mode 100644
index 00000000..360da9dd
--- /dev/null
+++ b/external_libs/python/zmq/backend/cython/error.so
diff --git a/external_libs/python/zmq/backend/cython/message.so b/external_libs/python/zmq/backend/cython/message.so
new file mode 100644
index 00000000..f674489f
--- /dev/null
+++ b/external_libs/python/zmq/backend/cython/message.so
diff --git a/external_libs/python/zmq/backend/cython/socket.so b/external_libs/python/zmq/backend/cython/socket.so
new file mode 100644
index 00000000..1c927042
--- /dev/null
+++ b/external_libs/python/zmq/backend/cython/socket.so
diff --git a/external_libs/python/zmq/backend/cython/utils.so b/external_libs/python/zmq/backend/cython/utils.so
new file mode 100644
index 00000000..b4e5b283
--- /dev/null
+++ b/external_libs/python/zmq/backend/cython/utils.so
diff --git a/external_libs/python/zmq/devices/monitoredqueue.so b/external_libs/python/zmq/devices/monitoredqueue.so
new file mode 100644
index 00000000..edca8a4b
--- /dev/null
+++ b/external_libs/python/zmq/devices/monitoredqueue.so
diff --git a/src/zmq/libzmq.so.3 b/external_libs/python/zmq/libzmq.so
index 16980c27..16980c27 100755..100644
--- a/src/zmq/libzmq.so.3
+++ b/external_libs/python/zmq/libzmq.so
diff --git a/linux/ws_main.py b/linux/ws_main.py
index 6a8967bf..f30a7be3 100755
--- a/linux/ws_main.py
+++ b/linux/ws_main.py
@@ -159,7 +159,7 @@ rpc_server_mock_src = SrcGroup(dir='src/rpc-server/src',
                           ])
 
 # JSON package
-json_src = SrcGroup(dir='external_libs/json',
+json_src = SrcGroup(dir='external_libs/cpp/json',
                     src_list=[
                         'jsoncpp.cpp'
                         ])
@@ -170,7 +170,7 @@ rpc_server_mock = SrcGroups([cmn_src,
                              json_src
                              ])
 
-yaml_src = SrcGroup(dir='yaml-cpp/src/',
+yaml_src = SrcGroup(dir='external_libs/cpp/yaml-cpp/src/',
         src_list=[
             'aliasmanager.cpp',
             'binary.cpp',
@@ -221,11 +221,11 @@ cxxflags_base =['-DWIN_UCODE_SIM',
 
 
 includes_path =''' ../src/pal/linux/
-                   ../src/zmq/include/
                    ../src/
                    ../src/rpc-server/include
-                   ../external_libs/json/
-                   ../yaml-cpp/include/
+                   ../external_libs/cpp/json/
+                   ../external_libs/cpp/zmq/include/
+                   ../external_libs/cpp/yaml-cpp/include/
               ''';
 
 
@@ -349,15 +349,15 @@ build_types = [
                build_option(name = "bp-sim", src = bp, debug_mode= DEBUG_, platform = PLATFORM_32, is_pie = False),
                build_option(name = "bp-sim", src = bp, debug_mode= DEBUG_, platform = PLATFORM_64, is_pie = False),
                build_option(name = "bp-sim", src = bp, debug_mode= RELEASE_,platform = PLATFORM_32, is_pie = False),
-               build_option(name = "bp-sim", src = bp, debug_mode= RELEASE_,platform = PLATFORM_64, is_pie = False)
+               build_option(name = "bp-sim", src = bp, debug_mode= RELEASE_,platform = PLATFORM_64, is_pie = False),
 
-               #build_option(name = "mock-rpc-server", use = ['zmq'], src = rpc_server_mock, debug_mode= DEBUG_,platform = PLATFORM_64, is_pie = False),
+               build_option(name = "mock-rpc-server", use = ['zmq'], src = rpc_server_mock, debug_mode= DEBUG_,platform = PLATFORM_64, is_pie = False),
               ]
 
 
 
 def build_prog (bld, build_obj):
-    zmq_lib_path='src/zmq/'
+    zmq_lib_path='external_libs/cpp/zmq/'
     bld.read_shlib( name='zmq' , paths=[top + zmq_lib_path] )
 
     bld.program(features='cxx cxxprogram', 
diff --git a/linux_dpdk/ws_main.py b/linux_dpdk/ws_main.py
index 997c80fb..817950f3 100755
--- a/linux_dpdk/ws_main.py
+++ b/linux_dpdk/ws_main.py
@@ -131,7 +131,7 @@ net_src = SrcGroup(dir='src/common/Network/Packet',
            'VLANHeader.cpp']);
 
 # JSON package
-json_src = SrcGroup(dir='external_libs/json',
+json_src = SrcGroup(dir='external_libs/cpp/json',
         src_list=[
             'jsoncpp.cpp'
            ])
@@ -149,12 +149,12 @@ rpc_server_src = SrcGroup(dir='src/rpc-server/src',
                           ])
 
 # JSON package
-json_src = SrcGroup(dir='external_libs/json',
+json_src = SrcGroup(dir='external_libs/cpp/json',
                     src_list=[
                         'jsoncpp.cpp'
                         ])
 
-yaml_src = SrcGroup(dir='yaml-cpp/src/',
+yaml_src = SrcGroup(dir='external_libs/cpp/yaml-cpp/src/',
         src_list=[
             'aliasmanager.cpp',
             'binary.cpp',
@@ -398,10 +398,13 @@ common_flags_old = common_flags + [
 
 includes_path =''' ../src/pal/linux_dpdk/
                    ../src/
-                   ../external_libs/json/
+                   
                    ../src/rpc-server/include
-                   ../yaml-cpp/include/
-                   ../src/zmq/include/
+
+                   ../external_libs/cpp/yaml-cpp/include/
+                   ../external_libs/cpp/zmq/include/
+                   ../external_libs/cpp/json/
+
                         ../src/dpdk_lib18/librte_eal/linuxapp/eal/include/
                         ../src/dpdk_lib18/librte_eal/common/include/
                         ../src/dpdk_lib18/librte_eal/common/
@@ -590,7 +593,7 @@ build_types = [
 
 def build_prog (bld, build_obj):
 
-    zmq_lib_path='src/zmq/'
+    zmq_lib_path='external_libs/cpp/zmq/'
     bld.read_shlib( name='zmq' , paths=[top+zmq_lib_path] )
 
     #rte_libs =[
diff --git a/scripts/trex-console b/scripts/trex-console
index 50e097e7..6eab77dd 100755
--- a/scripts/trex-console
+++ b/scripts/trex-console
@@ -1,2 +1,2 @@
 #!/bin/bash
-../src/console/trex_console.py $@
+../scripts/automation/trex_control_plane/console/trex_console.py $@
diff --git a/src/zmq/libzmq.so.3.1.0 b/src/zmq/libzmq.so.3.1.0
deleted file mode 100755
index 16980c27..00000000
--- a/src/zmq/libzmq.so.3.1.0
+++ /dev/null