Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DataFormats/Common : Changes needed to compile with macOS clang and libc++ #17348

Merged
merged 3 commits into from Feb 8, 2017
Merged

DataFormats/Common : Changes needed to compile with macOS clang and libc++ #17348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e9e095
Changes needed to compile with macOS clang and libc++
gartung Jan 31, 2017
498136e
remove using statment completely
gartung Feb 7, 2017
32d9b54
remove __gnu namespace
gartung Feb 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion DataFormats/Common/interface/RangeMap.h
View file
Open in desktop
Expand Up @@ -21,7 +21,6 @@
#include <map>
#include <vector>
#include <functional>

#include "DataFormats/Common/interface/CMS_CLASS_VERSION.h"
#include "FWCore/Utilities/interface/Exception.h"
#include "DataFormats/Common/interface/traits.h"
Expand Down
5 changes: 2 additions & 3 deletions DataFormats/Common/test/testBoostRange.cpp
View file
Open in desktop
Expand Up @@ -7,7 +7,6 @@

#include <algorithm>
#include <cassert>
#include <ext/algorithm>
#include <iostream>
#include <vector>

Expand Down Expand Up @@ -97,13 +96,13 @@ template<typename R>
void test_sort(R r) {
//std::cout << "Check sort for " << typeid(R).name() << std::endl;
//std::cout << "Before sort: " << std::endl;
assert(!__gnu_cxx::is_sorted(r.begin(), r.end(), DummySorter()));
assert(!std::is_sorted(r.begin(), r.end(), DummySorter()));
//for(typename R::const_iterator it = r.begin(), ed = r.end(); it != ed; ++it) { std::cout << " - " << *it << std::endl; }
std::sort(r.begin(), r.end(), DummySorter());
//std::cout << "After sort: " << std::endl;
//for(typename R::const_iterator it = r.begin(), ed = r.end(); it != ed; ++it) { std::cout << " - " << *it << std::endl; }
//std::cout << "End check " << std::endl;
if(!__gnu_cxx::is_sorted(r.begin(), r.end(), DummySorter())) {
if(!std::is_sorted(r.begin(), r.end(), DummySorter())) {
std::cout << "Sort for " << typeid(R).name() << " compiles but doesn't sort!" << std::endl;
}
}
Expand Down