More work on making use of nested namespaces

This commit is contained in:
Alexander Bock
2017-07-16 01:55:35 -04:00
parent 4dba552fd1
commit 26682669ff
160 changed files with 726 additions and 908 deletions
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -25,8 +25,7 @@
#include <modules/globebrowsing/rendering/gpu/gpulayeradjustment.h>
#include <modules/globebrowsing/rendering/layer/layeradjustment.h>
namespace openspace {
namespace globebrowsing {
namespace openspace::globebrowsing {
void GPULayerAdjustment::setValue(ghoul::opengl::ProgramObject* programObject,
const LayerAdjustment& layerAdjustment)
@@ -44,8 +43,9 @@ void GPULayerAdjustment::setValue(ghoul::opengl::ProgramObject* programObject,
}
}
void GPULayerAdjustment::bind(const LayerAdjustment& layerAdjustment, ghoul::opengl::ProgramObject* programObject,
const std::string& nameBase)
void GPULayerAdjustment::bind(const LayerAdjustment& layerAdjustment,
ghoul::opengl::ProgramObject* programObject,
const std::string& nameBase)
{
switch (layerAdjustment.type()) {
case layergroupid::AdjustmentTypeID::None:
@@ -60,5 +60,4 @@ void GPULayerAdjustment::bind(const LayerAdjustment& layerAdjustment, ghoul::ope
}
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing