Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kicad-source-mirror
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
kicad-source-mirror
Commits
241fdb4d
Commit
241fdb4d
authored
Dec 06, 2011
by
Dick Hollenbeck
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix compile of kicad_plugin.cpp with wxWidgets 2.9.x
parent
fafd74ca
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
4 deletions
+8
-4
richio.h
include/richio.h
+8
-4
No files found.
include/richio.h
View file @
241fdb4d
...
@@ -56,10 +56,7 @@
...
@@ -56,10 +56,7 @@
// use one of the following __LOC__ defs, depending on whether your
// use one of the following __LOC__ defs, depending on whether your
// compiler supports __func__ or not, and how it handles __LINE__
// compiler supports __func__ or not, and how it handles __LINE__
#if defined ( _MSC_VER )
#define __LOC__ ((std::string(__FUNCTION__) + "() : line ") + TOSTRING(__LINE__)).c_str()
#define __func__ __FUNCTION__
#endif
#define __LOC__ ((std::string(__func__) + "() : line ") + TOSTRING(__LINE__)).c_str()
//#define __LOC__ TOSTRING(__LINE__)
//#define __LOC__ TOSTRING(__LINE__)
/// macro which captures the "call site" values of __FILE_ & __LOC__
/// macro which captures the "call site" values of __FILE_ & __LOC__
...
@@ -96,12 +93,19 @@ struct IO_ERROR // : std::exception
...
@@ -96,12 +93,19 @@ struct IO_ERROR // : std::exception
init
(
aThrowersFile
,
aThrowersLoc
,
aMsg
);
init
(
aThrowersFile
,
aThrowersLoc
,
aMsg
);
}
}
#if !wxCHECK_VERSION(2, 9, 0)
// 2.9.0 and greater provide a wxString() constructor taking "const char*" whereas
// 2.8 did not. In 2.9.x this IO_ERROR() constructor uses that wxString( const char* )
// constructor making this here constructor ambiguous with the IO_ERROR()
// taking the wxString.
IO_ERROR
(
const
char
*
aThrowersFile
,
IO_ERROR
(
const
char
*
aThrowersFile
,
const
char
*
aThrowersLoc
,
const
char
*
aThrowersLoc
,
const
std
::
string
&
aMsg
)
const
std
::
string
&
aMsg
)
{
{
init
(
aThrowersFile
,
aThrowersLoc
,
wxString
::
FromUTF8
(
aMsg
.
c_str
()
)
);
init
(
aThrowersFile
,
aThrowersLoc
,
wxString
::
FromUTF8
(
aMsg
.
c_str
()
)
);
}
}
#endif
/**
/**
* handles the case where _() is passed as aMsg.
* handles the case where _() is passed as aMsg.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment