[llvm-branch-commits] [lldb] r198473 - Remove explicit global namespace scope to build on FreeBSD

Ed Maste emaste at freebsd.org
Fri Jan 3 18:56:49 PST 2014


Author: emaste
Date: Fri Jan  3 20:56:49 2014
New Revision: 198473

URL: http://llvm.org/viewvc/llvm-project?rev=198473&view=rev
Log:
Remove explicit global namespace scope to build on FreeBSD

getcurx() etc. exist as macros in FreeBSD's ncurses.h, and caused a build
failure with the explicit scope.

Modified:
    lldb/branches/iohandler/source/Core/IOHandler.cpp

Modified: lldb/branches/iohandler/source/Core/IOHandler.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/iohandler/source/Core/IOHandler.cpp?rev=198473&r1=198472&r2=198473&view=diff
==============================================================================
--- lldb/branches/iohandler/source/Core/IOHandler.cpp (original)
+++ lldb/branches/iohandler/source/Core/IOHandler.cpp Fri Jan  3 20:56:49 2014
@@ -620,12 +620,12 @@ namespace curses
         void    Clear ()    { ::wclear (m_window); }
         void    Erase ()    { ::werase (m_window); }
         int     GetChar ()  { return ::wgetch (m_window); }
-        int     GetCursorX ()     { return ::getcurx (m_window); }
-        int     GetCursorY ()     { return ::getcury (m_window); }
-        int     GetParentX ()     { return ::getparx (m_window); }
-        int     GetParentY ()     { return ::getpary (m_window); }
-        int     GetMaxX()   { return ::getmaxx (m_window); }
-        int     GetMaxY()   { return ::getmaxy (m_window); }
+        int     GetCursorX ()     { return getcurx (m_window); }
+        int     GetCursorY ()     { return getcury (m_window); }
+        int     GetParentX ()     { return getparx (m_window); }
+        int     GetParentY ()     { return getpary (m_window); }
+        int     GetMaxX()   { return getmaxx (m_window); }
+        int     GetMaxY()   { return getmaxy (m_window); }
         int     GetWidth()  { return GetMaxX(); }
         int     GetHeight() { return GetMaxY(); }
         void    MoveCursor (int x, int y) {  ::wmove (m_window, y, x); }





More information about the llvm-branch-commits mailing list