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.

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

Fix/no cx11 warning #18

Merged
merged 5 commits into from
Oct 21, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/trivial.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ int main()
delete nns;

return 0;
}
}
2 changes: 1 addition & 1 deletion examples/usage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ int main()
delete nns;

return 0;
}
}
2 changes: 1 addition & 1 deletion nabo/nabo.h
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ namespace Nabo
//! creation option
enum CreationOptionFlags
{
TOUCH_STATISTICS = 1, //!< perform statistics on the number of points touched
TOUCH_STATISTICS = 1 //!< perform statistics on the number of points touched
};

//! search option
Expand Down
9 changes: 8 additions & 1 deletion tests/helpers.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <iostream>
#include <fstream>

#ifdef BOOST_STDINT
#include <boost/cstdint.hpp>
using boost::uint64_t;
#else // BOOST_STDINT
#include <stdint.h>
#endif // BOOST_STDINT

using namespace std;
using namespace Nabo;

Expand Down Expand Up @@ -140,7 +147,7 @@ namespace boost
*/
struct timer
{
typedef unsigned long long Time;
typedef uint64_t Time;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please add an include for <cstdint>

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or <stdint.h> for c++03

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aha. Sorry. I wondered about that but I didn't get a complaint. Strange. And I know that you need <stdint.h> vs <cstdint> depending on standard.


timer():_start_time(curTime()){ }
void restart() { _start_time = curTime(); }
Expand Down
2 changes: 1 addition & 1 deletion tests/knnbench.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -393,4 +393,4 @@ int main(int argc, char* argv[])
}

return 0;
}
}
2 changes: 1 addition & 1 deletion tests/knnbucketsize.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -99,4 +99,4 @@ int main(int argc, char* argv[])
doTestEpsilon<double>(argv[1], K, method, searchCount);

return 0;
}
}
2 changes: 1 addition & 1 deletion tests/knnepsilon.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -99,4 +99,4 @@ int main(int argc, char* argv[])
doTestEpsilon<double>(argv[1], K, method, searchCount);

return 0;
}
}
2 changes: 1 addition & 1 deletion tests/knnvalidate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -203,4 +203,4 @@ int main(int argc, char* argv[])
//validate<double>(argv[1], K, method);

return 0;
}
}