nyje/medit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Yevgen Muntyan 2017-10-26 13:33:42 -07:00
commit 9a4605e735
7 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
moo/moocpp/gobjptr.h
View File

@ -86,7 +86,7 @@ public:
return ObjectPtr(obj, ObjectMemPolicy::CopyReference); return ObjectPtr(obj, ObjectMemPolicy::CopyReference);
} }
ObjectPtr& operator=(nullptr_t) ObjectPtr& operator=(std::nullptr_t)
{ {
reset(); reset();
return *this; return *this;
@ -127,7 +127,7 @@ public:
return m_p == nullptr; return m_p == nullptr;
} }
bool operator==(const nullptr_t&) const bool operator==(const std::nullptr_t&) const
{ {
return m_p == nullptr; return m_p == nullptr;
} }

4
moo/moocpp/gstr.cpp
View File

@ -20,7 +20,7 @@ gstr::gstr()
{ {
} }
gstr::gstr(nullptr_t) gstr::gstr(std::nullptr_t)
: gstr() : gstr()
{ {
} }
@ -112,7 +112,7 @@ bool gstr::operator==(const char* other) const
return strcmp(get(), other ? other : "") == 0; return strcmp(get(), other ? other : "") == 0;
} }
bool gstr::operator==(nullptr_t) const bool gstr::operator==(std::nullptr_t) const
{ {
return empty(); return empty();
} }

4
moo/moocpp/gstr.h
View File

@ -30,7 +30,7 @@ class gstr
{ {
public: public:
gstr(); gstr();
gstr(nullptr_t); gstr(std::nullptr_t);
explicit gstr(const char* s); explicit gstr(const char* s);
gstr(char* s, bool); gstr(char* s, bool);
~gstr(); ~gstr();
@ -52,7 +52,7 @@ public:
bool operator==(const gstr& other) const; bool operator==(const gstr& other) const;
bool operator==(const char* other) const; bool operator==(const char* other) const;
bool operator==(nullptr_t) const; bool operator==(std::nullptr_t) const;
template<typename T> template<typename T>
bool operator!=(const T& other) const bool operator!=(const T& other) const

6
moo/mooedit/mooeditor-tests.cpp
View File

@ -32,7 +32,7 @@ check_contents (const gstr& filename,
if (!g_file_get_contents (filename.get(), &contents, NULL, &error)) if (!g_file_get_contents (filename.get(), &contents, NULL, &error))
{ {
TEST_FAILED_MSG ("could not load file '%s': %s", TEST_FAILED_MSG ("could not load file '%s': %s",
filename, error->message); filename.get(), error->message);
g_error_free (error); g_error_free (error);
return; return;
} }
@ -223,7 +223,7 @@ test_suite_init (G_GNUC_UNUSED gpointer data)
if (_moo_mkdir_with_parents (test_data.working_dir.get(), &err) != 0) if (_moo_mkdir_with_parents (test_data.working_dir.get(), &err) != 0)
{ {
g_critical ("could not create directory '%s': %s", g_critical ("could not create directory '%s': %s",
test_data.working_dir, test_data.working_dir.get(),
mgw_strerror (err)); mgw_strerror (err));
test_data.working_dir.clear(); test_data.working_dir.clear();
return FALSE; return FALSE;
@ -242,7 +242,7 @@ test_suite_cleanup (G_GNUC_UNUSED gpointer data)
if (!_moo_remove_dir (test_data.working_dir.get(), TRUE, &error)) if (!_moo_remove_dir (test_data.working_dir.get(), TRUE, &error))
{ {
g_critical ("could not remove directory '%s': %s", g_critical ("could not remove directory '%s': %s",
test_data.working_dir, error->message); test_data.working_dir.get(), error->message);
g_error_free (error); g_error_free (error);
error = NULL; error = NULL;
} }

2
moo/moopython/moopython-utils.h
View File

@ -67,7 +67,7 @@ void moo_python_remove_path (const char *dir);
#define return_Int(v) return PyInt_FromLong (v) #define return_Int(v) return PyInt_FromLong (v)
#ifdef __cplusplus #ifdef __cplusplus
const nullptr_t moo_nullptr = nullptr; const std::nullptr_t moo_nullptr = nullptr;
#else #else
#define moo_nullptr NULL #define moo_nullptr NULL
#endif #endif

5
moo/mooutils/Makefile.incl
View File

@ -119,6 +119,7 @@ moo_sources += \
mooutils/mooutils-gobject-private.h \ mooutils/mooutils-gobject-private.h \
mooutils/mooutils-gobject.cpp \ mooutils/mooutils-gobject.cpp \
mooutils/mooutils-gobject.h \ mooutils/mooutils-gobject.h \
mooutils/mooutils-gpp.h \
mooutils/mooutils-macros.h \ mooutils/mooutils-macros.h \
mooutils/mooutils-mem.h \ mooutils/mooutils-mem.h \
mooutils/mooutils-messages.h \ mooutils/mooutils-messages.h \
@ -162,8 +163,8 @@ mooutils/mooutils-enums.c.stamp: $(moo_utils_enum_headers) Makefile mooutils/moo
endif endif
mooutils_win32_sources = \ mooutils_win32_sources = \
mooutils/mooutils-win32.c \ mooutils/mooutils-win32.cpp \
mooutils/mooappinput-win32.c mooutils/mooappinput-win32.cpp
mooutils_unix_sources = \ mooutils_unix_sources = \
mooutils/mooappinput-unix.c mooutils/mooappinput-unix.c

2
moo/mooutils/mooutils-fs.cpp
View File

@ -1245,8 +1245,10 @@ _moo_glob_match_simple (const char *pattern,
if ((gl = _moo_glob_new (pattern))) if ((gl = _moo_glob_new (pattern)))
result = _moo_glob_match (gl, filename); result = _moo_glob_match (gl, filename);
#if 0
if (result && 0) if (result && 0)
_moo_message ("'%s' matched '%s'", filename, pattern); _moo_message ("'%s' matched '%s'", filename, pattern);
#endif
_moo_glob_free (gl); _moo_glob_free (gl);
return result; return result;