Skip to content

Commit a300b19

Browse files
appkinsappkins
committed
fix includes
fixes includes for types
1 parent e77643b commit a300b19

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+182
-578
lines changed

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#
1515
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
1616
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17-
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17+
# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
1818
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1919
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2020
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ copies or substantial portions of the Software.
1414

1515
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
1616
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17+
FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
1818
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1919
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2020
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

‎cmake/CMakeLists.txt.in‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
cmake_minimum_required(VERSION 2.8.2)
2+
3+
project(googletest-download NONE)
4+
5+
include(ExternalProject)
6+
ExternalProject_Add(googletest
7+
GIT_REPOSITORY https://github.com/google/googletest.git
8+
GIT_TAG master
9+
SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-src"
10+
BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-build"
11+
CONFIGURE_COMMAND ""
12+
BUILD_COMMAND ""
13+
INSTALL_COMMAND ""
14+
TEST_COMMAND ""
15+
)

‎cmake/DownloadGTest.cmake‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# Downloads and unpacks googletest at configure time. Based on the instructions
2+
# at https://github.com/google/googletest/tree/master/googletest#incorporating-into-an-existing-cmake-project
3+
4+
# Download and unpack googletest at configure time
5+
configure_file(
6+
${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt.in
7+
googletest-download/CMakeLists.txt
8+
)
9+
execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" .
10+
RESULT_VARIABLE result
11+
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download )
12+
if(result)
13+
message(FATAL_ERROR "CMake step for googletest failed: ${result}")
14+
endif()
15+
execute_process(COMMAND ${CMAKE_COMMAND} --build .
16+
RESULT_VARIABLE result
17+
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download )
18+
if(result)
19+
message(FATAL_ERROR "Build step for googletest failed: ${result}")
20+
endif()
21+
22+
# Prevent overriding the parent project's compiler/linker
23+
# settings on Windows
24+
set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
25+
26+
# Add googletest directly to our build. This defines
27+
# the gtest and gtest_main targets.
28+
add_subdirectory(${CMAKE_CURRENT_BINARY_DIR}/googletest-src
29+
${CMAKE_CURRENT_BINARY_DIR}/googletest-build
30+
EXCLUDE_FROM_ALL)
31+
32+
# The gtest/gtest_main targets carry header search path
33+
# dependencies automatically when using CMake 2.8.11 or
34+
# later. Otherwise we have to add them here ourselves.
35+
if (CMAKE_VERSION VERSION_LESS 2.8.11)
36+
include_directories("${gtest_SOURCE_DIR}/include")
37+
endif()

‎docs/html/client_8hpp_source.html‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎docs/html/error_8hpp_source.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<div class="title">error.hpp</div> </div>
7373
</div><!--header-->
7474
<div class="contents">
75-
<div class="fragment"><div class="line"><a m_name="l00001"></a><span class="lineno"> 1</span>&#160;<span class="comment">// The MIT License (MIT)</span></div><div class="line"><a m_name="l00002"></a><span class="lineno"> 2</span>&#160;<span class="comment">//</span></div><div class="line"><a m_name="l00003"></a><span class="lineno"> 3</span>&#160;<span class="comment">// Copyright (c) 2015-2017 Simon Ninon &lt;simon.ninon@gmail.com&gt;</span></div><div class="line"><a m_name="l00004"></a><span class="lineno"> 4</span>&#160;<span class="comment">//</span></div><div class="line"><a m_name="l00005"></a><span class="lineno"> 5</span>&#160;<span class="comment">// Permission is hereby granted, free of charge, to any person obtaining a copy</span></div><div class="line"><a m_name="l00006"></a><span class="lineno"> 6</span>&#160;<span class="comment">// of this software and associated documentation files (the &quot;Software&quot;), to deal</span></div><div class="line"><a m_name="l00007"></a><span class="lineno"> 7</span>&#160;<span class="comment">// in the Software without restriction, including without limitation the rights</span></div><div class="line"><a m_name="l00008"></a><span class="lineno"> 8</span>&#160;<span class="comment">// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell</span></div><div class="line"><a m_name="l00009"></a><span class="lineno"> 9</span>&#160;<span class="comment">// copies of the Software, and to permit persons to whom the Software is</span></div><div class="line"><a m_name="l00010"></a><span class="lineno"> 10</span>&#160;<span class="comment">// furnished to do so, subject to the following conditions:</span></div><div class="line"><a m_name="l00011"></a><span class="lineno"> 11</span>&#160;<span class="comment">//</span></div><div class="line"><a m_name="l00012"></a><span class="lineno"> 12</span>&#160;<span class="comment">// The above copyright notice and this permission notice shall be included in all</span></div><div class="line"><a m_name="l00013"></a><span class="lineno"> 13</span>&#160;<span class="comment">// copies or substantial portions of the Software.</span></div><div class="line"><a m_name="l00014"></a><span class="lineno"> 14</span>&#160;<span class="comment">//</span></div><div class="line"><a m_name="l00015"></a><span class="lineno"> 15</span>&#160;<span class="comment">// THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</span></div><div class="line"><a m_name="l00016"></a><span class="lineno"> 16</span>&#160;<span class="comment">// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</span></div><div class="line"><a m_name="l00017"></a><span class="lineno"> 17</span>&#160;<span class="comment">// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE</span></div><div class="line"><a m_name="l00018"></a><span class="lineno"> 18</span>&#160;<span class="comment">// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER</span></div><div class="line"><a m_name="l00019"></a><span class="lineno"> 19</span>&#160;<span class="comment">// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,</span></div><div class="line"><a m_name="l00020"></a><span class="lineno"> 20</span>&#160;<span class="comment">// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span></div><div class="line"><a m_name="l00021"></a><span class="lineno"> 21</span>&#160;<span class="comment">// SOFTWARE.</span></div><div class="line"><a m_name="l00022"></a><span class="lineno"> 22</span>&#160;</div><div class="line"><a m_name="l00023"></a><span class="lineno"> 23</span>&#160;<span class="preprocessor">#pragma once</span></div><div class="line"><a m_name="l00024"></a><span class="lineno"> 24</span>&#160;</div><div class="line"><a m_name="l00025"></a><span class="lineno"> 25</span>&#160;<span class="preprocessor">#include &lt;stdexcept&gt;</span></div><div class="line"><a m_name="l00026"></a><span class="lineno"> 26</span>&#160;<span class="preprocessor">#include &lt;string&gt;</span></div><div class="line"><a m_name="l00027"></a><span class="lineno"> 27</span>&#160;</div><div class="line"><a m_name="l00028"></a><span class="lineno"> 28</span>&#160;<span class="keyword">namespace </span><a class="code" href="namespacecpp__redis.html">cpp_redis</a> {</div><div class="line"><a m_name="l00029"></a><span class="lineno"> 29</span>&#160;</div><div class="line"><a m_name="l00033"></a><span class="lineno"><a class="line" href="classcpp__redis_1_1redis__error.html"> 33</a></span>&#160;<span class="keyword">class </span><a class="code" href="classcpp__redis_1_1redis__error.html">redis_error</a> : <span class="keyword">public</span> std::runtime_error {</div><div class="line"><a m_name="l00034"></a><span class="lineno"> 34</span>&#160;<span class="keyword">public</span>:</div><div class="line"><a m_name="l00035"></a><span class="lineno"> 35</span>&#160; <span class="keyword">using</span> std::runtime_error::runtime_error;</div><div class="line"><a m_name="l00036"></a><span class="lineno"> 36</span>&#160; <span class="keyword">using</span> std::runtime_error::what;</div><div class="line"><a m_name="l00037"></a><span class="lineno"> 37</span>&#160;</div><div class="line"><a m_name="l00039"></a><span class="lineno"><a class="line" href="classcpp__redis_1_1redis__error.html#a1445e654b3936c7f5aa1c298bcf24966"> 39</a></span>&#160; <span class="keyword">explicit</span> <a class="code" href="classcpp__redis_1_1redis__error.html#a1445e654b3936c7f5aa1c298bcf24966">redis_error</a>(<span class="keyword">const</span> std::string&amp; err)</div><div class="line"><a m_name="l00040"></a><span class="lineno"> 40</span>&#160; : std::runtime_error(err.c_str()) {</div><div class="line"><a m_name="l00041"></a><span class="lineno"> 41</span>&#160; }</div><div class="line"><a m_name="l00042"></a><span class="lineno"> 42</span>&#160;</div><div class="line"><a m_name="l00044"></a><span class="lineno"><a class="line" href="classcpp__redis_1_1redis__error.html#a0ced25483119c2318b1a5a69cac1919f"> 44</a></span>&#160; <span class="keyword">explicit</span> <a class="code" href="classcpp__redis_1_1redis__error.html#a0ced25483119c2318b1a5a69cac1919f">redis_error</a>(<span class="keyword">const</span> <span class="keywordtype">char</span>* err)</div><div class="line"><a m_name="l00045"></a><span class="lineno"> 45</span>&#160; : std::runtime_error(err) {</div><div class="line"><a m_name="l00046"></a><span class="lineno"> 46</span>&#160; }</div><div class="line"><a m_name="l00047"></a><span class="lineno"> 47</span>&#160;};</div><div class="line"><a m_name="l00048"></a><span class="lineno"> 48</span>&#160;</div><div class="line"><a m_name="l00049"></a><span class="lineno"> 49</span>&#160;} <span class="comment">// namespace cpp_redis</span></div><div class="ttc" id="classcpp__redis_1_1redis__error_html_a1445e654b3936c7f5aa1c298bcf24966"><div class="ttname"><a href="classcpp__redis_1_1redis__error.html#a1445e654b3936c7f5aa1c298bcf24966">cpp_redis::redis_error::redis_error</a></div><div class="ttdeci">redis_error(const std::string &amp;err)</div><div class="ttdoc">ctor (string) </div><div class="ttdef"><b>Definition:</b> error.hpp:39</div></div>
75+
<div class="fragment"><div class="line"><a m_name="l00001"></a><span class="lineno"> 1</span>&#160;<span class="comment">// The MIT License (MIT)</span></div><div class="line"><a m_name="l00002"></a><span class="lineno"> 2</span>&#160;<span class="comment">//</span></div><div class="line"><a m_name="l00003"></a><span class="lineno"> 3</span>&#160;<span class="comment">// Copyright (c) 2015-2017 Simon Ninon &lt;simon.ninon@gmail.com&gt;</span></div><div class="line"><a m_name="l00004"></a><span class="lineno"> 4</span>&#160;<span class="comment">//</span></div><div class="line"><a m_name="l00005"></a><span class="lineno"> 5</span>&#160;<span class="comment">// Permission is hereby granted, free of charge, to any person obtaining a copy</span></div><div class="line"><a m_name="l00006"></a><span class="lineno"> 6</span>&#160;<span class="comment">// of this software and associated documentation files (the &quot;Software&quot;), to deal</span></div><div class="line"><a m_name="l00007"></a><span class="lineno"> 7</span>&#160;<span class="comment">// in the Software without restriction, including without limitation the rights</span></div><div class="line"><a m_name="l00008"></a><span class="lineno"> 8</span>&#160;<span class="comment">// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell</span></div><div class="line"><a m_name="l00009"></a><span class="lineno"> 9</span>&#160;<span class="comment">// copies of the Software, and to permit persons to whom the Software is</span></div><div class="line"><a m_name="l00010"></a><span class="lineno"> 10</span>&#160;<span class="comment">// furnished to do so, subject to the following conditions:</span></div><div class="line"><a m_name="l00011"></a><span class="lineno"> 11</span>&#160;<span class="comment">//</span></div><div class="line"><a m_name="l00012"></a><span class="lineno"> 12</span>&#160;<span class="comment">// The above copyright notice and this permission notice shall be included in all</span></div><div class="line"><a m_name="l00013"></a><span class="lineno"> 13</span>&#160;<span class="comment">// copies or substantial portions of the Software.</span></div><div class="line"><a m_name="l00014"></a><span class="lineno"> 14</span>&#160;<span class="comment">//</span></div><div class="line"><a m_name="l00015"></a><span class="lineno"> 15</span>&#160;<span class="comment">// THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</span></div><div class="line"><a m_name="l00016"></a><span class="lineno"> 16</span>&#160;<span class="comment">// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</span></div><div class="line"><a m_name="l00017"></a><span class="lineno"> 17</span>&#160;<span class="comment">// FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE</span></div><div class="line"><a m_name="l00018"></a><span class="lineno"> 18</span>&#160;<span class="comment">// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER</span></div><div class="line"><a m_name="l00019"></a><span class="lineno"> 19</span>&#160;<span class="comment">// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,</span></div><div class="line"><a m_name="l00020"></a><span class="lineno"> 20</span>&#160;<span class="comment">// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</span></div><div class="line"><a m_name="l00021"></a><span class="lineno"> 21</span>&#160;<span class="comment">// SOFTWARE.</span></div><div class="line"><a m_name="l00022"></a><span class="lineno"> 22</span>&#160;</div><div class="line"><a m_name="l00023"></a><span class="lineno"> 23</span>&#160;<span class="preprocessor">#pragma once</span></div><div class="line"><a m_name="l00024"></a><span class="lineno"> 24</span>&#160;</div><div class="line"><a m_name="l00025"></a><span class="lineno"> 25</span>&#160;<span class="preprocessor">#include &lt;stdexcept&gt;</span></div><div class="line"><a m_name="l00026"></a><span class="lineno"> 26</span>&#160;<span class="preprocessor">#include &lt;string&gt;</span></div><div class="line"><a m_name="l00027"></a><span class="lineno"> 27</span>&#160;</div><div class="line"><a m_name="l00028"></a><span class="lineno"> 28</span>&#160;<span class="keyword">namespace </span><a class="code" href="namespacecpp__redis.html">cpp_redis</a> {</div><div class="line"><a m_name="l00029"></a><span class="lineno"> 29</span>&#160;</div><div class="line"><a m_name="l00033"></a><span class="lineno"><a class="line" href="classcpp__redis_1_1redis__error.html"> 33</a></span>&#160;<span class="keyword">class </span><a class="code" href="classcpp__redis_1_1redis__error.html">redis_error</a> : <span class="keyword">public</span> std::runtime_error {</div><div class="line"><a m_name="l00034"></a><span class="lineno"> 34</span>&#160;<span class="keyword">public</span>:</div><div class="line"><a m_name="l00035"></a><span class="lineno"> 35</span>&#160; <span class="keyword">using</span> std::runtime_error::runtime_error;</div><div class="line"><a m_name="l00036"></a><span class="lineno"> 36</span>&#160; <span class="keyword">using</span> std::runtime_error::what;</div><div class="line"><a m_name="l00037"></a><span class="lineno"> 37</span>&#160;</div><div class="line"><a m_name="l00039"></a><span class="lineno"><a class="line" href="classcpp__redis_1_1redis__error.html#a1445e654b3936c7f5aa1c298bcf24966"> 39</a></span>&#160; <span class="keyword">explicit</span> <a class="code" href="classcpp__redis_1_1redis__error.html#a1445e654b3936c7f5aa1c298bcf24966">redis_error</a>(<span class="keyword">const</span> std::string&amp; err)</div><div class="line"><a m_name="l00040"></a><span class="lineno"> 40</span>&#160; : std::runtime_error(err.c_str()) {</div><div class="line"><a m_name="l00041"></a><span class="lineno"> 41</span>&#160; }</div><div class="line"><a m_name="l00042"></a><span class="lineno"> 42</span>&#160;</div><div class="line"><a m_name="l00044"></a><span class="lineno"><a class="line" href="classcpp__redis_1_1redis__error.html#a0ced25483119c2318b1a5a69cac1919f"> 44</a></span>&#160; <span class="keyword">explicit</span> <a class="code" href="classcpp__redis_1_1redis__error.html#a0ced25483119c2318b1a5a69cac1919f">redis_error</a>(<span class="keyword">const</span> <span class="keywordtype">char</span>* err)</div><div class="line"><a m_name="l00045"></a><span class="lineno"> 45</span>&#160; : std::runtime_error(err) {</div><div class="line"><a m_name="l00046"></a><span class="lineno"> 46</span>&#160; }</div><div class="line"><a m_name="l00047"></a><span class="lineno"> 47</span>&#160;};</div><div class="line"><a m_name="l00048"></a><span class="lineno"> 48</span>&#160;</div><div class="line"><a m_name="l00049"></a><span class="lineno"> 49</span>&#160;} <span class="comment">// namespace cpp_redis</span></div><div class="ttc" id="classcpp__redis_1_1redis__error_html_a1445e654b3936c7f5aa1c298bcf24966"><div class="ttname"><a href="classcpp__redis_1_1redis__error.html#a1445e654b3936c7f5aa1c298bcf24966">cpp_redis::redis_error::redis_error</a></div><div class="ttdeci">redis_error(const std::string &amp;err)</div><div class="ttdoc">ctor (string) </div><div class="ttdef"><b>Definition:</b> error.hpp:39</div></div>
7676
<div class="ttc" id="classcpp__redis_1_1redis__error_html"><div class="ttname"><a href="classcpp__redis_1_1redis__error.html">cpp_redis::redis_error</a></div><div class="ttdef"><b>Definition:</b> error.hpp:33</div></div>
7777
<div class="ttc" id="classcpp__redis_1_1redis__error_html_a0ced25483119c2318b1a5a69cac1919f"><div class="ttname"><a href="classcpp__redis_1_1redis__error.html#a0ced25483119c2318b1a5a69cac1919f">cpp_redis::redis_error::redis_error</a></div><div class="ttdeci">redis_error(const char *err)</div><div class="ttdoc">ctor(char*) </div><div class="ttdef"><b>Definition:</b> error.hpp:44</div></div>
7878
<div class="ttc" id="namespacecpp__redis_html"><div class="ttname"><a href="namespacecpp__redis.html">cpp_redis</a></div><div class="ttdef"><b>Definition:</b> array_builder.hpp:29</div></div>

‎docs/html/functions_m.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ <h3><a id="index_m"></a>- m_cv_mutex -</h3><ul>
240240
<li>m_subscribed_sessions_mutex
241241
: <a class="el" href="classcpp__redis_1_1subscriber.html#ae46b99f9ff06e2a05daca6273ffbb155">cpp_redis::subscriber</a>
242242
</li>
243-
<li>m_sync_condvar
243+
<li>m_sync_cond_var
244244
: <a class="el" href="classcpp__redis_1_1client.html#a3dcead667f0e7a23766fbd35bcf8cfc2">cpp_redis::client</a>
245245
, <a class="el" href="classcpp__redis_1_1sentinel.html#a069c52d386173818d4c0656b242107dd">cpp_redis::sentinel</a>
246246
</li>

‎docs/html/jquery.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/html/logger_8hpp_source.html‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)