-
Notifications
You must be signed in to change notification settings - Fork 9.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixed build broken by previous commits that added use of string in lo…
…w-level code
- 5.5.0
- 5.4.1
- 5.4.0
- 5.4.0-rc2
- 5.4.0-rc1
- 5.3.4
- 5.3.3
- 5.3.2
- 5.3.1
- 5.3.0
- 5.3.0-rc1
- 5.2.0
- 5.1.0
- 5.0.1
- 5.0.0
- 5.0.0-rc3
- 5.0.0-rc2
- 5.0.0-rc1
- 5.0.0-beta-20210916
- 5.0.0-beta-20210815
- 5.0.0-alpha-20210401
- 5.0.0-alpha-20201231
- 5.0.0-alpha-20201224
- 5.0.0-alpha
- 4.1.3
- 4.1.2
- 4.1.1
- 4.1.1-rc2
- 4.1.1-rc1
- 4.1.0
- 4.1.0-rc4
- 4.1.0-rc3
- 4.1.0-rc2
- 4.1.0-rc1
- 4.0.0
- 4.0.0-rc4
- 4.0.0-rc3
- 4.0.0-rc2
- 4.0.0-rc1
- 4.0.0-beta.4
- 4.0.0-beta.3
- 4.0.0-beta.2
- 4.0.0-beta.1
1 parent
df41eab
commit aee910a
Showing
9 changed files
with
14 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -53,6 +53,12 @@ | |
#define SIGNED signed | ||
#endif | ||
|
||
// Fix to map between google use of string without std and everywhere else. | ||
#ifdef USE_STD_NAMESPACE | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
theraysmith
via email
Author
Contributor
|
||
#include <string> | ||
using std::string; | ||
#endif | ||
|
||
#if defined(_WIN32) || defined(__CYGWIN__) | ||
#ifndef M_PI | ||
#define M_PI 3.14159265358979323846 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The current code includes a mixture of
string
without namespace andstd::string
. Other types from the standard namespace (likestd::vector
for example) always use the namespace prefix.Wouldn't it be better to clean that situation and use
std::string
in the Tesseract code (avoiding thatUSE_STD_NAMESPACE
hack)? Or is usingstring
part of the Google coding conventions (then we'd have to replace allstd::string
code).