Merge branch 'asio' (fixes #24)

This also fixes #37 (deprecates it, anyway).
rpclib · Jan 15, 2016 · a15c875 · a15c875
2 parents b6be846 + fd923ed
commit a15c875
Show file tree

Hide file tree

Showing 434 changed files with 87,702 additions and 521 deletions.
diff --git a/.clang-format b/.clang-format
@@ -4,3 +4,4 @@ Standard: Cpp11
 UseTab: Never
 ColumnLimit: 80
 AccessModifierOffset: -4
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 build
+.idea
 *.pyc
 compile_commands.json
 CMakeLists.txt.user

diff --git a/.gitmodules b/.gitmodules
diff --git a/.travis.yml b/.travis.yml
@@ -1,44 +1,49 @@
 dist: trusty
 language: cpp
 compiler:
-    #- clang
-    - g++
+  #- clang
+  - g++
+
+branches:
+  only:
+    - master
+    - dev
 
 env:
-    global:
-        - CI_HOME=`pwd`
+  global:
+    - CI_HOME=`pwd`
 
 addons:
-    apt:
-        sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.7
-            - george-edison55-precise-backports
-        packages:
-            - gcc-5
-            - g++-5
-            #- clang-3.7
-            - cmake
-            - cmake-data
-
-install:
-    #- pip install --user codecov
-    - pip install --user cpp-coveralls
-    #- if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.7" CC="clang-3.7"; fi
-    - if [ "$CXX" = "g++" ]; then export CXX="g++-5" CC="gcc-5"; fi
-
-script:
-    - cd $CI_HOME
-    - git submodule init
-    - git submodule update --init --recursive
-    - mkdir build && cd build
-    - cmake -Dcoverage=ON ..
-    - make -j2
-
-after_success:
-    - ./tests/callme_test
-    - cd ..
-    - coveralls --exclude dependencies --exclude test --gcov /usr/bin/gcov-5
-    #- codecov
-    
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+      - llvm-toolchain-precise-3.7
+      - george-edison55-precise-backports
+    packages:
+      - gcc-5
+      - g++-5
+        #- clang-3.7
+      - cmake
+      - cmake-data
+
+    install:
+      #- pip install --user codecov
+      - pip install --user cpp-coveralls
+        #- if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.7" CC="clang-3.7"; fi
+      - if [ "$CXX" = "g++" ]; then export CXX="g++-5" CC="gcc-5"; fi
+
+    script:
+      - cd $CI_HOME
+      - git submodule init
+      - git submodule update --init --recursive
+      - mkdir build && cd build
+      - cmake -Dcoverage=ON ..
+      - make -j2
+
+    after_success:
+      - ./tests/callme_test
+      - cd ..
+      - coveralls --exclude dependencies --exclude test --gcov /usr/bin/gcov-5
+        #- codecov
+
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -22,8 +22,7 @@ endif()
 set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
 
 include_directories(include
-    dependencies/include
-    dependencies/libuv-cmake/libuv-1.6.1/include)
+    dependencies/include)
 
 file(GLOB_RECURSE CALLME_HEADERS include/callme/*.h)
 file(GLOB_RECURSE DEP_HEADERS dependencies/include/*.h dependencies/include/*.hpp)

diff --git a/appveyor.yml b/appveyor.yml
@@ -3,27 +3,28 @@ os: Visual Studio 2015
 clone_folder: C:\projects\callme
 test: off
 
-configuration:
-    - Release
-
 branches:
-    only:
-        - master
+  only:
+    - master
+    - dev
+
+configuration:
+  - Release
 
 environment:
-    matrix:
-        - CMAKE_PLATFORM: "Visual Studio 14 2015"
+  matrix:
+    - CMAKE_PLATFORM: "Visual Studio 14 2015"
 
 install: true
 
 build_script:
-    - cd c:\projects\callme
-    - git submodule init
-    - git submodule update --init --recursive
-    - md build
-    - cd build
-    - cmake -Dcompdb=OFF -G "%CMAKE_PLATFORM%" ..
-    - set MSBuildLogger="C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
-    - set MSBuildOptions=/v:m /p:Configuration=%Configuration% /logger:%MSBuildLogger%
-    - msbuild %MSBuildOptions% callme.sln
-    - tests\Release\callme_test.exe
+  - cd c:\projects\callme
+  - git submodule init
+  - git submodule update --init --recursive
+  - md build
+  - cd build
+  - cmake -Dcompdb=OFF -G "%CMAKE_PLATFORM%" ..
+  - set MSBuildLogger="C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+  - set MSBuildOptions=/v:m /p:Configuration=%Configuration% /logger:%MSBuildLogger%
+  - msbuild %MSBuildOptions% callme.sln
+  - tests\Release\callme_test.exe
diff --git a/cmake/compiler_specific.cmake b/cmake/compiler_specific.cmake
@@ -3,16 +3,25 @@
 cmake_policy(SET CMP0054 OLD) # silence quoted variables warning
 
 if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -std=c++14")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wno-unused-local-typedef -std=c++14")
 elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -std=c++14")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wno-unused-local-typedef -std=c++14")
     if(coverage)
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g --coverage -O0")
     endif()
 elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")
   # using Intel C++
 elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
     add_definitions(-DWIN32_LEAN_AND_MEAN -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -D_GNU_SOURCE)
+
+    add_definitions(
+        -DASIO_HAS_STD_ADDRESSOF
+        -DASIO_HAS_STD_ARRAY    
+        -DASIO_HAS_CSTDINT
+        -DASIO_HAS_STD_SHARED_PTR
+        -DASIO_HAS_STD_TYPE_TRAITS
+    )
+
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
 	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Zi")
     set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /DEBUG")

diff --git a/dependencies/include/asio.hpp b/dependencies/include/asio.hpp
@@ -0,0 +1,122 @@
+//
+// asio.hpp
+// ~~~~~~~~
+//
+// Copyright (c) 2003-2015 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#ifndef ASIO_HPP
+#define ASIO_HPP
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+# pragma once
+#endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
+
+#include "asio/async_result.hpp"
+#include "asio/basic_datagram_socket.hpp"
+#include "asio/basic_deadline_timer.hpp"
+#include "asio/basic_io_object.hpp"
+#include "asio/basic_raw_socket.hpp"
+#include "asio/basic_seq_packet_socket.hpp"
+#include "asio/basic_serial_port.hpp"
+#include "asio/basic_signal_set.hpp"
+#include "asio/basic_socket_acceptor.hpp"
+#include "asio/basic_socket_iostream.hpp"
+#include "asio/basic_socket_streambuf.hpp"
+#include "asio/basic_stream_socket.hpp"
+#include "asio/basic_streambuf.hpp"
+#include "asio/basic_waitable_timer.hpp"
+#include "asio/buffer.hpp"
+#include "asio/buffered_read_stream_fwd.hpp"
+#include "asio/buffered_read_stream.hpp"
+#include "asio/buffered_stream_fwd.hpp"
+#include "asio/buffered_stream.hpp"
+#include "asio/buffered_write_stream_fwd.hpp"
+#include "asio/buffered_write_stream.hpp"
+#include "asio/buffers_iterator.hpp"
+#include "asio/completion_condition.hpp"
+#include "asio/connect.hpp"
+#include "asio/coroutine.hpp"
+#include "asio/datagram_socket_service.hpp"
+#include "asio/deadline_timer_service.hpp"
+#include "asio/deadline_timer.hpp"
+#include "asio/error.hpp"
+#include "asio/error_code.hpp"
+#include "asio/generic/basic_endpoint.hpp"
+#include "asio/generic/datagram_protocol.hpp"
+#include "asio/generic/raw_protocol.hpp"
+#include "asio/generic/seq_packet_protocol.hpp"
+#include "asio/generic/stream_protocol.hpp"
+#include "asio/handler_alloc_hook.hpp"
+#include "asio/handler_continuation_hook.hpp"
+#include "asio/handler_invoke_hook.hpp"
+#include "asio/handler_type.hpp"
+#include "asio/io_service.hpp"
+#include "asio/ip/address.hpp"
+#include "asio/ip/address_v4.hpp"
+#include "asio/ip/address_v6.hpp"
+#include "asio/ip/basic_endpoint.hpp"
+#include "asio/ip/basic_resolver.hpp"
+#include "asio/ip/basic_resolver_entry.hpp"
+#include "asio/ip/basic_resolver_iterator.hpp"
+#include "asio/ip/basic_resolver_query.hpp"
+#include "asio/ip/host_name.hpp"
+#include "asio/ip/icmp.hpp"
+#include "asio/ip/multicast.hpp"
+#include "asio/ip/resolver_query_base.hpp"
+#include "asio/ip/resolver_service.hpp"
+#include "asio/ip/tcp.hpp"
+#include "asio/ip/udp.hpp"
+#include "asio/ip/unicast.hpp"
+#include "asio/ip/v6_only.hpp"
+#include "asio/is_read_buffered.hpp"
+#include "asio/is_write_buffered.hpp"
+#include "asio/local/basic_endpoint.hpp"
+#include "asio/local/connect_pair.hpp"
+#include "asio/local/datagram_protocol.hpp"
+#include "asio/local/stream_protocol.hpp"
+#include "asio/placeholders.hpp"
+#include "asio/posix/basic_descriptor.hpp"
+#include "asio/posix/basic_stream_descriptor.hpp"
+#include "asio/posix/descriptor_base.hpp"
+#include "asio/posix/stream_descriptor.hpp"
+#include "asio/posix/stream_descriptor_service.hpp"
+#include "asio/raw_socket_service.hpp"
+#include "asio/read.hpp"
+#include "asio/read_at.hpp"
+#include "asio/read_until.hpp"
+#include "asio/seq_packet_socket_service.hpp"
+#include "asio/serial_port.hpp"
+#include "asio/serial_port_base.hpp"
+#include "asio/serial_port_service.hpp"
+#include "asio/signal_set.hpp"
+#include "asio/signal_set_service.hpp"
+#include "asio/socket_acceptor_service.hpp"
+#include "asio/socket_base.hpp"
+#include "asio/strand.hpp"
+#include "asio/stream_socket_service.hpp"
+#include "asio/streambuf.hpp"
+#include "asio/system_error.hpp"
+#include "asio/thread.hpp"
+#include "asio/time_traits.hpp"
+#include "asio/version.hpp"
+#include "asio/wait_traits.hpp"
+#include "asio/waitable_timer_service.hpp"
+#include "asio/windows/basic_handle.hpp"
+#include "asio/windows/basic_object_handle.hpp"
+#include "asio/windows/basic_random_access_handle.hpp"
+#include "asio/windows/basic_stream_handle.hpp"
+#include "asio/windows/object_handle.hpp"
+#include "asio/windows/object_handle_service.hpp"
+#include "asio/windows/overlapped_ptr.hpp"
+#include "asio/windows/random_access_handle.hpp"
+#include "asio/windows/random_access_handle_service.hpp"
+#include "asio/windows/stream_handle.hpp"
+#include "asio/windows/stream_handle_service.hpp"
+#include "asio/write.hpp"
+#include "asio/write_at.hpp"
+
+#endif // ASIO_HPP