Skip to content

Commit eed0f8e

Browse files
committed
Drop GCC 4.7, remove work-around
1 parent 4d78639 commit eed0f8e

File tree

3 files changed

+3
-16
lines changed

3 files changed

+3
-16
lines changed

.travis.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,6 @@ language: cpp
22

33
matrix:
44
include:
5-
- os: linux
6-
compiler: gcc
7-
addons:
8-
apt:
9-
sources: ['ubuntu-toolchain-r-test']
10-
packages: ['g++-4.7']
11-
env: COMPILER=g++-4.7
12-
135
- os: linux
146
compiler: gcc
157
addons:

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ The Art of C++ / JSON is a zero-dependency C++11 header-only library that provid
1313
* [RFC7159], [ECMA-404]: The JavaScript Object Notation (JSON) Data Interchange Format
1414
* [RFC6901]: JavaScript Object Notation (JSON) Pointer
1515
* [RFC6902]: JavaScript Object Notation (JSON) Patch
16+
* Provides *SAX* and *DOM* APIs.
1617
* Numeric values are stored as `int64_t`, `uint64_t` or `double` internally.
1718
* Standard containers `std::string` for JSON strings, `std::vector< tao::json::value >` for JSON arrays, and `std::map< std::string, tao::json::value >` for JSON objects.
1819
* No memory allocations by the JSON value class itself (the wrapped standard containers perform their memory allocations normally).
@@ -68,7 +69,7 @@ For questions and suggestions about the Art of C++ / JSON please contact the aut
6869

6970
The Art of C++ / JSON contains the [PEGTL](https://github.com/ColinH/PEGTL) which is licensed as follows:
7071

71-
> Copyright (c) 2014-2015 Dr. Colin Hirsch and Daniel Frey
72+
> Copyright (c) 2014-2016 Dr. Colin Hirsch and Daniel Frey
7273
>
7374
> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
7475
>
@@ -91,4 +92,4 @@ The Art of C++ / JSON contains slightly modified portions of the [double-convers
9192
[RFC7159]: https://tools.ietf.org/html/rfc7159
9293
[ECMA-404]: http://www.ecma-international.org/publications/standards/Ecma-404.htm
9394
[RFC6901]: https://tools.ietf.org/html/rfc6901
94-
[RFC6902]: https://tools.ietf.org/html/rfc6902
95+
[RFC6902]: https://tools.ietf.org/html/rfc6902

include/tao/json/value.hh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -765,13 +765,7 @@ namespace tao
765765
template< typename K, typename V >
766766
std::pair< typename std::map< std::string, basic_value >::iterator, bool > unsafe_emplace( K && k, V && v )
767767
{
768-
#if (__GNUC__ > 4) || ((__GNUC__ == 4 ) && (__GNUC_MINOR__ >= 8))
769768
return m_union.o.emplace( std::forward< K >( k ), std::forward< V >( v ) );
770-
#else
771-
// work-around for missing std::map::emplace() in GCC 4.7
772-
using value_type = typename std::map< std::string, basic_value >::value_type;
773-
return m_union.o.insert( value_type( std::forward< K >( k ), std::forward< V >( v ) ) );
774-
#endif
775769
}
776770

777771
template< typename K, typename V >

0 commit comments

Comments
 (0)