boost/variant
2
0
Fork 0
mirror of https://github.com/boostorg/variant.git synced 2026-01-19 04:42:16 +00:00
Code Issues Projects Releases Wiki Activity

disambiguate class variant.

Browse Source 
When compiled with C++17 features enabled, class variant is defined in both namespace 'std' and namespace 'boost'.

Signed-off-by: Daniela Engert <dani@ngrt.de>
This commit is contained in:
Daniela Engert
2018-01-26 17:50:07 +01:00
parent 30f57614d3
commit 8b073bc92f
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/test7.cpp
View File

@@ -220,7 +220,7 @@ void var_compare(const VariantType& v, ExpectedType expected)
void run()
{
variant<string, short> v0;
boost::variant<string, short> v0;
var_compare(v0, string(""));
@@ -230,7 +230,7 @@ void run()
v0 = "penny lane";
var_compare(v0, string("penny lane"));
variant<jas, string, int> v1, v2 = jas(195);
boost::variant<jas, string, int> v1, v2 = jas(195);
var_compare(v1, jas(364));
v1 = jas(500);
@@ -240,7 +240,7 @@ void run()
var_compare(v2, jas(500));
variant<string, int> v3;
boost::variant<string, int> v3;
var_compare(v3, string(""));
}

1
test/test8.cpp
View File

@@ -17,7 +17,6 @@
#include <vector>
#include <string>
using namespace std;
using namespace boost;
typedef variant<float, std::string, int, std::vector<std::string> > t_var1;