summaryrefslogtreecommitdiffstats
path: root/libcxx/test/std/containers/associative/map/map.modifiers/merge.pass.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'libcxx/test/std/containers/associative/map/map.modifiers/merge.pass.cpp')
-rw-r--r--libcxx/test/std/containers/associative/map/map.modifiers/merge.pass.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/libcxx/test/std/containers/associative/map/map.modifiers/merge.pass.cpp b/libcxx/test/std/containers/associative/map/map.modifiers/merge.pass.cpp
index 1cef30944a8..ae943df6a45 100644
--- a/libcxx/test/std/containers/associative/map/map.modifiers/merge.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.modifiers/merge.pass.cpp
@@ -49,7 +49,7 @@ struct throw_comparator
};
#endif
-int main()
+int main(int, char**)
{
{
std::map<int, int> src{{1, 0}, {3, 0}, {5, 0}};
@@ -146,4 +146,5 @@ int main()
first.merge(std::move(second));
}
}
+ return 0;
}
OpenPOWER on IntegriCloud