Skip to content

Commit 75ffc0b

Browse files
committed
Fix warning
1 parent 2e4d2bc commit 75ffc0b

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/Core/Datatypes/Geometry.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
Copyright (c) 2012 Scientific Computing and Imaging Institute,
77
University of Utah.
88
9-
9+
1010
Permission is hereby granted, free of charge, to any person obtaining a
1111
copy of this software and associated documentation files (the "Software"),
1212
to deal in the Software without restriction, including without limitation
@@ -28,7 +28,7 @@
2828
/// @todo Documentation Core/Datatypes/Geometry.h
2929

3030
#ifndef CORE_DATATYPES_GEOMETRY_H
31-
#define CORE_DATATYPES_GEOMETRY_H
31+
#define CORE_DATATYPES_GEOMETRY_H
3232

3333
#include <cstdint>
3434
#include <list>
@@ -79,7 +79,7 @@ namespace Datatypes {
7979
DatatypeConstHandle get_underlying() const;
8080
virtual GeometryObject* clone() const { return new GeometryObject(*this); }
8181

82-
std::string objectName; ///< Name of this object. Should be unique
82+
std::string objectName; ///< Name of this object. Should be unique
8383
///< across all modules in the network.
8484

8585
// Could require rvalue references...
@@ -149,7 +149,7 @@ namespace Datatypes {
149149
struct SpireSubPass
150150
{
151151
SpireSubPass() {}
152-
SpireSubPass(const std::string& name, const std::string& vboName,
152+
SpireSubPass(const std::string& name, const std::string& vboName,
153153
const std::string& iboName, const std::string& program,
154154
ColorScheme scheme, const RenderState& state,
155155
RenderType renType, const SpireVBO& vbo, const SpireIBO& ibo) :
@@ -161,8 +161,8 @@ namespace Datatypes {
161161
renderType(renType),
162162
vbo(vbo),
163163
ibo(ibo),
164-
mColorScheme(scheme),
165-
scalar(1.0)
164+
scalar(1.0),
165+
mColorScheme(scheme)
166166
{}
167167

168168
static const char* getName() { return "SpireSubPass"; }

0 commit comments

Comments
 (0)