Skip to content

Commit

Permalink
Cleanup stray semicolons
Browse files Browse the repository at this point in the history
I believe this is the last group from #889
  • Loading branch information
noloader committed Oct 4, 2019
1 parent 883dbce commit f2c0c2c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
8 changes: 4 additions & 4 deletions config_misc.h
Expand Up @@ -145,13 +145,13 @@
#endif // CRYPTOPP_CXX11_CONSTEXPR

#if defined(CRYPTOPP_DOXYGEN_PROCESSING)
# define CRYPTOPP_CONSTANT(x) static const int x;
# define CRYPTOPP_CONSTANT(x) static const int x
#elif defined(CRYPTOPP_CXX11_ENUM)
# define CRYPTOPP_CONSTANT(x) enum : int { x };
# define CRYPTOPP_CONSTANT(x) enum : int { x }
#elif defined(CRYPTOPP_CXX11_CONSTEXPR)
# define CRYPTOPP_CONSTANT(x) constexpr static int x;
# define CRYPTOPP_CONSTANT(x) constexpr static int x
#else
# define CRYPTOPP_CONSTANT(x) static const int x;
# define CRYPTOPP_CONSTANT(x) static const int x
#endif

// Warnings
Expand Down
1 change: 0 additions & 1 deletion config_ns.h
Expand Up @@ -56,7 +56,6 @@ namespace CryptoPP { }
#define NAMESPACE_BEGIN(x) namespace x {
#define NAMESPACE_END }
#define DOCUMENTED_TYPEDEF(x, y) typedef x y
;

#endif // CRYPTOPP_DOXYGEN_PROCESSING

Expand Down

4 comments on commit f2c0c2c

@irwir
Copy link
Contributor

@irwir irwir commented on f2c0c2c Oct 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit breaks VS 2019 compilation when using the provided cryptlib.vcxproj.

@noloader
Copy link
Collaborator Author

@noloader noloader commented on f2c0c2c Oct 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @irwir .

I can't duplicate it locally using VS2015 or VS2017 using the Nmake file or MSbuild. I don't have VS2019 to test with.

Can you provide more details?

Ping @MarcelRaad .

@irwir
Copy link
Contributor

@irwir irwir commented on f2c0c2c Oct 8, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Both VS 2017 and VS2019 fail, no VS2015 at hand; Community edition will do.
How to reproduce.
Get an archive from Github, unpack, start IDE, open the project or solution, right click on the library project and select Build.

@noloader
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@irwir,

I was able to duplicate on a VS2013 machine. The compile errors should be fixed now. Sorry about that.

In the future please make a pull request. It will avoid the lag time when we have trouble duplicating the issue.

Please sign in to comment.