Skip to content

fix ifstream >> byte with c++17 #293

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

Merged
ahornung merged 1 commit into from
Apr 26, 2020
Merged

fix ifstream >> byte with c++17 #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions octomap/src/binvox2bt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@
using namespace std;
using namespace octomap;

#if __cplusplus < 201500L
namespace octomap {
typedef unsigned char byte;
#endif
}

int main(int argc, char **argv)
{
Expand Down Expand Up @@ -229,8 +229,8 @@ int main(int argc, char **argv)
cout.flush();

// read voxel data
byte value;
byte count;
octomap::byte value;
octomap::byte count;
int index = 0;
int end_index = 0;
unsigned nr_voxels = 0;
Expand Down
3 changes: 0 additions & 3 deletions octomap/src/edit_octree.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@
using namespace std;
using namespace octomap;

#if __cplusplus < 201500L
typedef unsigned char byte;
#endif

int main(int argc, char **argv)
{
Expand Down