Skip to content
Snippets Groups Projects
Commit 0bafdb51 authored by Cory Quammen's avatar Cory Quammen Committed by Kitware Robot
Browse files

Merge topic 'web_app_issues'


d27c1758 Fix issues with vtkWebApplication

Acked-by: default avatarKitware Robot <kwrobot@kitware.com>
Reviewed-by: default avatarKen Martin <ken.martin@kitware.com>
Merge-request: !2740
parents 9b578c78 d27c1758
No related branches found
No related tags found
No related merge requests found
......@@ -444,7 +444,7 @@ vtkObjectIdMap* vtkWebApplication::GetObjectIdMap()
}
//----------------------------------------------------------------------------
const std::string vtkWebApplication::GetObjectId(vtkObject* obj)
std::string vtkWebApplication::GetObjectId(vtkObject* obj)
{
std::ostringstream oss;
oss << std::hex << static_cast<void*>(obj);
......
......@@ -26,7 +26,7 @@
#include "vtkObject.h"
#include "vtkWebCoreModule.h" // needed for exports
#include <string>
#include <string> // needed for std::string
class vtkObjectIdMap;
class vtkRenderWindow;
......@@ -123,7 +123,7 @@ public:
*
* e.g. 0x8f05a90
*/
static const std::string GetObjectId(vtkObject* obj);
static std::string GetObjectId(vtkObject* obj);
protected:
vtkWebApplication();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment